diff --git a/Documentation/dontdiff b/Documentation/dontdiff
-index 39462cf..611a556 100644
+index 74c25c8..deadba2 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -2,9 +2,11 @@
logo_*.c
logo_*_clut224.c
logo_*_mono.c
-@@ -163,14 +181,15 @@ machtypes.h
+@@ -162,14 +180,15 @@ mach-types.h
+ machtypes.h
map
map_hugetlb
- maui_boot.h
-media
mconf
+mdp
mkprep
mkregtable
mktables
-@@ -187,6 +206,8 @@ oui.c*
+@@ -186,6 +205,8 @@ oui.c*
page-types
parse.c
parse.h
patches*
pca200e.bin
pca200e_ecd.bin2
-@@ -196,6 +217,7 @@ perf-archive
+@@ -195,6 +216,7 @@ perf-archive
piggyback
piggy.gzip
piggy.S
pnmtologo
ppc_defs.h*
pss_boot.h
-@@ -205,7 +227,10 @@ r200_reg_safe.h
+@@ -204,7 +226,10 @@ r200_reg_safe.h
r300_reg_safe.h
r420_reg_safe.h
r600_reg_safe.h
relocs
rlim_names.h
rn50_reg_safe.h
-@@ -215,8 +240,11 @@ series
+@@ -214,8 +239,11 @@ series
setup
setup.bin
setup.elf
split-include
syscalltab.h
tables.c
-@@ -226,6 +254,7 @@ tftpboot.img
+@@ -225,6 +253,7 @@ tftpboot.img
timeconst.h
times.h*
trix_boot.h
utsrelease.h*
vdso-syms.lds
vdso.lds
-@@ -237,13 +266,17 @@ vdso32.lds
+@@ -236,13 +265,17 @@ vdso32.lds
vdso32.so.dbg
vdso64.lds
vdso64.so.dbg
vmlinuz
voffset.h
vsyscall.lds
-@@ -251,9 +284,11 @@ vsyscall_32.lds
+@@ -250,9 +283,11 @@ vsyscall_32.lds
wanxlfw.inc
uImage
unifdef
+zconf.lex.c
zoffset.h
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index ad7e2e5..199f49e 100644
+index 9776f06..18b1856 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -905,6 +905,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
hashdist= [KNL,NUMA] Large hashes allocated during boot
are distributed across NUMA nodes. Defaults on
for 64-bit NUMA, off otherwise.
-@@ -2050,6 +2053,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -2082,6 +2085,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
pcd. [PARIDE]
diff --git a/Makefile b/Makefile
-index 471b83c..a290aa2 100644
+index 39f170a..5d22cce 100644
--- a/Makefile
+++ b/Makefile
@@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
-@@ -404,8 +405,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
+@@ -414,8 +415,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
# Rules shared between *config targets and build targets
# Basic helpers built in scripts/
$(Q)$(MAKE) $(build)=scripts/basic
$(Q)rm -f .tmp_quiet_recordmcount
-@@ -561,6 +562,60 @@ else
+@@ -575,6 +576,60 @@ else
KBUILD_CFLAGS += -O2
endif
include $(srctree)/arch/$(SRCARCH)/Makefile
ifdef CONFIG_READABLE_ASM
-@@ -715,7 +770,7 @@ export mod_strip_cmd
+@@ -731,7 +786,7 @@ export mod_sign_cmd
ifeq ($(KBUILD_EXTMOD),)
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -762,6 +817,8 @@ endif
+@@ -778,6 +833,8 @@ endif
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
$(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
# Handle descending into subdirectories listed in $(vmlinux-dirs)
-@@ -771,7 +828,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
+@@ -787,7 +844,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
# Error messages still appears in the original language
PHONY += $(vmlinux-dirs)
$(Q)$(MAKE) $(build)=$@
# Store (new) KERNELRELASE string in include/config/kernel.release
-@@ -815,6 +872,7 @@ prepare0: archprepare FORCE
+@@ -831,6 +888,7 @@ prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.
# All the preparing..
prepare: prepare0
# Generate some files
-@@ -922,6 +980,8 @@ all: modules
+@@ -938,6 +996,8 @@ all: modules
# using awk while concatenating to the final file.
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
@$(kecho) ' Building modules, stage 2.';
-@@ -937,7 +997,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
+@@ -953,7 +1013,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
# Target to prepare building external modules
PHONY += modules_prepare
# Target to install modules
PHONY += modules_install
-@@ -994,7 +1054,7 @@ CLEAN_DIRS += $(MODVERDIR)
- MRPROPER_DIRS += include/config usr/include include/generated \
- arch/*/include/generated
- MRPROPER_FILES += .config .config.old .version .old_version \
-- include/linux/version.h \
-+ include/linux/version.h tools/gcc/size_overflow_hash.h\
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
+@@ -1013,7 +1073,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
+ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
+ signing_key.priv signing_key.x509 x509.genkey \
+ extra_certificates signing_key.x509.keyid \
+- signing_key.x509.signer
++ signing_key.x509.signer tools/gcc/size_overflow_hash.h
# clean - Delete most, but leave enough to build external modules
-@@ -1032,6 +1092,7 @@ distclean: mrproper
+ #
+@@ -1053,6 +1113,7 @@ distclean: mrproper
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-o -name '.*.rej' \
-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-type f -print | xargs rm -f
-@@ -1192,6 +1253,8 @@ PHONY += $(module-dirs) modules
+@@ -1213,6 +1274,8 @@ PHONY += $(module-dirs) modules
$(module-dirs): crmodverdir $(objtree)/Module.symvers
$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
modules: $(module-dirs)
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1326,17 +1389,21 @@ else
+@@ -1349,17 +1412,21 @@ else
target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
endif
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
%.symtypes: %.c prepare scripts FORCE
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1346,11 +1413,15 @@ endif
+@@ -1369,11 +1436,15 @@ endif
$(cmd_crmodverdir)
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir)
for (i = 0; i < n; i++) {
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
-index bc1acdd..a922a6d 100644
+index 14db93e..47bed62 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
-@@ -1312,7 +1312,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
+@@ -1295,16 +1295,16 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
+ generic version except that we know how to honor ADDR_LIMIT_32BIT. */
+
+ static unsigned long
+-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
+- unsigned long limit)
++arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
++ unsigned long limit, unsigned long flags)
+ {
+ struct vm_area_struct *vma = find_vma(current->mm, addr);
+-
++ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
+ while (1) {
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
return -ENOMEM;
- if (!vma || addr + len <= vma->vm_start)
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
return addr;
addr = vma->vm_end;
vma = vma->vm_next;
-@@ -1348,6 +1348,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1340,20 +1340,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
+#endif
+
if (addr) {
- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
+- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
++ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
if (addr != (unsigned long) -ENOMEM)
-@@ -1355,8 +1359,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ return addr;
}
/* Next, try allocating at TASK_UNMAPPED_BASE. */
- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
- len, limit);
-+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
++ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
+
if (addr != (unsigned long) -ENOMEM)
return addr;
+ /* Finally, try allocating in low memory. */
+- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
++ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
+
+ return addr;
+ }
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index 0c4132d..88f0d53 100644
--- a/arch/alpha/mm/fault.c
#define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
-index 75fe66b..2255c86 100644
+index 75fe66b..ba3dee4 100644
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
@@ -4,8 +4,10 @@
/*
* Memory returned by kmalloc() may be used for DMA, so we must make
+@@ -24,5 +26,6 @@
+ #endif
+
+ #define __read_mostly __attribute__((__section__(".data..read_mostly")))
++#define __read_only __attribute__ ((__section__(".data..read_only")))
+
+ #endif
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
-index e4448e1..7bc86b7 100644
+index e1489c5..d418304 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
-@@ -108,7 +108,7 @@ struct cpu_cache_fns {
+@@ -116,7 +116,7 @@ struct cpu_cache_fns {
void (*dma_unmap_area)(const void *, size_t, int);
void (*dma_flush_range)(const void *, const void *);
#include <asm-generic/cmpxchg-local.h>
+diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h
+index ab98fdd..6b19938 100644
+--- a/arch/arm/include/asm/delay.h
++++ b/arch/arm/include/asm/delay.h
+@@ -24,9 +24,9 @@ extern struct arm_delay_ops {
+ void (*delay)(unsigned long);
+ void (*const_udelay)(unsigned long);
+ void (*udelay)(unsigned long);
+-} arm_delay_ops;
++} *arm_delay_ops;
+
+-#define __delay(n) arm_delay_ops.delay(n)
++#define __delay(n) arm_delay_ops->delay(n)
+
+ /*
+ * This function intentionally does not exist; if you see references to
+@@ -47,8 +47,8 @@ extern void __bad_udelay(void);
+ * first constant multiplications gets optimized away if the delay is
+ * a constant)
+ */
+-#define __udelay(n) arm_delay_ops.udelay(n)
+-#define __const_udelay(n) arm_delay_ops.const_udelay(n)
++#define __udelay(n) arm_delay_ops->udelay(n)
++#define __const_udelay(n) arm_delay_ops->const_udelay(n)
+
+ #define udelay(n) \
+ (__builtin_constant_p(n) ? \
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index 38050b1..9d90e8b 100644
--- a/arch/arm/include/asm/elf.h
+#define KM_TYPE_NR 17
#endif
+diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
+index 9e614a1..3302cca 100644
+--- a/arch/arm/include/asm/mach/dma.h
++++ b/arch/arm/include/asm/mach/dma.h
+@@ -22,7 +22,7 @@ struct dma_ops {
+ int (*residue)(unsigned int, dma_t *); /* optional */
+ int (*setspeed)(unsigned int, dma_t *, int); /* optional */
+ const char *type;
+-};
++} __do_const;
+
+ struct dma_struct {
+ void *addr; /* single DMA address */
+diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
+index 195ac2f..2272f0d 100644
+--- a/arch/arm/include/asm/mach/map.h
++++ b/arch/arm/include/asm/mach/map.h
+@@ -34,6 +34,9 @@ struct map_desc {
+ #define MT_MEMORY_ITCM 13
+ #define MT_MEMORY_SO 14
+ #define MT_MEMORY_DMA_READY 15
++#define MT_MEMORY_R 16
++#define MT_MEMORY_RW 17
++#define MT_MEMORY_RX 18
+
+ #ifdef CONFIG_MMU
+ extern void iotable_init(struct map_desc *, int);
diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
index 53426c6..c7baff3 100644
--- a/arch/arm/include/asm/outercache.h
#ifdef CONFIG_OUTER_CACHE
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
-index ecf9019..b71d9a1 100644
+index 812a494..71fc0b6 100644
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
@@ -114,7 +114,7 @@ struct cpu_user_fns {
#ifdef MULTI_USER
extern struct cpu_user_fns cpu_user;
diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
-index 943504f..bf8d667 100644
+index 943504f..84d0f84 100644
--- a/arch/arm/include/asm/pgalloc.h
+++ b/arch/arm/include/asm/pgalloc.h
-@@ -43,6 +43,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
+@@ -17,6 +17,7 @@
+ #include <asm/processor.h>
+ #include <asm/cacheflush.h>
+ #include <asm/tlbflush.h>
++#include <asm/system_info.h>
+
+ #define check_pgt_cache() do { } while (0)
+
+@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
}
#else /* !CONFIG_ARM_LPAE */
/*
-@@ -51,6 +56,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
+@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
#define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
#define pmd_free(mm, pmd) do { } while (0)
#define pud_populate(mm,pmd,pte) BUG()
#endif /* CONFIG_ARM_LPAE */
+@@ -126,6 +133,16 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
+ __free_page(pte);
+ }
+
++static inline void __pmd_update(pmd_t *pmdp, pmdval_t prot)
++{
++ pmdval_t pmdval = pmd_val(*pmdp) | prot;
++ pmdp[0] = __pmd(pmdval);
++#ifndef CONFIG_ARM_LPAE
++ pmdp[1] = __pmd(pmdval + 256 * sizeof(pte_t));
++#endif
++ flush_pmd_entry(pmdp);
++}
++
+ static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
+ pmdval_t prot)
+ {
+@@ -155,7 +172,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
+ static inline void
+ pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
+ {
+- __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
++ __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
+ }
+ #define pmd_pgtable(pmd) pmd_page(pmd)
+
+diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
+index 5cfba15..d437dc2 100644
+--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
++++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
+@@ -20,12 +20,15 @@
+ #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
+ #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
+ #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
++#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* PXN */
+ #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
+ #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
+ #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
++
+ /*
+ * - section
+ */
++#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0)
+ #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
+ #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
+ #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
+@@ -37,6 +40,7 @@
+ #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
+ #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
+ #define PMD_SECT_AF (_AT(pmdval_t, 0))
++#define PMD_SECT_AP_RDONLY (_AT(pmdval_t, 0))
+
+ #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
+ #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
+diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
+index 2317a71..1897391 100644
+--- a/arch/arm/include/asm/pgtable-2level.h
++++ b/arch/arm/include/asm/pgtable-2level.h
+@@ -123,6 +123,7 @@
+ #define L_PTE_USER (_AT(pteval_t, 1) << 8)
+ #define L_PTE_XN (_AT(pteval_t, 1) << 9)
+ #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
++#define L_PTE_PXN (_AT(pteval_t, 1) << 11) /* v7*/
+
+ /*
+ * These are the memory types, defined to be compatible with
+diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
+index d795282..d82ff13 100644
+--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
++++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
+@@ -32,6 +32,7 @@
+ #define PMD_TYPE_SECT (_AT(pmdval_t, 1) << 0)
+ #define PMD_BIT4 (_AT(pmdval_t, 0))
+ #define PMD_DOMAIN(x) (_AT(pmdval_t, 0))
++#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 59) /* PXNTable */
+
+ /*
+ * - section
+@@ -41,9 +42,11 @@
+ #define PMD_SECT_S (_AT(pmdval_t, 3) << 8)
+ #define PMD_SECT_AF (_AT(pmdval_t, 1) << 10)
+ #define PMD_SECT_nG (_AT(pmdval_t, 1) << 11)
++#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 53)
+ #define PMD_SECT_XN (_AT(pmdval_t, 1) << 54)
+ #define PMD_SECT_AP_WRITE (_AT(pmdval_t, 0))
+ #define PMD_SECT_AP_READ (_AT(pmdval_t, 0))
++#define PMD_SECT_AP_RDONLY (_AT(pmdval_t, 1) << 7)
+ #define PMD_SECT_TEX(x) (_AT(pmdval_t, 0))
+
+ /*
+@@ -66,6 +69,7 @@
+ #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
+ #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
+ #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
++#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
+ #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
+
+ /*
+diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
+index b249035..4ab204b 100644
+--- a/arch/arm/include/asm/pgtable-3level.h
++++ b/arch/arm/include/asm/pgtable-3level.h
+@@ -73,6 +73,7 @@
+ #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */
+ #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
+ #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
++#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
+ #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
+ #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55) /* unused */
+ #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56) /* unused */
+@@ -80,6 +81,7 @@
+ /*
+ * To be used in assembly code with the upper page attributes.
+ */
++#define L_PTE_PXN_HIGH (1 << (53 - 32))
+ #define L_PTE_XN_HIGH (1 << (54 - 32))
+ #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
+
+diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
+index 08c1231..1031bb4 100644
+--- a/arch/arm/include/asm/pgtable.h
++++ b/arch/arm/include/asm/pgtable.h
+@@ -30,6 +30,9 @@
+ #include <asm/pgtable-2level.h>
+ #endif
+
++#define ktla_ktva(addr) (addr)
++#define ktva_ktla(addr) (addr)
++
+ /*
+ * Just any arbitrary offset to the start of the vmalloc VM area: the
+ * current 8MB value just means that there will be a 8MB "hole" after the
+@@ -45,6 +48,9 @@
+ #define LIBRARY_TEXT_START 0x0c000000
+
+ #ifndef __ASSEMBLY__
++extern pteval_t __supported_pte_mask;
++extern pmdval_t __supported_pmd_mask;
++
+ extern void __pte_error(const char *file, int line, pte_t);
+ extern void __pmd_error(const char *file, int line, pmd_t);
+ extern void __pgd_error(const char *file, int line, pgd_t);
+@@ -53,6 +59,17 @@ extern void __pgd_error(const char *file, int line, pgd_t);
+ #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
+ #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
+
++#define __HAVE_ARCH_PAX_OPEN_KERNEL
++#define __HAVE_ARCH_PAX_CLOSE_KERNEL
++
++#ifdef CONFIG_PAX_KERNEXEC
++static inline unsigned long pax_open_kernel(void) { return 0; /* TODO */ }
++static inline unsigned long pax_close_kernel(void) { return 0; /* TODO */ }
++#else
++static inline unsigned long pax_open_kernel(void) { return 0; }
++static inline unsigned long pax_close_kernel(void) { return 0; }
++#endif
++
+ /*
+ * This is the lowest virtual address we can permit any user space
+ * mapping to be mapped at. This is particularly important for
+@@ -63,8 +80,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
+ /*
+ * The pgprot_* and protection_map entries will be fixed up in runtime
+ * to include the cachable and bufferable bits based on memory policy,
+- * as well as any architecture dependent bits like global/ASID and SMP
+- * shared mapping bits.
++ * as well as any architecture dependent bits like global/ASID, PXN,
++ * and SMP shared mapping bits.
+ */
+ #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
+
+@@ -242,7 +259,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
+
+ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+ {
+- const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER;
++ const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | __supported_pte_mask;
+ pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
+ return pte;
+ }
+diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h
+index f3628fb..a0672dd 100644
+--- a/arch/arm/include/asm/proc-fns.h
++++ b/arch/arm/include/asm/proc-fns.h
+@@ -75,7 +75,7 @@ extern struct processor {
+ unsigned int suspend_size;
+ void (*do_suspend)(void *);
+ void (*do_resume)(void *);
+-} processor;
++} __do_const processor;
+
+ #ifndef MULTI_CPU
+ extern void cpu_proc_init(void);
+diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
+index 2e3be16..4dc90fc 100644
+--- a/arch/arm/include/asm/smp.h
++++ b/arch/arm/include/asm/smp.h
+@@ -106,7 +106,7 @@ struct smp_operations {
+ int (*cpu_disable)(unsigned int cpu);
+ #endif
+ #endif
+-};
++} __no_const;
+
+ /*
+ * set platform specific SMP operations
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
-index af7b0bd..6750a8c 100644
+index 8477b4c..801a6a9 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
-@@ -148,6 +148,12 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
- #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
+@@ -151,6 +151,12 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
#define TIF_SYSCALL_TRACE 8
#define TIF_SYSCALL_AUDIT 9
+ #define TIF_SYSCALL_TRACEPOINT 10
+
+/* within 8 bits of TIF_SYSCALL_TRACE
+ to meet flexible second operand requirements
+*/
-+#define TIF_GRSEC_SETXID 10
++#define TIF_GRSEC_SETXID 11
+
- #define TIF_POLLING_NRFLAG 16
#define TIF_USING_IWMMXT 17
#define TIF_MEMDIE 18 /* is terminating due to OOM killer */
-@@ -163,9 +169,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
- #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG)
+ #define TIF_RESTORE_SIGMASK 20
+@@ -165,9 +171,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+ #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
#define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
/* Checks for any syscall work in entry-common.S */
--#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
-+#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
-+ _TIF_GRSEC_SETXID)
+-#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
++#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | \
++ _TIF_GRSEC_SETXID)
/*
* Change these and you break ASM code in entry-common.S
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index 77bd79f..ad4cd27 100644
+index 7e1f760..f2c37b1 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
-@@ -22,6 +22,8 @@
- #define VERIFY_READ 0
- #define VERIFY_WRITE 1
-
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-+
- /*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
-@@ -418,8 +420,23 @@ do { \
+@@ -418,8 +418,23 @@ do { \
#ifdef CONFIG_MMU
+
+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
+{
-+ if (!__builtin_constant_p(n))
-+ check_object_size(to, n, false);
++ check_object_size(to, n, false);
++
+ return ___copy_from_user(to, from, n);
+}
+
+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
+{
-+ if (!__builtin_constant_p(n))
-+ check_object_size(from, n, true);
++ check_object_size(from, n, true);
++
+ return ___copy_to_user(to, from, n);
+}
+
extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
-@@ -431,6 +448,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
+@@ -431,6 +446,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
{
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else /* security hole - plug it */
-@@ -440,6 +460,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
+@@ -440,6 +458,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
{
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
+diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
+index 96ee092..37f1844 100644
+--- a/arch/arm/include/uapi/asm/ptrace.h
++++ b/arch/arm/include/uapi/asm/ptrace.h
+@@ -73,7 +73,7 @@
+ * ARMv7 groups of PSR bits
+ */
+ #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
+-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
++#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
+ #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
+ #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
+
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index 60d3b73..9168db0 100644
--- a/arch/arm/kernel/armksyms.c
EXPORT_SYMBOL(__clear_user);
EXPORT_SYMBOL(__get_user_1);
+diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
+index 486a15a..d95523a 100644
+--- a/arch/arm/kernel/head.S
++++ b/arch/arm/kernel/head.S
+@@ -52,7 +52,9 @@
+ .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE
+
+ .macro pgtbl, rd, phys
+- add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE
++ mov \rd, #TEXT_OFFSET
++ sub \rd, #PG_DIR_SIZE
++ add \rd, \rd, \phys
+ .endm
+
+ /*
+diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
+index 1e9be5d..03edbc2 100644
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -37,12 +37,37 @@
+ #endif
+
+ #ifdef CONFIG_MMU
+-void *module_alloc(unsigned long size)
++static inline void *__module_alloc(unsigned long size, pgprot_t prot)
+ {
++ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
++ return NULL;
+ return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
+- GFP_KERNEL, PAGE_KERNEL_EXEC, -1,
++ GFP_KERNEL, prot, -1,
+ __builtin_return_address(0));
+ }
++
++void *module_alloc(unsigned long size)
++{
++
++#ifdef CONFIG_PAX_KERNEXEC
++ return __module_alloc(size, PAGE_KERNEL);
++#else
++ return __module_alloc(size, PAGE_KERNEL_EXEC);
++#endif
++
++}
++
++#ifdef CONFIG_PAX_KERNEXEC
++void module_free_exec(struct module *mod, void *module_region)
++{
++ module_free(mod, module_region);
++}
++
++void *module_alloc_exec(unsigned long size)
++{
++ return __module_alloc(size, PAGE_KERNEL_EXEC);
++}
++#endif
+ #endif
+
+ int
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 693b744..e684262 100644
+index 90084a6..a8b26bc 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -28,7 +28,6 @@
-#include <linux/random.h>
#include <linux/hw_breakpoint.h>
#include <linux/cpuidle.h>
-
+ #include <linux/leds.h>
@@ -256,9 +255,10 @@ void machine_power_off(void)
machine_shutdown();
if (pm_power_off)
{
machine_shutdown();
-@@ -501,12 +501,6 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -283,8 +283,8 @@ void __show_regs(struct pt_regs *regs)
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version);
+- print_symbol("PC is at %s\n", instruction_pointer(regs));
+- print_symbol("LR is at %s\n", regs->ARM_lr);
++ printk("PC is at %pA\n", instruction_pointer(regs));
++ printk("LR is at %pA\n", regs->ARM_lr);
+ printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
+ "sp : %08lx ip : %08lx fp : %08lx\n",
+ regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
+@@ -451,12 +451,6 @@ unsigned long get_wchan(struct task_struct *p)
return 0;
}
/*
* The vectors page is always readable from user space for the
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
-index 3e0fc5f..a42d2ec 100644
+index 739db3a..7f4a272 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
-@@ -913,11 +913,20 @@ enum ptrace_syscall_dir {
+@@ -916,6 +916,10 @@ enum ptrace_syscall_dir {
PTRACE_SYSCALL_EXIT,
};
static int ptrace_syscall_trace(struct pt_regs *regs, int scno,
enum ptrace_syscall_dir dir)
{
- unsigned long ip;
+@@ -923,6 +927,11 @@ static int ptrace_syscall_trace(struct pt_regs *regs, int scno,
+
+ current_thread_info()->syscall = scno;
+#ifdef CONFIG_GRKERNSEC_SETXID
+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
return scno;
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index a81dcec..ac42f0f 100644
+index da1d1aa..ef9bc58 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
-@@ -112,13 +112,13 @@ struct processor processor __read_mostly;
- struct cpu_tlb_fns cpu_tlb __read_mostly;
+@@ -97,21 +97,23 @@ EXPORT_SYMBOL(system_serial_high);
+ unsigned int elf_hwcap __read_mostly;
+ EXPORT_SYMBOL(elf_hwcap);
+
++pteval_t __supported_pte_mask __read_only;
++pmdval_t __supported_pmd_mask __read_only;
+
+ #ifdef MULTI_CPU
+-struct processor processor __read_mostly;
++struct processor processor;
+ #endif
+ #ifdef MULTI_TLB
+-struct cpu_tlb_fns cpu_tlb __read_mostly;
++struct cpu_tlb_fns cpu_tlb __read_only;
#endif
#ifdef MULTI_USER
-struct cpu_user_fns cpu_user __read_mostly;
EXPORT_SYMBOL(outer_cache);
#endif
+@@ -236,9 +238,13 @@ static int __get_cpu_architecture(void)
+ asm("mrc p15, 0, %0, c0, c1, 4"
+ : "=r" (mmfr0));
+ if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
+- (mmfr0 & 0x000000f0) >= 0x00000030)
++ (mmfr0 & 0x000000f0) >= 0x00000030) {
+ cpu_arch = CPU_ARCH_ARMv7;
+- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
++ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
++ __supported_pte_mask |= L_PTE_PXN;
++ __supported_pmd_mask |= PMD_PXNTABLE;
++ }
++ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
+ (mmfr0 & 0x000000f0) == 0x00000020)
+ cpu_arch = CPU_ARCH_ARMv6;
+ else
+@@ -455,7 +461,7 @@ static void __init setup_processor(void)
+ __cpu_architecture = __get_cpu_architecture();
+
+ #ifdef MULTI_CPU
+- processor = *list->proc;
++ memcpy((void *)&processor, list->proc, sizeof processor);
+ #endif
+ #ifdef MULTI_TLB
+ cpu_tlb = *list->tlb;
+diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
+index fbc8b26..000ded0 100644
+--- a/arch/arm/kernel/smp.c
++++ b/arch/arm/kernel/smp.c
+@@ -70,7 +70,7 @@ enum ipi_msg_type {
+
+ static DECLARE_COMPLETION(cpu_running);
+
+-static struct smp_operations smp_ops;
++static struct smp_operations smp_ops __read_only;
+
+ void __init smp_set_ops(struct smp_operations *ops)
+ {
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
-index b0179b8..b54c6c1 100644
+index b0179b8..7713948 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
+@@ -57,7 +57,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
+ void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
+ {
+ #ifdef CONFIG_KALLSYMS
+- printk("[<%08lx>] (%pS) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
++ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
+ #else
+ printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
+ #endif
@@ -266,6 +266,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
static int die_owner = -1;
static unsigned int die_nest_count;
if (signr)
do_exit(signr);
}
+diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
+index 36ff15b..75d9e9d 100644
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -8,7 +8,11 @@
+ #include <asm/thread_info.h>
+ #include <asm/memory.h>
+ #include <asm/page.h>
+-
++
++#ifdef CONFIG_PAX_KERNEXEC
++#include <asm/pgtable.h>
++#endif
++
+ #define PROC_INFO \
+ . = ALIGN(4); \
+ VMLINUX_SYMBOL(__proc_info_begin) = .; \
+@@ -90,6 +94,11 @@ SECTIONS
+ _text = .;
+ HEAD_TEXT
+ }
++
++#ifdef CONFIG_PAX_KERNEXEC
++ . = ALIGN(1<<SECTION_SHIFT);
++#endif
++
+ .text : { /* Real text segment */
+ _stext = .; /* Text and read-only data */
+ __exception_text_start = .;
+@@ -133,6 +142,10 @@ SECTIONS
+
+ _etext = .; /* End of text and rodata section */
+
++#ifdef CONFIG_PAX_KERNEXEC
++ . = ALIGN(1<<SECTION_SHIFT);
++#endif
++
+ #ifndef CONFIG_XIP_KERNEL
+ . = ALIGN(PAGE_SIZE);
+ __init_begin = .;
+@@ -192,6 +205,11 @@ SECTIONS
+ . = PAGE_OFFSET + TEXT_OFFSET;
+ #else
+ __init_end = .;
++
++#ifdef CONFIG_PAX_KERNEXEC
++ . = ALIGN(1<<SECTION_SHIFT);
++#endif
++
+ . = ALIGN(THREAD_SIZE);
+ __data_loc = .;
+ #endif
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
index 66a477a..bee61d3 100644
--- a/arch/arm/lib/copy_from_user.S
ENDPROC(__copy_to_user_std)
.pushsection .fixup,"ax"
+diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
+index 0dc5385..45833ef 100644
+--- a/arch/arm/lib/delay.c
++++ b/arch/arm/lib/delay.c
+@@ -28,12 +28,14 @@
+ /*
+ * Default to the loop-based delay implementation.
+ */
+-struct arm_delay_ops arm_delay_ops = {
++static struct arm_delay_ops arm_loop_delay_ops = {
+ .delay = __loop_delay,
+ .const_udelay = __loop_const_udelay,
+ .udelay = __loop_udelay,
+ };
+
++struct arm_delay_ops *arm_delay_ops __read_only = &arm_loop_delay_ops;
++
+ static const struct delay_timer *delay_timer;
+ static bool delay_calibrated;
+
+@@ -67,6 +69,12 @@ static void __timer_udelay(unsigned long usecs)
+ __timer_const_udelay(usecs * UDELAY_MULT);
+ }
+
++static struct arm_delay_ops arm_timer_delay_ops = {
++ .delay = __timer_delay,
++ .const_udelay = __timer_const_udelay,
++ .udelay = __timer_udelay,
++};
++
+ void __init register_current_timer_delay(const struct delay_timer *timer)
+ {
+ if (!delay_calibrated) {
+@@ -74,9 +82,7 @@ void __init register_current_timer_delay(const struct delay_timer *timer)
+ delay_timer = timer;
+ lpj_fine = timer->freq / HZ;
+ loops_per_jiffy = lpj_fine;
+- arm_delay_ops.delay = __timer_delay;
+- arm_delay_ops.const_udelay = __timer_const_udelay;
+- arm_delay_ops.udelay = __timer_udelay;
++ arm_delay_ops = &arm_timer_delay_ops;
+ delay_calibrated = true;
+ } else {
+ pr_info("Ignoring duplicate/late registration of read_current_timer delay\n");
diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
index 025f742..8432b08 100644
--- a/arch/arm/lib/uaccess_with_memcpy.c
/*
* This test is stubbed out of the main function above to keep
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
-index 1201191..eabbb2c 100644
+index 2c6c218..2b87c2d 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
-@@ -160,7 +160,7 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
+@@ -150,7 +150,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
clk_gate_ops.disable(hw);
}
-static struct clk_ops clk_gate_fn_ops;
-+static clk_ops_no_const clk_gate_fn_ops;
++static int clk_gate_fn_is_enabled(struct clk_hw *hw)
++{
++ return clk_gate_ops.is_enabled(hw);
++}
++
++static struct clk_ops clk_gate_fn_ops = {
++ .enable = clk_gate_fn_enable,
++ .disable = clk_gate_fn_disable,
++ .is_enabled = clk_gate_fn_is_enabled,
++};
static struct clk __init *clk_register_gate_fn(struct device *dev,
const char *name,
+@@ -184,14 +193,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
+ gate_fn->fn_en = fn_en;
+ gate_fn->fn_dis = fn_dis;
+
+- /* ops is the gate ops, but with our enable/disable functions */
+- if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
+- clk_gate_fn_ops.disable != clk_gate_fn_disable) {
+- clk_gate_fn_ops = clk_gate_ops;
+- clk_gate_fn_ops.enable = clk_gate_fn_enable;
+- clk_gate_fn_ops.disable = clk_gate_fn_disable;
+- }
+-
+ clk = clk_register(dev, &gate_fn->gate.hw);
+
+ if (IS_ERR(clk))
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
-index 677357f..8828dda 100644
+index d95f727..12f10dd 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
-@@ -593,7 +593,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
+@@ -589,7 +589,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
}
#endif
};
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index 37afbd1..c22ad7c 100644
+index 87cc6d0..fd4f248 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -187,10 +187,10 @@ struct omap_hwmod_soc_ops {
+@@ -189,10 +189,10 @@ struct omap_hwmod_soc_ops {
int (*is_hardreset_asserted)(struct omap_hwmod *oh,
struct omap_hwmod_rst_info *ohri);
int (*init_clkdm)(struct omap_hwmod *oh);
/* omap_hwmod_list contains all registered struct omap_hwmods */
static LIST_HEAD(omap_hwmod_list);
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
-index c3bd834..e81ef02 100644
+index 5dbf13f..9be36fd 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
-@@ -174,6 +174,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
+@@ -25,6 +25,7 @@
+ #include <asm/system_misc.h>
+ #include <asm/system_info.h>
+ #include <asm/tlbflush.h>
++#include <asm/sections.h>
+
+ #include "fault.h"
+
+@@ -138,6 +139,19 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
+ if (fixup_exception(regs))
+ return;
+
++#ifdef CONFIG_PAX_KERNEXEC
++ if (fsr & FSR_WRITE) {
++ if (((unsigned long)_stext <= addr && addr < init_mm.end_code) || (MODULES_VADDR <= addr && addr < MODULES_END)) {
++ if (current->signal->curr_ip)
++ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
++ ¤t->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
++ else
++ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
++ current->comm, task_pid_nr(current), current_uid(), current_euid());
++ }
++ }
++#endif
++
+ /*
+ * No handler, we'll have to terminate things with extreme prejudice.
+ */
+@@ -174,6 +188,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
}
#endif
tsk->thread.address = addr;
tsk->thread.error_code = fsr;
tsk->thread.trap_no = 14;
-@@ -397,6 +404,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
+@@ -398,6 +419,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
}
#endif /* CONFIG_MMU */
/*
* First Level Translation Fault Handler
*
-@@ -574,6 +608,20 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
+@@ -575,12 +623,41 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
struct siginfo info;
++#ifdef CONFIG_PAX_KERNEXEC
++ if (!user_mode(regs) && is_xn_fault(ifsr)) {
++ if (current->signal->curr_ip)
++ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n",
++ ¤t->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid(),
++ addr >= TASK_SIZE ? "non-executable kernel" : "userland", addr);
++ else
++ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n",
++ current->comm, task_pid_nr(current), current_uid(), current_euid(),
++ addr >= TASK_SIZE ? "non-executable kernel" : "userland", addr);
++ goto die;
++ }
++#endif
++
+#ifdef CONFIG_PAX_REFCOUNT
-+ if (fsr_fs(ifsr) == 2) {
++ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
+ unsigned int bkpt;
+
+ if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
return;
+ printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
+ inf->name, ifsr, addr);
+
++die:
+ info.si_signo = inf->sig;
+ info.si_errno = 0;
+ info.si_code = inf->code;
+diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
+index cf08bdf..f1a0383 100644
+--- a/arch/arm/mm/fault.h
++++ b/arch/arm/mm/fault.h
+@@ -3,6 +3,7 @@
+
+ /*
+ * Fault status register encodings. We steal bit 31 for our own purposes.
++ * Set when the FSR value is from an instruction fault.
+ */
+ #define FSR_LNX_PF (1 << 31)
+ #define FSR_WRITE (1 << 11)
+@@ -22,6 +23,12 @@ static inline int fsr_fs(unsigned int fsr)
+ }
+ #endif
+
++/* valid for LPAE and !LPAE */
++static inline int is_xn_fault(unsigned int fsr)
++{
++ return ((fsr_fs(fsr) & 0x3c) == 0xc);
++}
++
+ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
+ unsigned long search_exception_table(unsigned long addr);
+
+diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
+index ad722f1..46b670e 100644
+--- a/arch/arm/mm/init.c
++++ b/arch/arm/mm/init.c
+@@ -734,9 +734,43 @@ void __init mem_init(void)
+
+ void free_initmem(void)
+ {
++
++#ifdef CONFIG_PAX_KERNEXEC
++ unsigned long addr;
++ pgd_t *pgd;
++ pud_t *pud;
++ pmd_t *pmd;
++#endif
++
+ #ifdef CONFIG_HAVE_TCM
+ extern char __tcm_start, __tcm_end;
++#endif
+
++#ifdef CONFIG_PAX_KERNEXEC
++ /* make pages tables, etc before .text NX */
++ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ __pmd_update(pmd, PMD_SECT_XN);
++ }
++ /* make init NX */
++ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ __pmd_update(pmd, PMD_SECT_XN);
++ }
++ /* make kernel code/rodata read-only */
++ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ __pmd_update(pmd, PMD_SECT_AP_RDONLY);
++ }
++#endif
++
++#ifdef CONFIG_HAVE_TCM
+ poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
+ totalram_pages += free_area(__phys_to_pfn(__pa(&__tcm_start)),
+ __phys_to_pfn(__pa(&__tcm_end)),
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
-index ce8cb19..3ec539d 100644
+index ce8cb19..061aa14 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
-@@ -93,6 +93,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -72,6 +72,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ unsigned long start_addr;
+ int do_align = 0;
+ int aliasing = cache_is_vipt_aliasing();
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ /*
+ * We only need to do colour alignment if either the I or D
+@@ -93,6 +94,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
if (len > TASK_SIZE)
return -ENOMEM;
if (addr) {
if (do_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -100,15 +104,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -100,15 +105,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
- if (TASK_SIZE - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
return addr;
}
if (len > mm->cached_hole_size) {
}
full_search:
-@@ -124,14 +127,14 @@ full_search:
+@@ -124,14 +128,14 @@ full_search:
* Start a new search - just in case we missed
* some holes.
*/
return -ENOMEM;
}
- if (!vma || addr + len <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr, len)) {
++ if (check_heap_stack_gap(vma, addr, len, offset)) {
/*
* Remember the place where we stopped the search:
*/
-@@ -266,10 +269,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -156,6 +160,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ unsigned long addr = addr0;
+ int do_align = 0;
+ int aliasing = cache_is_vipt_aliasing();
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ /*
+ * We only need to do colour alignment if either the I or D
+@@ -175,6 +180,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ return addr;
+ }
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
+ /* requesting a specific address */
+ if (addr) {
+ if (do_align)
+@@ -182,8 +191,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ else
+ addr = PAGE_ALIGN(addr);
+ vma = find_vma(mm, addr);
+- if (TASK_SIZE - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
+ return addr;
+ }
+
+@@ -203,7 +211,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ /* make sure it can fit in the remaining address space */
+ if (addr > len) {
+ vma = find_vma(mm, addr-len);
+- if (!vma || addr <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr - len, len, offset))
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr-len);
+ }
+@@ -212,17 +220,17 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ goto bottomup;
+
+ addr = mm->mmap_base - len;
+- if (do_align)
+- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
+
+ do {
++ if (do_align)
++ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
+ /*
+ * Lookup failure means no vma is above this address,
+ * else if new region fits below vma->vm_start,
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
+- if (!vma || addr+len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr);
+
+@@ -231,10 +239,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ mm->cached_hole_size = vma->vm_start - addr;
+
+ /* try just below the current vma->vm_start */
+- addr = vma->vm_start - len;
+- if (do_align)
+- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
+- } while (len < vma->vm_start);
++ addr = skip_heap_stack_gap(vma, len, offset);
++ } while (!IS_ERR_VALUE(addr));
+
+ bottomup:
+ /*
+@@ -259,6 +265,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+ {
+ unsigned long random_factor = 0UL;
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
+ /* 8 bits of randomness in 20 address space bits */
+ if ((current->flags & PF_RANDOMIZE) &&
+ !(current->personality & ADDR_NO_RANDOMIZE))
+@@ -266,10 +276,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
if (mmap_is_legacy()) {
mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
+diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
+index 99b47b9..579b667 100644
+--- a/arch/arm/mm/mmu.c
++++ b/arch/arm/mm/mmu.c
+@@ -227,16 +227,16 @@ static struct mem_type mem_types[] = {
+ [MT_UNCACHED] = {
+ .prot_pte = PROT_PTE_DEVICE,
+ .prot_l1 = PMD_TYPE_TABLE,
+- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
++ .prot_sect = PROT_SECT_DEVICE | PMD_SECT_XN,
+ .domain = DOMAIN_IO,
+ },
+ [MT_CACHECLEAN] = {
+- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
++ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_AP_RDONLY,
+ .domain = DOMAIN_KERNEL,
+ },
+ #ifndef CONFIG_ARM_LPAE
+ [MT_MINICLEAN] = {
+- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
++ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE | PMD_SECT_AP_RDONLY,
+ .domain = DOMAIN_KERNEL,
+ },
+ #endif
+@@ -258,8 +258,26 @@ static struct mem_type mem_types[] = {
+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
+ .domain = DOMAIN_KERNEL,
+ },
++ [MT_MEMORY_R] = {
++ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_RDONLY | L_PTE_XN,
++ .prot_l1 = PMD_TYPE_TABLE,
++ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_RDONLY | PMD_SECT_XN,
++ .domain = DOMAIN_KERNEL,
++ },
++ [MT_MEMORY_RW] = {
++ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | L_PTE_XN,
++ .prot_l1 = PMD_TYPE_TABLE,
++ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_XN,
++ .domain = DOMAIN_KERNEL,
++ },
++ [MT_MEMORY_RX] = {
++ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_RDONLY,
++ .prot_l1 = PMD_TYPE_TABLE,
++ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_RDONLY,
++ .domain = DOMAIN_KERNEL,
++ },
+ [MT_ROM] = {
+- .prot_sect = PMD_TYPE_SECT,
++ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_RDONLY,
+ .domain = DOMAIN_KERNEL,
+ },
+ [MT_MEMORY_NONCACHED] = {
+@@ -273,7 +291,7 @@ static struct mem_type mem_types[] = {
+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
+ L_PTE_XN,
+ .prot_l1 = PMD_TYPE_TABLE,
+- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
++ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_AP_RDONLY,
+ .domain = DOMAIN_KERNEL,
+ },
+ [MT_MEMORY_ITCM] = {
+@@ -432,6 +450,8 @@ static void __init build_mem_type_table(void)
+ * from SVC mode and no access from userspace.
+ */
+ mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
++ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
++ mem_types[MT_MEMORY_R].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
+ mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
+ mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
+ #endif
+@@ -450,6 +470,12 @@ static void __init build_mem_type_table(void)
+ mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
+ mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;
+ mem_types[MT_MEMORY].prot_pte |= L_PTE_SHARED;
++ mem_types[MT_MEMORY_R].prot_sect |= PMD_SECT_S;
++ mem_types[MT_MEMORY_R].prot_pte |= L_PTE_SHARED;
++ mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
++ mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
++ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
++ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
+ mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
+ mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S;
+ mem_types[MT_MEMORY_NONCACHED].prot_pte |= L_PTE_SHARED;
+@@ -487,6 +513,8 @@ static void __init build_mem_type_table(void)
+ vecs_pgprot |= PTE_EXT_AF;
+ #endif
+
++ user_pgprot |= __supported_pte_mask;
++
+ for (i = 0; i < 16; i++) {
+ pteval_t v = pgprot_val(protection_map[i]);
+ protection_map[i] = __pgprot(v | user_pgprot);
+@@ -503,6 +531,12 @@ static void __init build_mem_type_table(void)
+ mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
+ mem_types[MT_MEMORY].prot_sect |= ecc_mask | cp->pmd;
+ mem_types[MT_MEMORY].prot_pte |= kern_pgprot;
++ mem_types[MT_MEMORY_R].prot_sect |= ecc_mask | cp->pmd;
++ mem_types[MT_MEMORY_R].prot_pte |= kern_pgprot;
++ mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
++ mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
++ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
++ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
+ mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
+ mem_types[MT_MEMORY_NONCACHED].prot_sect |= ecc_mask;
+ mem_types[MT_ROM].prot_sect |= cp->pmd;
+@@ -1198,7 +1232,41 @@ static void __init map_lowmem(void)
+ map.pfn = __phys_to_pfn(start);
+ map.virtual = __phys_to_virt(start);
+ map.length = end - start;
++
++#ifdef CONFIG_PAX_KERNEXEC
++ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
++ struct map_desc kernel;
++ struct map_desc initmap;
++
++ /* when freeing initmem we will make this RW */
++ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
++ initmap.virtual = (unsigned long)__init_begin;
++ initmap.length = _sdata - __init_begin;
++ initmap.type = MT_MEMORY;
++ create_mapping(&initmap);
++
++ /* when freeing initmem we will make this RX */
++ kernel.pfn = __phys_to_pfn(__pa(_stext));
++ kernel.virtual = (unsigned long)_stext;
++ kernel.length = __init_begin - _stext;
++ kernel.type = MT_MEMORY;
++ create_mapping(&kernel);
++
++ if (map.virtual < (unsigned long)_stext) {
++ map.length = (unsigned long)_stext - map.virtual;
++ map.type = MT_MEMORY;
++ create_mapping(&map);
++ }
++
++ map.pfn = __phys_to_pfn(__pa(_sdata));
++ map.virtual = (unsigned long)_sdata;
++ map.length = end - __pa(_sdata);
++ }
++
++ map.type = MT_MEMORY_RW;
++#else
+ map.type = MT_MEMORY;
++#endif
+
+ create_mapping(&map);
+ }
diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h
-index fd556f7..af2e7d2 100644
+index ec63e4a..62aa5f1d 100644
--- a/arch/arm/plat-orion/include/plat/addr-map.h
+++ b/arch/arm/plat-orion/include/plat/addr-map.h
@@ -26,7 +26,7 @@ struct orion_addr_map_cfg {
extern void *samsung_dmadev_get_ops(void);
extern void *s3c_dma_get_ops(void);
-diff --git a/arch/arm/plat-samsung/include/plat/ehci.h b/arch/arm/plat-samsung/include/plat/ehci.h
-index 5f28cae..3d23723 100644
---- a/arch/arm/plat-samsung/include/plat/ehci.h
-+++ b/arch/arm/plat-samsung/include/plat/ehci.h
-@@ -14,7 +14,7 @@
- struct s5p_ehci_platdata {
- int (*phy_init)(struct platform_device *pdev, int type);
- int (*phy_exit)(struct platform_device *pdev, int type);
--};
-+} __no_const;
-
- extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
-
diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
index c3a58a1..78fbf54 100644
--- a/arch/avr32/include/asm/cache.h
/*
* Memory returned by kmalloc() may be used for DMA, so we must make
diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
-index 3b3159b..425ea94 100644
+index e2c3287..6c4f98c 100644
--- a/arch/avr32/include/asm/elf.h
+++ b/arch/avr32/include/asm/elf.h
@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
#endif /* __ASM_AVR32_KMAP_TYPES_H */
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
-index b92e609..b69c101 100644
+index b2f2d2d..d1c85cb 100644
--- a/arch/avr32/mm/fault.c
+++ b/arch/avr32/mm/fault.c
@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
/*
* This routine handles page faults. It determines the address and the
* problem, and then passes it off to one of the appropriate routines.
-@@ -173,6 +190,16 @@ bad_area:
+@@ -174,6 +191,16 @@ bad_area:
up_read(&mm->mmap_sem);
if (user_mode(regs)) {
#endif
diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
-index 385fd30..6c3d97e 100644
+index 385fd30..3aaf4fe 100644
--- a/arch/frv/mm/elf-fdpic.c
+++ b/arch/frv/mm/elf-fdpic.c
-@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ {
+ struct vm_area_struct *vma;
+ unsigned long limit;
++ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
+
+ if (len > TASK_SIZE)
+ return -ENOMEM;
+@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
if (addr) {
addr = PAGE_ALIGN(addr);
vma = find_vma(current->mm, addr);
- if (TASK_SIZE - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
goto success;
}
-@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -89,7 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
for (; vma; vma = vma->vm_next) {
if (addr > limit)
break;
- if (addr + len <= vma->vm_start)
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
goto success;
addr = vma->vm_end;
}
-@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -104,7 +104,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
for (; vma; vma = vma->vm_next) {
if (addr > limit)
break;
- if (addr + len <= vma->vm_start)
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
goto success;
addr = vma->vm_end;
}
-diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h
-index c635028..6d9445a 100644
---- a/arch/h8300/include/asm/cache.h
-+++ b/arch/h8300/include/asm/cache.h
-@@ -1,8 +1,10 @@
- #ifndef __ARCH_H8300_CACHE_H
- #define __ARCH_H8300_CACHE_H
-
-+#include <linux/const.h>
-+
- /* bytes per L1 cache line */
--#define L1_CACHE_BYTES 4
-+#define L1_CACHE_BYTES _AC(4,UL)
-
- /* m68k-elf-gcc 2.95.2 doesn't like these */
-
diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
-index 0f01de2..d37d309 100644
+index f4ca594..adc72fd6 100644
--- a/arch/hexagon/include/asm/cache.h
+++ b/arch/hexagon/include/asm/cache.h
@@ -21,9 +21,11 @@
static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
-index 449c8c0..432a3d2 100644
+index 449c8c0..50cdf87 100644
--- a/arch/ia64/include/asm/uaccess.h
+++ b/arch/ia64/include/asm/uaccess.h
-@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
+@@ -42,6 +42,8 @@
+ #include <asm/pgtable.h>
+ #include <asm/io.h>
+
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ /*
+ * For historical reasons, the following macros are grossly misnamed:
+ */
+@@ -240,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
+ static inline unsigned long
+ __copy_to_user (void __user *to, const void *from, unsigned long count)
+ {
++ if (count > INT_MAX)
++ return count;
++
++ if (!__builtin_constant_p(count))
++ check_object_size(from, count, true);
++
+ return __copy_user(to, (__force void __user *) from, count);
+ }
+
+ static inline unsigned long
+ __copy_from_user (void *to, const void __user *from, unsigned long count)
+ {
++ if (count > INT_MAX)
++ return count;
++
++ if (!__builtin_constant_p(count))
++ check_object_size(to, count, false);
++
+ return __copy_user((__force void __user *) to, from, count);
+ }
+
+@@ -255,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
+ ({ \
+ void __user *__cu_to = (to); \
const void *__cu_from = (from); \
- long __cu_len = (n); \
+- long __cu_len = (n); \
++ unsigned long __cu_len = (n); \
\
- if (__access_ok(__cu_to, __cu_len, get_fs())) \
-+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
++ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
++ if (!__builtin_constant_p(n)) \
++ check_object_size(__cu_from, __cu_len, true); \
__cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
++ } \
__cu_len; \
})
-@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
- long __cu_len = (n); \
+
+@@ -266,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
+ ({ \
+ void *__cu_to = (to); \
+ const void __user *__cu_from = (from); \
+- long __cu_len = (n); \
++ unsigned long __cu_len = (n); \
\
__chk_user_ptr(__cu_from); \
- if (__access_ok(__cu_from, __cu_len, get_fs())) \
-+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
++ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
++ if (!__builtin_constant_p(n)) \
++ check_object_size(__cu_to, __cu_len, false); \
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
++ } \
__cu_len; \
})
+
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index 24603be..948052d 100644
--- a/arch/ia64/kernel/module.c
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
-index d9439ef..b9a4303 100644
+index d9439ef..d0cac6b 100644
--- a/arch/ia64/kernel/sys_ia64.c
+++ b/arch/ia64/kernel/sys_ia64.c
-@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
+@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
+ unsigned long start_addr, align_mask = PAGE_SIZE - 1;
+ struct mm_struct *mm = current->mm;
+ struct vm_area_struct *vma;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ if (len > RGN_MAP_LIMIT)
+ return -ENOMEM;
+@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
#endif
if (!addr)
addr = mm->free_area_cache;
-@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
+@@ -61,14 +69,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
return -ENOMEM;
}
- if (!vma || addr + len <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr, len)) {
++ if (check_heap_stack_gap(vma, addr, len, offset)) {
/* Remember the address where we stopped this search: */
mm->free_area_cache = addr + len;
return addr;
+diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
+index c64460b..4d250a6 100644
+--- a/arch/ia64/kernel/topology.c
++++ b/arch/ia64/kernel/topology.c
+@@ -445,7 +445,7 @@ static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata cache_cpu_notifier =
++static struct notifier_block cache_cpu_notifier =
+ {
+ .notifier_call = cache_cpu_callback
+ };
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 0ccb28f..8992469 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
* ensure percpu data fits
* into percpu page size
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
-index 8443daf..0a01e30 100644
+index 6cf0341..d352594 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
/*
* If for any reason at all we couldn't handle the fault, make
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
-index 5ca674b..e0e1b70 100644
+index 5ca674b..127c3cb 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
-@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
+@@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
+ unsigned long pgoff, unsigned long flags)
+ {
+ struct vm_area_struct *vmm;
++ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
+
+ if (len > RGN_MAP_LIMIT)
+ return -ENOMEM;
+@@ -171,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
/* At this point: (!vmm || addr < vmm->vm_end). */
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
return -ENOMEM;
- if (!vmm || (addr + len) <= vmm->vm_start)
-+ if (check_heap_stack_gap(vmm, addr, len))
++ if (check_heap_stack_gap(vmm, addr, len, offset))
return addr;
addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
}
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
-index 0eab454..bd794f2 100644
+index 082e383..fb7be80 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
-index 3f4c5cb..3439c6e 100644
+index 01cc6ba..bcb7a5d 100644
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
@@ -21,6 +21,10 @@
#define ATOMIC_INIT(i) { (i) }
/*
-@@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -759,6 +763,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
*/
#define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
/*
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
-index ca97e0e..cd08920 100644
+index 18806a5..141ffcf 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
-@@ -111,6 +111,8 @@ register struct thread_info *__current_thread_info __asm__("$28");
+@@ -110,6 +110,8 @@ register struct thread_info *__current_thread_info __asm__("$28");
#define TIF_32BIT_ADDR 23 /* 32-bit address space (o32/n32) */
#define TIF_FPUBOUND 24 /* thread bound to FPU-full CPU set */
#define TIF_LOAD_WATCH 25 /* If set, load watch registers */
+#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
#define TIF_SYSCALL_TRACE 31 /* syscall trace active */
- #ifdef CONFIG_MIPS32_O32
-@@ -134,15 +136,18 @@ register struct thread_info *__current_thread_info __asm__("$28");
+ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
+@@ -125,15 +127,18 @@ register struct thread_info *__current_thread_info __asm__("$28");
#define _TIF_32BIT_ADDR (1<<TIF_32BIT_ADDR)
#define _TIF_FPUBOUND (1<<TIF_FPUBOUND)
#define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
+#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
/* work to do on interrupt/exception return */
- #define _TIF_WORK_MASK (0x0000ffef & \
- ~(_TIF_SECCOMP | _TIF_SYSCALL_AUDIT))
+ #define _TIF_WORK_MASK \
+ (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME)
/* work to do on any return to u-space */
--#define _TIF_ALLWORK_MASK (0x8000ffff & ~_TIF_SECCOMP)
-+#define _TIF_ALLWORK_MASK ((0x8000ffff & ~_TIF_SECCOMP) | _TIF_GRSEC_SETXID)
+-#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT)
++#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID)
#endif /* __KERNEL__ */
/*
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
-index e9a5fd7..378809a 100644
+index 69b17a9..9db82f9 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
-@@ -480,15 +480,3 @@ unsigned long get_wchan(struct task_struct *task)
+@@ -478,15 +478,3 @@ unsigned long get_wchan(struct task_struct *task)
out:
return pc;
}
goto out;
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
-index a632bc1..0b77c7c 100644
+index 374f66e..1c882a0 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -52,7 +52,7 @@ NESTED(handle_sys, PT_SIZE, sp)
bnez t0, syscall_trace_entry # -> yes
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
-index 3b5a5e9..e1ee86d 100644
+index 169de6a..f594a89 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -54,7 +54,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
and t0, t1, t0
bnez t0, syscall_trace_entry
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
-index 6be6f70..1859577 100644
+index 86ec03f..1235baf 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -53,7 +53,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
and t0, t1, t0
bnez t0, n32_syscall_trace_entry
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
-index 5422855..74e63a3 100644
+index 53c2d72..3734584 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -81,7 +81,7 @@ NESTED(handle_sys, PT_SIZE, sp)
and t0, t1, t0
bnez t0, trace_a_syscall
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
-index c14f6df..537e729 100644
+index ddcec1e..c7f983e 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -27,6 +27,23 @@
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
-index 302d779..7d35bf8 100644
+index 302d779..6459dc0 100644
--- a/arch/mips/mm/mmap.c
+++ b/arch/mips/mm/mmap.c
-@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+@@ -71,6 +71,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+ struct vm_area_struct *vma;
+ unsigned long addr = addr0;
+ int do_color_align;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ if (unlikely(len > TASK_SIZE))
+ return -ENOMEM;
+@@ -95,6 +96,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
do_color_align = 1;
/* requesting a specific address */
if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+@@ -102,8 +108,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
- if (TASK_SIZE - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len, offset))
return addr;
}
-@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+@@ -118,7 +123,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr)
return -ENOMEM;
- if (!vma || addr + len <= vma->vm_start)
-+ if (check_heap_stack_gap(vmm, addr, len))
++ if (check_heap_stack_gap(vmm, addr, len, offset))
return addr;
addr = vma->vm_end;
if (do_color_align)
-@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+@@ -145,7 +150,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
/* make sure it can fit in the remaining address space */
if (likely(addr > len)) {
vma = find_vma(mm, addr - len);
- if (!vma || addr <= vma->vm_start) {
-+ if (check_heap_stack_gap(vmm, addr - len, len))
++ if (check_heap_stack_gap(vmm, addr - len, len, offset))
/* cache the address as a hint for next time */
return mm->free_area_cache = addr - len;
}
-@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+@@ -155,17 +160,17 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+ goto bottomup;
+
+ addr = mm->mmap_base - len;
+- if (do_color_align)
+- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
+
+ do {
++ if (do_color_align)
++ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
+ /*
+ * Lookup failure means no vma is above this address,
+ * else if new region fits below vma->vm_start,
* return with success:
*/
vma = find_vma(mm, addr);
- if (likely(!vma || addr + len <= vma->vm_start)) {
-+ if (check_heap_stack_gap(vmm, addr, len)) {
++ if (check_heap_stack_gap(vmm, addr, len, offset)) {
/* cache the address as a hint for next time */
return mm->free_area_cache = addr;
}
-@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -175,10 +180,8 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+ mm->cached_hole_size = vma->vm_start - addr;
+
+ /* try just below the current vma->vm_start */
+- addr = vma->vm_start - len;
+- if (do_color_align)
+- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
+- } while (likely(len < vma->vm_start));
++ addr = skip_heap_stack_gap(vma, len, offset);
++ } while (!IS_ERR_VALUE(addr));
+
+ bottomup:
+ /*
+@@ -223,6 +226,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+ {
+ unsigned long random_factor = 0UL;
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
+ if (current->flags & PF_RANDOMIZE) {
+ random_factor = get_random_int();
+ random_factor = random_factor << PAGE_SHIFT;
+@@ -234,38 +241,23 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+
+ if (mmap_is_legacy()) {
+ mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
++
++#ifdef CONFIG_PAX_RANDMMAP
++ if (mm->pax_flags & MF_PAX_RANDMMAP)
++ mm->mmap_base += mm->delta_mmap;
++#endif
++
+ mm->get_unmapped_area = arch_get_unmapped_area;
+ mm->unmap_area = arch_unmap_area;
+ } else {
+ mm->mmap_base = mmap_base(random_factor);
++
++#ifdef CONFIG_PAX_RANDMMAP
++ if (mm->pax_flags & MF_PAX_RANDMMAP)
++ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
++#endif
++
+ mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
}
DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
me->arch.unwind_section, table, end, gp);
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
-index 7426e40..30c8dbe 100644
+index f76c108..92bad82 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
-@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
+@@ -33,9 +33,11 @@
+ #include <linux/utsname.h>
+ #include <linux/personality.h>
+
+-static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
++static unsigned long get_unshared_area(struct file *filp, unsigned long addr, unsigned long len,
++ unsigned long flags)
+ {
+ struct vm_area_struct *vma;
++ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
+
+ addr = PAGE_ALIGN(addr);
+
+@@ -43,7 +45,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr)
return -ENOMEM;
- if (!vma || addr + len <= vma->vm_start)
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
return addr;
addr = vma->vm_end;
}
-@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
+@@ -67,11 +69,12 @@ static int get_offset(struct address_space *mapping)
+ return offset & 0x3FF000;
+ }
+
+-static unsigned long get_shared_area(struct address_space *mapping,
+- unsigned long addr, unsigned long len, unsigned long pgoff)
++static unsigned long get_shared_area(struct file *filp, struct address_space *mapping,
++ unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags)
+ {
+ struct vm_area_struct *vma;
+ int offset = mapping ? get_offset(mapping) : 0;
++ unsigned long rand_offset = gr_rand_threadstack_offset(current->mm, filp, flags);
+
+ offset = (offset + (pgoff << PAGE_SHIFT)) & 0x3FF000;
+
+@@ -81,7 +84,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr)
return -ENOMEM;
- if (!vma || addr + len <= vma->vm_start)
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, rand_offset))
return addr;
addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
if (addr < vma->vm_end) /* handle wraparound */
-@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -100,14 +103,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
if (flags & MAP_FIXED)
return addr;
if (!addr)
+ addr = current->mm->mmap_base;
if (filp) {
- addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
+- addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
++ addr = get_shared_area(filp, filp->f_mapping, addr, len, pgoff, flags);
+ } else if(flags & MAP_SHARED) {
+- addr = get_shared_area(NULL, addr, len, pgoff);
++ addr = get_shared_area(filp, NULL, addr, len, pgoff, flags);
+ } else {
+- addr = get_unshared_area(addr, len);
++ addr = get_unshared_area(filp, addr, len, flags);
+ }
+ return addr;
+ }
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 45ba99f..8e22c33 100644
--- a/arch/parisc/kernel/traps.c
/*
* If for any reason at all we couldn't handle the fault, make
diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
-index da29032..f76c24c 100644
+index e3b1d41..8e81edf 100644
--- a/arch/powerpc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
-@@ -522,6 +522,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
+@@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
return t1;
}
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
-index 3bf9cca..e7457d0 100644
+index 6abf0a1..459d0f1 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
-@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
+@@ -28,8 +28,19 @@
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
/*
* Our registers are always unsigned longs, whether we're a 32 bit
-@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+@@ -124,10 +135,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
(0x7ff >> (PAGE_SHIFT - 12)) : \
(0x3ffff >> (PAGE_SHIFT - 12)))
-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
-#define arch_randomize_brk arch_randomize_brk
-
- #endif /* __KERNEL__ */
-
- /*
+-
+ #ifdef CONFIG_SPU_BASE
+ /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
+ #define NT_SPU 1
diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
index 8196e9c..d83a9f3 100644
--- a/arch/powerpc/include/asm/exec.h
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_KMAP_TYPES_H */
diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
-index d4a7f64..451de1c 100644
+index 8565c25..2865190 100644
--- a/arch/powerpc/include/asm/mman.h
+++ b/arch/powerpc/include/asm/mman.h
-@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
+@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
}
#define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
* Use the top bit of the higher-level page table entries to indicate whether
* the entries we point to contain hugepages. This works because we know that
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
-index fed85e6..da5c71b 100644
+index cd915d6..c10cee8 100644
--- a/arch/powerpc/include/asm/page_64.h
+++ b/arch/powerpc/include/asm/page_64.h
-@@ -146,15 +146,18 @@ do { \
+@@ -154,15 +154,18 @@ do { \
* stack by default, so in the absence of a PT_GNU_STACK program header
* we turn execute permission off.
*/
static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
pte_t *pte)
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
-index 2e0e411..7899c68 100644
+index a9cbd3b..3b67efa 100644
--- a/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@ -2,6 +2,7 @@
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
-index 6386086..6982225 100644
+index d24c141..b60696e 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
-@@ -212,6 +212,7 @@
+@@ -215,6 +215,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
#define DSISR_NOHPTE 0x40000000 /* no translation found */
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
-index faf9352..ab2ccec 100644
+index 406b7b9..af63426 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
-@@ -97,12 +97,14 @@ static inline struct thread_info *current_thread_info(void)
+@@ -97,7 +97,6 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_PERFMON_CTXSW 6 /* perfmon needs ctxsw calls */
#define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
#define TIF_SINGLESTEP 8 /* singlestepping active */
#define TIF_SECCOMP 10 /* secure computing */
#define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */
#define TIF_NOERROR 12 /* Force successful syscall return */
- #define TIF_NOTIFY_RESUME 13 /* callback before returning to user */
+@@ -106,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_SYSCALL_TRACEPOINT 15 /* syscall tracepoint instrumentation */
-+#define TIF_MEMDIE 16 /* is terminating due to OOM killer */
+ #define TIF_EMULATE_STACK_STORE 16 /* Is an instruction emulation
+ for stack store? */
++#define TIF_MEMDIE 17 /* is terminating due to OOM killer */
+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
+#define TIF_GRSEC_SETXID 9 /* update credentials on syscall entry/exit */
/* as above, but as bit values */
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
-@@ -119,8 +121,10 @@ static inline struct thread_info *current_thread_info(void)
- #define _TIF_NOERROR (1<<TIF_NOERROR)
- #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
+@@ -124,8 +126,10 @@ static inline struct thread_info *current_thread_info(void)
+ #define _TIF_UPROBE (1<<TIF_UPROBE)
#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
+ #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
#define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
- _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT)
+ _TIF_GRSEC_SETXID)
#define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
- _TIF_NOTIFY_RESUME)
+ _TIF_NOTIFY_RESUME | _TIF_UPROBE)
diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
-index 17bb40c..353c98b 100644
+index 4db4959..335e00c 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -13,6 +13,8 @@
/*
* The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with
-@@ -329,52 +331,6 @@ do { \
+@@ -318,52 +320,6 @@ do { \
extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);
static inline unsigned long __copy_from_user_inatomic(void *to,
const void __user *from, unsigned long n)
{
-@@ -398,6 +354,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
+@@ -387,6 +343,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
if (ret == 0)
return 0;
}
return __copy_tofrom_user((__force void __user *)to, from, n);
}
-@@ -424,6 +384,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
+@@ -413,6 +373,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
if (ret == 0)
return 0;
}
return __copy_tofrom_user(to, (__force const void __user *)from, n);
}
-@@ -441,6 +405,92 @@ static inline unsigned long __copy_to_user(void __user *to,
+@@ -430,6 +394,92 @@ static inline unsigned long __copy_to_user(void __user *to,
return __copy_to_user_inatomic(to, from, size);
}
static inline unsigned long clear_user(void __user *addr, unsigned long size)
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
-index 98be7f0..8ef62de 100644
+index 4684e33..acc4d19e 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
-@@ -661,6 +661,7 @@ storage_fault_common:
+@@ -715,6 +715,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
mr r4,r14
mr r5,r15
ld r14,PACA_EXGEN+EX_R14(r13)
-@@ -669,8 +670,7 @@ storage_fault_common:
+@@ -723,8 +724,7 @@ storage_fault_common:
cmpdi r3,0
bne- 1f
b .ret_from_except_lite
ld r4,_DAR(r1)
bl .bad_page_fault
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
-index 39aa97d..dc916ee 100644
+index 10b658a..e542888 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
-@@ -890,10 +890,10 @@ handle_page_fault:
+@@ -1013,10 +1013,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
-index 1a1f2dd..f4d1bb4 100644
+index ba48233..16ac31d 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
-@@ -681,8 +681,8 @@ void show_regs(struct pt_regs * regs)
+@@ -680,8 +680,8 @@ void show_regs(struct pt_regs * regs)
* Lookup NIP late so we have the best change of getting the
* above info out without failing
*/
#endif
show_stack(current, (unsigned long *) regs->gpr[1]);
if (!user_mode(regs))
-@@ -1181,10 +1181,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1175,10 +1175,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
newsp = stack[0];
ip = stack[STACK_FRAME_LR_SAVE];
if (!firstframe || ip != lr) {
(void *)current->ret_stack[curr_frame].ret);
curr_frame--;
}
-@@ -1204,7 +1204,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1198,7 +1198,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
struct pt_regs *regs = (struct pt_regs *)
(sp + STACK_FRAME_OVERHEAD);
lr = regs->link;
regs->trap, (void *)regs->nip, (void *)lr);
firstframe = 1;
}
-@@ -1246,58 +1246,3 @@ void __ppc64_runlatch_off(void)
+@@ -1240,58 +1240,3 @@ void __ppc64_runlatch_off(void)
mtspr(SPRN_CTRLT, ctrl);
}
#endif /* CONFIG_PPC64 */
- return ret;
-}
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
-index c10fc28..c4ef063 100644
+index 79d8e56..38ffcbb 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
-@@ -1660,6 +1660,10 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -1663,6 +1663,10 @@ long arch_ptrace(struct task_struct *child, long request,
return ret;
}
/*
* We must return the syscall number to actually look up in the table.
* This can be -1L to skip running any syscall at all.
-@@ -1670,6 +1674,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
+@@ -1673,6 +1677,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
secure_computing_strict(regs->gpr[0]);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
/*
-@@ -1704,6 +1713,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
+@@ -1707,6 +1716,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
{
int step;
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
-index 8b4c049..dcd6ef3 100644
+index 804e323..79181c1 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
-@@ -852,7 +852,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
+@@ -851,7 +851,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
addr = frame;
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
-index ae0843f..f16372c 100644
+index 3251840..3f7c77a 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -133,6 +133,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
}
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
-index b67db22..38825d2 100644
+index 1b2076f..835e4be 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -34,6 +34,7 @@
EXPORT_SYMBOL(copy_in_user);
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
-index 08ffcf5..a0ab912 100644
+index 0a6b283..7674925 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -32,6 +32,10 @@
/*
* Check whether the instruction at regs->nip is a store using
* an update addressing form which will update r1.
-@@ -215,7 +246,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
+@@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
* indicate errors in DSISR but can validly be set in SRR1.
*/
if (trap == 0x400)
else
is_write = error_code & DSISR_ISSTORE;
#else
-@@ -366,7 +397,7 @@ good_area:
+@@ -367,7 +398,7 @@ good_area:
* "undefined". Of those that can be set, this is the only
* one which seems bad.
*/
/* Guarded storage error. */
goto bad_area;
#endif /* CONFIG_8xx */
-@@ -381,7 +412,7 @@ good_area:
+@@ -382,7 +413,7 @@ good_area:
* processors use the same I/D cache coherency mechanism
* as embedded.
*/
goto bad_area;
#endif /* CONFIG_PPC_STD_MMU */
-@@ -463,6 +494,23 @@ bad_area:
+@@ -465,6 +496,23 @@ bad_area:
bad_area_nosemaphore:
/* User mode accesses cause a SIGSEGV */
if (user_mode(regs)) {
return 0;
}
diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
-index 67a42ed..1c7210c 100644
+index 67a42ed..c16ef80 100644
--- a/arch/powerpc/mm/mmap_64.c
+++ b/arch/powerpc/mm/mmap_64.c
-@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -57,6 +57,10 @@ static unsigned long mmap_rnd(void)
+ {
+ unsigned long rnd = 0;
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
+ if (current->flags & PF_RANDOMIZE) {
+ /* 8MB for 32bit, 1GB for 64bit */
+ if (is_32bit_task())
+@@ -91,10 +95,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
*/
if (mmap_is_legacy()) {
mm->mmap_base = TASK_UNMAPPED_BASE;
mm->unmap_area = arch_unmap_area_topdown;
}
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
-index 73709f7..6b90313 100644
+index 5829d2a..af84242 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
-@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
+@@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
if ((mm->task_size - len) < addr)
return 0;
vma = find_vma(mm, addr);
- return (!vma || (addr + len) <= vma->vm_start);
-+ return check_heap_stack_gap(vma, addr, len);
++ return check_heap_stack_gap(vma, addr, len, 0);
}
static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
-@@ -256,7 +256,7 @@ full_search:
+@@ -272,7 +272,7 @@ full_search:
addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
continue;
}
- if (!vma || addr + len <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr, len)) {
++ if (check_heap_stack_gap(vma, addr, len, 0)) {
/*
* Remember the place where we stopped the search:
*/
-@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
+@@ -329,10 +329,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
}
}
/* Check for hit with different page size */
mask = slice_range_to_mask(addr, len);
-@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
+@@ -352,7 +356,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
* return with success:
*/
vma = find_vma(mm, addr);
- if (!vma || (addr + len) <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr, len)) {
++ if (check_heap_stack_gap(vma, addr, len, 0)) {
/* remember the address as a hint for next time */
if (use_cache)
mm->free_area_cache = addr;
-@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
+@@ -364,7 +368,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
mm->cached_hole_size = vma->vm_start - addr;
/* try just below the current vma->vm_start */
- addr = vma->vm_start;
-+ addr = skip_heap_stack_gap(vma, len);
++ addr = skip_heap_stack_gap(vma, len, 0);
}
/*
-@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
+@@ -442,6 +446,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
if (fixed && addr > (mm->task_size - len))
return -EINVAL;
#define __read_mostly __attribute__((__section__(".data..read_mostly")))
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
-index 9b94a16..63d4034 100644
+index 178ff96..8c93bd1 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
-@@ -159,8 +159,14 @@ extern unsigned int vdso_enabled;
+@@ -160,8 +160,14 @@ extern unsigned int vdso_enabled;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. */
-@@ -209,7 +215,4 @@ struct linux_binprm;
+@@ -210,9 +216,6 @@ struct linux_binprm;
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
int arch_setup_additional_pages(struct linux_binprm *, int);
-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
-#define arch_randomize_brk arch_randomize_brk
-
+ void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
+
#endif
diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
index c4a93d6..4d2a9b4 100644
#endif /* __ASM_EXEC_H */
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
-index a8ab18b..75ddbf0 100644
+index 34268df..ea97318 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
-@@ -239,6 +239,10 @@ static inline unsigned long __must_check
+@@ -252,6 +252,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
might_fault();
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-@@ -264,6 +268,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
+@@ -277,6 +281,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
static inline unsigned long __must_check
__copy_from_user(void *to, const void __user *from, unsigned long n)
{
if (__builtin_constant_p(n) && (n <= 256))
return uaccess.copy_from_user_small(n, from, to);
else
-@@ -295,10 +302,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
+@@ -308,10 +315,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
static inline unsigned long __must_check
copy_from_user(void *to, const void __user *from, unsigned long n)
{
return n;
}
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
-index 46412b1..e32874f 100644
+index 4610dea..cf0af21 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
-@@ -160,11 +160,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
+@@ -171,11 +171,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
/* Increase core size by size of got & plt and set start
offsets for got and plt. */
return 0;
}
-@@ -241,7 +241,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -252,7 +252,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
if (info->got_initialized == 0) {
Elf_Addr *gotent;
info->got_offset;
*gotent = val;
info->got_initialized = 1;
-@@ -265,7 +265,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -276,7 +276,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
else if (r_type == R_390_GOTENT ||
r_type == R_390_GOTPLTENT)
*(unsigned int *) loc =
else if (r_type == R_390_GOT64 ||
r_type == R_390_GOTPLT64)
*(unsigned long *) loc = val;
-@@ -279,7 +279,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -290,7 +290,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
if (info->plt_initialized == 0) {
unsigned int *ip;
info->plt_offset;
#ifndef CONFIG_64BIT
ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
-@@ -304,7 +304,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -315,7 +315,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
val - loc + 0xffffUL < 0x1ffffeUL) ||
(r_type == R_390_PLT32DBL &&
val - loc + 0xffffffffULL < 0x1fffffffeULL)))
me->arch.plt_offset +
info->plt_offset;
val += rela->r_addend - loc;
-@@ -326,7 +326,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
case R_390_GOTOFF32: /* 32 bit offset to GOT. */
case R_390_GOTOFF64: /* 64 bit offset to GOT. */
val = val + rela->r_addend -
if (r_type == R_390_GOTOFF16)
*(unsigned short *) loc = val;
else if (r_type == R_390_GOTOFF32)
-@@ -336,7 +336,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -347,7 +347,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
break;
case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
-index 7331753..dd71de4 100644
+index cd31ad4..201c5a3 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
-@@ -316,39 +316,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -283,39 +283,3 @@ unsigned long get_wchan(struct task_struct *p)
}
return 0;
}
#define __read_mostly __attribute__((__section__(".data..read_mostly")))
diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
-index afeb710..d1d1289 100644
+index afeb710..e8366ef 100644
--- a/arch/sh/mm/mmap.c
+++ b/arch/sh/mm/mmap.c
-@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -49,6 +49,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ struct vm_area_struct *vma;
+ unsigned long start_addr;
+ int do_colour_align;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ if (flags & MAP_FIXED) {
+ /* We do not accept a shared mapping if it would violate
+@@ -74,8 +75,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
- if (TASK_SIZE - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
return addr;
}
-@@ -106,7 +105,7 @@ full_search:
+@@ -106,7 +106,7 @@ full_search:
}
return -ENOMEM;
}
- if (likely(!vma || addr + len <= vma->vm_start)) {
-+ if (likely(check_heap_stack_gap(vma, addr, len))) {
++ if (likely(check_heap_stack_gap(vma, addr, len, offset))) {
/*
* Remember the place where we stopped the search:
*/
-@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -131,6 +131,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ struct mm_struct *mm = current->mm;
+ unsigned long addr = addr0;
+ int do_colour_align;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ if (flags & MAP_FIXED) {
+ /* We do not accept a shared mapping if it would violate
+@@ -157,8 +158,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
- if (TASK_SIZE - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
return addr;
}
-@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -179,7 +179,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
/* make sure it can fit in the remaining address space */
if (likely(addr > len)) {
vma = find_vma(mm, addr-len);
- if (!vma || addr <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr - len, len)) {
++ if (check_heap_stack_gap(vma, addr - len, len, offset)) {
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr-len);
}
-@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -188,18 +188,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
if (unlikely(mm->mmap_base < len))
goto bottomup;
*/
vma = find_vma(mm, addr);
- if (likely(!vma || addr+len <= vma->vm_start)) {
-+ if (likely(check_heap_stack_gap(vma, addr, len))) {
++ if (likely(check_heap_stack_gap(vma, addr, len, offset))) {
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr);
}
-@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -209,10 +209,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
mm->cached_hole_size = vma->vm_start - addr;
/* try just below the current vma->vm_start */
- if (do_colour_align)
- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
- } while (likely(len < vma->vm_start));
-+ addr = skip_heap_stack_gap(vma, len);
++ addr = skip_heap_stack_gap(vma, len, offset);
+ } while (!IS_ERR_VALUE(addr));
bottomup:
/*
diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
-index ce35a1c..2e7b8f9 100644
+index be56a24..443328f 100644
--- a/arch/sparc/include/asm/atomic_64.h
+++ b/arch/sparc/include/asm/atomic_64.h
@@ -14,18 +14,40 @@
#ifdef CONFIG_SPARC32
#define SMP_CACHE_BYTES_SHIFT 5
diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
-index 2d4d755..81b6662 100644
+index ac74a2c..a9e58af 100644
--- a/arch/sparc/include/asm/elf_32.h
+++ b/arch/sparc/include/asm/elf_32.h
@@ -114,6 +114,13 @@ typedef struct {
instruction set this cpu supports. This can NOT be done in userspace
on Sparc. */
diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
-index 7df8b7f..4946269 100644
+index 370ca1e..d4f4a98 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
-@@ -180,6 +180,13 @@ typedef struct {
+@@ -189,6 +189,13 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
unsigned long address)
diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
-index 40b2d7a..22a665b 100644
+index bcfe063..b333142 100644
--- a/arch/sparc/include/asm/pgalloc_64.h
+++ b/arch/sparc/include/asm/pgalloc_64.h
@@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
unsigned long mask, tmp1, tmp2, result;
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
-index e6cd224..3a71793 100644
+index 25849ae..924c54b 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -49,6 +49,8 @@ struct thread_info {
/*
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
-index cfa8c38..13f30d3 100644
+index a3fe4dc..cae132a 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -63,6 +63,8 @@ struct thread_info {
}
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
-index 7c831d8..d440ca7 100644
+index 73083e1..2bc62a6 100644
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@ -10,6 +10,7 @@
extra-y := head_$(BITS).o
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
-index 14006d8..8146238 100644
+index 487bffb..955a925 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -126,14 +126,14 @@ void show_regs(struct pt_regs *r)
} while (++count < 16);
printk("\n");
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
-index aff0c72..9067b39 100644
+index c6e0c29..052832b 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
-@@ -179,14 +179,14 @@ static void show_regwindow(struct pt_regs *regs)
+@@ -181,14 +181,14 @@ static void show_regwindow(struct pt_regs *regs)
printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
if (regs->tstate & TSTATE_PRIV)
printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
regs->u_regs[3]);
-@@ -199,7 +199,7 @@ void show_regs(struct pt_regs *regs)
+@@ -201,7 +201,7 @@ void show_regs(struct pt_regs *regs)
printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
regs->u_regs[15]);
show_regwindow(regs);
show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
}
-@@ -284,7 +284,7 @@ void arch_trigger_all_cpu_backtrace(void)
+@@ -290,7 +290,7 @@ void arch_trigger_all_cpu_backtrace(void)
((tp && tp->task) ? tp->task->pid : -1));
if (gp->tstate & TSTATE_PRIV) {
(void *) gp->o7,
(void *) gp->i7,
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
-index 484daba..0674139 100644
+index 7ff45e4..a58f271 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -1057,6 +1057,10 @@ long arch_ptrace(struct task_struct *child, long request,
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
-index 0c9b31b..7cb7aee 100644
+index 0c9b31b..55a8ba6 100644
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
-@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -39,6 +39,7 @@ asmlinkage unsigned long sys_getpagesize(void)
+ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags)
+ {
+ struct vm_area_struct * vmm;
++ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
+
+ if (flags & MAP_FIXED) {
+ /* We do not accept a shared mapping if it would violate
+@@ -54,7 +55,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
if (len > TASK_SIZE - PAGE_SIZE)
return -ENOMEM;
if (!addr)
if (flags & MAP_SHARED)
addr = COLOUR_ALIGN(addr);
-@@ -65,7 +65,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -65,7 +66,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
/* At this point: (!vmm || addr < vmm->vm_end). */
if (TASK_SIZE - PAGE_SIZE - len < addr)
return -ENOMEM;
- if (!vmm || addr + len <= vmm->vm_start)
-+ if (check_heap_stack_gap(vmm, addr, len))
++ if (check_heap_stack_gap(vmm, addr, len, offset))
return addr;
addr = vmm->vm_end;
if (flags & MAP_SHARED)
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
-index 11c6c96..3ec33e8 100644
+index 878ef3d..f100719 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
-@@ -107,7 +107,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -102,12 +102,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ unsigned long task_size = TASK_SIZE;
+ unsigned long start_addr;
+ int do_color_align;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ if (flags & MAP_FIXED) {
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
*/
((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
return -EINVAL;
return addr;
-@@ -122,6 +122,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -122,6 +123,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
if (filp || (flags & MAP_SHARED))
do_color_align = 1;
if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -129,15 +133,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -129,15 +134,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
- if (task_size - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
return addr;
}
mm->cached_hole_size = 0;
}
-@@ -157,14 +160,14 @@ full_search:
+@@ -157,14 +161,14 @@ full_search:
vma = find_vma(mm, VA_EXCLUDE_END);
}
if (unlikely(task_size < addr)) {
return -ENOMEM;
}
- if (likely(!vma || addr + len <= vma->vm_start)) {
-+ if (likely(check_heap_stack_gap(vma, addr, len))) {
++ if (likely(check_heap_stack_gap(vma, addr, len, offset))) {
/*
* Remember the place where we stopped the search:
*/
-@@ -198,7 +201,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -190,6 +194,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ unsigned long task_size = STACK_TOP32;
+ unsigned long addr = addr0;
+ int do_color_align;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ /* This should only ever run for 32-bit processes. */
+ BUG_ON(!test_thread_flag(TIF_32BIT));
+@@ -198,7 +203,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
*/
((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
return -EINVAL;
return addr;
-@@ -219,8 +222,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -219,8 +224,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
addr = PAGE_ALIGN(addr);
vma = find_vma(mm, addr);
- if (task_size - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
return addr;
}
-@@ -241,7 +243,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -241,7 +245,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
/* make sure it can fit in the remaining address space */
if (likely(addr > len)) {
vma = find_vma(mm, addr-len);
- if (!vma || addr <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr - len, len)) {
++ if (check_heap_stack_gap(vma, addr - len, len, offset)) {
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr-len);
}
-@@ -250,18 +252,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -250,18 +254,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
if (unlikely(mm->mmap_base < len))
goto bottomup;
*/
vma = find_vma(mm, addr);
- if (likely(!vma || addr+len <= vma->vm_start)) {
-+ if (likely(check_heap_stack_gap(vma, addr, len))) {
++ if (likely(check_heap_stack_gap(vma, addr, len, offset))) {
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr);
}
-@@ -271,10 +273,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -271,10 +275,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
mm->cached_hole_size = vma->vm_start - addr;
/* try just below the current vma->vm_start */
- if (do_color_align)
- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
- } while (likely(len < vma->vm_start));
-+ addr = skip_heap_stack_gap(vma, len);
++ addr = skip_heap_stack_gap(vma, len, offset);
+ } while (!IS_ERR_VALUE(addr));
bottomup:
/*
-@@ -373,6 +373,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -348,6 +350,10 @@ static unsigned long mmap_rnd(void)
+ {
+ unsigned long rnd = 0UL;
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
+ if (current->flags & PF_RANDOMIZE) {
+ unsigned long val = get_random_int();
+ if (test_thread_flag(TIF_32BIT))
+@@ -373,6 +379,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
gap == RLIM_INFINITY ||
sysctl_legacy_va_layout) {
mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
} else {
-@@ -385,6 +391,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -385,6 +397,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
gap = (task_size / 6 * 5);
mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
mm->unmap_area = arch_unmap_area_topdown;
}
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
-index 7f5f65d..3308382 100644
+index bf23477..b7425a6 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
be,pt %icc, rtrap
nop
call syscall_trace_leave
-@@ -179,7 +179,7 @@ linux_sparc_syscall32:
+@@ -189,7 +189,7 @@ linux_sparc_syscall32:
srl %i5, 0, %o5 ! IEU1
srl %i2, 0, %o2 ! IEU0 Group
bne,pn %icc, linux_syscall_trace32 ! CTI
mov %i0, %l5 ! IEU1
call %l7 ! CTI Group brk forced
-@@ -202,7 +202,7 @@ linux_sparc_syscall:
+@@ -212,7 +212,7 @@ linux_sparc_syscall:
mov %i3, %o3 ! IEU1
mov %i4, %o4 ! IEU0 Group
bne,pn %icc, linux_syscall_trace ! CTI Group
mov %i0, %l5 ! IEU0
2: call %l7 ! CTI Group brk forced
-@@ -218,7 +218,7 @@ ret_sys_call:
+@@ -228,7 +228,7 @@ ret_sys_call:
cmp %o0, -ERESTART_RESTARTBLOCK
bgeu,pn %xcc, 1f
}
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
-index 3b05e66..6ea2917 100644
+index b66a779..8e8d66c 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
-@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
+@@ -76,7 +76,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
i + 1,
p->trapstack[i].tstate, p->trapstack[i].tpc,
p->trapstack[i].tnpc, p->trapstack[i].tt);
}
}
-@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
+@@ -96,6 +96,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
lvl -= 0x100;
if (regs->tstate & TSTATE_PRIV) {
sprintf(buffer, "Kernel bad sw trap %lx", lvl);
die_if_kernel(buffer, regs);
}
-@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
+@@ -114,11 +120,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
void bad_trap_tl1(struct pt_regs *regs, long lvl)
{
char buffer[32];
dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
+@@ -1142,7 +1153,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
printk("%s" "ERROR(%d): ",
(recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
(recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
(afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
-@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
+@@ -1749,7 +1760,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
smp_processor_id(),
(type & 0x1) ? 'I' : 'D',
regs->tpc);
panic("Irrecoverable Cheetah+ parity error.");
}
-@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
+@@ -1757,7 +1768,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
smp_processor_id(),
(type & 0x1) ? 'I' : 'D',
regs->tpc);
}
struct sun4v_error_entry {
-@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
+@@ -2104,9 +2115,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
regs->tpc, tl);
(void *) regs->u_regs[UREG_I7]);
printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
"pte[%lx] error[%lx]\n",
-@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
+@@ -2128,9 +2139,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
regs->tpc, tl);
(void *) regs->u_regs[UREG_I7]);
printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
"pte[%lx] error[%lx]\n",
-@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
+@@ -2336,13 +2347,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
fp = (unsigned long)sf->fp + STACK_BIAS;
}
graph++;
}
}
-@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
+@@ -2367,6 +2378,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
return (struct reg_window *) (fp + STACK_BIAS);
}
void die_if_kernel(char *str, struct pt_regs *regs)
{
static int die_counter;
-@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -2395,7 +2408,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
while (rw &&
count++ < 30 &&
kstack_valid(tp, (unsigned long) rw)) {
(void *) rw->ins[7]);
rw = kernel_stack_up(rw);
-@@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -2408,8 +2421,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
}
user_instruction_dump ((unsigned int __user *) regs->tpc);
}
}
EXPORT_SYMBOL(die_if_kernel);
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
-index f81d038..e7a4680 100644
+index 8201c25e..072a2a7 100644
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
-@@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs *regs)
+@@ -286,7 +286,7 @@ static void log_unaligned(struct pt_regs *regs)
static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
if (__ratelimit(&ratelimit)) {
}
}
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
-index dff4096..bd9a388 100644
+index 8410065f2..4fd4ca22 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -2,7 +2,7 @@
lib-$(CONFIG_SPARC32) += ashrdi3.o
lib-$(CONFIG_SPARC32) += memcpy.o memset.o
diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
-index 4d502da..527c48d 100644
+index 85c233d..68500e0 100644
--- a/arch/sparc/lib/atomic_64.S
+++ b/arch/sparc/lib/atomic_64.S
@@ -17,7 +17,12 @@
cmp %g1, %g7
bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
-index 3b31218..345c609 100644
+index 0c4e35e..745d3e4 100644
--- a/arch/sparc/lib/ksyms.c
+++ b/arch/sparc/lib/ksyms.c
@@ -109,12 +109,18 @@ EXPORT_SYMBOL(__downgrade_write);
EXPORT_SYMBOL(atomic64_sub);
+EXPORT_SYMBOL(atomic64_sub_unchecked);
EXPORT_SYMBOL(atomic64_sub_ret);
+ EXPORT_SYMBOL(atomic64_dec_if_positive);
- /* Atomic bit operations. */
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
index 30c3ecc..736f015 100644
--- a/arch/sparc/mm/Makefile
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
obj-y += fault_$(BITS).o
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
-index 77ac917..baf45db 100644
+index e98bfda..ea8d221 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -21,6 +21,9 @@
if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
-index 1fe0429..8dd5dd5 100644
+index 097aee7..5ca6697 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -21,6 +21,9 @@
printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
dump_stack();
unhandled_fault(regs->tpc, current, regs);
-@@ -272,6 +275,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
+@@ -270,6 +273,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
show_regs(regs);
}
asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
{
struct mm_struct *mm = current->mm;
-@@ -343,6 +806,29 @@ retry:
+@@ -341,6 +804,29 @@ retry:
if (!vma)
goto bad_area;
* load/store/atomic was a write or not, it only says that there
* was no match. So in such a case we (carefully) read the
diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
-index 07e1453..0a7d9e9 100644
+index f76f83d..ee0d859 100644
--- a/arch/sparc/mm/hugetlbpage.c
+++ b/arch/sparc/mm/hugetlbpage.c
-@@ -67,7 +67,7 @@ full_search:
+@@ -34,6 +34,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
+ struct vm_area_struct * vma;
+ unsigned long task_size = TASK_SIZE;
+ unsigned long start_addr;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ if (test_thread_flag(TIF_32BIT))
+ task_size = STACK_TOP32;
+@@ -67,7 +68,7 @@ full_search:
}
return -ENOMEM;
}
- if (likely(!vma || addr + len <= vma->vm_start)) {
-+ if (likely(check_heap_stack_gap(vma, addr, len))) {
++ if (likely(check_heap_stack_gap(vma, addr, len, offset))) {
/*
* Remember the place where we stopped the search:
*/
-@@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -90,6 +91,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ struct vm_area_struct *vma;
+ struct mm_struct *mm = current->mm;
+ unsigned long addr = addr0;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ /* This should only ever run for 32-bit processes. */
+ BUG_ON(!test_thread_flag(TIF_32BIT));
+@@ -106,7 +108,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
/* make sure it can fit in the remaining address space */
if (likely(addr > len)) {
vma = find_vma(mm, addr-len);
- if (!vma || addr <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr - len, len)) {
++ if (check_heap_stack_gap(vma, addr - len, len, offset)) {
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr-len);
}
-@@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -115,16 +117,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
if (unlikely(mm->mmap_base < len))
goto bottomup;
*/
vma = find_vma(mm, addr);
- if (likely(!vma || addr+len <= vma->vm_start)) {
-+ if (likely(check_heap_stack_gap(vma, addr, len))) {
++ if (likely(check_heap_stack_gap(vma, addr, len, offset))) {
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr);
}
-@@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -134,8 +137,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
mm->cached_hole_size = vma->vm_start - addr;
/* try just below the current vma->vm_start */
- addr = (vma->vm_start-len) & HPAGE_MASK;
- } while (likely(len < vma->vm_start));
-+ addr = skip_heap_stack_gap(vma, len);
++ addr = skip_heap_stack_gap(vma, len, offset);
+ } while (!IS_ERR_VALUE(addr));
bottomup:
/*
-@@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -163,6 +166,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+ struct mm_struct *mm = current->mm;
+ struct vm_area_struct *vma;
+ unsigned long task_size = TASK_SIZE;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ if (test_thread_flag(TIF_32BIT))
+ task_size = STACK_TOP32;
+@@ -181,8 +185,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
if (addr) {
addr = ALIGN(addr, HPAGE_SIZE);
vma = find_vma(mm, addr);
- if (task_size - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
else
copy_from_user_overflow();
diff --git a/arch/um/Makefile b/arch/um/Makefile
-index 0970910..9f65c40 100644
+index 133f7de..1d6f2f1 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -62,6 +62,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
#endif
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
-index 7cfc3ce..cbd1a58 100644
+index 5ff53d9..5850cdf 100644
--- a/arch/um/include/asm/page.h
+++ b/arch/um/include/asm/page.h
@@ -14,6 +14,9 @@
#ifdef CONFIG_64BIT
#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
-index c5f5afa..6abce4b 100644
+index b6d699c..df7ac1d 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
-@@ -402,22 +402,6 @@ int singlestepping(void * t)
+@@ -387,22 +387,6 @@ int singlestepping(void * t)
return 2;
}
/*
* Memory returned by kmalloc() may be used for DMA, so we must make
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 50a1d1f..c26369f 100644
+index 46c3bff..b82f26b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -220,7 +220,7 @@ config X86_HT
+@@ -241,7 +241,7 @@ config X86_HT
config X86_32_LAZY_GS
def_bool y
config ARCH_HWEIGHT_CFLAGS
string
-@@ -1049,7 +1049,7 @@ choice
+@@ -1033,6 +1033,7 @@ config MICROCODE_OLD_INTERFACE
+
+ config X86_MSR
+ tristate "/dev/cpu/*/msr - Model-specific register support"
++ depends on !GRKERNSEC_KMEM
+ ---help---
+ This device gives privileged processes access to the x86
+ Model-Specific Registers (MSRs). It is a character device with
+@@ -1056,7 +1057,7 @@ choice
config NOHIGHMEM
bool "off"
---help---
Linux can use up to 64 Gigabytes of physical memory on x86 systems.
However, the address space of 32-bit x86 processors is only 4
-@@ -1086,7 +1086,7 @@ config NOHIGHMEM
+@@ -1093,7 +1094,7 @@ config NOHIGHMEM
config HIGHMEM4G
bool "4GB"
---help---
Select this if you have a 32-bit processor and between 1 and 4
gigabytes of physical RAM.
-@@ -1140,7 +1140,7 @@ config PAGE_OFFSET
+@@ -1147,7 +1148,7 @@ config PAGE_OFFSET
hex
default 0xB0000000 if VMSPLIT_3G_OPT
default 0x80000000 if VMSPLIT_2G
default 0x40000000 if VMSPLIT_1G
default 0xC0000000
depends on X86_32
-@@ -1528,6 +1528,7 @@ config SECCOMP
+@@ -1548,6 +1549,7 @@ config SECCOMP
config CC_STACKPROTECTOR
bool "Enable -fstack-protector buffer overflow detection"
---help---
This option turns on the -fstack-protector GCC feature. This
feature puts, at the beginning of functions, a canary value on
-@@ -1585,6 +1586,7 @@ config KEXEC_JUMP
+@@ -1605,6 +1607,7 @@ config KEXEC_JUMP
config PHYSICAL_START
hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
default "0x1000000"
---help---
This gives the physical address where the kernel is loaded.
-@@ -1648,6 +1650,7 @@ config X86_NEED_RELOCS
+@@ -1668,6 +1671,7 @@ config X86_NEED_RELOCS
config PHYSICAL_ALIGN
hex "Alignment value to which kernel should be aligned" if X86_32
default "0x1000000"
range 0x2000 0x1000000
---help---
This value puts the alignment restrictions on physical address
-@@ -1679,9 +1682,10 @@ config HOTPLUG_CPU
+@@ -1699,9 +1703,10 @@ config HOTPLUG_CPU
Say N if you want to disable CPU hotplug.
config COMPAT_VDSO
+ def_bool n
prompt "Compat VDSO support"
depends on X86_32 || IA32_EMULATION
-+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
++ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
---help---
Map the 32-bit VDSO to the predictable old-style address too.
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
-index 706e12e..62e4feb 100644
+index f3b86d0..17fd30f 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
-@@ -334,7 +334,7 @@ config X86_PPRO_FENCE
+@@ -335,7 +335,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
def_bool y
config X86_INVD_BUG
def_bool y
-@@ -358,7 +358,7 @@ config X86_POPAD_OK
+@@ -359,7 +359,7 @@ config X86_POPAD_OK
config X86_ALIGNMENT_16
def_bool y
config X86_INTEL_USERCOPY
def_bool y
-@@ -404,7 +404,7 @@ config X86_CMPXCHG64
+@@ -405,7 +405,7 @@ config X86_CMPXCHG64
# generates cmov.
config X86_CMOV
def_bool y
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
-index f7535be..37db2d1 100644
+index ccce0ed..fd9da25 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
-@@ -64,6 +64,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
+@@ -65,6 +65,9 @@ KBUILD_CFLAGS := $(USERINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
$(call cc-option, -fno-stack-protector) \
$(call cc-option, -mpreferred-stack-boundary=2)
KBUILD_CFLAGS += $(call cc-option, -m32)
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
GCOV_PROFILE := n
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index b3e0227..f2c02d5 100644
+index ccae7e2..8ac70be 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
-@@ -142,7 +142,6 @@ again:
+@@ -144,7 +144,6 @@ again:
*addr = max_addr;
}
efi_call_phys1(sys_table->boottime->free_pool, map);
fail:
-@@ -206,7 +205,6 @@ static efi_status_t low_alloc(unsigned long size, unsigned long align,
+@@ -208,7 +207,6 @@ static efi_status_t low_alloc(unsigned long size, unsigned long align,
if (i == map_size / desc_size)
status = EFI_NOT_FOUND;
fail:
return status;
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
-index aa4aaf1..6656f2f 100644
+index ccb2f4a..e49b20e 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
-@@ -116,7 +116,7 @@ preferred_addr:
+@@ -118,7 +118,7 @@ preferred_addr:
notl %eax
andl %eax, %ebx
#else
#endif
/* Target address to relocate to for decompression */
-@@ -202,7 +202,7 @@ relocated:
+@@ -204,7 +204,7 @@ relocated:
* and where it was actually loaded.
*/
movl %ebp, %ebx
jz 2f /* Nothing to be done if loaded at compiled addr. */
/*
* Process relocations.
-@@ -210,8 +210,7 @@ relocated:
+@@ -212,8 +212,7 @@ relocated:
1: subl $4, %edi
movl (%edi), %ecx
err = check_flags();
}
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
-index b4e15dd..8ac59ce 100644
+index 8c132a6..13e5c96 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
-@@ -391,10 +391,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
+@@ -387,10 +387,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
# single linked list of
# struct setup_data
movq RRBP, %rbp;
movq RXOR, %rbx;
++ pax_force_retaddr 0, 1
+ ret;
+diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
+index a41a3aa..bdf5753 100644
+--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
++++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
+@@ -23,6 +23,8 @@
+ *
+ */
+
++#include <asm/alternative-asm.h>
++
+ .file "cast5-avx-x86_64-asm_64.S"
+
+ .extern cast5_s1
+@@ -293,6 +295,7 @@ __skip_enc:
+ leaq 3*(2*4*4)(%r11), %rax;
+ outunpack_blocks(%rax, RR4, RL4, RTMP, RX, RKM);
+
++ pax_force_retaddr 0, 1
+ ret;
+
+ __enc_xor16:
+@@ -303,6 +306,7 @@ __enc_xor16:
+ leaq 3*(2*4*4)(%r11), %rax;
+ outunpack_xor_blocks(%rax, RR4, RL4, RTMP, RX, RKM);
+
++ pax_force_retaddr 0, 1
+ ret;
+
+ .align 16
+@@ -369,6 +373,7 @@ __dec_tail:
+ leaq 3*(2*4*4)(%r11), %rax;
+ outunpack_blocks(%rax, RR4, RL4, RTMP, RX, RKM);
+
++ pax_force_retaddr 0, 1
+ ret;
+
+ __skip_dec:
+diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
+index 218d283..819e6da 100644
+--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
++++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
+@@ -23,6 +23,8 @@
+ *
+ */
+
++#include <asm/alternative-asm.h>
++
+ .file "cast6-avx-x86_64-asm_64.S"
+
+ .extern cast6_s1
+@@ -324,12 +326,14 @@ __cast6_enc_blk_8way:
+ outunpack_blocks(%r11, RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
+ outunpack_blocks(%rax, RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
+
++ pax_force_retaddr 0, 1
+ ret;
+
+ __enc_xor8:
+ outunpack_xor_blocks(%r11, RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
+ outunpack_xor_blocks(%rax, RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
+
++ pax_force_retaddr 0, 1
+ ret;
+
+ .align 16
+@@ -380,4 +384,5 @@ cast6_dec_blk_8way:
+ outunpack_blocks(%r11, RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
+ outunpack_blocks(%rax, RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
+
+ pax_force_retaddr 0, 1
ret;
diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
.size \name, .-\name
diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
-index 35f4557..16b379f 100644
+index 1585abb..1ff9d9b 100644
--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
-@@ -21,6 +21,8 @@
+@@ -23,6 +23,8 @@
*
*/
.file "twofish-avx-x86_64-asm_64.S"
.text
-@@ -250,12 +252,14 @@ __twofish_enc_blk_8way:
- outunpack_blocks(%rsi, RC1, RD1, RA1, RB1, RK1, RX, RY, RK2);
- outunpack_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX, RY, RK2);
+@@ -303,12 +305,14 @@ __twofish_enc_blk_8way:
+ outunpack_blocks(%r11, RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
+ outunpack_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
-+ pax_force_retaddr
++ pax_force_retaddr 0, 1
ret;
__enc_xor8:
- outunpack_xor_blocks(%rsi, RC1, RD1, RA1, RB1, RK1, RX, RY, RK2);
- outunpack_xor_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX, RY, RK2);
+ outunpack_xor_blocks(%r11, RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
+ outunpack_xor_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
-+ pax_force_retaddr
++ pax_force_retaddr 0, 1
ret;
.align 8
-@@ -297,4 +301,5 @@ twofish_dec_blk_8way:
- outunpack_blocks(%rsi, RA1, RB1, RC1, RD1, RK1, RX, RY, RK2);
- outunpack_blocks(%rax, RA2, RB2, RC2, RD2, RK1, RX, RY, RK2);
+@@ -354,4 +358,5 @@ twofish_dec_blk_8way:
+ outunpack_blocks(%r11, RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
+ outunpack_blocks(%rax, RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
-+ pax_force_retaddr
++ pax_force_retaddr 0, 1
ret;
diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
index 5b012a2..36d5364 100644
set_fs(KERNEL_DS);
has_dumped = 1;
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
-index 673ac9b..7a8c5df 100644
+index efc6a95..95abfe2 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
-@@ -162,7 +162,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
+@@ -163,8 +163,8 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
}
seg = get_fs();
set_fs(KERNEL_DS);
-- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
-+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
+- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
+- (stack_t __force __user *) &uoss, regs->sp);
++ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
++ (stack_t __force_user *) &uoss, regs->sp);
set_fs(seg);
if (ret >= 0 && uoss_ptr) {
if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
-@@ -361,7 +361,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
- */
- static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
- size_t frame_size,
-- void **fpstate)
-+ void __user **fpstate)
- {
- unsigned long sp;
-
-@@ -382,7 +382,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
-
- if (used_math()) {
- sp = sp - sig_xstate_ia32_size;
-- *fpstate = (struct _fpstate_ia32 *) sp;
-+ *fpstate = (struct _fpstate_ia32 __user *) sp;
- if (save_i387_xstate_ia32(*fpstate) < 0)
- return (void __user *) -1L;
- }
-@@ -390,7 +390,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+@@ -396,7 +396,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
* i.e. so that on function entry ((sp + 4) & 15) == 0. */
return (void __user *) sp;
}
-@@ -448,7 +448,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
+@@ -454,7 +454,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
* These are actually not used anymore, but left because some
* gdb versions depend on them as a marker.
*/
-- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
+- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
} put_user_catch(err);
if (err)
-@@ -490,7 +490,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+@@ -496,7 +496,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
0xb8,
__NR_ia32_rt_sigreturn,
0x80cd,
};
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-@@ -520,16 +520,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+@@ -522,16 +522,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
* Not actually used anymore, but left because some gdb
* versions need it.
*/
-- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
+- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
} put_user_catch(err);
- if (err)
+ err |= copy_siginfo_to_user32(&frame->info, info);
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index 20e5f7b..f33c779 100644
+index e7fa545..9e6fe1a 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
-@@ -14,8 +14,10 @@
- #include <asm/segment.h>
+@@ -15,8 +15,10 @@
#include <asm/irqflags.h>
#include <asm/asm.h>
+ #include <asm/smap.h>
+#include <asm/pgtable.h>
#include <linux/linkage.h>
#include <linux/err.h>
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
#include <linux/elf-em.h>
-@@ -95,6 +97,32 @@ ENTRY(native_irq_enable_sysexit)
+@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
ENDPROC(native_irq_enable_sysexit)
#endif
/*
* 32bit SYSENTER instruction entry.
*
-@@ -121,12 +149,6 @@ ENTRY(ia32_sysenter_target)
+@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
CFI_REGISTER rsp,rbp
SWAPGS_UNSAFE_STACK
movq PER_CPU_VAR(kernel_stack), %rsp
movl %ebp,%ebp /* zero extension */
pushq_cfi $__USER32_DS
/*CFI_REL_OFFSET ss,0*/
-@@ -134,22 +156,42 @@ ENTRY(ia32_sysenter_target)
+@@ -135,24 +157,44 @@ ENTRY(ia32_sysenter_target)
CFI_REL_OFFSET rsp,0
pushfq_cfi
/*CFI_REL_OFFSET rflags,0*/
+ add %r11,%rbp
+#endif
+
+ ASM_STAC
1: movl (%rbp),%ebp
_ASM_EXTABLE(1b,ia32_badarg)
+ ASM_CLAC
- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+ GET_THREAD_INFO(%r11)
CFI_REMEMBER_STATE
jnz sysenter_tracesys
cmpq $(IA32_NR_syscalls-1),%rax
-@@ -159,12 +201,15 @@ sysenter_do_call:
+@@ -162,12 +204,15 @@ sysenter_do_call:
sysenter_dispatch:
call *ia32_sys_call_table(,%rax,8)
movq %rax,RAX-ARGOFFSET(%rsp)
/* clear IF, that popfq doesn't enable interrupts early */
andl $~0x200,EFLAGS-R11(%rsp)
movl RIP-R11(%rsp),%edx /* User %eip */
-@@ -190,6 +235,9 @@ sysexit_from_sys_call:
+@@ -193,6 +238,9 @@ sysexit_from_sys_call:
movl %eax,%esi /* 2nd arg: syscall number */
movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
call __audit_syscall_entry
movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
cmpq $(IA32_NR_syscalls-1),%rax
ja ia32_badsys
-@@ -201,7 +249,7 @@ sysexit_from_sys_call:
+@@ -204,7 +252,7 @@ sysexit_from_sys_call:
.endm
.macro auditsys_exit exit
+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
jnz ia32_ret_from_sys_call
TRACE_IRQS_ON
- sti
-@@ -212,11 +260,12 @@ sysexit_from_sys_call:
+ ENABLE_INTERRUPTS(CLBR_NONE)
+@@ -215,11 +263,12 @@ sysexit_from_sys_call:
1: setbe %al /* 1 if error, 0 if not */
movzbl %al,%edi /* zero-extend that into %edi */
call __audit_syscall_exit
+ GET_THREAD_INFO(%r11)
movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
- cli
+ DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+ testl %edi,TI_flags(%r11)
jz \exit
CLEAR_RREGS -ARGOFFSET
jmp int_with_check
-@@ -234,7 +283,7 @@ sysexit_audit:
+@@ -237,7 +286,7 @@ sysexit_audit:
sysenter_tracesys:
#ifdef CONFIG_AUDITSYSCALL
jz sysenter_auditsys
#endif
SAVE_REST
-@@ -246,6 +295,9 @@ sysenter_tracesys:
+@@ -249,6 +298,9 @@ sysenter_tracesys:
RESTORE_REST
cmpq $(IA32_NR_syscalls-1),%rax
ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
jmp sysenter_do_call
CFI_ENDPROC
ENDPROC(ia32_sysenter_target)
-@@ -273,19 +325,25 @@ ENDPROC(ia32_sysenter_target)
+@@ -276,19 +328,25 @@ ENDPROC(ia32_sysenter_target)
ENTRY(ia32_cstar_target)
CFI_STARTPROC32 simple
CFI_SIGNAL_FRAME
movl %eax,%eax /* zero extension */
movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
movq %rcx,RIP-ARGOFFSET(%rsp)
-@@ -301,10 +359,17 @@ ENTRY(ia32_cstar_target)
+@@ -304,12 +362,19 @@ ENTRY(ia32_cstar_target)
/* no need to do an access_ok check here because r8 has been
32bit zero extended */
/* hardware stack frame is complete now */
+ add %r11,%r8
+#endif
+
+ ASM_STAC
1: movl (%r8),%r9d
_ASM_EXTABLE(1b,ia32_badarg)
+ ASM_CLAC
- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+ GET_THREAD_INFO(%r11)
CFI_REMEMBER_STATE
jnz cstar_tracesys
cmpq $IA32_NR_syscalls-1,%rax
-@@ -314,12 +379,15 @@ cstar_do_call:
+@@ -319,12 +384,15 @@ cstar_do_call:
cstar_dispatch:
call *ia32_sys_call_table(,%rax,8)
movq %rax,RAX-ARGOFFSET(%rsp)
RESTORE_ARGS 0,-ARG_SKIP,0,0,0
movl RIP-ARGOFFSET(%rsp),%ecx
CFI_REGISTER rip,rcx
-@@ -347,7 +415,7 @@ sysretl_audit:
+@@ -352,7 +420,7 @@ sysretl_audit:
cstar_tracesys:
#ifdef CONFIG_AUDITSYSCALL
jz cstar_auditsys
#endif
xchgl %r9d,%ebp
-@@ -361,6 +429,9 @@ cstar_tracesys:
+@@ -366,6 +434,9 @@ cstar_tracesys:
xchgl %ebp,%r9d
cmpq $(IA32_NR_syscalls-1),%rax
ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
jmp cstar_do_call
END(ia32_cstar_target)
-@@ -401,19 +472,26 @@ ENTRY(ia32_syscall)
+@@ -407,19 +478,26 @@ ENTRY(ia32_syscall)
CFI_REL_OFFSET rip,RIP-RIP
PARAVIRT_ADJUST_EXCEPTION_FRAME
SWAPGS
jnz ia32_tracesys
cmpq $(IA32_NR_syscalls-1),%rax
ja ia32_badsys
-@@ -436,6 +514,9 @@ ia32_tracesys:
+@@ -442,6 +520,9 @@ ia32_tracesys:
RESTORE_REST
cmpq $(IA32_NR_syscalls-1),%rax
ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
END(ia32_syscall)
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
-index 4540bec..714d913 100644
+index 86d68d1..f9960fe 100644
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
-@@ -287,7 +287,7 @@ asmlinkage long sys32_sigaction(int sig, struct old_sigaction32 __user *act,
- return ret;
- }
-
--asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
-+asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
- int options)
- {
- return compat_sys_wait4(pid, stat_addr, options, NULL);
@@ -303,7 +303,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
mm_segment_t old_fs = get_fs();
set_fs(old_fs);
diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
-index 952bd01..7692c6f 100644
+index 372231c..a5aa1a1 100644
--- a/arch/x86/include/asm/alternative-asm.h
+++ b/arch/x86/include/asm/alternative-asm.h
-@@ -15,6 +15,45 @@
+@@ -18,6 +18,45 @@
.endm
#endif
.long \orig - .
.long \alt - .
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
-index 7078068..f58bcda 100644
+index 58ed6d9..f1cbe58 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -105,7 +105,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
- ".section .discard,\"aw\",@progbits\n" \
+ ".pushsection .discard,\"aw\",@progbits\n" \
DISCARD_ENTRY(1) \
- ".previous\n" \
-- ".section .altinstr_replacement, \"ax\"\n" \
-+ ".section .altinstr_replacement, \"a\"\n" \
+ ".popsection\n" \
+- ".pushsection .altinstr_replacement, \"ax\"\n" \
++ ".pushsection .altinstr_replacement, \"a\"\n" \
ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
- ".previous"
+ ".popsection"
@@ -119,7 +119,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
DISCARD_ENTRY(1) \
DISCARD_ENTRY(2) \
- ".previous\n" \
-- ".section .altinstr_replacement, \"ax\"\n" \
-+ ".section .altinstr_replacement, \"a\"\n" \
+ ".popsection\n" \
+- ".pushsection .altinstr_replacement, \"ax\"\n" \
++ ".pushsection .altinstr_replacement, \"a\"\n" \
ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
- ".previous"
+ ".popsection"
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
-index f342612..b3fe911 100644
+index 3388034..ba52312 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -44,7 +44,7 @@ static inline void generic_apic_probe(void)
"popl %%ebp\n\t"
"popl %%edi\n\t"
diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
-index 58cb6d4..a4b806c 100644
+index b6c3b82..b4c077a 100644
--- a/arch/x86/include/asm/atomic.h
+++ b/arch/x86/include/asm/atomic.h
@@ -22,7 +22,18 @@
if (likely(old == c))
break;
c = old;
-@@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
- return c;
+@@ -241,6 +458,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
}
-+/**
+ /**
+ * atomic_inc_not_zero_hint - increment if not null
+ * @v: pointer of type atomic_t
+ * @hint: probable value of the atomic before the increment
+
+ return 0;
+}
-
- /*
- * atomic_dec_if_positive - decrement by 1 if old value positive
-@@ -293,14 +552,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
++
++/**
+ * atomic_inc_short - increment of a short integer
+ * @v: pointer to type int
+ *
+@@ -269,14 +529,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
#endif
/* These are x86-specific, used by some header files */
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
-index 72f5009..2f8b9a9 100644
+index 6dfd019..0c6699f 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -40,7 +40,7 @@
if (len)
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
-index 99480e5..d81165b 100644
+index 8d871ea..c1a0dc9 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
@@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
({ \
__typeof__ (*(ptr)) __ret = (inc); \
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
-index 6b7ee5f..9d664b3 100644
+index 8c297aa..7a90f03 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
-@@ -202,13 +202,14 @@
+@@ -205,7 +205,7 @@
#define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
#define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
#define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
#define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
#define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
#define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
- #define X86_FEATURE_RTM (9*32+11) /* Restricted Transactional Memory */
- #define X86_FEATURE_RDSEED (9*32+18) /* The RDSEED instruction */
- #define X86_FEATURE_ADX (9*32+19) /* The ADCX and ADOX instructions */
-+#define X86_FEATURE_SMAP (9*32+20) /* Supervisor Mode Access Prevention */
-
- #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
-
-@@ -373,7 +374,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+@@ -379,7 +379,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
".section .discard,\"aw\",@progbits\n"
" .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
".previous\n"
#endif /* _ASM_X86_EMERGENCY_RESTART_H */
diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
-index 75f4c6d..ee3eb8f 100644
+index 41ab26e..a88c9e6 100644
--- a/arch/x86/include/asm/fpu-internal.h
+++ b/arch/x86/include/asm/fpu-internal.h
-@@ -86,6 +86,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
- {
- int err;
-
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
-+ fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
-+#endif
-+
- /* See comment in fxsave() below. */
- #ifdef CONFIG_AS_FXSAVEQ
- asm volatile("1: fxrstorq %[fx]\n\t"
-@@ -115,6 +120,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
- {
- int err;
-
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
-+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
-+#endif
-+
- /*
- * Clear the bytes not touched by the fxsave and reserved
- * for the SW usage.
-@@ -271,7 +281,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
+@@ -126,7 +126,9 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
+ ({ \
+ int err; \
+ asm volatile(ASM_STAC "\n" \
+- "1:" #insn "\n\t" \
++ "1:" \
++ __copyuser_seg \
++ #insn "\n\t" \
+ "2: " ASM_CLAC "\n" \
+ ".section .fixup,\"ax\"\n" \
+ "3: movl $-1,%[err]\n" \
+@@ -299,7 +301,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
"emms\n\t" /* clear stack tags */
"fildl %P[addr]", /* set F?P to defined value */
X86_FEATURE_FXSAVE_LEAK,
- [addr] "m" (tsk->thread.fpu.has_fpu));
-+ [addr] "m" (init_tss[smp_processor_id()].x86_tss.sp0));
++ [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
return fpu_restore_checking(&tsk->thread.fpu);
}
diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
-index 71ecbcb..bac10b7 100644
+index f373046..02653e2 100644
--- a/arch/x86/include/asm/futex.h
+++ b/arch/x86/include/asm/futex.h
-@@ -11,16 +11,18 @@
- #include <asm/processor.h>
+@@ -12,6 +12,7 @@
+ #include <asm/smap.h>
#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
+ typecheck(u32 __user *, uaddr); \
- asm volatile("1:\t" insn "\n" \
- "2:\t.section .fixup,\"ax\"\n" \
- "3:\tmov\t%3, %1\n" \
+ asm volatile("\t" ASM_STAC "\n" \
+ "1:\t" insn "\n" \
+ "2:\t" ASM_CLAC "\n" \
+@@ -20,15 +21,16 @@
"\tjmp\t2b\n" \
"\t.previous\n" \
_ASM_EXTABLE(1b, 3b) \
- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
-+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
++ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
: "i" (-EFAULT), "0" (oparg), "1" (0))
#define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
+ typecheck(u32 __user *, uaddr); \
- asm volatile("1:\tmovl %2, %0\n" \
+ asm volatile("\t" ASM_STAC "\n" \
+ "1:\tmovl %2, %0\n" \
"\tmovl\t%0, %3\n" \
"\t" insn "\n" \
-@@ -33,7 +35,7 @@
+- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
++ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
+ "\tjnz\t1b\n" \
+ "3:\t" ASM_CLAC "\n" \
+ "\t.section .fixup,\"ax\"\n" \
+@@ -38,7 +40,7 @@
_ASM_EXTABLE(1b, 4b) \
_ASM_EXTABLE(2b, 4b) \
: "=&a" (oldval), "=&r" (ret), \
: "r" (oparg), "i" (-EFAULT), "1" (0))
static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
-@@ -60,10 +62,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
+@@ -65,10 +67,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
switch (op) {
case FUTEX_OP_SET:
uaddr, oparg);
break;
case FUTEX_OP_OR:
-@@ -122,13 +124,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
+@@ -128,14 +130,14 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
return -EFAULT;
-- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
-+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
- "2:\t.section .fixup, \"ax\"\n"
+ asm volatile("\t" ASM_STAC "\n"
+- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
++ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
+ "2:\t" ASM_CLAC "\n"
+ "\t.section .fixup, \"ax\"\n"
"3:\tmov %3, %0\n"
"\tjmp 2b\n"
"\t.previous\n"
/* EISA */
extern void eisa_set_level_irq(unsigned int irq);
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
-index d8e8eef..99f81ae 100644
+index d8e8eef..15b1179 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
+@@ -184,7 +184,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
+ return ioremap_nocache(offset, size);
+ }
+
+-extern void iounmap(volatile void __iomem *addr);
++extern void iounmap(const volatile void __iomem *addr);
+
+ extern void set_iounmap_nonlazy(void);
+
@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
#include <linux/vmalloc.h>
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
-index 5478825..839e88c 100644
+index d3ddd17..c9fb0cc 100644
--- a/arch/x86/include/asm/kprobes.h
+++ b/arch/x86/include/asm/kprobes.h
-@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
+@@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
#define RELATIVEJUMP_SIZE 5
#define RELATIVECALL_OPCODE 0xe8
#define RELATIVE_ADDR_SIZE 4
#define flush_insn_slot(p) do { } while (0)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
-index 09155d6..d2e6df9 100644
+index b2e11f4..f293e2e 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
-@@ -694,7 +694,7 @@ struct kvm_x86_ops {
+@@ -707,7 +707,7 @@ struct kvm_x86_ops {
int (*check_intercept)(struct kvm_vcpu *vcpu,
struct x86_instruction_info *info,
enum x86_intercept_stage stage);
struct kvm_arch_async_pf {
u32 token;
diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
-index c8bed0d..e5721fa 100644
+index c8bed0d..85c03fd 100644
--- a/arch/x86/include/asm/local.h
+++ b/arch/x86/include/asm/local.h
-@@ -17,26 +17,58 @@ typedef struct {
+@@ -10,33 +10,97 @@ typedef struct {
+ atomic_long_t a;
+ } local_t;
+
++typedef struct {
++ atomic_long_unchecked_t a;
++} local_unchecked_t;
++
+ #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
+
+ #define local_read(l) atomic_long_read(&(l)->a)
++#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
+ #define local_set(l, i) atomic_long_set(&(l)->a, (i))
++#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
static inline void local_inc(local_t *l)
{
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
++ : "+m" (l->a.counter));
++}
++
++static inline void local_inc_unchecked(local_unchecked_t *l)
++{
++ asm volatile(_ASM_INC "%0\n"
: "+m" (l->a.counter));
}
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
++ : "+m" (l->a.counter));
++}
++
++static inline void local_dec_unchecked(local_unchecked_t *l)
++{
++ asm volatile(_ASM_DEC "%0\n"
: "+m" (l->a.counter));
}
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
++ : "+m" (l->a.counter)
++ : "ir" (i));
++}
++
++static inline void local_add_unchecked(long i, local_unchecked_t *l)
++{
++ asm volatile(_ASM_ADD "%1,%0\n"
: "+m" (l->a.counter)
: "ir" (i));
}
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
++ : "+m" (l->a.counter)
++ : "ir" (i));
++}
++
++static inline void local_sub_unchecked(long i, local_unchecked_t *l)
++{
++ asm volatile(_ASM_SUB "%1,%0\n"
: "+m" (l->a.counter)
: "ir" (i));
}
-@@ -54,7 +86,16 @@ static inline int local_sub_and_test(long i, local_t *l)
+@@ -54,7 +118,16 @@ static inline int local_sub_and_test(long i, local_t *l)
{
unsigned char c;
: "+m" (l->a.counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -72,7 +113,16 @@ static inline int local_dec_and_test(local_t *l)
+@@ -72,7 +145,16 @@ static inline int local_dec_and_test(local_t *l)
{
unsigned char c;
: "+m" (l->a.counter), "=qm" (c)
: : "memory");
return c != 0;
-@@ -90,7 +140,16 @@ static inline int local_inc_and_test(local_t *l)
+@@ -90,7 +172,16 @@ static inline int local_inc_and_test(local_t *l)
{
unsigned char c;
: "+m" (l->a.counter), "=qm" (c)
: : "memory");
return c != 0;
-@@ -109,7 +168,16 @@ static inline int local_add_negative(long i, local_t *l)
+@@ -109,7 +200,16 @@ static inline int local_add_negative(long i, local_t *l)
{
unsigned char c;
: "+m" (l->a.counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -132,7 +200,15 @@ static inline long local_add_return(long i, local_t *l)
+@@ -132,7 +232,15 @@ static inline long local_add_return(long i, local_t *l)
#endif
/* Modern 486+ processor */
__i = i;
: "+r" (i), "+m" (l->a.counter)
: : "memory");
return i + __i;
+@@ -147,6 +255,38 @@ no_xadd: /* Legacy 386 processor */
+ #endif
+ }
+
++/**
++ * local_add_return_unchecked - add and return
++ * @i: integer value to add
++ * @l: pointer to type local_unchecked_t
++ *
++ * Atomically adds @i to @l and returns @i + @l
++ */
++static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
++{
++ long __i;
++#ifdef CONFIG_M386
++ unsigned long flags;
++ if (unlikely(boot_cpu_data.x86 <= 3))
++ goto no_xadd;
++#endif
++ /* Modern 486+ processor */
++ __i = i;
++ asm volatile(_ASM_XADD "%0, %1\n"
++ : "+r" (i), "+m" (l->a.counter)
++ : : "memory");
++ return i + __i;
++
++#ifdef CONFIG_M386
++no_xadd: /* Legacy 386 processor */
++ local_irq_save(flags);
++ __i = local_read_unchecked(l);
++ local_set_unchecked(l, i + __i);
++ local_irq_restore(flags);
++ return i + __i;
++#endif
++}
++
+ static inline long local_sub_return(long i, local_t *l)
+ {
+ return local_add_return(-i, l);
+@@ -157,6 +297,8 @@ static inline long local_sub_return(long i, local_t *l)
+
+ #define local_cmpxchg(l, o, n) \
+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
++#define local_cmpxchg_unchecked(l, o, n) \
++ (cmpxchg_local(&((l)->a.counter), (o), (n)))
+ /* Always has a lock prefix */
+ #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
+
diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
index 593e51d..fa69c9a 100644
--- a/arch/x86/include/asm/mman.h
#endif /* __ASSEMBLY__ */
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
-index 142236e..6a6b4a6 100644
+index 142236e..57cf5ea 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
-@@ -84,20 +84,20 @@ struct pv_init_ops {
- */
- unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
- unsigned long addr, unsigned len);
--};
-+} __no_const;
-
-
- struct pv_lazy_ops {
- /* Set deferred update mode, used for batching operations. */
- void (*enter)(void);
- void (*leave)(void);
--};
-+} __no_const;
-
- struct pv_time_ops {
- unsigned long long (*sched_clock)(void);
- unsigned long long (*steal_clock)(int cpu);
- unsigned long (*get_tsc_khz)(void);
--};
-+} __no_const;
-
- struct pv_cpu_ops {
- /* hooks for various privileged instructions */
-@@ -191,7 +191,7 @@ struct pv_cpu_ops {
-
- void (*start_context_switch)(struct task_struct *prev);
- void (*end_context_switch)(struct task_struct *next);
--};
-+} __no_const;
-
- struct pv_irq_ops {
- /*
-@@ -222,7 +222,7 @@ struct pv_apic_ops {
- unsigned long start_eip,
- unsigned long start_esp);
- #endif
--};
-+} __no_const;
-
- struct pv_mmu_ops {
- unsigned long (*read_cr2)(void);
@@ -312,6 +312,7 @@ struct pv_mmu_ops {
struct paravirt_callee_save make_pud;
};
struct arch_spinlock;
-@@ -333,7 +340,7 @@ struct pv_lock_ops {
- void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
- int (*spin_trylock)(struct arch_spinlock *lock);
- void (*spin_unlock)(struct arch_spinlock *lock);
--};
-+} __no_const;
-
- /* This contains all the paravirt structures: we get a convenient
- * number for each function using the offset which we use to indicate
diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
index b4389a4..7024269 100644
--- a/arch/x86/include/asm/pgalloc.h
/*
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index c3520d7..cf742ef 100644
+index a1f780d..a3eb32f 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
+ preempt_disable();
+ barrier();
+ cr0 = read_cr0() ^ X86_CR0_WP;
-+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
++ BUG_ON(cr0 & X86_CR0_WP);
+ write_cr0(cr0);
+ return cr0 ^ X86_CR0_WP;
+}
+ unsigned long cr0;
+
+ cr0 = read_cr0() ^ X86_CR0_WP;
-+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
++ BUG_ON(!(cr0 & X86_CR0_WP));
+ write_cr0(cr0);
+ barrier();
+ preempt_enable_no_resched();
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
-index 0c92113..34a77c6 100644
+index 8faa215..a8a17ea 100644
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -25,9 +25,6 @@
__flush_tlb_one((vaddr)); \
} while (0)
-@@ -74,6 +79,9 @@ do { \
+@@ -75,6 +80,9 @@ do { \
#endif /* !__ASSEMBLY__ */
#define MODULES_END VMALLOC_END
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
-index 8251be0..4ea8b46 100644
+index 47356f9..deb94a2 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -16,10 +16,14 @@
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
-index 013286a..8b42f4f 100644
+index ec8a1fc..7ccb593 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -16,13 +16,12 @@
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h
-index aea1d1d..680cf09 100644
---- a/arch/x86/include/asm/processor-flags.h
-+++ b/arch/x86/include/asm/processor-flags.h
-@@ -65,6 +65,7 @@
- #define X86_CR4_PCIDE 0x00020000 /* enable PCID support */
- #define X86_CR4_OSXSAVE 0x00040000 /* enable xsave and xrestore */
- #define X86_CR4_SMEP 0x00100000 /* enable SMEP support */
-+#define X86_CR4_SMAP 0x00200000 /* enable SMAP support */
-
- /*
- * x86-64 Task Priority Register, CR8
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index d048cad..45e350f 100644
+index ad1fc85..0b15fe1 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -289,7 +289,7 @@ struct tss_struct {
/*
* Save the original ist values for checking stack pointers during debugging
-@@ -822,11 +822,18 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -818,11 +818,18 @@ static inline void spin_lock_prefetch(const void *x)
*/
#define TASK_SIZE PAGE_OFFSET
#define TASK_SIZE_MAX TASK_SIZE
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
.io_bitmap_ptr = NULL, \
-@@ -840,7 +847,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -836,7 +843,7 @@ static inline void spin_lock_prefetch(const void *x)
*/
#define INIT_TSS { \
.x86_tss = { \
.ss0 = __KERNEL_DS, \
.ss1 = __KERNEL_CS, \
.io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
-@@ -851,11 +858,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -847,11 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
/*
* The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -870,7 +873,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -866,7 +869,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define task_pt_regs(task) \
({ \
struct pt_regs *__regs__; \
__regs__ - 1; \
})
-@@ -880,13 +883,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -876,13 +879,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
/*
* User space process size. 47bits minus one guard page.
*/
#define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -897,11 +900,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -893,11 +896,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define STACK_TOP_MAX TASK_SIZE_MAX
#define INIT_THREAD { \
}
/*
-@@ -929,6 +932,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
+@@ -925,6 +928,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
*/
#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
#define KSTK_EIP(task) (task_pt_regs(task)->ip)
/* Get/set a process' ability to use the timestamp counter instruction */
-@@ -989,12 +996,12 @@ extern bool cpu_has_amd_erratum(const int *);
+@@ -985,12 +992,12 @@ extern bool cpu_has_amd_erratum(const int *);
#define cpu_has_amd_erratum(x) (false)
#endif /* CONFIG_CPU_SUP_AMD */
#endif /* _ASM_X86_PROCESSOR_H */
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
-index dcfde52..dbfea06 100644
+index 19f16eb..b50624b 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -155,28 +155,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
u32 gdt_base;
#else
diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
-index a82c4f1..ac45053 100644
+index a82c4f1..f9c9696 100644
--- a/arch/x86/include/asm/reboot.h
+++ b/arch/x86/include/asm/reboot.h
-@@ -6,13 +6,13 @@
+@@ -6,12 +6,12 @@
struct pt_regs;
struct machine_ops {
void (*shutdown)(void);
void (*crash_shutdown)(struct pt_regs *);
- void (*emergency_restart)(void);
--};
+ void (* __noreturn emergency_restart)(void);
-+} __no_const;
+ };
extern struct machine_ops machine_ops;
-
diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
index 2dbe4a7..ce1db00 100644
--- a/arch/x86/include/asm/rwsem.h
#endif /* !__ASSEMBLY__ */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
-index 4f19a15..9e14f27 100644
+index 4f19a15..e04d86f 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -36,7 +36,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
static inline struct cpumask *cpu_sibling_mask(int cpu)
{
-@@ -79,7 +79,7 @@ struct smp_ops {
-
- void (*send_call_func_ipi)(const struct cpumask *mask);
- void (*send_call_func_single_ipi)(int cpu);
--};
-+} __no_const;
-
- /* Globals due to paravirt */
- extern void set_cpu_sibling_map(int cpu);
@@ -190,14 +190,8 @@ extern unsigned disabled_cpus __cpuinitdata;
extern int safe_smp_processor_id(void);
[current_task] "m" (current_task) \
__switch_canary_iparam \
: "memory", "cc" __EXTRA_CLOBBER)
-diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
-index 3fda9db4..4ca1c61 100644
---- a/arch/x86/include/asm/sys_ia32.h
-+++ b/arch/x86/include/asm/sys_ia32.h
-@@ -40,7 +40,7 @@ asmlinkage long sys32_sigaction(int, struct old_sigaction32 __user *,
- struct old_sigaction32 __user *);
- asmlinkage long sys32_alarm(unsigned int);
-
--asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
-+asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
- asmlinkage long sys32_sysfs(int, u32, u32);
-
- asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
-index 89f794f..1422765 100644
+index 2d946e6..e453ec4 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -10,6 +10,7 @@
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
-@@ -122,16 +117,18 @@ struct thread_info {
+@@ -122,17 +117,18 @@ struct thread_info {
#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
#define _TIF_ADDR32 (1 << TIF_ADDR32)
#define _TIF_X32 (1 << TIF_X32)
/* work to do in syscall_trace_enter() */
#define _TIF_WORK_SYSCALL_ENTRY \
(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
-- _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT)
-+ _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
-+ _TIF_GRSEC_SETXID)
+ _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
+- _TIF_NOHZ)
++ _TIF_NOHZ | _TIF_GRSEC_SETXID)
/* work to do in syscall_trace_leave() */
#define _TIF_WORK_SYSCALL_EXIT \
(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
-- _TIF_SYSCALL_TRACEPOINT)
-+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
+- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
++ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
/* work to do on interrupt/exception return */
#define _TIF_WORK_MASK \
-@@ -141,7 +138,8 @@ struct thread_info {
-
+@@ -143,7 +139,7 @@ struct thread_info {
/* work to do on any return to user space */
#define _TIF_ALLWORK_MASK \
-- ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT)
-+ ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
-+ _TIF_GRSEC_SETXID)
+ ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
+- _TIF_NOHZ)
++ _TIF_NOHZ | _TIF_GRSEC_SETXID)
/* Only used for 64 bit */
#define _TIF_DO_NOTIFY_MASK \
-@@ -157,45 +155,40 @@ struct thread_info {
+@@ -159,45 +155,40 @@ struct thread_info {
#define PREEMPT_ACTIVE 0x10000000
/*
* macros/functions for gaining access to the thread information structure
* preempt_count needs to be 1 initially, until the scheduler is functional.
-@@ -203,27 +196,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -205,27 +196,8 @@ static inline struct thread_info *current_thread_info(void)
#ifndef __ASSEMBLY__
DECLARE_PER_CPU(unsigned long, kernel_stack);
#endif
#endif /* !X86_32 */
-@@ -284,5 +258,12 @@ static inline bool is_ia32_task(void)
+@@ -286,5 +258,12 @@ static inline bool is_ia32_task(void)
extern void arch_task_cache_init(void);
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
extern void arch_release_task_struct(struct task_struct *tsk);
#endif
#endif /* _ASM_X86_THREAD_INFO_H */
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
-index e1f3a17..1ab364d 100644
+index 7ccf8d1..9a18110 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
-@@ -7,12 +7,15 @@
+@@ -7,6 +7,7 @@
#include <linux/compiler.h>
#include <linux/thread_info.h>
#include <linux/string.h>
+#include <linux/sched.h>
#include <asm/asm.h>
#include <asm/page.h>
-
- #define VERIFY_READ 0
- #define VERIFY_WRITE 1
-
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-+
- /*
- * The fs value determines whether argument validity checking should be
- * performed or not. If get_fs() == USER_DS, checking is performed, with
-@@ -28,7 +31,12 @@
+ #include <asm/smap.h>
+@@ -29,7 +30,12 @@
#define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit)
#define segment_eq(a, b) ((a).seg == (b).seg)
-@@ -76,8 +84,33 @@
+@@ -77,8 +83,33 @@
* checks that the pointer is in the user space range - after calling
* this function, memory access functions may still return -EFAULT.
*/
/*
* The exception table consists of pairs of addresses relative to the
-@@ -188,12 +221,20 @@ extern int __get_user_bad(void);
+@@ -189,13 +220,21 @@ extern int __get_user_bad(void);
asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
: "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
#ifdef CONFIG_X86_32
#define __put_user_asm_u64(x, addr, err, errret) \
-- asm volatile("1: movl %%eax,0(%2)\n" \
+ asm volatile(ASM_STAC "\n" \
+- "1: movl %%eax,0(%2)\n" \
- "2: movl %%edx,4(%2)\n" \
-+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
++ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
- "3:\n" \
+ "3: " ASM_CLAC "\n" \
".section .fixup,\"ax\"\n" \
"4: movl %3,%0\n" \
-@@ -205,8 +246,8 @@ extern int __get_user_bad(void);
- : "A" (x), "r" (addr), "i" (errret), "0" (err))
+@@ -208,8 +247,8 @@ extern int __get_user_bad(void);
#define __put_user_asm_ex_u64(x, addr) \
-- asm volatile("1: movl %%eax,0(%1)\n" \
+ asm volatile(ASM_STAC "\n" \
+- "1: movl %%eax,0(%1)\n" \
- "2: movl %%edx,4(%1)\n" \
-+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
++ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
- "3:\n" \
+ "3: " ASM_CLAC "\n" \
_ASM_EXTABLE_EX(1b, 2b) \
_ASM_EXTABLE_EX(2b, 3b) \
-@@ -258,7 +299,7 @@ extern void __put_user_8(void);
+@@ -261,7 +300,7 @@ extern void __put_user_8(void);
__typeof__(*(ptr)) __pu_val; \
__chk_user_ptr(ptr); \
might_fault(); \
switch (sizeof(*(ptr))) { \
case 1: \
__put_user_x(1, __pu_val, ptr, __ret_pu); \
-@@ -379,7 +420,7 @@ do { \
- } while (0)
+@@ -383,7 +422,7 @@ do { \
#define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
-- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
-+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
- "2:\n" \
+ asm volatile(ASM_STAC "\n" \
+- "1: mov"itype" %2,%"rtype"1\n" \
++ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
+ "2: " ASM_CLAC "\n" \
".section .fixup,\"ax\"\n" \
"3: mov %3,%0\n" \
-@@ -387,7 +428,7 @@ do { \
+@@ -391,7 +430,7 @@ do { \
" jmp 2b\n" \
".previous\n" \
_ASM_EXTABLE(1b, 3b) \
: "m" (__m(addr)), "i" (errret), "0" (err))
#define __get_user_size_ex(x, ptr, size) \
-@@ -412,7 +453,7 @@ do { \
+@@ -416,7 +455,7 @@ do { \
} while (0)
#define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
"2:\n" \
_ASM_EXTABLE_EX(1b, 2b) \
: ltype(x) : "m" (__m(addr)))
-@@ -429,13 +470,24 @@ do { \
+@@ -433,13 +472,24 @@ do { \
int __gu_err; \
unsigned long __gu_val; \
__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
/*
* Tell gcc we read from memory instead of writing: this is because
-@@ -443,7 +495,7 @@ struct __large_struct { unsigned long buf[100]; };
- * aliasing issues.
+@@ -448,7 +498,7 @@ struct __large_struct { unsigned long buf[100]; };
*/
#define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
-- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
-+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
- "2:\n" \
+ asm volatile(ASM_STAC "\n" \
+- "1: mov"itype" %"rtype"1,%2\n" \
++ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
+ "2: " ASM_CLAC "\n" \
".section .fixup,\"ax\"\n" \
"3: mov %3,%0\n" \
-@@ -451,10 +503,10 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -456,10 +506,10 @@ struct __large_struct { unsigned long buf[100]; };
".previous\n" \
_ASM_EXTABLE(1b, 3b) \
: "=r"(err) \
"2:\n" \
_ASM_EXTABLE_EX(1b, 2b) \
: : ltype(x), "m" (__m(addr)))
-@@ -493,8 +545,12 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -498,8 +548,12 @@ struct __large_struct { unsigned long buf[100]; };
* On error, the variable @x is set to zero.
*/
/**
* __put_user: - Write a simple value into user space, with less checking.
-@@ -516,8 +572,12 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -521,8 +575,12 @@ struct __large_struct { unsigned long buf[100]; };
* Returns zero on success, or -EFAULT on error.
*/
#define __get_user_unaligned __get_user
#define __put_user_unaligned __put_user
-@@ -535,7 +595,7 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -540,7 +598,7 @@ struct __large_struct { unsigned long buf[100]; };
#define get_user_ex(x, ptr) do { \
unsigned long __gue_val; \
__get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
} while (0)
#ifdef CONFIG_X86_WP_WORKS_OK
+@@ -574,8 +632,8 @@ strncpy_from_user(char *dst, const char __user *src, long count);
+ extern __must_check long strlen_user(const char __user *str);
+ extern __must_check long strnlen_user(const char __user *str, long n);
+
+-unsigned long __must_check clear_user(void __user *mem, unsigned long len);
+-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
++unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
++unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
+
+ /*
+ * movsl can be slow when source and dest are not both 8-byte aligned
diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
-index 576e39b..ccd0a39 100644
+index 7f760a9..04b1c65 100644
--- a/arch/x86/include/asm/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -11,15 +11,15 @@
/**
* __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
-@@ -43,6 +43,9 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
+@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
{
+ if ((long)n < 0)
+ return n;
++
++ check_object_size(from, n, true);
+
if (__builtin_constant_p(n)) {
unsigned long ret;
-@@ -61,6 +64,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
- return ret;
- }
- }
-+ if (!__builtin_constant_p(n))
-+ check_object_size(from, n, true);
- return __copy_to_user_ll(to, from, n);
- }
-
@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
__copy_to_user(void __user *to, const void *from, unsigned long n)
{
/* Avoid zeroing the tail if the copy fails..
* If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
* but as the zeroing behaviour is only significant when n is not
-@@ -137,6 +146,10 @@ static __always_inline unsigned long
+@@ -137,6 +146,12 @@ static __always_inline unsigned long
__copy_from_user(void *to, const void __user *from, unsigned long n)
{
might_fault();
+
+ if ((long)n < 0)
+ return n;
++
++ check_object_size(to, n, false);
+
if (__builtin_constant_p(n)) {
unsigned long ret;
-@@ -152,6 +165,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
- return ret;
- }
- }
-+ if (!__builtin_constant_p(n))
-+ check_object_size(to, n, false);
- return __copy_from_user_ll(to, from, n);
- }
-
@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
const void __user *from, unsigned long n)
{
extern void copy_from_user_overflow(void)
#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
-@@ -199,21 +222,65 @@ extern void copy_from_user_overflow(void)
+@@ -199,17 +222,60 @@ extern void copy_from_user_overflow(void)
#endif
;
+{
+ size_t sz = __compiletime_object_size(to);
+
++ check_object_size(to, n, false);
++
+ if (unlikely(sz != (size_t)-1 && sz < n))
copy_from_user_overflow();
-
+ else if (access_ok(VERIFY_READ, from, n))
+ n = __copy_from_user(to, from, n);
-+ else if ((long)n > 0) {
-+ if (!__builtin_constant_p(n))
-+ check_object_size(to, n, false);
++ else if ((long)n > 0)
+ memset(to, 0, n);
-+ }
return n;
}
--unsigned long __must_check clear_user(void __user *mem, unsigned long len);
--unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
-+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
-+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
-
- #endif /* _ASM_X86_UACCESS_32_H */
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
-index d8def8b..ac7fc15 100644
+index 142810c..4b68a3e 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -10,6 +10,9 @@
copy_user_generic(void *to, const void *from, unsigned len)
{
unsigned ret;
-@@ -41,142 +44,238 @@ copy_user_generic(void *to, const void *from, unsigned len)
+@@ -41,142 +44,203 @@ copy_user_generic(void *to, const void *from, unsigned len)
ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
"=d" (len)),
"1" (to), "2" (from), "3" (len)
- WARN(1, "Buffer overflow detected!\n");
-#endif
+
++ check_object_size(to, n, false);
+ if (access_ok(VERIFY_READ, from, n))
+ n = __copy_from_user(to, from, n);
-+ else if (n < INT_MAX) {
-+ if (!__builtin_constant_p(n))
-+ check_object_size(to, n, false);
++ else if (n < INT_MAX)
+ memset(to, 0, n);
-+ }
return n;
}
+ unsigned ret = 0;
might_fault();
-- if (!__builtin_constant_p(size))
-- return copy_user_generic(dst, (__force void *)src, size);
+
+ if (size > INT_MAX)
+ return size;
+
++ check_object_size(dst, size, false);
++
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ if (!__access_ok(VERIFY_READ, src, size))
+ return size;
+ return size;
+ }
+
-+ if (!__builtin_constant_p(size)) {
-+ check_object_size(dst, size, false);
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
-+ src += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
-+ }
+ if (!__builtin_constant_p(size))
+- return copy_user_generic(dst, (__force void *)src, size);
++ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
switch (size) {
- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
return ret;
default:
- return copy_user_generic(dst, (__force void *)src, size);
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
-+ src += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
++ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
}
}
+ unsigned ret = 0;
might_fault();
-- if (!__builtin_constant_p(size))
-- return copy_user_generic((__force void *)dst, src, size);
+
+ if (size > INT_MAX)
+ return size;
+
++ check_object_size(src, size, true);
++
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ if (!__access_ok(VERIFY_WRITE, dst, size))
+ return size;
+ return size;
+ }
+
-+ if (!__builtin_constant_p(size)) {
-+ check_object_size(src, size, true);
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
-+ dst += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ return copy_user_generic((__force_kernel void *)dst, src, size);
-+ }
+ if (!__builtin_constant_p(size))
+- return copy_user_generic((__force void *)dst, src, size);
++ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
switch (size) {
- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
return ret;
default:
- return copy_user_generic((__force void *)dst, src, size);
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
-+ dst += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ return copy_user_generic((__force_kernel void *)dst, src, size);
++ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
}
}
+ unsigned ret = 0;
might_fault();
-- if (!__builtin_constant_p(size))
-- return copy_user_generic((__force void *)dst,
-- (__force void *)src, size);
+
+ if (size > INT_MAX)
+ return size;
+ return size;
+#endif
+
-+ if (!__builtin_constant_p(size)) {
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
-+ src += PAX_USER_SHADOW_BASE;
-+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
-+ dst += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ return copy_user_generic((__force_kernel void *)dst,
-+ (__force_kernel const void *)src, size);
-+ }
+ if (!__builtin_constant_p(size))
+- return copy_user_generic((__force void *)dst,
+- (__force void *)src, size);
++ return copy_user_generic((__force_kernel void *)____m(dst),
++ (__force_kernel const void *)____m(src), size);
switch (size) {
case 1: {
u8 tmp;
ret, "b", "b", "=q", 1);
if (likely(!ret))
__put_user_asm(tmp, (u8 __user *)dst,
-@@ -185,7 +284,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -185,7 +249,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
}
case 2: {
u16 tmp;
ret, "w", "w", "=r", 2);
if (likely(!ret))
__put_user_asm(tmp, (u16 __user *)dst,
-@@ -195,7 +294,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -195,7 +259,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
case 4: {
u32 tmp;
ret, "l", "k", "=r", 4);
if (likely(!ret))
__put_user_asm(tmp, (u32 __user *)dst,
-@@ -204,7 +303,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -204,7 +268,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
}
case 8: {
u64 tmp;
ret, "q", "", "=r", 8);
if (likely(!ret))
__put_user_asm(tmp, (u64 __user *)dst,
-@@ -212,44 +311,89 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -212,41 +276,72 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
return ret;
}
default:
- return copy_user_generic((__force void *)dst,
- (__force void *)src, size);
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
-+ src += PAX_USER_SHADOW_BASE;
-+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
-+ dst += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ return copy_user_generic((__force_kernel void *)dst,
-+ (__force_kernel const void *)src, size);
++ return copy_user_generic((__force_kernel void *)____m(dst),
++ (__force_kernel const void *)____m(src), size);
}
}
--__must_check unsigned long clear_user(void __user *mem, unsigned long len);
--__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
-+__must_check unsigned long clear_user(void __user *mem, unsigned long len) __size_overflow(2);
-+__must_check unsigned long __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
-
static __must_check __always_inline int
-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ if (!__access_ok(VERIFY_READ, src, size))
+ return size;
-+
-+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
-+ src += PAX_USER_SHADOW_BASE;
+#endif
+
-+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
++ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
}
-static __must_check __always_inline int
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ if (!__access_ok(VERIFY_WRITE, dst, size))
+ return size;
-+
-+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
-+ dst += PAX_USER_SHADOW_BASE;
+#endif
+
-+ return copy_user_generic((__force_kernel void *)dst, src, size);
++ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
}
-extern long __copy_user_nocache(void *dst, const void __user *src,
+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
#endif /* _ASM_X86_UACCESS_64_H */
-diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
-index bb05228..d763d5b 100644
---- a/arch/x86/include/asm/vdso.h
-+++ b/arch/x86/include/asm/vdso.h
-@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
- #define VDSO32_SYMBOL(base, name) \
- ({ \
- extern const char VDSO32_##name[]; \
-- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
-+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
- })
- #endif
-
diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
index 5b238981..77fdd78 100644
--- a/arch/x86/include/asm/word-at-a-time.h
};
#define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
-diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
-index 38155f6..e4184ba 100644
---- a/arch/x86/include/asm/x86_init.h
-+++ b/arch/x86/include/asm/x86_init.h
-@@ -29,7 +29,7 @@ struct x86_init_mpparse {
- void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
- void (*find_smp_config)(void);
- void (*get_smp_config)(unsigned int early);
--};
-+} __no_const;
-
- /**
- * struct x86_init_resources - platform specific resource related ops
-@@ -43,7 +43,7 @@ struct x86_init_resources {
- void (*probe_roms)(void);
- void (*reserve_resources)(void);
- char *(*memory_setup)(void);
--};
-+} __no_const;
-
- /**
- * struct x86_init_irqs - platform specific interrupt setup
-@@ -56,7 +56,7 @@ struct x86_init_irqs {
- void (*pre_vector_init)(void);
- void (*intr_init)(void);
- void (*trap_init)(void);
--};
-+} __no_const;
-
- /**
- * struct x86_init_oem - oem platform specific customizing functions
-@@ -66,7 +66,7 @@ struct x86_init_irqs {
- struct x86_init_oem {
- void (*arch_setup)(void);
- void (*banner)(void);
--};
-+} __no_const;
-
- /**
- * struct x86_init_mapping - platform specific initial kernel pagetable setup
-@@ -77,7 +77,7 @@ struct x86_init_oem {
- */
- struct x86_init_mapping {
- void (*pagetable_reserve)(u64 start, u64 end);
--};
-+} __no_const;
-
- /**
- * struct x86_init_paging - platform specific paging functions
-@@ -87,7 +87,7 @@ struct x86_init_mapping {
- struct x86_init_paging {
- void (*pagetable_setup_start)(pgd_t *base);
- void (*pagetable_setup_done)(pgd_t *base);
--};
-+} __no_const;
-
- /**
- * struct x86_init_timers - platform specific timer setup
-@@ -102,7 +102,7 @@ struct x86_init_timers {
- void (*tsc_pre_init)(void);
- void (*timer_init)(void);
- void (*wallclock_init)(void);
--};
-+} __no_const;
-
- /**
- * struct x86_init_iommu - platform specific iommu setup
-@@ -110,7 +110,7 @@ struct x86_init_timers {
- */
- struct x86_init_iommu {
- int (*iommu_init)(void);
--};
-+} __no_const;
-
- /**
- * struct x86_init_pci - platform specific pci init functions
-@@ -124,7 +124,7 @@ struct x86_init_pci {
- int (*init)(void);
- void (*init_irq)(void);
- void (*fixup_irqs)(void);
--};
-+} __no_const;
-
- /**
- * struct x86_init_ops - functions for platform specific setup
-@@ -140,7 +140,7 @@ struct x86_init_ops {
- struct x86_init_timers timers;
- struct x86_init_iommu iommu;
- struct x86_init_pci pci;
--};
-+} __no_const;
-
- /**
- * struct x86_cpuinit_ops - platform specific cpu hotplug setups
-@@ -151,7 +151,7 @@ struct x86_cpuinit_ops {
- void (*setup_percpu_clockev)(void);
- void (*early_percpu_clock_init)(void);
- void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
--};
-+} __no_const;
-
- /**
- * struct x86_platform_ops - platform specific runtime functions
-@@ -177,7 +177,7 @@ struct x86_platform_ops {
- void (*save_sched_clock_state)(void);
- void (*restore_sched_clock_state)(void);
- void (*apic_post_init)(void);
--};
-+} __no_const;
-
- struct pci_dev;
-
-@@ -186,14 +186,14 @@ struct x86_msi_ops {
- void (*teardown_msi_irq)(unsigned int irq);
- void (*teardown_msi_irqs)(struct pci_dev *dev);
- void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
--};
-+} __no_const;
-
- struct x86_io_apic_ops {
- void (*init) (void);
- unsigned int (*read) (unsigned int apic, unsigned int reg);
- void (*write) (unsigned int apic, unsigned int reg, unsigned int value);
- void (*modify)(unsigned int apic, unsigned int reg, unsigned int value);
--};
-+} __no_const;
-
- extern struct x86_init_ops x86_init;
- extern struct x86_cpuinit_ops x86_cpuinit;
diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
-index 8a1b6f9..a29c4e4 100644
+index 0415cda..b43d877 100644
--- a/arch/x86/include/asm/xsave.h
+++ b/arch/x86/include/asm/xsave.h
-@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
- {
- int err;
+@@ -71,7 +71,9 @@ static inline int xsave_user(struct xsave_struct __user *buf)
+ return -EFAULT;
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
-+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
-+#endif
-+
- /*
- * Clear the xsave header first, so that reserved fields are
- * initialized to zero.
-@@ -93,10 +98,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
+ __asm__ __volatile__(ASM_STAC "\n"
+- "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
++ "1:"
++ __copyuser_seg
++ ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
+ "2: " ASM_CLAC "\n"
+ ".section .fixup,\"ax\"\n"
+ "3: movl $-1,%[err]\n"
+@@ -87,12 +89,14 @@ static inline int xsave_user(struct xsave_struct __user *buf)
static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
{
int err;
u32 lmask = mask;
u32 hmask = mask >> 32;
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
-+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
-+#endif
-+
- __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
- "2:\n"
+ __asm__ __volatile__(ASM_STAC "\n"
+- "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
++ "1:"
++ __copyuser_seg
++ ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
+ "2: " ASM_CLAC "\n"
".section .fixup,\"ax\"\n"
+ "3: movl $-1,%[err]\n"
+diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
+index 91ce48f..a48ea05 100644
+--- a/arch/x86/kernel/Makefile
++++ b/arch/x86/kernel/Makefile
+@@ -23,7 +23,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
+ obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
+ obj-$(CONFIG_IRQ_WORK) += irq_work.o
+ obj-y += probe_roms.o
+-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
++obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
+ obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
+ obj-y += syscall_$(BITS).o
+ obj-$(CONFIG_X86_64) += vsyscall_64.o
+diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
+index e651f7a..c995dc4 100644
+--- a/arch/x86/kernel/acpi/boot.c
++++ b/arch/x86/kernel/acpi/boot.c
+@@ -1576,7 +1576,7 @@ int __init acpi_boot_init(void)
+ acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet);
+
+ if (!acpi_noirq)
+- x86_init.pci.init = pci_acpi_init;
++ *(void **)&x86_init.pci.init = pci_acpi_init;
+
+ return 0;
+ }
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
-index 1b8e5a0..354fd59 100644
+index 11676cf..a8cf3ec 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
-@@ -69,8 +69,12 @@ int acpi_suspend_lowlevel(void)
+@@ -74,8 +74,12 @@ int acpi_suspend_lowlevel(void)
#else /* CONFIG_64BIT */
#ifdef CONFIG_SMP
stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
bogus_magic:
jmp bogus_magic
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
-index ced4534..3e75d69 100644
+index ef5ccca..bd83949 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
-@@ -281,6 +281,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
+@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
*/
for (a = start; a < end; a++) {
instr = (u8 *)&a->instr_offset + a->instr_offset;
replacement = (u8 *)&a->repl_offset + a->repl_offset;
BUG_ON(a->replacementlen > a->instrlen);
BUG_ON(a->instrlen > sizeof(insnbuf));
-@@ -312,10 +319,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
+@@ -299,10 +306,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
for (poff = start; poff < end; poff++) {
u8 *ptr = (u8 *)poff + *poff;
- if (*ptr == 0x3e)
+ if (*ktla_ktva(ptr) == 0x3e)
text_poke(ptr, ((unsigned char []){0xf0}), 1);
- };
+ }
mutex_unlock(&text_mutex);
-@@ -333,10 +346,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
+@@ -317,10 +330,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
for (poff = start; poff < end; poff++) {
u8 *ptr = (u8 *)poff + *poff;
- if (*ptr == 0xf0)
+ if (*ktla_ktva(ptr) == 0xf0)
text_poke(ptr, ((unsigned char []){0x3E}), 1);
- };
+ }
mutex_unlock(&text_mutex);
-@@ -505,7 +524,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
+@@ -468,7 +487,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
BUG_ON(p->len > MAX_PATCH_LEN);
/* prep the buffer with the original instructions */
used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
(unsigned long)p->instr, p->len);
-@@ -573,7 +592,7 @@ void __init alternative_instructions(void)
- if (smp_alt_once)
+@@ -515,7 +534,7 @@ void __init alternative_instructions(void)
+ if (!uniproc_patched || num_possible_cpus() == 1)
free_init_pages("SMP alternatives",
(unsigned long)__smp_locks,
- (unsigned long)__smp_locks_end);
+ PAGE_ALIGN((unsigned long)__smp_locks_end));
+ #endif
- restart_nmi();
- }
-@@ -590,13 +609,17 @@ void __init alternative_instructions(void)
+ apply_paravirt(__parainstructions, __parainstructions_end);
+@@ -535,13 +554,17 @@ void __init alternative_instructions(void)
* instructions. And on the local CPU you need to be protected again NMI or MCE
* handlers seeing an inconsistent instruction while you patch.
*/
local_irq_restore(flags);
/* Could also do a CLFLUSH here to speed up CPU recovery; but
that causes hangs on some VIA CPUs. */
-@@ -618,36 +641,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
+@@ -563,36 +586,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
*/
void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
{
return addr;
}
+diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
+index e663112..21938a3 100644
+--- a/arch/x86/kernel/amd_gart_64.c
++++ b/arch/x86/kernel/amd_gart_64.c
+@@ -851,7 +851,7 @@ int __init gart_iommu_init(void)
+
+ flush_gart();
+ dma_ops = &gart_dma_ops;
+- x86_platform.iommu_shutdown = gart_iommu_shutdown;
++ *(void **)&x86_platform.iommu_shutdown = gart_iommu_shutdown;
+ swiotlb = 0;
+
+ return 0;
+diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
+index d5fd66f..6119b16 100644
+--- a/arch/x86/kernel/aperture_64.c
++++ b/arch/x86/kernel/aperture_64.c
+@@ -390,7 +390,7 @@ int __init gart_iommu_hole_init(void)
+
+ iommu_detected = 1;
+ gart_iommu_aperture = 1;
+- x86_init.iommu.iommu_init = gart_iommu_init;
++ *(void **)&x86_init.iommu.iommu_init = gart_iommu_init;
+
+ ctl = read_pci_config(bus, slot, 3,
+ AMD64_GARTAPERTURECTL);
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index 24deb30..94a3426 100644
+index b17416e..be6e5dc 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -185,7 +185,7 @@ int first_system_vector = 0xfe;
}
}
+diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
+index a65829a..6ddc249 100644
+--- a/arch/x86/kernel/apic/apic_numachip.c
++++ b/arch/x86/kernel/apic/apic_numachip.c
+@@ -178,7 +178,7 @@ static int __init numachip_system_init(void)
+ if (!numachip_system)
+ return 0;
+
+- x86_cpuinit.fixup_cpu_id = fixup_cpu_id;
++ *(void **)&x86_cpuinit.fixup_cpu_id = fixup_cpu_id;
+
+ map_csrs();
+
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index c265593..137c4ac 100644
+index 1817fa9..7bff097 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1084,7 +1084,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
{
raw_spin_unlock(&vector_lock);
}
-@@ -2408,7 +2408,7 @@ static void ack_apic_edge(struct irq_data *data)
+@@ -2411,7 +2411,7 @@ static void ack_apic_edge(struct irq_data *data)
ack_APIC_irq();
}
#ifdef CONFIG_GENERIC_PENDING_IRQ
static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
-@@ -2549,7 +2549,7 @@ static void ack_apic_level(struct irq_data *data)
+@@ -2552,7 +2552,7 @@ static void ack_apic_level(struct irq_data *data)
* at the cpu.
*/
if (!(v & (1 << (i & 0x1f)))) {
eoi_ioapic_irq(irq, cfg);
}
+diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
+index d661ee9..512c0a1 100644
+--- a/arch/x86/kernel/apic/numaq_32.c
++++ b/arch/x86/kernel/apic/numaq_32.c
+@@ -257,14 +257,14 @@ static __init void early_check_numaq(void)
+ early_get_smp_config();
+
+ if (found_numaq) {
+- x86_init.mpparse.mpc_record = numaq_mpc_record;
+- x86_init.mpparse.setup_ioapic_ids = x86_init_noop;
+- x86_init.mpparse.mpc_apic_id = mpc_apic_id;
+- x86_init.mpparse.smp_read_mpc_oem = smp_read_mpc_oem;
+- x86_init.mpparse.mpc_oem_pci_bus = mpc_oem_pci_bus;
+- x86_init.mpparse.mpc_oem_bus_info = mpc_oem_bus_info;
+- x86_init.timers.tsc_pre_init = numaq_tsc_init;
+- x86_init.pci.init = pci_numaq_init;
++ *(void **)&x86_init.mpparse.mpc_record = numaq_mpc_record;
++ *(void **)&x86_init.mpparse.setup_ioapic_ids = x86_init_noop;
++ *(void **)&x86_init.mpparse.mpc_apic_id = mpc_apic_id;
++ *(void **)&x86_init.mpparse.smp_read_mpc_oem = smp_read_mpc_oem;
++ *(void **)&x86_init.mpparse.mpc_oem_pci_bus = mpc_oem_pci_bus;
++ *(void **)&x86_init.mpparse.mpc_oem_bus_info = mpc_oem_bus_info;
++ *(void **)&x86_init.timers.tsc_pre_init = numaq_tsc_init;
++ *(void **)&x86_init.pci.init = pci_numaq_init;
+ }
+ }
+
+diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
+index 8cfade9..8ea7b51 100644
+--- a/arch/x86/kernel/apic/x2apic_uv_x.c
++++ b/arch/x86/kernel/apic/x2apic_uv_x.c
+@@ -139,8 +139,8 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+ is_uv1 ? UV1_HUB_REVISION_BASE : UV2_HUB_REVISION_BASE;
+ pnodeid = early_get_pnodeid();
+ early_get_apic_pnode_shift();
+- x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;
+- x86_platform.nmi_init = uv_nmi_init;
++ *(void **)&x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;
++ *(void **)&x86_platform.nmi_init = uv_nmi_init;
+ if (!strcmp(oem_table_id, "UVL"))
+ uv_system_type = UV_LEGACY_APIC;
+ else if (!strcmp(oem_table_id, "UVX"))
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index d65464e..1035d31 100644
--- a/arch/x86/kernel/apm_32.c
proc_create("apm", 0, NULL, &apm_file_ops);
diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
-index 68de2dc..1f3c720 100644
+index 2861082..6d4718e 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -33,6 +33,8 @@ void common(void) {
BLANK();
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
-index d30a6a9..79becab 100644
+index a0e067d..9c7db16 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
obj-y += proc.o capflags.o powerflags.o common.o
obj-y += vmware.o hypervisor.o mshyperv.o
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 9d92e19..49d7d79 100644
+index 1b7d165..b9e2627 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
-@@ -724,7 +724,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
+@@ -738,7 +738,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
unsigned int size)
{
/* AMD errata T13 (order #21922) */
if (c->x86_model == 3 && c->x86_mask == 0)
size = 64;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index a5fbc3c..2254849 100644
+index 7505f7b..d59dac0 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -86,60 +86,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
static int __init x86_xsave_setup(char *s)
{
setup_clear_cpu_cap(X86_FEATURE_XSAVE);
-@@ -376,7 +322,7 @@ void switch_to_new_gdt(int cpu)
+@@ -389,7 +335,7 @@ void switch_to_new_gdt(int cpu)
{
struct desc_ptr gdt_descr;
gdt_descr.size = GDT_SIZE - 1;
load_gdt(&gdt_descr);
/* Reload the per-cpu base */
-@@ -872,6 +818,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -885,6 +831,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
/* Filter out anything that depends on CPUID levels we don't have */
filter_cpuid_features(c, true);
/* If the model name is still unset, do table lookup. */
if (!c->x86_model_id[0]) {
const char *p;
-@@ -1054,10 +1004,12 @@ static __init int setup_disablecpuid(char *arg)
+@@ -1068,10 +1018,12 @@ static __init int setup_disablecpuid(char *arg)
}
__setup("clearcpuid=", setup_disablecpuid);
DEFINE_PER_CPU_FIRST(union irq_stack_union,
irq_stack_union) __aligned(PAGE_SIZE);
-@@ -1071,7 +1023,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
+@@ -1085,7 +1037,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
EXPORT_PER_CPU_SYMBOL(current_task);
DEFINE_PER_CPU(unsigned long, kernel_stack) =
EXPORT_PER_CPU_SYMBOL(kernel_stack);
DEFINE_PER_CPU(char *, irq_stack_ptr) =
-@@ -1165,7 +1117,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
+@@ -1178,7 +1130,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
{
memset(regs, 0, sizeof(struct pt_regs));
regs->fs = __KERNEL_PERCPU;
return regs;
}
-@@ -1220,7 +1172,7 @@ void __cpuinit cpu_init(void)
+@@ -1233,7 +1185,7 @@ void __cpuinit cpu_init(void)
int i;
cpu = stack_smp_processor_id();
oist = &per_cpu(orig_ist, cpu);
#ifdef CONFIG_NUMA
-@@ -1246,7 +1198,7 @@ void __cpuinit cpu_init(void)
+@@ -1259,7 +1211,7 @@ void __cpuinit cpu_init(void)
switch_to_new_gdt(cpu);
loadsegment(fs, 0);
memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
syscall_init();
-@@ -1255,7 +1207,6 @@ void __cpuinit cpu_init(void)
+@@ -1268,7 +1220,6 @@ void __cpuinit cpu_init(void)
wrmsrl(MSR_KERNEL_GS_BASE, 0);
barrier();
if (cpu != 0)
enable_x2apic();
-@@ -1311,7 +1262,7 @@ void __cpuinit cpu_init(void)
+@@ -1321,7 +1272,7 @@ void __cpuinit cpu_init(void)
{
int cpu = smp_processor_id();
struct task_struct *curr = current;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
-index 0a4ce29..f211176 100644
+index 198e019..867575e 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
load_idt(&idt_descr);
}
#endif
+diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
+index 93c5451..3887433 100644
+--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
++++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
+@@ -983,6 +983,22 @@ static struct attribute *default_attrs[] = {
+ };
+
+ #ifdef CONFIG_AMD_NB
++static struct attribute *default_attrs_amd_nb[] = {
++ &type.attr,
++ &level.attr,
++ &coherency_line_size.attr,
++ &physical_line_partition.attr,
++ &ways_of_associativity.attr,
++ &number_of_sets.attr,
++ &size.attr,
++ &shared_cpu_map.attr,
++ &shared_cpu_list.attr,
++ NULL,
++ NULL,
++ NULL,
++ NULL
++};
++
+ static struct attribute ** __cpuinit amd_l3_attrs(void)
+ {
+ static struct attribute **attrs;
+@@ -993,18 +1009,7 @@ static struct attribute ** __cpuinit amd_l3_attrs(void)
+
+ n = ARRAY_SIZE(default_attrs);
+
+- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
+- n += 2;
+-
+- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
+- n += 1;
+-
+- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
+- if (attrs == NULL)
+- return attrs = default_attrs;
+-
+- for (n = 0; default_attrs[n]; n++)
+- attrs[n] = default_attrs[n];
++ attrs = default_attrs_amd_nb;
+
+ if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
+ attrs[n++] = &cache_disable_0.attr;
+@@ -1055,6 +1060,13 @@ static struct kobj_type ktype_cache = {
+ .default_attrs = default_attrs,
+ };
+
++#ifdef CONFIG_AMD_NB
++static struct kobj_type ktype_cache_amd_nb = {
++ .sysfs_ops = &sysfs_ops,
++ .default_attrs = default_attrs_amd_nb,
++};
++#endif
++
+ static struct kobj_type ktype_percpu_entry = {
+ .sysfs_ops = &sysfs_ops,
+ };
+@@ -1120,20 +1132,26 @@ static int __cpuinit cache_add_dev(struct device *dev)
+ return retval;
+ }
+
++#ifdef CONFIG_AMD_NB
++ amd_l3_attrs();
++#endif
++
+ for (i = 0; i < num_cache_leaves; i++) {
++ struct kobj_type *ktype;
++
+ this_object = INDEX_KOBJECT_PTR(cpu, i);
+ this_object->cpu = cpu;
+ this_object->index = i;
+
+ this_leaf = CPUID4_INFO_IDX(cpu, i);
+
+- ktype_cache.default_attrs = default_attrs;
++ ktype = &ktype_cache;
+ #ifdef CONFIG_AMD_NB
+ if (this_leaf->base.nb)
+- ktype_cache.default_attrs = amd_l3_attrs();
++ ktype = &ktype_cache_amd_nb;
+ #endif
+ retval = kobject_init_and_add(&(this_object->kobj),
+- &ktype_cache,
++ ktype,
+ per_cpu(ici_cache_kobject, cpu),
+ "index%1lu", i);
+ if (unlikely(retval)) {
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index 292d025..b520c94 100644
+index 46cbf86..55c7292 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -45,6 +45,7 @@
#include "mce-internal.h"
-@@ -253,7 +254,7 @@ static void print_mce(struct mce *m)
+@@ -254,7 +255,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
print_symbol("{%s}", m->ip);
pr_cont("\n");
}
-@@ -286,10 +287,10 @@ static void print_mce(struct mce *m)
+@@ -287,10 +288,10 @@ static void print_mce(struct mce *m)
#define PANIC_TIMEOUT 5 /* 5 seconds */
/* Panic in progress. Enable interrupts and wait for final IPI */
static void wait_for_panic(void)
-@@ -313,7 +314,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -314,7 +315,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
/*
* Make sure only one CPU runs in machine check panic
*/
wait_for_panic();
barrier();
-@@ -321,7 +322,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -322,7 +323,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
console_verbose();
} else {
/* Don't log too much for fake panic */
return;
}
/* First print corrected ones that are still unlogged */
-@@ -693,7 +694,7 @@ static int mce_timed_out(u64 *t)
+@@ -694,7 +695,7 @@ static int mce_timed_out(u64 *t)
* might have been modified by someone else.
*/
rmb();
wait_for_panic();
if (!monarch_timeout)
goto out;
-@@ -1619,7 +1620,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
+@@ -1659,7 +1660,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
}
/* Call the installed machine check handler for this CPU setup. */
unexpected_machine_check;
/*
-@@ -1642,7 +1643,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1682,7 +1683,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
return;
}
__mcheck_cpu_init_generic();
__mcheck_cpu_init_vendor(c);
-@@ -1656,7 +1659,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1696,7 +1699,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
*/
static DEFINE_SPINLOCK(mce_chrdev_state_lock);
static int mce_chrdev_open_exclu; /* already open exclusive? */
static int mce_chrdev_open(struct inode *inode, struct file *file)
-@@ -1664,7 +1667,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1704,7 +1707,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
spin_lock(&mce_chrdev_state_lock);
if (mce_chrdev_open_exclu ||
spin_unlock(&mce_chrdev_state_lock);
return -EBUSY;
-@@ -1672,7 +1675,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1712,7 +1715,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
if (file->f_flags & O_EXCL)
mce_chrdev_open_exclu = 1;
spin_unlock(&mce_chrdev_state_lock);
-@@ -1683,7 +1686,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
+@@ -1723,7 +1726,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
{
spin_lock(&mce_chrdev_state_lock);
mce_chrdev_open_exclu = 0;
spin_unlock(&mce_chrdev_state_lock);
-@@ -2407,7 +2410,7 @@ struct dentry *mce_get_debugfs_dir(void)
+@@ -2367,7 +2370,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block mce_cpu_notifier __cpuinitdata = {
++static struct notifier_block mce_cpu_notifier __cpuinitconst = {
+ .notifier_call = mce_cpu_callback,
+ };
+
+@@ -2445,7 +2448,7 @@ struct dentry *mce_get_debugfs_dir(void)
static void mce_reset(void)
{
cpu_missing = 0;
extern int generic_get_free_region(unsigned long base, unsigned long size,
int replace_reg);
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
-index 915b876..171f845 100644
+index d18b2b8..d3b834c 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
-@@ -1757,7 +1757,7 @@ static unsigned long get_segment_base(unsigned int segment)
+@@ -1759,7 +1759,7 @@ static unsigned long get_segment_base(unsigned int segment)
if (idx > GDT_ENTRIES)
return 0;
}
return get_desc_base(desc + idx);
-@@ -1847,7 +1847,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
+@@ -1849,7 +1849,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
break;
perf_callchain_store(entry, frame.return_address);
}
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
-index 6bca492..36e4496 100644
+index 324bb52..1a93d85 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
-@@ -1947,10 +1947,10 @@ __init int intel_pmu_init(void)
+@@ -1949,10 +1949,10 @@ __init int intel_pmu_init(void)
* v2 and above have a perf capabilities MSR
*/
if (version > 1) {
}
intel_ds_init();
+diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
+index d22d0c4..088eb6f 100644
+--- a/arch/x86/kernel/cpu/vmware.c
++++ b/arch/x86/kernel/cpu/vmware.c
+@@ -79,7 +79,7 @@ static void __init vmware_platform_setup(void)
+ VMWARE_PORT(GETHZ, eax, ebx, ecx, edx);
+
+ if (ebx != UINT_MAX)
+- x86_platform.calibrate_tsc = vmware_get_tsc_khz;
++ *(void **)&x86_platform.calibrate_tsc = vmware_get_tsc_khz;
+ else
+ printk(KERN_WARNING
+ "Failed to get TSC freq from the hypervisor\n");
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 13ad899..f642b9a 100644
--- a/arch/x86/kernel/crash.c
if (__die(str, regs, err))
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
-index 1038a41..ac7e5f6 100644
+index 1038a41..db2c12b 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
unsigned int code_len = code_bytes;
unsigned char c;
u8 *ip;
-+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
++ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
pr_emerg("Stack:\n");
show_stack_log_lvl(NULL, regs, ®s->sp, 0, KERN_EMERG);
+EXPORT_SYMBOL(pax_check_alloca);
+#endif
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
-index b653675..33190c0 100644
+index b653675..51cc8c0 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
put_cpu();
}
EXPORT_SYMBOL(dump_trace);
+@@ -249,7 +253,7 @@ void show_regs(struct pt_regs *regs)
+ {
+ int i;
+ unsigned long sp;
+- const int cpu = smp_processor_id();
++ const int cpu = raw_smp_processor_id();
+ struct task_struct *cur = current;
+
+ sp = regs->sp;
@@ -304,3 +308,50 @@ int is_valid_bugaddr(unsigned long ip)
return ud2 == 0x0b0f;
#include <asm/processor.h>
#include <asm/fcntl.h>
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
-index 8f8e8ee..3617d6e 100644
+index cf8639b..6c6a674 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
-@@ -176,13 +176,153 @@
+@@ -177,13 +177,153 @@
/*CFI_REL_OFFSET gs, PT_GS*/
.endm
.macro SET_KERNEL_GS reg
cld
PUSH_GS
pushl_cfi %fs
-@@ -205,7 +345,7 @@
+@@ -206,7 +346,7 @@
CFI_REL_OFFSET ecx, 0
pushl_cfi %ebx
CFI_REL_OFFSET ebx, 0
movl %edx, %ds
movl %edx, %es
movl $(__KERNEL_PERCPU), %edx
-@@ -213,6 +353,15 @@
+@@ -214,6 +354,15 @@
SET_KERNEL_GS %edx
.endm
.macro RESTORE_INT_REGS
popl_cfi %ebx
CFI_RESTORE ebx
-@@ -296,7 +445,7 @@ ENTRY(ret_from_fork)
+@@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
popfl_cfi
jmp syscall_exit
CFI_ENDPROC
-END(ret_from_fork)
+ENDPROC(ret_from_fork)
- /*
- * Interrupt exit functions should be protected against kprobes
-@@ -329,7 +478,15 @@ ret_from_intr:
+ ENTRY(ret_from_kernel_thread)
+ CFI_STARTPROC
+@@ -344,7 +493,15 @@ ret_from_intr:
andl $SEGMENT_RPL_MASK, %eax
#endif
cmpl $USER_RPL, %eax
ENTRY(resume_userspace)
LOCKDEP_SYS_EXIT
-@@ -341,8 +498,8 @@ ENTRY(resume_userspace)
+@@ -356,8 +513,8 @@ ENTRY(resume_userspace)
andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
# int/exception return?
jne work_pending
#ifdef CONFIG_PREEMPT
ENTRY(resume_kernel)
-@@ -357,7 +514,7 @@ need_resched:
+@@ -372,7 +529,7 @@ need_resched:
jz restore_all
call preempt_schedule_irq
jmp need_resched
#endif
CFI_ENDPROC
/*
-@@ -391,28 +548,43 @@ sysenter_past_esp:
+@@ -406,30 +563,45 @@ sysenter_past_esp:
/*CFI_REL_OFFSET cs, 0*/
/*
* Push current_thread_info()->sysenter_return to the stack.
+#else
cmpl $__PAGE_OFFSET-3,%ebp
jae syscall_fault
+ ASM_STAC
1: movl (%ebp),%ebp
+ ASM_CLAC
+#endif
+
movl %ebp,PT_EBP(%esp)
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
jnz sysenter_audit
sysenter_do_call:
-@@ -427,12 +599,24 @@ sysenter_do_call:
+@@ -444,12 +616,24 @@ sysenter_do_call:
testl $_TIF_ALLWORK_MASK, %ecx
jne sysexit_audit
sysenter_exit:
PTGS_TO_GS
ENABLE_INTERRUPTS_SYSEXIT
-@@ -449,6 +633,9 @@ sysenter_audit:
+@@ -466,6 +650,9 @@ sysenter_audit:
movl %eax,%edx /* 2nd arg: syscall number */
movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
call __audit_syscall_entry
pushl_cfi %ebx
movl PT_EAX(%esp),%eax /* reload syscall number */
jmp sysenter_do_call
-@@ -474,10 +661,16 @@ sysexit_audit:
+@@ -491,10 +678,16 @@ sysexit_audit:
CFI_ENDPROC
.pushsection .fixup,"ax"
PTGS_TO_GS_EX
ENDPROC(ia32_sysenter_target)
-@@ -491,6 +684,11 @@ ENTRY(system_call)
+@@ -509,6 +702,11 @@ ENTRY(system_call)
pushl_cfi %eax # save orig_eax
SAVE_ALL
GET_THREAD_INFO(%ebp)
# system call tracing in operation / emulation
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
jnz syscall_trace_entry
-@@ -509,6 +707,15 @@ syscall_exit:
+@@ -527,6 +725,15 @@ syscall_exit:
testl $_TIF_ALLWORK_MASK, %ecx # current->work
jne syscall_exit_work
restore_all:
TRACE_IRQS_IRET
restore_all_notrace:
-@@ -565,14 +772,34 @@ ldt_ss:
+@@ -583,14 +790,34 @@ ldt_ss:
* compensating for the offset by changing to the ESPFIX segment with
* a base address that matches for the difference.
*/
pushl_cfi $__ESPFIX_SS
pushl_cfi %eax /* new kernel esp */
/* Disable interrupts, but do not irqtrace this section: we
-@@ -601,35 +828,23 @@ work_resched:
+@@ -619,20 +846,18 @@ work_resched:
movl TI_flags(%ebp), %ecx
andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
# than syscall tracing?
#ifdef CONFIG_VM86
testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
- movl %esp, %eax
-- jne work_notifysig_v86 # returning to kernel-space or
-+ jz 1f # returning to kernel-space or
+ jne work_notifysig_v86 # returning to kernel-space or
# vm86-space
-- TRACE_IRQS_ON
-- ENABLE_INTERRUPTS(CLBR_NONE)
-- movb PT_CS(%esp), %bl
-- andb $SEGMENT_RPL_MASK, %bl
-- cmpb $USER_RPL, %bl
-- jb resume_kernel
-- xorl %edx, %edx
-- call do_notify_resume
-- jmp resume_userspace
-
-- ALIGN
--work_notifysig_v86:
- pushl_cfi %ecx # save ti_flags for do_notify_resume
- call save_v86_state # %eax contains pt_regs pointer
- popl_cfi %ecx
- movl %eax, %esp
+ 1:
-#else
- movl %esp, %eax
-+1:
#endif
TRACE_IRQS_ON
ENABLE_INTERRUPTS(CLBR_NONE)
-@@ -640,7 +855,7 @@ work_notifysig_v86:
- xorl %edx, %edx
- call do_notify_resume
- jmp resume_userspace
+@@ -653,7 +878,7 @@ work_notifysig_v86:
+ movl %eax, %esp
+ jmp 1b
+ #endif
-END(work_pending)
+ENDPROC(work_pending)
# perform syscall exit tracing
ALIGN
-@@ -648,11 +863,14 @@ syscall_trace_entry:
+@@ -661,11 +886,14 @@ syscall_trace_entry:
movl $-ENOSYS,PT_EAX(%esp)
movl %esp, %eax
call syscall_trace_enter
# perform syscall exit tracing
ALIGN
-@@ -665,20 +883,24 @@ syscall_exit_work:
+@@ -678,21 +906,25 @@ syscall_exit_work:
movl %esp, %eax
call syscall_trace_leave
jmp resume_userspace
+ push %ss
+ pop %ds
+#endif
+ ASM_CLAC
GET_THREAD_INFO(%ebp)
movl $-EFAULT,PT_EAX(%esp)
jmp resume_userspace
CFI_ENDPROC
/*
* End of kprobes section
-@@ -750,6 +972,36 @@ ENTRY(ptregs_clone)
- CFI_ENDPROC
- ENDPROC(ptregs_clone)
-
-+ ALIGN;
-+ENTRY(kernel_execve)
-+ CFI_STARTPROC
-+ pushl_cfi %ebp
-+ sub $PT_OLDSS+4,%esp
-+ pushl_cfi %edi
-+ pushl_cfi %ecx
-+ pushl_cfi %eax
-+ lea 3*4(%esp),%edi
-+ mov $PT_OLDSS/4+1,%ecx
-+ xorl %eax,%eax
-+ rep stosl
-+ popl_cfi %eax
-+ popl_cfi %ecx
-+ popl_cfi %edi
-+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
-+ pushl_cfi %esp
-+ call sys_execve
-+ add $4,%esp
-+ CFI_ADJUST_CFA_OFFSET -4
-+ GET_THREAD_INFO(%ebp)
-+ test %eax,%eax
-+ jz syscall_exit
-+ add $PT_OLDSS+4,%esp
-+ CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
-+ popl_cfi %ebp
-+ ret
-+ CFI_ENDPROC
-+ENDPROC(kernel_execve)
-+
- .macro FIXUP_ESPFIX_STACK
- /*
- * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -759,8 +1011,15 @@ ENDPROC(ptregs_clone)
+@@ -772,8 +1004,15 @@ ENDPROC(ptregs_clone)
* normal stack and adjusts ESP with the matching offset.
*/
/* fixup the stack */
shl $16, %eax
addl %esp, %eax /* the adjusted stack pointer */
pushl_cfi $__KERNEL_DS
-@@ -813,7 +1072,7 @@ vector=vector+1
+@@ -826,7 +1065,7 @@ vector=vector+1
.endr
2: jmp common_interrupt
.endr
.previous
END(interrupt)
-@@ -861,7 +1120,7 @@ ENTRY(coprocessor_error)
+@@ -877,7 +1116,7 @@ ENTRY(coprocessor_error)
pushl_cfi $do_coprocessor_error
jmp error_code
CFI_ENDPROC
ENTRY(simd_coprocessor_error)
RING0_INT_FRAME
-@@ -882,7 +1141,7 @@ ENTRY(simd_coprocessor_error)
+@@ -899,7 +1138,7 @@ ENTRY(simd_coprocessor_error)
#endif
jmp error_code
CFI_ENDPROC
ENTRY(device_not_available)
RING0_INT_FRAME
-@@ -890,18 +1149,18 @@ ENTRY(device_not_available)
+@@ -908,18 +1147,18 @@ ENTRY(device_not_available)
pushl_cfi $do_device_not_available
jmp error_code
CFI_ENDPROC
#endif
ENTRY(overflow)
-@@ -910,7 +1169,7 @@ ENTRY(overflow)
+@@ -929,7 +1168,7 @@ ENTRY(overflow)
pushl_cfi $do_overflow
jmp error_code
CFI_ENDPROC
ENTRY(bounds)
RING0_INT_FRAME
-@@ -918,7 +1177,7 @@ ENTRY(bounds)
+@@ -938,7 +1177,7 @@ ENTRY(bounds)
pushl_cfi $do_bounds
jmp error_code
CFI_ENDPROC
ENTRY(invalid_op)
RING0_INT_FRAME
-@@ -926,7 +1185,7 @@ ENTRY(invalid_op)
+@@ -947,7 +1186,7 @@ ENTRY(invalid_op)
pushl_cfi $do_invalid_op
jmp error_code
CFI_ENDPROC
ENTRY(coprocessor_segment_overrun)
RING0_INT_FRAME
-@@ -934,35 +1193,35 @@ ENTRY(coprocessor_segment_overrun)
+@@ -956,7 +1195,7 @@ ENTRY(coprocessor_segment_overrun)
pushl_cfi $do_coprocessor_segment_overrun
jmp error_code
CFI_ENDPROC
ENTRY(invalid_TSS)
RING0_EC_FRAME
+@@ -964,7 +1203,7 @@ ENTRY(invalid_TSS)
pushl_cfi $do_invalid_TSS
jmp error_code
CFI_ENDPROC
ENTRY(segment_not_present)
RING0_EC_FRAME
+@@ -972,7 +1211,7 @@ ENTRY(segment_not_present)
pushl_cfi $do_segment_not_present
jmp error_code
CFI_ENDPROC
ENTRY(stack_segment)
RING0_EC_FRAME
+@@ -980,7 +1219,7 @@ ENTRY(stack_segment)
pushl_cfi $do_stack_segment
jmp error_code
CFI_ENDPROC
ENTRY(alignment_check)
RING0_EC_FRAME
+@@ -988,7 +1227,7 @@ ENTRY(alignment_check)
pushl_cfi $do_alignment_check
jmp error_code
CFI_ENDPROC
ENTRY(divide_error)
RING0_INT_FRAME
-@@ -970,7 +1229,7 @@ ENTRY(divide_error)
+@@ -997,7 +1236,7 @@ ENTRY(divide_error)
pushl_cfi $do_divide_error
jmp error_code
CFI_ENDPROC
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
-@@ -979,7 +1238,7 @@ ENTRY(machine_check)
+@@ -1007,7 +1246,7 @@ ENTRY(machine_check)
pushl_cfi machine_check_vector
jmp error_code
CFI_ENDPROC
#endif
ENTRY(spurious_interrupt_bug)
-@@ -988,7 +1247,7 @@ ENTRY(spurious_interrupt_bug)
+@@ -1017,7 +1256,7 @@ ENTRY(spurious_interrupt_bug)
pushl_cfi $do_spurious_interrupt_bug
jmp error_code
CFI_ENDPROC
/*
* End of kprobes section
*/
-@@ -1102,7 +1361,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
+@@ -1120,7 +1359,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
ENTRY(mcount)
ret
ENTRY(ftrace_caller)
cmpl $0, function_trace_stop
-@@ -1131,7 +1390,7 @@ ftrace_graph_call:
+@@ -1153,7 +1392,7 @@ ftrace_graph_call:
.globl ftrace_stub
ftrace_stub:
ret
-END(ftrace_caller)
+ENDPROC(ftrace_caller)
- #else /* ! CONFIG_DYNAMIC_FTRACE */
-
-@@ -1167,7 +1426,7 @@ trace:
+ ENTRY(ftrace_regs_caller)
+ pushf /* push flags before compare (in cs location) */
+@@ -1254,7 +1493,7 @@ trace:
popl %ecx
popl %eax
jmp ftrace_stub
#endif /* CONFIG_DYNAMIC_FTRACE */
#endif /* CONFIG_FUNCTION_TRACER */
-@@ -1188,7 +1447,7 @@ ENTRY(ftrace_graph_caller)
+@@ -1272,7 +1511,7 @@ ENTRY(ftrace_graph_caller)
popl %ecx
popl %eax
ret
.globl return_to_handler
return_to_handler:
-@@ -1243,15 +1502,18 @@ error_code:
+@@ -1328,15 +1567,18 @@ error_code:
movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
REG_TO_PTGS %ecx
SET_KERNEL_GS %ecx
/*
* Debug traps and NMI can happen at the one SYSENTER instruction
-@@ -1293,7 +1555,7 @@ debug_stack_correct:
+@@ -1379,7 +1621,7 @@ debug_stack_correct:
call do_debug
jmp ret_from_exception
CFI_ENDPROC
/*
* NMI is doubly nasty. It can happen _while_ we're handling
-@@ -1330,6 +1592,9 @@ nmi_stack_correct:
+@@ -1417,6 +1659,9 @@ nmi_stack_correct:
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
call do_nmi
jmp restore_all_notrace
CFI_ENDPROC
-@@ -1366,12 +1631,15 @@ nmi_espfix_stack:
+@@ -1453,12 +1698,15 @@ nmi_espfix_stack:
FIXUP_ESPFIX_STACK # %eax == %esp
xorl %edx,%edx # zero error code
call do_nmi
ENTRY(int3)
RING0_INT_FRAME
-@@ -1383,14 +1651,14 @@ ENTRY(int3)
+@@ -1471,14 +1719,14 @@ ENTRY(int3)
call do_int3
jmp ret_from_exception
CFI_ENDPROC
#ifdef CONFIG_KVM_GUEST
ENTRY(async_page_fault)
-@@ -1398,7 +1666,7 @@ ENTRY(async_page_fault)
+@@ -1487,7 +1735,7 @@ ENTRY(async_page_fault)
pushl_cfi $do_async_page_fault
jmp error_code
CFI_ENDPROC
/*
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
-index dcdd0ea..de0bb2d 100644
+index 1328fe4..cb03298 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
-@@ -57,6 +57,8 @@
- #include <asm/percpu.h>
- #include <asm/asm.h>
+@@ -59,6 +59,8 @@
+ #include <asm/rcu.h>
+ #include <asm/smap.h>
#include <linux/err.h>
+#include <asm/pgtable.h>
+#include <asm/alternative-asm.h>
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
#include <linux/elf-em.h>
-@@ -70,8 +72,9 @@
- #ifdef CONFIG_FUNCTION_TRACER
+@@ -80,8 +82,9 @@
#ifdef CONFIG_DYNAMIC_FTRACE
- ENTRY(mcount)
+
+ ENTRY(function_hook)
+ pax_force_retaddr
retq
--END(mcount)
-+ENDPROC(mcount)
+-END(function_hook)
++ENDPROC(function_hook)
- ENTRY(ftrace_caller)
- cmpl $0, function_trace_stop
-@@ -94,8 +97,9 @@ GLOBAL(ftrace_graph_call)
+ /* skip is set if stack has been adjusted */
+ .macro ftrace_caller_setup skip=0
+@@ -122,8 +125,9 @@ GLOBAL(ftrace_graph_call)
#endif
GLOBAL(ftrace_stub)
-END(ftrace_caller)
+ENDPROC(ftrace_caller)
+ ENTRY(ftrace_regs_caller)
+ /* Save the current flags before compare (in SS location)*/
+@@ -191,7 +195,7 @@ ftrace_restore_flags:
+ popfq
+ jmp ftrace_stub
+
+-END(ftrace_regs_caller)
++ENDPROC(ftrace_regs_caller)
+
+
#else /* ! CONFIG_DYNAMIC_FTRACE */
- ENTRY(mcount)
-@@ -114,6 +118,7 @@ ENTRY(mcount)
+@@ -212,6 +216,7 @@ ENTRY(function_hook)
#endif
GLOBAL(ftrace_stub)
retq
trace:
-@@ -123,12 +128,13 @@ trace:
- movq 8(%rbp), %rsi
+@@ -225,12 +230,13 @@ trace:
+ #endif
subq $MCOUNT_INSN_SIZE, %rdi
+ pax_force_fptr ftrace_trace_function
MCOUNT_RESTORE_FRAME
jmp ftrace_stub
--END(mcount)
-+ENDPROC(mcount)
+-END(function_hook)
++ENDPROC(function_hook)
#endif /* CONFIG_DYNAMIC_FTRACE */
#endif /* CONFIG_FUNCTION_TRACER */
-@@ -148,8 +154,9 @@ ENTRY(ftrace_graph_caller)
+@@ -252,8 +258,9 @@ ENTRY(ftrace_graph_caller)
MCOUNT_RESTORE_FRAME
GLOBAL(return_to_handler)
subq $24, %rsp
-@@ -165,6 +172,7 @@ GLOBAL(return_to_handler)
+@@ -269,7 +276,9 @@ GLOBAL(return_to_handler)
movq 8(%rsp), %rdx
movq (%rsp), %rax
addq $24, %rsp
+ pax_force_fptr %rdi
jmp *%rdi
++ENDPROC(return_to_handler)
#endif
-@@ -180,6 +188,280 @@ ENTRY(native_usergs_sysret64)
+
+@@ -284,6 +293,273 @@ ENTRY(native_usergs_sysret64)
ENDPROC(native_usergs_sysret64)
#endif /* CONFIG_PARAVIRT */
+ ljmpq __KERNEL_CS,3f
+3: SET_RDI_INTO_CR0
+ jmp 1b
-+#ifdef CONFIG_PARAVIRT
-+ PV_RESTORE_REGS(CLBR_RDI);
-+#endif
-+
-+ popq %rdi
-+ pax_force_retaddr
-+ retq
+ENDPROC(pax_exit_kernel)
+#endif
+
.macro TRACE_IRQS_IRETQ offset=ARGOFFSET
#ifdef CONFIG_TRACE_IRQFLAGS
-@@ -271,8 +553,8 @@ ENDPROC(native_usergs_sysret64)
+@@ -375,8 +651,8 @@ ENDPROC(native_usergs_sysret64)
.endm
.macro UNFAKE_STACK_FRAME
.endm
/*
-@@ -359,7 +641,7 @@ ENDPROC(native_usergs_sysret64)
+@@ -463,7 +739,7 @@ ENDPROC(native_usergs_sysret64)
movq %rsp, %rsi
leaq -RBP(%rsp),%rdi /* arg1 for handler */
je 1f
SWAPGS
/*
-@@ -394,9 +676,10 @@ ENTRY(save_rest)
+@@ -498,9 +774,10 @@ ENTRY(save_rest)
movq_cfi r15, R15+16
movq %r11, 8(%rsp) /* return address */
FIXUP_TOP_OF_STACK %r11, 16
/* save complete stack frame */
.pushsection .kprobes.text, "ax"
-@@ -425,9 +708,10 @@ ENTRY(save_paranoid)
+@@ -529,9 +806,10 @@ ENTRY(save_paranoid)
js 1f /* negative -> in kernel */
SWAPGS
xorl %ebx,%ebx
.popsection
/*
-@@ -449,7 +733,7 @@ ENTRY(ret_from_fork)
+@@ -553,7 +831,7 @@ ENTRY(ret_from_fork)
RESTORE_REST
- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
- jz retint_restore_args
+ jz 1f
testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
-@@ -459,7 +743,7 @@ ENTRY(ret_from_fork)
- jmp ret_from_sys_call # go to the SYSRET fastpath
-
+@@ -571,7 +849,7 @@ ENTRY(ret_from_fork)
+ RESTORE_REST
+ jmp int_ret_from_sys_call
CFI_ENDPROC
-END(ret_from_fork)
+ENDPROC(ret_from_fork)
/*
* System call entry. Up to 6 arguments in registers are supported.
-@@ -495,7 +779,7 @@ END(ret_from_fork)
+@@ -608,7 +886,7 @@ END(ret_from_fork)
ENTRY(system_call)
CFI_STARTPROC simple
CFI_SIGNAL_FRAME
CFI_REGISTER rip,rcx
/*CFI_REGISTER rflags,r11*/
SWAPGS_UNSAFE_STACK
-@@ -508,16 +792,23 @@ GLOBAL(system_call_after_swapgs)
+@@ -621,16 +899,23 @@ GLOBAL(system_call_after_swapgs)
movq %rsp,PER_CPU_VAR(old_rsp)
movq PER_CPU_VAR(kernel_stack),%rsp
jnz tracesys
system_call_fastpath:
#if __SYSCALL_MASK == ~0
-@@ -527,7 +818,7 @@ system_call_fastpath:
+@@ -640,7 +925,7 @@ system_call_fastpath:
cmpl $__NR_syscall_max,%eax
#endif
ja badsys
call *sys_call_table(,%rax,8) # XXX: rip relative
movq %rax,RAX-ARGOFFSET(%rsp)
/*
-@@ -541,10 +832,13 @@ sysret_check:
+@@ -654,10 +939,13 @@ sysret_check:
LOCKDEP_SYS_EXIT
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
/*
* sysretq will re-enable interrupts:
*/
-@@ -596,14 +890,18 @@ badsys:
+@@ -709,14 +997,18 @@ badsys:
* jump back to the normal fast path.
*/
auditsys:
jmp system_call_fastpath
/*
-@@ -624,7 +922,7 @@ sysret_audit:
+@@ -737,7 +1029,7 @@ sysret_audit:
/* Do syscall tracing */
tracesys:
#ifdef CONFIG_AUDITSYSCALL
jz auditsys
#endif
SAVE_REST
-@@ -632,12 +930,16 @@ tracesys:
+@@ -745,12 +1037,16 @@ tracesys:
FIXUP_TOP_OF_STACK %rdi
movq %rsp,%rdi
call syscall_trace_enter
RESTORE_REST
#if __SYSCALL_MASK == ~0
cmpq $__NR_syscall_max,%rax
-@@ -646,7 +948,7 @@ tracesys:
+@@ -759,7 +1055,7 @@ tracesys:
cmpl $__NR_syscall_max,%eax
#endif
ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
call *sys_call_table(,%rax,8)
movq %rax,RAX-ARGOFFSET(%rsp)
/* Use IRET because user could have changed frame */
-@@ -667,7 +969,9 @@ GLOBAL(int_with_check)
+@@ -780,7 +1076,9 @@ GLOBAL(int_with_check)
andl %edi,%edx
jnz int_careful
andl $~TS_COMPAT,TI_status(%rcx)
/* Either reschedule or signal or syscall exit tracking needed. */
/* First do a reschedule test. */
-@@ -713,7 +1017,7 @@ int_restore_rest:
+@@ -826,7 +1124,7 @@ int_restore_rest:
TRACE_IRQS_OFF
jmp int_with_check
CFI_ENDPROC
/*
* Certain special system calls that need to save a complete full stack frame.
-@@ -729,7 +1033,7 @@ ENTRY(\label)
+@@ -842,7 +1140,7 @@ ENTRY(\label)
call \func
jmp ptregscall_common
CFI_ENDPROC
.endm
PTREGSCALL stub_clone, sys_clone, %r8
-@@ -747,9 +1051,10 @@ ENTRY(ptregscall_common)
+@@ -860,9 +1158,10 @@ ENTRY(ptregscall_common)
movq_cfi_restore R12+8, r12
movq_cfi_restore RBP+8, rbp
movq_cfi_restore RBX+8, rbx
ENTRY(stub_execve)
CFI_STARTPROC
-@@ -764,7 +1069,7 @@ ENTRY(stub_execve)
+@@ -876,7 +1175,7 @@ ENTRY(stub_execve)
RESTORE_REST
jmp int_ret_from_sys_call
CFI_ENDPROC
/*
* sigreturn is special because it needs to restore all registers on return.
-@@ -782,7 +1087,7 @@ ENTRY(stub_rt_sigreturn)
+@@ -894,7 +1193,7 @@ ENTRY(stub_rt_sigreturn)
RESTORE_REST
jmp int_ret_from_sys_call
CFI_ENDPROC
#ifdef CONFIG_X86_X32_ABI
PTREGSCALL stub_x32_sigaltstack, sys32_sigaltstack, %rdx
-@@ -851,7 +1156,7 @@ vector=vector+1
+@@ -962,7 +1261,7 @@ vector=vector+1
2: jmp common_interrupt
.endr
CFI_ENDPROC
.previous
END(interrupt)
-@@ -871,6 +1176,16 @@ END(interrupt)
+@@ -982,6 +1281,16 @@ END(interrupt)
subq $ORIG_RAX-RBP, %rsp
CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
SAVE_ARGS_IRQ
call \func
.endm
-@@ -902,7 +1217,7 @@ ret_from_intr:
+@@ -1014,7 +1323,7 @@ ret_from_intr:
exit_intr:
GET_THREAD_INFO(%rcx)
je retint_kernel
/* Interrupt came from user space */
-@@ -924,12 +1239,16 @@ retint_swapgs: /* return to user-space */
+@@ -1036,12 +1345,16 @@ retint_swapgs: /* return to user-space */
* The iretq could re-enable interrupts:
*/
DISABLE_INTERRUPTS(CLBR_ANY)
retint_restore_args: /* return to kernel space */
DISABLE_INTERRUPTS(CLBR_ANY)
+ pax_exit_kernel
-+ pax_force_retaddr RIP-ARGOFFSET
++ pax_force_retaddr (RIP-ARGOFFSET)
/*
* The iretq could re-enable interrupts:
*/
-@@ -1012,7 +1331,7 @@ ENTRY(retint_kernel)
+@@ -1124,7 +1437,7 @@ ENTRY(retint_kernel)
#endif
CFI_ENDPROC
/*
* End of kprobes section
*/
-@@ -1029,7 +1348,7 @@ ENTRY(\sym)
+@@ -1142,7 +1455,7 @@ ENTRY(\sym)
interrupt \do_sym
jmp ret_from_intr
CFI_ENDPROC
.endm
#ifdef CONFIG_SMP
-@@ -1084,12 +1403,22 @@ ENTRY(\sym)
+@@ -1198,12 +1511,22 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
.endm
.macro paranoidzeroentry sym do_sym
-@@ -1101,15 +1430,25 @@ ENTRY(\sym)
+@@ -1216,15 +1539,25 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF
.macro paranoidzeroentry_ist sym do_sym ist
ENTRY(\sym)
INTR_FRAME
-@@ -1119,14 +1458,30 @@ ENTRY(\sym)
+@@ -1235,14 +1568,30 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF_DEBUG
.endm
.macro errorentry sym do_sym
-@@ -1137,13 +1492,23 @@ ENTRY(\sym)
+@@ -1254,13 +1603,23 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
.endm
/* error code is on the stack already */
-@@ -1156,13 +1521,23 @@ ENTRY(\sym)
+@@ -1274,13 +1633,23 @@ ENTRY(\sym)
call save_paranoid
DEFAULT_FRAME 0
TRACE_IRQS_OFF
.endm
zeroentry divide_error do_divide_error
-@@ -1192,9 +1567,10 @@ gs_change:
+@@ -1310,9 +1679,10 @@ gs_change:
2: mfence /* workaround */
SWAPGS
popfq_cfi
_ASM_EXTABLE(gs_change,bad_gs)
.section .fixup,"ax"
-@@ -1213,13 +1589,14 @@ ENTRY(kernel_thread_helper)
- * Here we are in the child and the registers are set as they were
- * at kernel_thread() invocation in the parent.
- */
-+ pax_force_fptr %rsi
- call *%rsi
- # exit
- mov %eax, %edi
- call do_exit
- ud2 # padding for call trace
- CFI_ENDPROC
--END(kernel_thread_helper)
-+ENDPROC(kernel_thread_helper)
-
- /*
- * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
-@@ -1246,11 +1623,11 @@ ENTRY(kernel_execve)
- RESTORE_REST
- testq %rax,%rax
- je int_ret_from_sys_call
-- RESTORE_ARGS
- UNFAKE_STACK_FRAME
-+ pax_force_retaddr
- ret
- CFI_ENDPROC
--END(kernel_execve)
-+ENDPROC(kernel_execve)
-
- /* Call softirq on interrupt stack. Interrupts are off. */
- ENTRY(call_softirq)
-@@ -1268,9 +1645,10 @@ ENTRY(call_softirq)
+@@ -1340,9 +1710,10 @@ ENTRY(call_softirq)
CFI_DEF_CFA_REGISTER rsp
CFI_ADJUST_CFA_OFFSET -8
decl PER_CPU_VAR(irq_count)
#ifdef CONFIG_XEN
zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
-@@ -1308,7 +1686,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
+@@ -1380,7 +1751,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
decl PER_CPU_VAR(irq_count)
jmp error_exit
CFI_ENDPROC
/*
* Hypervisor uses this for application faults while it executes.
-@@ -1367,7 +1745,7 @@ ENTRY(xen_failsafe_callback)
+@@ -1439,7 +1810,7 @@ ENTRY(xen_failsafe_callback)
SAVE_ALL
jmp error_exit
CFI_ENDPROC
apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
xen_hvm_callback_vector xen_evtchn_do_upcall
-@@ -1416,16 +1794,31 @@ ENTRY(paranoid_exit)
+@@ -1488,16 +1859,31 @@ ENTRY(paranoid_exit)
TRACE_IRQS_OFF_DEBUG
testl %ebx,%ebx /* swapgs needed? */
jnz paranoid_restore
jmp irq_return
paranoid_userspace:
GET_THREAD_INFO(%rcx)
-@@ -1454,7 +1847,7 @@ paranoid_schedule:
+@@ -1526,7 +1912,7 @@ paranoid_schedule:
TRACE_IRQS_OFF
jmp paranoid_userspace
CFI_ENDPROC
/*
* Exception entry point. This expects an error code/orig_rax on the stack.
-@@ -1481,12 +1874,13 @@ ENTRY(error_entry)
+@@ -1553,12 +1939,13 @@ ENTRY(error_entry)
movq_cfi r14, R14+8
movq_cfi r15, R15+8
xorl %ebx,%ebx
ret
/*
-@@ -1513,7 +1907,7 @@ bstep_iret:
+@@ -1585,7 +1972,7 @@ bstep_iret:
movq %rcx,RIP+8(%rsp)
jmp error_swapgs
CFI_ENDPROC
/* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
-@@ -1533,7 +1927,7 @@ ENTRY(error_exit)
+@@ -1605,7 +1992,7 @@ ENTRY(error_exit)
jnz retint_careful
jmp retint_swapgs
CFI_ENDPROC
/*
* Test if a given stack is an NMI stack or not.
-@@ -1591,9 +1985,11 @@ ENTRY(nmi)
+@@ -1663,9 +2050,11 @@ ENTRY(nmi)
* If %cs was not the kernel segment, then the NMI triggered in user
* space, which means it is definitely not nested.
*/
/*
* Check the special variable on the stack to see if NMIs are
* executing.
-@@ -1752,6 +2148,17 @@ end_repeat_nmi:
+@@ -1824,6 +2213,17 @@ end_repeat_nmi:
*/
movq %cr2, %r12
/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
movq %rsp,%rdi
movq $-1,%rsi
-@@ -1767,21 +2174,32 @@ end_repeat_nmi:
+@@ -1839,21 +2239,32 @@ end_repeat_nmi:
testl %ebx,%ebx /* swapgs needed? */
jnz nmi_restore
nmi_swapgs:
/*
* End of kprobes section
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
-index c3a7cb4..3ad00dc 100644
+index 1d41402..af9a46a 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
/*
* Note: Due to modules and __init, code can
* disappear and change, we need to protect against faulting
-@@ -212,7 +214,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
+@@ -227,7 +229,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
unsigned char old[MCOUNT_INSN_SIZE], *new;
int ret;
new = ftrace_call_replace(ip, (unsigned long)func);
/* See comment above by declaration of modifying_ftrace_code */
-@@ -605,6 +607,8 @@ static int ftrace_mod_jmp(unsigned long ip,
+@@ -238,7 +240,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
+ /* Also update the regs callback function */
+ if (!ret) {
+ ip = (unsigned long)(&ftrace_regs_call);
+- memcpy(old, &ftrace_regs_call, MCOUNT_INSN_SIZE);
++ memcpy(old, ktla_ktva((void *)&ftrace_regs_call), MCOUNT_INSN_SIZE);
+ new = ftrace_call_replace(ip, (unsigned long)func);
+ ret = ftrace_modify_code(ip, old, new);
+ }
+@@ -279,7 +281,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size)
+ * kernel identity mapping to modify code.
+ */
+ if (within(ip, (unsigned long)_text, (unsigned long)_etext))
+- ip = (unsigned long)__va(__pa(ip));
++ ip = (unsigned long)__va(__pa(ktla_ktva(ip)));
+
+ return probe_kernel_write((void *)ip, val, size);
+ }
+@@ -289,7 +291,7 @@ static int add_break(unsigned long ip, const char *old)
+ unsigned char replaced[MCOUNT_INSN_SIZE];
+ unsigned char brk = BREAKPOINT_INSTRUCTION;
+
+- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
++ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
+ return -EFAULT;
+
+ /* Make sure it is what we expect it to be */
+@@ -637,7 +639,7 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
+ return ret;
+
+ fail_update:
+- probe_kernel_write((void *)ip, &old_code[0], 1);
++ probe_kernel_write((void *)ktla_ktva(ip), &old_code[0], 1);
+ goto out;
+ }
+
+@@ -670,6 +672,8 @@ static int ftrace_mod_jmp(unsigned long ip,
{
unsigned char code[MCOUNT_INSN_SIZE];
return -EFAULT;
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
-index c18f59d..9c0c9f6 100644
+index c18f59d..69ddbc4 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
-@@ -18,6 +18,7 @@
+@@ -18,20 +18,20 @@
#include <asm/io_apic.h>
#include <asm/bios_ebda.h>
#include <asm/tlbflush.h>
static void __init i386_default_early_setup(void)
{
-@@ -30,8 +31,7 @@ static void __init i386_default_early_setup(void)
+ /* Initialize 32bit specific setup functions */
+- x86_init.resources.reserve_resources = i386_reserve_resources;
+- x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
++ *(void **)&x86_init.resources.reserve_resources = i386_reserve_resources;
++ *(void **)&x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
+
+ reserve_ebda_region();
+ }
void __init i386_start_kernel(void)
{
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
-index d42ab17..87b9555 100644
+index 4dac2f6..bc6a335 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -26,6 +26,12 @@
num_subarch_entries = (. - subarch_entries) / 4
.previous
#else
-@@ -310,6 +382,7 @@ default_entry:
- orl %edx,%eax
+@@ -316,6 +388,7 @@ default_entry:
+ movl pa(mmu_cr4_features),%eax
movl %eax,%cr4
+#ifdef CONFIG_X86_PAE
testb $X86_CR4_PAE, %al # check if PAE is enabled
jz 6f
-@@ -338,6 +411,9 @@ default_entry:
+@@ -344,6 +417,9 @@ default_entry:
/* Make changes effective */
wrmsr
6:
/*
-@@ -436,14 +512,20 @@ is386: movl $2,%ecx # set MP
+@@ -442,14 +518,20 @@ is386: movl $2,%ecx # set MP
1: movl $(__KERNEL_DS),%eax # reload all the segment registers
movl %eax,%ss # after changing gdt.
movl %eax,%gs
xorl %eax,%eax # Clear LDT
-@@ -520,8 +602,11 @@ setup_once:
+@@ -526,8 +608,11 @@ setup_once:
* relocation. Manually set base address in stack canary
* segment descriptor.
*/
movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
shrl $16, %ecx
movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -552,7 +637,7 @@ ENDPROC(early_idt_handlers)
+@@ -558,7 +643,7 @@ ENDPROC(early_idt_handlers)
/* This is global to keep gas from relaxing the jumps */
ENTRY(early_idt_handler)
cld
je hlt_loop
incl %ss:early_recursion_flag
-@@ -590,8 +675,8 @@ ENTRY(early_idt_handler)
+@@ -596,8 +681,8 @@ ENTRY(early_idt_handler)
pushl (20+6*4)(%esp) /* trapno */
pushl $fault_msg
call printk
hlt_loop:
hlt
jmp hlt_loop
-@@ -610,8 +695,11 @@ ENDPROC(early_idt_handler)
+@@ -616,8 +701,11 @@ ENDPROC(early_idt_handler)
/* This is the default interrupt "handler" :-) */
ALIGN
ignore_int:
pushl %eax
pushl %ecx
pushl %edx
-@@ -620,9 +708,6 @@ ignore_int:
+@@ -626,9 +714,6 @@ ignore_int:
movl $(__KERNEL_DS),%eax
movl %eax,%ds
movl %eax,%es
pushl 16(%esp)
pushl 24(%esp)
pushl 32(%esp)
-@@ -656,29 +741,43 @@ ENTRY(setup_once_ref)
+@@ -662,29 +747,43 @@ ENTRY(setup_once_ref)
/*
* BSS section
*/
ENTRY(initial_page_table)
.long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
# if KPMDS == 3
-@@ -697,12 +796,20 @@ ENTRY(initial_page_table)
+@@ -703,12 +802,20 @@ ENTRY(initial_page_table)
# error "Kernel PMDs should be 1, 2 or 3"
# endif
.align PAGE_SIZE /* needs to be page-sized too */
__INITRODATA
int_msg:
-@@ -730,7 +837,7 @@ fault_msg:
+@@ -736,7 +843,7 @@ fault_msg:
* segment size, and 32-bit linear address value:
*/
.globl boot_gdt_descr
.globl idt_descr
-@@ -739,7 +846,7 @@ fault_msg:
+@@ -745,7 +852,7 @@ fault_msg:
.word 0 # 32 bit align gdt_desc.address
boot_gdt_descr:
.word __BOOT_DS+7
.word 0 # 32-bit align idt_desc.address
idt_descr:
-@@ -750,7 +857,7 @@ idt_descr:
+@@ -756,7 +863,7 @@ idt_descr:
.word 0 # 32 bit align gdt_desc.address
ENTRY(early_gdt_descr)
.word GDT_ENTRIES*8-1
/*
* The boot_gdt must mirror the equivalent in setup.S and is
-@@ -759,5 +866,65 @@ ENTRY(early_gdt_descr)
+@@ -765,5 +872,65 @@ ENTRY(early_gdt_descr)
.align L1_CACHE_BYTES
ENTRY(boot_gdt)
.fill GDT_ENTRY_BOOT_CS,8,0
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
-index f250431..54097e7 100644
+index 675a050..95febfd 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
-@@ -59,7 +59,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
+@@ -55,7 +55,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
static inline bool interrupted_user_mode(void)
{
struct pt_regs *regs = get_irq_regs();
/*
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
-index 36d1853..bf25736 100644
+index 9a5c460..dc4374d 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -209,7 +209,7 @@ spurious_8259A_irq:
return -EPERM;
}
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
-index d44f782..31ab01e 100644
+index e4595f1..ee3bfb8 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -18,7 +18,7 @@
/* Function pointer for generic interrupt vector handling */
void (*x86_platform_ipi_callback)(void) = NULL;
-@@ -121,9 +121,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
+@@ -122,9 +122,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
seq_printf(p, " Machine check polls\n");
#endif
{
struct setup_data_node *node = file->private_data;
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
-index 3f61904..873cea9 100644
+index 836f832..a8bda67 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -127,11 +127,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
*(unsigned long *)mem = kernel_stack_pointer(regs);
break;
case GDB_GS:
-@@ -476,12 +476,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
+@@ -229,7 +229,10 @@ static void kgdb_correct_hw_break(void)
+ bp->attr.bp_addr = breakinfo[breakno].addr;
+ bp->attr.bp_len = breakinfo[breakno].len;
+ bp->attr.bp_type = breakinfo[breakno].type;
+- info->address = breakinfo[breakno].addr;
++ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
++ info->address = ktla_ktva(breakinfo[breakno].addr);
++ else
++ info->address = breakinfo[breakno].addr;
+ info->len = breakinfo[breakno].len;
+ info->type = breakinfo[breakno].type;
+ val = arch_install_hw_breakpoint(bp);
+@@ -476,12 +479,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
case 'k':
/* clear the trace bit */
linux_regs->flags &= ~X86_EFLAGS_TF;
raw_smp_processor_id());
}
-@@ -546,7 +546,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
+@@ -546,7 +549,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
switch (cmd) {
case DIE_DEBUG:
if (user_mode(regs))
return single_step_cont(regs, args);
break;
+@@ -751,11 +754,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
+ #endif /* CONFIG_DEBUG_RODATA */
+
+ bpt->type = BP_BREAKPOINT;
+- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
++ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
+ BREAK_INSTR_SIZE);
+ if (err)
+ return err;
+- err = probe_kernel_write((char *)bpt->bpt_addr,
++ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
+ arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
+ #ifdef CONFIG_DEBUG_RODATA
+ if (!err)
+@@ -768,7 +771,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
+ return -EBUSY;
+ text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
+ BREAK_INSTR_SIZE);
+- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
++ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
+ if (err)
+ return err;
+ if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
+@@ -793,13 +796,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
+ if (mutex_is_locked(&text_mutex))
+ goto knl_write;
+ text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
+- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
++ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
+ if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
+ goto knl_write;
+ return err;
+ knl_write:
+ #endif /* CONFIG_DEBUG_RODATA */
+- return probe_kernel_write((char *)bpt->bpt_addr,
++ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
+ (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
+ }
+
diff --git a/arch/x86/kernel/kprobes-opt.c b/arch/x86/kernel/kprobes-opt.c
-index c5e410e..da6aaf9 100644
+index c5e410e..ed5a7f0 100644
--- a/arch/x86/kernel/kprobes-opt.c
+++ b/arch/x86/kernel/kprobes-opt.c
@@ -338,7 +338,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
if (abs(rel) > 0x7fffffff)
return -ERANGE;
-@@ -359,11 +359,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -353,16 +353,16 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+ op->optinsn.size = ret;
+
+ /* Copy arch-dep-instance from template */
+- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
++ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
+
+ /* Set probe information */
synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
/* Set probe function call */
- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
-+ synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
++ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
/* Set returning jmp instruction at the tail of out-of-line buffer */
- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
-- (u8 *)op->kp.addr + op->optinsn.size);
-+ (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
+- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
++ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
+ (u8 *)op->kp.addr + op->optinsn.size);
flush_icache_range((unsigned long) buf,
- (unsigned long) buf + TMPL_END_IDX +
@@ -385,7 +385,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
((long)op->kp.addr + RELATIVEJUMP_SIZE));
RELATIVE_ADDR_SIZE);
insn_buf[0] = RELATIVEJUMP_OPCODE;
+@@ -483,7 +483,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
+ /* This kprobe is really able to run optimized path. */
+ op = container_of(p, struct optimized_kprobe, kp);
+ /* Detour through copied instructions */
+- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
++ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
+ if (!reenter)
+ reset_current_kprobe();
+ preempt_enable_no_resched();
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
-index e2f751e..dffa2a0 100644
+index 57916c0..9e0b9d0 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
-@@ -120,8 +120,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
+@@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
+ s32 raddr;
} __attribute__((packed)) *insn;
- insn = (struct __arch_relative_insn *)from;
+- insn = (struct __arch_relative_insn *)from;
++ insn = (struct __arch_relative_insn *)ktla_ktva(from);
+
+ pax_open_kernel();
insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
return 0; /* Page fault may occur on this address. */
retry:
+@@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
+ * for the first byte, we can recover the original instruction
+ * from it and kp->opcode.
+ */
+- memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
++ memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+ buf[0] = kp->opcode;
+- return (unsigned long)buf;
++ return ktva_ktla((unsigned long)buf);
+ }
+
+ /*
@@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
/* Another subsystem puts a breakpoint, failed to recover */
if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
preempt_enable_no_resched();
return;
}
-@@ -504,7 +511,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
+@@ -502,9 +509,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
+ regs->flags &= ~X86_EFLAGS_IF;
+ /* single step inline if the instruction is an int3 */
if (p->opcode == BREAKPOINT_INSTRUCTION)
- regs->ip = (unsigned long)p->addr;
+- regs->ip = (unsigned long)p->addr;
++ regs->ip = ktla_ktva((unsigned long)p->addr);
else
- regs->ip = (unsigned long)p->ainsn.insn;
+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
}
/*
-@@ -583,7 +590,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
+@@ -600,7 +607,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
setup_singlestep(p, regs, kcb, 0);
return 1;
}
/*
* The breakpoint instruction was removed right
* after we hit it. Another cpu has removed
-@@ -628,6 +635,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
+@@ -651,6 +658,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
" movq %rax, 152(%rsp)\n"
RESTORE_REGS_STRING
" popfq\n"
#else
" pushf\n"
SAVE_REGS_STRING
-@@ -765,7 +775,7 @@ static void __kprobes
+@@ -788,7 +798,7 @@ static void __kprobes
resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
{
unsigned long *tos = stack_addr(regs);
unsigned long orig_ip = (unsigned long)p->addr;
kprobe_opcode_t *insn = p->ainsn.insn;
-@@ -947,7 +957,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
+@@ -970,7 +980,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
struct die_args *args = data;
int ret = NOTIFY_DONE;
return ret;
switch (val) {
+diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
+index 4180a87..4678e4f 100644
+--- a/arch/x86/kernel/kvm.c
++++ b/arch/x86/kernel/kvm.c
+@@ -267,7 +267,7 @@ static void __init paravirt_ops_setup(void)
+ pv_info.paravirt_enabled = 1;
+
+ if (kvm_para_has_feature(KVM_FEATURE_NOP_IO_DELAY))
+- pv_cpu_ops.io_delay = kvm_io_delay;
++ *(void **)&pv_cpu_ops.io_delay = kvm_io_delay;
+
+ #ifdef CONFIG_X86_IO_APIC
+ no_timer_check = 1;
+@@ -461,18 +461,18 @@ void __init kvm_guest_init(void)
+ for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++)
+ spin_lock_init(&async_pf_sleepers[i].lock);
+ if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF))
+- x86_init.irqs.trap_init = kvm_apf_trap_init;
++ *(void **)&x86_init.irqs.trap_init = kvm_apf_trap_init;
+
+ if (kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
+ has_steal_clock = 1;
+- pv_time_ops.steal_clock = kvm_steal_clock;
++ *(void **)&pv_time_ops.steal_clock = kvm_steal_clock;
+ }
+
+ if (kvm_para_has_feature(KVM_FEATURE_PV_EOI))
+ apic_set_eoi_write(kvm_guest_apic_eoi_write);
+
+ #ifdef CONFIG_SMP
+- smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;
++ *(void **)&smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;
+ register_cpu_notifier(&kvm_cpu_notifier);
+ #else
+ kvm_guest_cpu_init();
+diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
+index f1b42b3..27ac4e7 100644
+--- a/arch/x86/kernel/kvmclock.c
++++ b/arch/x86/kernel/kvmclock.c
+@@ -211,19 +211,19 @@ void __init kvmclock_init(void)
+
+ if (kvm_register_clock("boot clock"))
+ return;
+- pv_time_ops.sched_clock = kvm_clock_read;
+- x86_platform.calibrate_tsc = kvm_get_tsc_khz;
+- x86_platform.get_wallclock = kvm_get_wallclock;
+- x86_platform.set_wallclock = kvm_set_wallclock;
++ *(void **)&pv_time_ops.sched_clock = kvm_clock_read;
++ *(void **)&x86_platform.calibrate_tsc = kvm_get_tsc_khz;
++ *(void **)&x86_platform.get_wallclock = kvm_get_wallclock;
++ *(void **)&x86_platform.set_wallclock = kvm_set_wallclock;
+ #ifdef CONFIG_X86_LOCAL_APIC
+- x86_cpuinit.early_percpu_clock_init =
++ *(void **)&x86_cpuinit.early_percpu_clock_init =
+ kvm_setup_secondary_clock;
+ #endif
+- x86_platform.save_sched_clock_state = kvm_save_sched_clock_state;
+- x86_platform.restore_sched_clock_state = kvm_restore_sched_clock_state;
+- machine_ops.shutdown = kvm_shutdown;
++ *(void **)&x86_platform.save_sched_clock_state = kvm_save_sched_clock_state;
++ *(void **)&x86_platform.restore_sched_clock_state = kvm_restore_sched_clock_state;
++ *(void **)&machine_ops.shutdown = kvm_shutdown;
+ #ifdef CONFIG_KEXEC
+- machine_ops.crash_shutdown = kvm_crash_shutdown;
++ *(void **)&machine_ops.crash_shutdown = kvm_crash_shutdown;
+ #endif
+ kvm_get_preset_lpj();
+ clocksource_register_hz(&kvm_clock, NSEC_PER_SEC);
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
index ebc9873..1b9724b 100644
--- a/arch/x86/kernel/ldt.c
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
-index 0327e2b..e43737b 100644
+index 3544aed..01ddc1c 100644
--- a/arch/x86/kernel/microcode_intel.c
+++ b/arch/x86/kernel/microcode_intel.c
-@@ -430,13 +430,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
+@@ -431,13 +431,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
static int get_ucode_user(void *to, const void *from, size_t n)
{
static void microcode_fini_cpu(int cpu)
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
-index 216a4d7..b328f09 100644
+index 216a4d7..228255a 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -43,15 +43,60 @@ do { \
+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
{
- if (PAGE_ALIGN(size) > MODULES_LEN)
-+ if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
++ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
return NULL;
return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index 17fff18..7bb2088 100644
+index 17fff18..0f5f957 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
.name = "bare hardware",
.paravirt_enabled = 0,
.kernel_rpl = 0,
-@@ -315,16 +322,16 @@ struct pv_info pv_info = {
- #endif
- };
-
--struct pv_init_ops pv_init_ops = {
-+struct pv_init_ops pv_init_ops __read_only = {
- .patch = native_patch,
- };
-
--struct pv_time_ops pv_time_ops = {
-+struct pv_time_ops pv_time_ops __read_only = {
- .sched_clock = native_sched_clock,
+@@ -324,7 +331,7 @@ struct pv_time_ops pv_time_ops = {
.steal_clock = native_steal_clock,
};
.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
.restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
-@@ -336,7 +343,7 @@ struct pv_irq_ops pv_irq_ops = {
- #endif
- };
-
--struct pv_cpu_ops pv_cpu_ops = {
-+struct pv_cpu_ops pv_cpu_ops __read_only = {
- .cpuid = native_cpuid,
- .get_debugreg = native_get_debugreg,
- .set_debugreg = native_set_debugreg,
-@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
- .end_context_switch = paravirt_nop,
- };
-
--struct pv_apic_ops pv_apic_ops = {
-+struct pv_apic_ops pv_apic_ops __read_only = {
- #ifdef CONFIG_X86_LOCAL_APIC
- .startup_ipi_hook = paravirt_nop,
+@@ -401,15 +408,20 @@ struct pv_apic_ops pv_apic_ops = {
#endif
};
};
EXPORT_SYMBOL_GPL(pv_time_ops);
+diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
+index 299d493..79c13dd 100644
+--- a/arch/x86/kernel/pci-calgary_64.c
++++ b/arch/x86/kernel/pci-calgary_64.c
+@@ -1461,7 +1461,7 @@ int __init detect_calgary(void)
+ printk(KERN_INFO "PCI-DMA: Calgary TCE table spec is %d\n",
+ specified_table_size);
+
+- x86_init.iommu.iommu_init = calgary_iommu_init;
++ *(void **)&x86_init.iommu.iommu_init = calgary_iommu_init;
+ }
+ return calgary_found;
+
diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
index 35ccf75..7a15747 100644
--- a/arch/x86/kernel/pci-iommu_table.c
#define DEBUG 1
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index ef6a845..8028ed3 100644
+index b644e1c..4a6d379 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -36,7 +36,8 @@
#ifdef CONFIG_X86_64
static DEFINE_PER_CPU(unsigned char, is_idle);
-@@ -94,7 +95,7 @@ void arch_task_cache_init(void)
+@@ -92,7 +93,7 @@ void arch_task_cache_init(void)
task_xstate_cachep =
kmem_cache_create("task_xstate", xstate_size,
__alignof__(union thread_xstate),
+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
}
- static inline void drop_fpu(struct task_struct *tsk)
-@@ -117,7 +118,7 @@ void exit_thread(void)
+ /*
+@@ -105,7 +106,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
if (bp) {
t->io_bitmap_ptr = NULL;
clear_thread_flag(TIF_IO_BITMAP);
-@@ -148,7 +149,7 @@ void show_regs_common(void)
+@@ -136,7 +137,7 @@ void show_regs_common(void)
board = dmi_get_system_info(DMI_BOARD_NAME);
printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s %s%s%s\n",
init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version,
-@@ -161,6 +162,9 @@ void flush_thread(void)
+@@ -149,6 +150,9 @@ void flush_thread(void)
{
struct task_struct *tsk = current;
+#endif
flush_ptrace_hw_breakpoint(tsk);
memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
- drop_fpu(tsk);
-@@ -318,10 +322,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
- regs.di = (unsigned long) arg;
-
- #ifdef CONFIG_X86_32
-- regs.ds = __USER_DS;
-- regs.es = __USER_DS;
-+ regs.ds = __KERNEL_DS;
-+ regs.es = __KERNEL_DS;
- regs.fs = __KERNEL_PERCPU;
-- regs.gs = __KERNEL_STACK_CANARY;
-+ savesegment(gs, regs.gs);
- #else
- regs.ss = __KERNEL_DS;
- #endif
-@@ -407,7 +411,7 @@ static void __exit_idle(void)
+ drop_init_fpu(tsk);
+@@ -336,7 +340,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
/* idle loop has pid 0 */
return;
__exit_idle();
}
-@@ -516,7 +520,7 @@ bool set_pm_idle_to_default(void)
+@@ -445,7 +449,7 @@ bool set_pm_idle_to_default(void)
return ret;
}
{
local_irq_disable();
/*
-@@ -744,16 +748,37 @@ static int __init idle_setup(char *str)
+@@ -673,16 +677,37 @@ static int __init idle_setup(char *str)
}
early_param("idle", idle_setup);
+}
+#endif
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 516fa18..80bd9e6 100644
+index 44e0bff..5ceb99c 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
-@@ -64,6 +64,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
+@@ -65,6 +65,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
unsigned long thread_saved_pc(struct task_struct *tsk)
{
return ((unsigned long *)tsk->thread.sp)[3];
}
void __show_regs(struct pt_regs *regs, int all)
-@@ -73,15 +74,14 @@ void __show_regs(struct pt_regs *regs, int all)
+@@ -74,21 +75,20 @@ void __show_regs(struct pt_regs *regs, int all)
unsigned long sp;
unsigned short ss, gs;
show_regs_common();
-@@ -134,13 +134,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+ printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
+ (u16)regs->cs, regs->ip, regs->flags,
+- smp_processor_id());
++ raw_smp_processor_id());
+ print_symbol("EIP is at %s\n", regs->ip);
+
+ printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
+@@ -131,20 +131,21 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+ unsigned long arg,
+ struct task_struct *p, struct pt_regs *regs)
+ {
+- struct pt_regs *childregs = task_pt_regs(p);
++ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
struct task_struct *tsk;
int err;
-- childregs = task_pt_regs(p);
-+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
- *childregs = *regs;
- childregs->ax = 0;
- childregs->sp = sp;
-
p->thread.sp = (unsigned long) childregs;
p->thread.sp0 = (unsigned long) (childregs+1);
+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
- p->thread.ip = (unsigned long) ret_from_fork;
-
-@@ -231,7 +232,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+ if (unlikely(!regs)) {
+ /* kernel thread */
+ memset(childregs, 0, sizeof(struct pt_regs));
+ p->thread.ip = (unsigned long) ret_from_kernel_thread;
+- task_user_gs(p) = __KERNEL_STACK_CANARY;
+- childregs->ds = __USER_DS;
+- childregs->es = __USER_DS;
++ savesegment(gs, childregs->gs);
++ childregs->ds = __KERNEL_DS;
++ childregs->es = __KERNEL_DS;
+ childregs->fs = __KERNEL_PERCPU;
+ childregs->bx = sp; /* function */
+ childregs->bp = arg;
+@@ -250,7 +251,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
struct thread_struct *prev = &prev_p->thread,
*next = &next_p->thread;
int cpu = smp_processor_id();
fpu_switch_t fpu;
/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -255,6 +256,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -274,6 +275,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
lazy_save_gs(prev->gs);
/*
* Load the per-thread Thread-Local Storage descriptor.
*/
-@@ -285,6 +290,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -304,6 +309,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
arch_end_context_switch(next_p);
/*
* Restore %gs if needed (which is common)
*/
-@@ -293,8 +301,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -312,8 +320,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
switch_fpu_finish(next_p, fpu);
return prev_p;
}
-@@ -324,4 +330,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -343,4 +349,3 @@ unsigned long get_wchan(struct task_struct *p)
} while (count++ < 16);
return 0;
}
-
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index 0a980c9..1d0e689 100644
+index 16c6365..5d32218 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
-@@ -153,8 +153,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -153,10 +153,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
struct pt_regs *childregs;
struct task_struct *me = current;
-- childregs = ((struct pt_regs *)
-- (THREAD_SIZE + task_stack_page(p))) - 1;
-+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
- *childregs = *regs;
-
- childregs->ax = 0;
-@@ -166,6 +165,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
++ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
+ childregs = task_pt_regs(p);
p->thread.sp = (unsigned long) childregs;
- p->thread.sp0 = (unsigned long) (childregs+1);
p->thread.usersp = me->thread.usersp;
+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
-
set_tsk_thread_flag(p, TIF_FORK);
-
-@@ -271,7 +271,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+ p->fpu_counter = 0;
+ p->thread.io_bitmap_ptr = NULL;
+@@ -274,7 +275,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
struct thread_struct *prev = &prev_p->thread;
struct thread_struct *next = &next_p->thread;
int cpu = smp_processor_id();
unsigned fsindex, gsindex;
fpu_switch_t fpu;
-@@ -353,10 +353,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -356,10 +357,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
prev->usersp = this_cpu_read(old_rsp);
this_cpu_write(old_rsp, next->usersp);
this_cpu_write(current_task, next_p);
/*
* Now maybe reload the debug registers and handle I/O bitmaps
-@@ -425,12 +424,11 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -428,12 +428,11 @@ unsigned long get_wchan(struct task_struct *p)
if (!p || p == current || p->state == TASK_RUNNING)
return 0;
stack = (unsigned long)task_stack_page(p);
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index c4c6a5c..905f440 100644
+index 974b67e..12cb2b5 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
-@@ -824,7 +824,7 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -183,14 +183,13 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
+ {
+ unsigned long context = (unsigned long)regs & ~(THREAD_SIZE - 1);
+ unsigned long sp = (unsigned long)®s->sp;
+- struct thread_info *tinfo;
+
+- if (context == (sp & ~(THREAD_SIZE - 1)))
++ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
+ return sp;
+
+- tinfo = (struct thread_info *)context;
+- if (tinfo->previous_esp)
+- return tinfo->previous_esp;
++ sp = *(unsigned long *)context;
++ if (sp)
++ return sp;
+
+ return (unsigned long)regs;
+ }
+@@ -587,7 +586,7 @@ static void ptrace_triggered(struct perf_event *bp,
+ static unsigned long ptrace_get_dr7(struct perf_event *bp[])
+ {
+ int i;
+- int dr7 = 0;
++ unsigned long dr7 = 0;
+ struct arch_hw_breakpoint *info;
+
+ for (i = 0; i < HBP_NUM; i++) {
+@@ -855,7 +854,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
int ret;
switch (request) {
/* read the word at location addr in the USER area. */
-@@ -909,14 +909,14 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -940,14 +939,14 @@ long arch_ptrace(struct task_struct *child, long request,
if ((int) addr < 0)
return -EIO;
ret = do_get_thread_area(child, addr,
break;
#endif
-@@ -1426,7 +1426,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
+@@ -1325,7 +1324,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
+
+ #ifdef CONFIG_X86_64
+
+-static struct user_regset x86_64_regsets[] __read_mostly = {
++static struct user_regset x86_64_regsets[] = {
+ [REGSET_GENERAL] = {
+ .core_note_type = NT_PRSTATUS,
+ .n = sizeof(struct user_regs_struct) / sizeof(long),
+@@ -1366,7 +1365,7 @@ static const struct user_regset_view user_x86_64_view = {
+ #endif /* CONFIG_X86_64 */
+
+ #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
+-static struct user_regset x86_32_regsets[] __read_mostly = {
++static struct user_regset x86_32_regsets[] = {
+ [REGSET_GENERAL] = {
+ .core_note_type = NT_PRSTATUS,
+ .n = sizeof(struct user_regs_struct32) / sizeof(u32),
+@@ -1419,13 +1418,13 @@ static const struct user_regset_view user_x86_32_view = {
+ */
+ u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
+
+-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
++void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
+ {
+ #ifdef CONFIG_X86_64
+- x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
++ *(unsigned int *)&x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
+ #endif
+ #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
+- x86_32_regsets[REGSET_XSTATE].n = size / sizeof(u64);
++ *(unsigned int *)&x86_32_regsets[REGSET_XSTATE].n = size / sizeof(u64);
+ #endif
+ xstate_fx_sw_bytes[USER_XSTATE_XCR0_WORD] = xstate_mask;
+ }
+@@ -1454,7 +1453,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
memset(info, 0, sizeof(*info));
info->si_signo = SIGTRAP;
info->si_code = si_code;
}
void user_single_step_siginfo(struct task_struct *tsk,
-@@ -1455,6 +1455,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
+@@ -1483,6 +1482,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
# define IS_IA32 0
#endif
/*
* We must return the syscall number to actually look up in the table.
* This can be -1L to skip running any syscall at all.
-@@ -1463,6 +1467,11 @@ long syscall_trace_enter(struct pt_regs *regs)
- {
- long ret = 0;
+@@ -1493,6 +1496,11 @@ long syscall_trace_enter(struct pt_regs *regs)
+
+ rcu_user_exit();
+#ifdef CONFIG_GRKERNSEC_SETXID
+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
-+ gr_delayed_cred_worker();
-+#endif
++ gr_delayed_cred_worker();
++#endif
+
/*
* If we stepped into a sysenter/syscall insn, it trapped in
* kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
-@@ -1511,6 +1520,11 @@ void syscall_trace_leave(struct pt_regs *regs)
- {
- bool step;
+@@ -1548,6 +1556,11 @@ void syscall_trace_leave(struct pt_regs *regs)
+ */
+ rcu_user_exit();
+#ifdef CONFIG_GRKERNSEC_SETXID
+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
-+ gr_delayed_cred_worker();
-+#endif
++ gr_delayed_cred_worker();
++#endif
+
audit_syscall_exit(regs);
return ret;
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 52190a9..8074389 100644
+index 76fa1e9..a93c759 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -36,7 +36,7 @@ void (*pm_power_off)(void);
"rm" (real_mode_header->machine_real_restart_asm),
"a" (type));
#else
-@@ -539,7 +566,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
+@@ -531,7 +558,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
* try to force a triple fault and then cycle between hitting the keyboard
* controller and doing that
*/
{
int i;
int attempt = 0;
-@@ -662,13 +689,13 @@ void native_machine_shutdown(void)
+@@ -654,13 +681,13 @@ void native_machine_shutdown(void)
#endif
}
{
pr_notice("machine restart\n");
-@@ -677,7 +704,7 @@ static void native_machine_restart(char *__unused)
+@@ -669,7 +696,7 @@ static void native_machine_restart(char *__unused)
__machine_emergency_restart(0);
}
{
/* Stop other cpus and apics */
machine_shutdown();
-@@ -687,7 +714,7 @@ static void native_machine_halt(void)
+@@ -679,7 +706,7 @@ static void native_machine_halt(void)
stop_this_cpu(NULL);
}
{
if (pm_power_off) {
if (!reboot_force)
-@@ -696,6 +723,7 @@ static void native_machine_power_off(void)
+@@ -688,6 +715,7 @@ static void native_machine_power_off(void)
}
/* A fallback in case there is no PM info available */
tboot_shutdown(TB_SHUTDOWN_HALT);
1:
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 5cee802..bc22bc3 100644
+index aeacb0e..f9d4c02 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -440,7 +440,7 @@ static void __init parse_setup_data(void)
+@@ -441,7 +441,7 @@ static void __init parse_setup_data(void)
switch (data->type) {
case SETUP_E820_EXT:
break;
case SETUP_DTB:
add_dtb(pa_data);
-@@ -632,7 +632,7 @@ static void __init trim_bios_range(void)
+@@ -710,7 +710,7 @@ static void __init trim_bios_range(void)
* area (640->1Mb) as ram even though it is not.
* take them out.
*/
- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
+
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
}
-
-@@ -755,14 +755,14 @@ void __init setup_arch(char **cmdline_p)
+@@ -834,14 +834,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
root_mountflags &= ~MS_RDONLY;
* Up to this point, the boot CPU has been using .init.data
* area. Reload any changed state for the boot CPU.
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
-index b280908..6de349e 100644
+index 70b27ee..fcf827f 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
-@@ -194,7 +194,7 @@ static unsigned long align_sigframe(unsigned long sp)
+@@ -195,7 +195,7 @@ static unsigned long align_sigframe(unsigned long sp)
* Align the stack pointer according to the i386 ABI,
* i.e. so that on function entry ((sp + 4) & 15) == 0.
*/
#else /* !CONFIG_X86_32 */
sp = round_down(sp, 16) - 8;
#endif
-@@ -245,11 +245,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
- * Return an always-bogus address instead so we will die with SIGSEGV.
- */
- if (onsigstack && !likely(on_sig_stack(sp)))
-- return (void __user *)-1L;
-+ return (__force void __user *)-1L;
-
- /* save i387 state */
- if (used_math() && save_i387_xstate(*fpstate) < 0)
-- return (void __user *)-1L;
-+ return (__force void __user *)-1L;
-
- return (void __user *)sp;
- }
-@@ -304,9 +304,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
+@@ -303,9 +303,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
}
if (current->mm->context.vdso)
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
-@@ -320,7 +320,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
+@@ -319,7 +319,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
* reasons and because gdb uses it as a signature to notice
* signal handler stack frames.
*/
if (err)
return -EFAULT;
-@@ -374,7 +374,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
+@@ -369,7 +369,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+ put_user_ex(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
/* Set up to return from userspace. */
- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
put_user_ex(restorer, &frame->pretcode);
-@@ -386,7 +389,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+@@ -381,7 +384,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
* reasons and because gdb uses it as a signature to notice
* signal handler stack frames.
*/
- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
} put_user_catch(err);
-
- if (err)
+
+ err |= copy_siginfo_to_user(&frame->info, info);
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
-index 7c5a8c3..88d422f 100644
+index f3e2ec8..ad5287a 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
-@@ -670,6 +670,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+@@ -673,6 +673,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
idle->thread.sp = (unsigned long) (((struct pt_regs *)
(THREAD_SIZE + task_stack_page(idle))) - 1);
per_cpu(current_task, cpu) = idle;
#ifdef CONFIG_X86_32
/* Stack for startup_32 can be just as for start_secondary onwards */
-@@ -677,11 +678,13 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+@@ -680,11 +681,13 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
#else
clear_tsk_thread_flag(idle, TIF_FORK);
initial_gs = per_cpu_offset(cpu);
initial_code = (unsigned long)start_secondary;
stack_start = idle->thread.sp;
-@@ -817,6 +820,12 @@ int __cpuinit native_cpu_up(unsigned int cpu, struct task_struct *tidle)
-
- per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
+@@ -823,6 +826,15 @@ int __cpuinit native_cpu_up(unsigned int cpu, struct task_struct *tidle)
+ /* the FPU context is blank, nobody can own it */
+ __cpu_disable_lazy_restore(cpu);
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
+ KERNEL_PGD_PTRS);
+#endif
++
++ /* the FPU context is blank, nobody can own it */
++ __cpu_disable_lazy_restore(cpu);
+
err = do_boot_cpu(apicid, cpu, tidle);
if (err) {
pr_debug("do_boot_cpu failed %d\n", err);
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
-index c346d11..d43b163 100644
+index 9b4d51d..5d28b58 100644
--- a/arch/x86/kernel/step.c
+++ b/arch/x86/kernel/step.c
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
for (i = 0; i < copied; i++) {
switch (opcode[i]) {
diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
-index 0b0cb5f..db6b9ed 100644
---- a/arch/x86/kernel/sys_i386_32.c
+new file mode 100644
+index 0000000..26bb1af
+--- /dev/null
+++ b/arch/x86/kernel/sys_i386_32.c
-@@ -24,17 +24,224 @@
-
- #include <asm/syscalls.h>
-
--/*
-- * Do a system call from kernel instead of calling sys_execve so we
-- * end up with proper pt_regs.
-- */
--int kernel_execve(const char *filename,
-- const char *const argv[],
-- const char *const envp[])
+@@ -0,0 +1,249 @@
++/*
++ * This file contains various random system calls that
++ * have a non-standard calling sequence on the Linux/i386
++ * platform.
++ */
++
++#include <linux/errno.h>
++#include <linux/sched.h>
++#include <linux/mm.h>
++#include <linux/fs.h>
++#include <linux/smp.h>
++#include <linux/sem.h>
++#include <linux/msg.h>
++#include <linux/shm.h>
++#include <linux/stat.h>
++#include <linux/syscalls.h>
++#include <linux/mman.h>
++#include <linux/file.h>
++#include <linux/utsname.h>
++#include <linux/ipc.h>
++
++#include <linux/uaccess.h>
++#include <linux/unistd.h>
++
++#include <asm/syscalls.h>
++
+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
- {
-- long __res;
-- asm volatile ("int $0x80"
-- : "=a" (__res)
-- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
-- return __res;
++{
+ unsigned long pax_task_size = TASK_SIZE;
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ struct mm_struct *mm = current->mm;
+ struct vm_area_struct *vma;
+ unsigned long start_addr, pax_task_size = TASK_SIZE;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
+ addr = PAGE_ALIGN(addr);
+ if (pax_task_size - len >= addr) {
+ vma = find_vma(mm, addr);
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ return addr;
+ }
+ }
+ }
+ return -ENOMEM;
+ }
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ break;
+ if (addr + mm->cached_hole_size < vma->vm_start)
+ mm->cached_hole_size = vma->vm_start - addr;
+ struct vm_area_struct *vma;
+ struct mm_struct *mm = current->mm;
+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
+ addr = PAGE_ALIGN(addr);
+ if (pax_task_size - len >= addr) {
+ vma = find_vma(mm, addr);
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ return addr;
+ }
+ }
+ /* make sure it can fit in the remaining address space */
+ if (addr > len) {
+ vma = find_vma(mm, addr-len);
-+ if (check_heap_stack_gap(vma, addr - len, len))
++ if (check_heap_stack_gap(vma, addr - len, len, offset))
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr-len);
+ }
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr);
+
+ mm->cached_hole_size = vma->vm_start - addr;
+
+ /* try just below the current vma->vm_start */
-+ addr = skip_heap_stack_gap(vma, len);
++ addr = skip_heap_stack_gap(vma, len, offset);
+ } while (!IS_ERR_VALUE(addr));
+
+bottomup:
+ mm->cached_hole_size = ~0UL;
+
+ return addr;
- }
++}
diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
-index b4d3c39..82bb73b 100644
+index b4d3c39..d699d77 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -95,8 +95,8 @@ out:
*end = TASK_SIZE;
}
}
-@@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -128,20 +128,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ struct vm_area_struct *vma;
+ unsigned long start_addr;
+ unsigned long begin, end;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
if (flags & MAP_FIXED)
return addr;
vma = find_vma(mm, addr);
- if (end - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
return addr;
}
if (((flags & MAP_32BIT) || test_thread_flag(TIF_ADDR32))
-@@ -172,7 +175,7 @@ full_search:
+@@ -172,7 +176,7 @@ full_search:
}
return -ENOMEM;
}
- if (!vma || addr + len <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr, len)) {
++ if (check_heap_stack_gap(vma, addr, len, offset)) {
/*
* Remember the place where we stopped the search:
*/
-@@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -195,7 +199,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
{
struct vm_area_struct *vma;
struct mm_struct *mm = current->mm;
- unsigned long addr = addr0, start_addr;
+ unsigned long base = mm->mmap_base, addr = addr0, start_addr;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
/* requested length too big for entire address space */
if (len > TASK_SIZE)
-@@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -208,13 +213,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
goto bottomup;
- return addr;
+ if (TASK_SIZE - len >= addr) {
+ vma = find_vma(mm, addr);
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ return addr;
+ }
}
/* check if free_area_cache is useful for us */
-@@ -240,7 +248,7 @@ try_again:
+@@ -240,7 +250,7 @@ try_again:
* return with success:
*/
vma = find_vma(mm, addr);
- if (!vma || addr+len <= vma->vm_start)
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
/* remember the address as a hint for next time */
return mm->free_area_cache = addr;
-@@ -249,8 +257,8 @@ try_again:
+@@ -249,8 +259,8 @@ try_again:
mm->cached_hole_size = vma->vm_start - addr;
/* try just below the current vma->vm_start */
- addr = vma->vm_start-len;
- } while (len < vma->vm_start);
-+ addr = skip_heap_stack_gap(vma, len);
++ addr = skip_heap_stack_gap(vma, len, offset);
+ } while (!IS_ERR_VALUE(addr));
fail:
/*
-@@ -270,13 +278,21 @@ bottomup:
+@@ -270,13 +280,21 @@ bottomup:
* can happen with large stack limits and large mmap()
* allocations.
*/
else
info = infobuf;
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index b481341..5918bbe 100644
+index 8276dc6..4ca48a2 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
-@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
+@@ -71,12 +71,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
char ignore_fpu_irq;
#endif
DECLARE_BITMAP(used_vectors, NR_VECTORS);
-@@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
+@@ -109,11 +103,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
}
- static void __kprobes
--do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
-+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
- long error_code, siginfo_t *info)
+ static int __kprobes
+-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
++do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
+ struct pt_regs *regs, long error_code)
{
- struct task_struct *tsk = current;
-
#ifdef CONFIG_X86_32
- if (regs->flags & X86_VM_MASK) {
+ if (v8086_mode(regs)) {
/*
- * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
+ * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
* On nmi (interrupt 2), do_trap should not be called.
-@@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
+@@ -126,12 +120,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
+ return -1;
}
#endif
+- if (!user_mode(regs)) {
++ if (!user_mode_novm(regs)) {
+ if (!fixup_exception(regs)) {
+ tsk->thread.error_code = error_code;
+ tsk->thread.trap_nr = trapnr;
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
++ str = "PAX: suspicious stack segment fault";
++#endif
++
+ die(str, regs, error_code);
+ }
++
++#ifdef CONFIG_PAX_REFCOUNT
++ if (trapnr == 4)
++ pax_report_refcount_overflow(regs);
++#endif
++
+ return 0;
+ }
-- if (!user_mode(regs))
-+ if (!user_mode_novm(regs))
- goto kernel_trap;
+@@ -139,7 +145,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
+ }
- #ifdef CONFIG_X86_32
-@@ -147,7 +141,7 @@ trap_signal:
+ static void __kprobes
+-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
++do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
+ long error_code, siginfo_t *info)
+ {
+ struct task_struct *tsk = current;
+@@ -163,7 +169,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
printk_ratelimit()) {
pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
regs->ip, regs->sp, error_code);
print_vma_addr(" in ", regs->ip);
pr_cont("\n");
-@@ -164,8 +158,20 @@ kernel_trap:
- if (!fixup_exception(regs)) {
- tsk->thread.error_code = error_code;
- tsk->thread.trap_nr = trapnr;
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
-+ str = "PAX: suspicious stack segment fault";
-+#endif
-+
- die(str, regs, error_code);
- }
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ if (trapnr == 4)
-+ pax_report_refcount_overflow(regs);
-+#endif
-+
- return;
-
- #ifdef CONFIG_X86_32
-@@ -258,14 +264,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -269,7 +275,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
conditional_sti(regs);
#ifdef CONFIG_X86_32
-- if (regs->flags & X86_VM_MASK)
-+ if (v8086_mode(regs))
- goto gp_in_vm86;
+- if (regs->flags & X86_VM_MASK) {
++ if (v8086_mode(regs)) {
+ local_irq_enable();
+ handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
+ goto exit;
+@@ -277,18 +283,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
#endif
tsk = current;
-- if (!user_mode(regs))
-+ if (!user_mode_novm(regs))
- goto gp_in_kernel;
+- if (!user_mode(regs)) {
++ if (!user_mode_novm(regs)) {
+ if (fixup_exception(regs))
+ goto exit;
+
+ tsk->thread.error_code = error_code;
+ tsk->thread.trap_nr = X86_TRAP_GP;
+ if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
+- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
++ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
++ die("PAX: suspicious general protection fault", regs, error_code);
++ else
++#endif
++
+ die("general protection fault", regs, error_code);
++ }
+ goto exit;
+ }
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
tsk->thread.error_code = error_code;
tsk->thread.trap_nr = X86_TRAP_GP;
-@@ -297,6 +319,13 @@ gp_in_kernel:
- if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
- X86_TRAP_GP, SIGSEGV) == NOTIFY_STOP)
- return;
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
-+ die("PAX: suspicious general protection fault", regs, error_code);
-+ else
-+#endif
-+
- die("general protection fault", regs, error_code);
- }
-
-@@ -432,7 +461,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -443,7 +473,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
/* It's safe to allow irq's after DR6 has been saved */
preempt_conditional_sti(regs);
handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
X86_TRAP_DB);
preempt_conditional_cli(regs);
-@@ -447,7 +476,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -458,7 +488,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
* We already checked v86 mode above, so we can check for kernel mode
* by just checking the CPL of CS.
*/
tsk->thread.debugreg6 &= ~DR_STEP;
set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
regs->flags &= ~X86_EFLAGS_TF;
-@@ -478,7 +507,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
+@@ -490,7 +520,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
return;
conditional_sti(regs);
if (!fixup_exception(regs)) {
task->thread.error_code = error_code;
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
-index 36fd420..7e5892d 100644
+index aafa555..a04691a 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
-@@ -607,7 +607,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
+@@ -614,7 +614,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
int ret = NOTIFY_DONE;
/* We are only interested in userspace traps */
* verify_cpu, returns the status of longmode and SSE in register %eax.
* 0: Success 1: Failure
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
-index 54abcc0..eb6c848 100644
+index 5c9687b..5f857d3 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
@@ -43,6 +43,7 @@
#ifdef CONFIG_SMP
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
-index 992f890..fc38904 100644
+index 992f890..0ab1aae 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
+@@ -114,7 +114,7 @@ static void __init set_vsmp_pv_ops(void)
+ pv_irq_ops.irq_enable = PV_CALLEE_SAVE(vsmp_irq_enable);
+ pv_irq_ops.save_fl = PV_CALLEE_SAVE(vsmp_save_fl);
+ pv_irq_ops.restore_fl = PV_CALLEE_SAVE(vsmp_restore_fl);
+- pv_init_ops.patch = vsmp_patch;
++ *(void **)&pv_init_ops.patch = vsmp_patch;
+ ctl &= ~(1 << 4);
+ }
+ writel(ctl, address + 4);
@@ -217,8 +217,8 @@ static void fill_vector_allocation_domain(int cpu, struct cpumask *retmask,
static void vsmp_apic_post_init(void)
{
}
void __init vsmp_init(void)
+@@ -227,7 +227,7 @@ void __init vsmp_init(void)
+ if (!is_vsmp_box())
+ return;
+
+- x86_platform.apic_post_init = vsmp_apic_post_init;
++ *(void **)&x86_platform.apic_post_init = vsmp_apic_post_init;
+
+ vsmp_cap_cpus();
+
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
-index 8d141b3..40a0fe4 100644
+index 3a3e8c9..1af9465 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -56,15 +56,13 @@
else if (!strcmp("none", str))
vsyscall_mode = NONE;
else
-@@ -306,8 +304,7 @@ done:
+@@ -315,8 +313,7 @@ done:
return true;
sigsegv:
}
/*
-@@ -360,10 +357,7 @@ void __init map_vsyscall(void)
+@@ -369,10 +366,7 @@ void __init map_vsyscall(void)
extern char __vvar_page;
unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
(unsigned long)VSYSCALL_START);
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
-index 6020f6f..bedd6e3 100644
+index 1330dd1..d220b99 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
-@@ -30,8 +30,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
+@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
EXPORT_SYMBOL(copy_user_generic_unrolled);
EXPORT_SYMBOL(copy_user_enhanced_fast_string);
EXPORT_SYMBOL(__copy_user_nocache);
EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(clear_page);
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
-index 3d3e207..1a73ab2 100644
+index ada87a3..afea76d 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
-@@ -132,7 +132,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
- fx_sw_user->xstate_size > fx_sw_user->extended_size)
- return -EINVAL;
-
-- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
-+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
- fx_sw_user->extended_size -
- FP_XSTATE_MAGIC2_SIZE));
- if (err)
-@@ -268,7 +268,7 @@ fx_only:
- * the other extended state.
- */
- xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
-- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
-+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
- }
+@@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
+ {
+ int err;
- /*
-@@ -297,7 +297,7 @@ int restore_i387_xstate(void __user *buf)
++ buf = (struct xsave_struct __user *)____m(buf);
if (use_xsave())
- err = restore_user_xstate(buf);
- else
-- err = fxrstor_checking((__force struct i387_fxsave_struct *)
-+ err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
- buf);
- if (unlikely(err)) {
- /*
+ err = xsave_user(buf);
+ else if (use_fxsr())
+@@ -311,6 +312,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
+ */
+ static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
+ {
++ buf = (void __user *)____m(buf);
+ if (use_xsave()) {
+ if ((unsigned long)buf % 64 || fx_only) {
+ u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
-index 0595f13..b544fa3 100644
+index ec79e77..420f5cc 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
out:
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
-index a3b57a2..ebbe732 100644
+index bba39bf..296540a 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
-@@ -256,6 +256,7 @@ struct gprefix {
+@@ -292,6 +292,7 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
#define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
do { \
__asm__ __volatile__ ( \
_PRE_EFLAGS("0", "4", "2") \
_op _suffix " %"_x"3,%1; " \
-@@ -270,8 +271,6 @@ struct gprefix {
+@@ -306,8 +307,6 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
/* Raw emulation: instruction has two explicit operands. */
#define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
do { \
switch ((ctxt)->dst.bytes) { \
case 2: \
____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
-@@ -287,7 +286,6 @@ struct gprefix {
+@@ -323,7 +322,6 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
#define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
do { \
case 1: \
____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index ce87878..ab48aa3 100644
+index 43e9fad..3b7c059 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
#define APIC_BUS_CYCLE_NS 1
/* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
-index bb7cf01..0348a05 100644
+index 714e2c0..3f7a086 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
-@@ -196,7 +196,7 @@ retry_walk:
+@@ -208,7 +208,7 @@ retry_walk:
if (unlikely(kvm_is_error_hva(host_addr)))
goto error;
+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
goto error;
-
+ walker->ptep_user[walker->level - 1] = ptep_user;
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
-index baead95..90feeb4 100644
+index d017df3..61ae42e 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
-@@ -3516,7 +3516,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
+@@ -3500,7 +3500,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
int cpu = raw_smp_processor_id();
struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
load_TR_desc();
}
-@@ -3894,6 +3898,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -3874,6 +3878,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
#endif
#endif
local_irq_disable();
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index b1eb202..254e292 100644
+index f858159..4ab7dba 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
-@@ -1331,7 +1331,11 @@ static void reload_tss(void)
+@@ -1332,7 +1332,11 @@ static void reload_tss(void)
struct desc_struct *descs;
descs = (void *)gdt->address;
load_TR_desc();
}
-@@ -1541,6 +1545,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
+@@ -1546,6 +1550,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
vmx->loaded_vmcs->cpu = cpu;
-@@ -2674,8 +2682,11 @@ static __init int hardware_setup(void)
+@@ -2669,8 +2677,11 @@ static __init int hardware_setup(void)
if (!cpu_has_vmx_flexpriority())
flexpriority_enabled = 0;
if (enable_ept && !cpu_has_vmx_ept_2m_page())
kvm_disable_largepages();
-@@ -3745,7 +3756,10 @@ static void vmx_set_constant_host_state(void)
+@@ -3712,7 +3723,10 @@ static void vmx_set_constant_host_state(void)
- vmcs_writel(HOST_CR0, read_cr0() | X86_CR0_TS); /* 22.2.3 */
+ vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
+
+#ifndef CONFIG_PAX_PER_CPU_PGD
vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
#ifdef CONFIG_X86_64
-@@ -3767,7 +3781,7 @@ static void vmx_set_constant_host_state(void)
+@@ -3733,7 +3747,7 @@ static void vmx_set_constant_host_state(void)
+ native_store_idt(&dt);
vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
- asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
-- vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
-+ vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
+- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
++ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
-@@ -6321,6 +6335,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
- "jmp .Lkvm_vmx_return \n\t"
- ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
- ".Lkvm_vmx_return: "
+@@ -6279,6 +6293,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+ "jmp 2f \n\t"
+ "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
+ "2: "
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
-+ ".Lkvm_vmx_return2: "
++ "ljmp %[cs],$3f\n\t"
++ "3: "
+#endif
+
/* Save guest registers, load host registers, keep flags */
- "mov %0, %c[wordsize](%%"R"sp) \n\t"
+ "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
"pop %0 \n\t"
-@@ -6369,6 +6389,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -6331,6 +6351,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
#endif
[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
[wordsize]"i"(sizeof(ulong))
+#endif
+
: "cc", "memory"
- , R"ax", R"bx", R"di", R"si"
#ifdef CONFIG_X86_64
-@@ -6376,7 +6401,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
- #endif
- );
+ , "rax", "rbx", "rdi", "rsi"
+@@ -6344,7 +6369,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+ if (debugctlmsr)
+ update_debugctlmsr(debugctlmsr);
-#ifndef CONFIG_X86_64
+#ifdef CONFIG_X86_32
/*
* The sysexit path does not restore ds/es, so we must set them to
* a reasonable value ourselves.
-@@ -6385,8 +6410,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -6353,8 +6378,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
* may be executed in interrupt context, which saves and restore segments
* around it, nullifying its effect.
*/
vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 2966c84..207d0cb 100644
+index 4f76417..93429b5 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
-@@ -1379,8 +1379,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
+@@ -1390,8 +1390,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
{
struct kvm *kvm = vcpu->kvm;
int lm = is_long_mode(vcpu);
u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
: kvm->arch.xen_hvm_config.blob_size_32;
u32 page_num = data & ~PAGE_MASK;
-@@ -2243,6 +2243,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
+@@ -2255,6 +2255,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
if (n < msr_list.nmsrs)
goto out;
r = -EFAULT;
if (copy_to_user(user_msr_list->indices, &msrs_to_save,
num_msrs_to_save * sizeof(u32)))
goto out;
-@@ -2368,7 +2370,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
+@@ -2379,7 +2381,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
struct kvm_interrupt *irq)
{
-- if (irq->irq < 0 || irq->irq >= 256)
-+ if (irq->irq >= 256)
+- if (irq->irq < 0 || irq->irq >= KVM_NR_INTERRUPTS)
++ if (irq->irq >= KVM_NR_INTERRUPTS)
return -EINVAL;
if (irqchip_in_kernel(vcpu->kvm))
return -ENXIO;
-@@ -4889,7 +4891,7 @@ static void kvm_set_mmio_spte_mask(void)
+@@ -4881,7 +4883,7 @@ static void kvm_set_mmio_spte_mask(void)
kvm_mmu_set_mmio_spte_mask(mask);
}
int r;
struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
-index 642d880..cc9ebac 100644
+index 642d880..5dd034e 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1116,12 +1116,12 @@ static u32 lguest_apic_safe_wait_icr_idle(void)
}
/*G:050
+@@ -1292,28 +1293,28 @@ __init void lguest_init(void)
+ pv_irq_ops.safe_halt = lguest_safe_halt;
+
+ /* Setup operations */
+- pv_init_ops.patch = lguest_patch;
++ *(void **)&pv_init_ops.patch = lguest_patch;
+
+ /* Intercepts of various CPU instructions */
+- pv_cpu_ops.load_gdt = lguest_load_gdt;
+- pv_cpu_ops.cpuid = lguest_cpuid;
+- pv_cpu_ops.load_idt = lguest_load_idt;
+- pv_cpu_ops.iret = lguest_iret;
+- pv_cpu_ops.load_sp0 = lguest_load_sp0;
+- pv_cpu_ops.load_tr_desc = lguest_load_tr_desc;
+- pv_cpu_ops.set_ldt = lguest_set_ldt;
+- pv_cpu_ops.load_tls = lguest_load_tls;
+- pv_cpu_ops.set_debugreg = lguest_set_debugreg;
+- pv_cpu_ops.clts = lguest_clts;
+- pv_cpu_ops.read_cr0 = lguest_read_cr0;
+- pv_cpu_ops.write_cr0 = lguest_write_cr0;
+- pv_cpu_ops.read_cr4 = lguest_read_cr4;
+- pv_cpu_ops.write_cr4 = lguest_write_cr4;
+- pv_cpu_ops.write_gdt_entry = lguest_write_gdt_entry;
+- pv_cpu_ops.write_idt_entry = lguest_write_idt_entry;
+- pv_cpu_ops.wbinvd = lguest_wbinvd;
+- pv_cpu_ops.start_context_switch = paravirt_start_context_switch;
+- pv_cpu_ops.end_context_switch = lguest_end_context_switch;
++ *(void **)&pv_cpu_ops.load_gdt = lguest_load_gdt;
++ *(void **)&pv_cpu_ops.cpuid = lguest_cpuid;
++ *(void **)&pv_cpu_ops.load_idt = lguest_load_idt;
++ *(void **)&pv_cpu_ops.iret = lguest_iret;
++ *(void **)&pv_cpu_ops.load_sp0 = lguest_load_sp0;
++ *(void **)&pv_cpu_ops.load_tr_desc = lguest_load_tr_desc;
++ *(void **)&pv_cpu_ops.set_ldt = lguest_set_ldt;
++ *(void **)&pv_cpu_ops.load_tls = lguest_load_tls;
++ *(void **)&pv_cpu_ops.set_debugreg = lguest_set_debugreg;
++ *(void **)&pv_cpu_ops.clts = lguest_clts;
++ *(void **)&pv_cpu_ops.read_cr0 = lguest_read_cr0;
++ *(void **)&pv_cpu_ops.write_cr0 = lguest_write_cr0;
++ *(void **)&pv_cpu_ops.read_cr4 = lguest_read_cr4;
++ *(void **)&pv_cpu_ops.write_cr4 = lguest_write_cr4;
++ *(void **)&pv_cpu_ops.write_gdt_entry = lguest_write_gdt_entry;
++ *(void **)&pv_cpu_ops.write_idt_entry = lguest_write_idt_entry;
++ *(void **)&pv_cpu_ops.wbinvd = lguest_wbinvd;
++ *(void **)&pv_cpu_ops.start_context_switch = paravirt_start_context_switch;
++ *(void **)&pv_cpu_ops.end_context_switch = lguest_end_context_switch;
+
+ /* Pagetable management */
+ pv_mmu_ops.write_cr3 = lguest_write_cr3;
+@@ -1341,11 +1342,11 @@ __init void lguest_init(void)
+ set_lguest_basic_apic_ops();
+ #endif
+
+- x86_init.resources.memory_setup = lguest_memory_setup;
+- x86_init.irqs.intr_init = lguest_init_IRQ;
+- x86_init.timers.timer_init = lguest_time_init;
+- x86_platform.calibrate_tsc = lguest_tsc_khz;
+- x86_platform.get_wallclock = lguest_get_wallclock;
++ *(void **)&x86_init.resources.memory_setup = lguest_memory_setup;
++ *(void **)&x86_init.irqs.intr_init = lguest_init_IRQ;
++ *(void **)&x86_init.timers.timer_init = lguest_time_init;
++ *(void **)&x86_platform.calibrate_tsc = lguest_tsc_khz;
++ *(void **)&x86_platform.get_wallclock = lguest_get_wallclock;
+
+ /*
+ * Now is a good time to look at the implementations of these functions
+@@ -1434,7 +1435,7 @@ __init void lguest_init(void)
+ * routine.
+ */
+ pm_power_off = lguest_power_off;
+- machine_ops.restart = lguest_restart;
++ *(void **)&machine_ops.restart = lguest_restart;
+
+ /*
+ * Now we're set up, call i386_start_kernel() in head32.c and we proceed
diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
index 00933d5..3a64af9 100644
--- a/arch/x86/lib/atomic64_386_32.S
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
-index 5b2995f..78e7644 100644
+index a30ca15..d25fab6 100644
--- a/arch/x86/lib/copy_user_64.S
+++ b/arch/x86/lib/copy_user_64.S
-@@ -17,6 +17,7 @@
- #include <asm/cpufeature.h>
+@@ -18,6 +18,7 @@
#include <asm/alternative-asm.h>
#include <asm/asm.h>
+ #include <asm/smap.h>
+#include <asm/pgtable.h>
/*
* By placing feature2 after feature1 in altinstructions section, we logically
-@@ -30,7 +31,7 @@
+@@ -31,7 +32,7 @@
.byte 0xe9 /* 32bit jump */
.long \orig-1f /* by default jump to orig */
1:
2: .byte 0xe9 /* near jump with 32bit immediate */
.long \alt1-1b /* offset */ /* or alternatively to alt1 */
3: .byte 0xe9 /* near jump with 32bit immediate */
-@@ -69,47 +70,20 @@
+@@ -70,47 +71,20 @@
#endif
.endm
ret
CFI_ENDPROC
ENDPROC(bad_from_user)
-@@ -139,19 +113,19 @@ ENTRY(copy_user_generic_unrolled)
+@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
jz 17f
1: movq (%rsi),%r8
2: movq 1*8(%rsi),%r9
16: movq %r11,7*8(%rdi)
leaq 64(%rsi),%rsi
leaq 64(%rdi),%rdi
-@@ -177,6 +151,7 @@ ENTRY(copy_user_generic_unrolled)
- decl %ecx
+@@ -180,6 +154,7 @@ ENTRY(copy_user_generic_unrolled)
jnz 21b
23: xor %eax,%eax
+ ASM_CLAC
+ pax_force_retaddr
ret
.section .fixup,"ax"
-@@ -246,6 +221,7 @@ ENTRY(copy_user_generic_string)
- 3: rep
+@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
movsb
4: xorl %eax,%eax
+ ASM_CLAC
+ pax_force_retaddr
ret
.section .fixup,"ax"
-@@ -279,6 +255,7 @@ ENTRY(copy_user_enhanced_fast_string)
- 1: rep
+@@ -286,6 +262,7 @@ ENTRY(copy_user_enhanced_fast_string)
movsb
2: xorl %eax,%eax
+ ASM_CLAC
+ pax_force_retaddr
ret
.section .fixup,"ax"
diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
-index cacddc7..09d49e4 100644
+index 6a4f43c..f5f9e26 100644
--- a/arch/x86/lib/copy_user_nocache_64.S
+++ b/arch/x86/lib/copy_user_nocache_64.S
@@ -8,6 +8,7 @@
#define FIX_ALIGNMENT 1
-@@ -15,6 +16,7 @@
- #include <asm/asm-offsets.h>
+@@ -16,6 +17,7 @@
#include <asm/thread_info.h>
#include <asm/asm.h>
+ #include <asm/smap.h>
+#include <asm/pgtable.h>
.macro ALIGN_DESTINATION
#ifdef FIX_ALIGNMENT
-@@ -48,6 +50,15 @@
+@@ -49,6 +51,15 @@
*/
ENTRY(__copy_user_nocache)
CFI_STARTPROC
+1:
+#endif
+
+ ASM_STAC
cmpl $8,%edx
jb 20f /* less then 8 bytes, go to byte copy loop */
- ALIGN_DESTINATION
-@@ -57,19 +68,19 @@ ENTRY(__copy_user_nocache)
+@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
jz 17f
1: movq (%rsi),%r8
2: movq 1*8(%rsi),%r9
16: movnti %r11,7*8(%rdi)
leaq 64(%rsi),%rsi
leaq 64(%rdi),%rdi
-@@ -96,6 +107,7 @@ ENTRY(__copy_user_nocache)
- jnz 21b
+@@ -99,6 +110,7 @@ ENTRY(__copy_user_nocache)
23: xorl %eax,%eax
+ ASM_CLAC
sfence
+ pax_force_retaddr
ret
CFI_RESTORE_STATE
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
-index 25b7ae8..3b52ccd 100644
+index 25b7ae8..169fafc 100644
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
-@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
+@@ -52,7 +52,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
len -= 2;
}
}
- isum = csum_partial_copy_generic((__force const void *)src,
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
-+ src += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
++ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
dst, len, isum, errp, NULL);
if (unlikely(*errp))
goto out_err;
-@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
+@@ -105,7 +105,7 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
}
*errp = 0;
- return csum_partial_copy_generic(src, (void __force *)dst,
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
-+ dst += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
++ return csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
len, isum, NULL, errp);
}
EXPORT_SYMBOL(csum_partial_copy_to_user);
diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
-index b33b1fb..219f389 100644
+index 156b9c8..b144132 100644
--- a/arch/x86/lib/getuser.S
+++ b/arch/x86/lib/getuser.S
-@@ -33,15 +33,38 @@
- #include <asm/asm-offsets.h>
+@@ -34,17 +34,40 @@
#include <asm/thread_info.h>
#include <asm/asm.h>
+ #include <asm/smap.h>
+#include <asm/segment.h>
+#include <asm/pgtable.h>
+#include <asm/alternative-asm.h>
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
+ ASM_STAC
-1: movzb (%_ASM_AX),%edx
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+
+1: __copyuser_seg movzb (%_ASM_AX),%edx
xor %eax,%eax
+ ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
ENDPROC(__get_user_1)
-@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
+@@ -52,14 +75,28 @@ ENDPROC(__get_user_1)
ENTRY(__get_user_2)
CFI_STARTPROC
add $1,%_ASM_AX
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
+ ASM_STAC
-2: movzwl -1(%_ASM_AX),%edx
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+
+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
xor %eax,%eax
+ ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
ENDPROC(__get_user_2)
-@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
+@@ -67,14 +104,28 @@ ENDPROC(__get_user_2)
ENTRY(__get_user_4)
CFI_STARTPROC
add $3,%_ASM_AX
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
+ ASM_STAC
-3: mov -3(%_ASM_AX),%edx
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+
+3: __copyuser_seg mov -3(%_ASM_AX),%edx
xor %eax,%eax
+ ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
ENDPROC(__get_user_4)
-@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
+@@ -87,10 +138,20 @@ ENTRY(__get_user_8)
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
+1234:
+#endif
+
+ ASM_STAC
4: movq -7(%_ASM_AX),%_ASM_DX
xor %eax,%eax
+ ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
ENDPROC(__get_user_8)
-@@ -91,6 +152,7 @@ bad_get_user:
- CFI_STARTPROC
+@@ -101,6 +162,7 @@ bad_get_user:
xor %edx,%edx
mov $(-EFAULT),%_ASM_AX
+ ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
END(bad_get_user)
diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
-index b1e6c4b..21ae8fc 100644
+index 54fcffe..7be149e 100644
--- a/arch/x86/lib/insn.c
+++ b/arch/x86/lib/insn.c
-@@ -21,6 +21,11 @@
+@@ -20,8 +20,10 @@
+
+ #ifdef __KERNEL__
#include <linux/string.h>
- #include <asm/inat.h>
- #include <asm/insn.h>
-+#ifdef __KERNEL__
+#include <asm/pgtable_types.h>
-+#else
+ #else
+ #include <string.h>
+#define ktla_ktva(addr) addr
-+#endif
-
- /* Verify next sizeof(t) bytes can be on the same instruction */
- #define validate_next(t, insn, n) \
-@@ -49,8 +54,8 @@
+ #endif
+ #include <asm/inat.h>
+ #include <asm/insn.h>
+@@ -53,8 +55,8 @@
void insn_init(struct insn *insn, const void *kaddr, int x86_64)
{
memset(insn, 0, sizeof(*insn));
3:
CFI_RESTORE_STATE
diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
-index 7f951c8..ebd573a 100644
+index fc6ba17..04471c5 100644
--- a/arch/x86/lib/putuser.S
+++ b/arch/x86/lib/putuser.S
-@@ -15,7 +15,9 @@
- #include <asm/thread_info.h>
+@@ -16,7 +16,9 @@
#include <asm/errno.h>
#include <asm/asm.h>
+ #include <asm/smap.h>
-
+#include <asm/segment.h>
+#include <asm/pgtable.h>
/*
* __put_user_X
-@@ -29,52 +31,119 @@
+@@ -30,57 +32,125 @@
* as they get called from within inline assembly.
*/
-#define ENTER CFI_STARTPROC ; \
- GET_THREAD_INFO(%_ASM_BX)
--#define EXIT ret ; \
+-#define EXIT ASM_CLAC ; \
+- ret ; \
+#define ENTER CFI_STARTPROC
-+#define EXIT pax_force_retaddr; ret ; \
++#define EXIT ASM_CLAC ; \
++ pax_force_retaddr ; \
++ ret ; \
CFI_ENDPROC
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ GET_THREAD_INFO(%_ASM_BX)
cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
jae bad_put_user
+ ASM_STAC
-1: movb %al,(%_ASM_CX)
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
sub $1,%_ASM_BX
cmp %_ASM_BX,%_ASM_CX
jae bad_put_user
+ ASM_STAC
-2: movw %ax,(%_ASM_CX)
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
sub $3,%_ASM_BX
cmp %_ASM_BX,%_ASM_CX
jae bad_put_user
+ ASM_STAC
-3: movl %eax,(%_ASM_CX)
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
sub $7,%_ASM_BX
cmp %_ASM_BX,%_ASM_CX
jae bad_put_user
+ ASM_STAC
-4: mov %_ASM_AX,(%_ASM_CX)
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
ret
CFI_ENDPROC
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
-index 1781b2f..90368dd 100644
+index 98f6d6b6..d27f045 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
-@@ -42,10 +42,12 @@ do { \
+@@ -42,11 +42,13 @@ do { \
int __d0; \
might_fault(); \
__asm__ __volatile__( \
+ __COPYUSER_SET_ES \
+ ASM_STAC "\n" \
"0: rep; stosl\n" \
" movl %2,%0\n" \
"1: rep; stosb\n" \
- "2:\n" \
+ "2: " ASM_CLAC "\n" \
+ __COPYUSER_RESTORE_ES \
".section .fixup,\"ax\"\n" \
"3: lea 0(%2,%0,4),%0\n" \
" jmp 2b\n" \
-@@ -97,7 +99,7 @@ EXPORT_SYMBOL(__clear_user);
+@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
#ifdef CONFIG_X86_INTEL_USERCOPY
static unsigned long
{
int d0, d1;
__asm__ __volatile__(
-@@ -109,36 +111,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
+@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
" .align 2,0x90\n"
"3: movl 0(%4), %%eax\n"
"4: movl 4(%4), %%edx\n"
" addl $-64, %0\n"
" addl $64, %4\n"
" addl $64, %3\n"
-@@ -148,10 +150,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
+@@ -149,10 +151,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
" shrl $2, %0\n"
" andl $3, %%eax\n"
" cld\n"
".section .fixup,\"ax\"\n"
"101: lea 0(%%eax,%0,4),%0\n"
" jmp 100b\n"
-@@ -201,46 +205,150 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
+@@ -202,46 +206,150 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
}
static unsigned long
" movl %%eax, 56(%3)\n"
" movl %%edx, 60(%3)\n"
" addl $-64, %0\n"
-@@ -252,9 +360,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
+@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
" shrl $2, %0\n"
" andl $3, %%eax\n"
" cld\n"
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
-@@ -297,48 +405,48 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
+@@ -298,48 +406,48 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
* hyoshiok@miraclelinux.com
*/
" movnti %%eax, 56(%3)\n"
" movnti %%edx, 60(%3)\n"
" addl $-64, %0\n"
-@@ -351,9 +459,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
+@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
" shrl $2, %0\n"
" andl $3, %%eax\n"
" cld\n"
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
-@@ -391,48 +499,48 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
+@@ -392,48 +500,48 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
return size;
}
" movnti %%eax, 56(%3)\n"
" movnti %%edx, 60(%3)\n"
" addl $-64, %0\n"
-@@ -445,9 +553,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
+@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
" shrl $2, %0\n"
" andl $3, %%eax\n"
" cld\n"
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
-@@ -487,32 +595,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
+@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
*/
unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
unsigned long size);
".section .fixup,\"ax\"\n" \
"5: addl %3,%0\n" \
" jmp 2b\n" \
-@@ -537,14 +649,14 @@ do { \
+@@ -538,14 +650,14 @@ do { \
" negl %0\n" \
" andl $7,%0\n" \
" subl %0,%3\n" \
"2:\n" \
".section .fixup,\"ax\"\n" \
"5: addl %3,%0\n" \
-@@ -627,9 +739,9 @@ survive:
- }
+@@ -629,9 +741,9 @@ survive:
#endif
+ stac();
if (movsl_is_ok(to, from, n))
- __copy_user(to, from, n);
+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
else
- n = __copy_user_intel(to, from, n);
+ n = __generic_copy_to_user_intel(to, from, n);
+ clac();
return n;
}
- EXPORT_SYMBOL(__copy_to_user_ll);
-@@ -649,10 +761,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
- unsigned long n)
+@@ -655,10 +767,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
{
+ stac();
if (movsl_is_ok(to, from, n))
- __copy_user(to, from, n);
+ __copy_user(to, from, n, __copyuser_seg, "", "");
- n = __copy_user_intel((void __user *)to,
- (const void *)from, n);
+ n = __generic_copy_from_user_intel(to, from, n);
+ clac();
return n;
}
- EXPORT_SYMBOL(__copy_from_user_ll_nozero);
-@@ -679,65 +790,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
+@@ -689,66 +800,51 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
if (n > 64 && cpu_has_xmm2)
n = __copy_user_intel_nocache(to, from, n);
else
- __copy_user(to, from, n);
+ __copy_user(to, from, n, __copyuser_seg, "", "");
#endif
+ clac();
return n;
}
EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
+EXPORT_SYMBOL(set_fs);
+#endif
diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
-index e5b130b..6690d31 100644
+index 05928aa..b33dea1 100644
--- a/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
-@@ -16,6 +16,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
- {
- long __d0;
- might_fault();
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
-+ addr += PAX_USER_SHADOW_BASE;
-+#endif
-+
- /* no memory constraint because it doesn't change any memory gcc knows
- about */
- asm volatile(
-@@ -52,12 +58,20 @@ unsigned long clear_user(void __user *to, unsigned long n)
+@@ -39,7 +39,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
+ _ASM_EXTABLE(0b,3b)
+ _ASM_EXTABLE(1b,2b)
+ : [size8] "=&c"(size), [dst] "=&D" (__d0)
+- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
++ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
+ [zero] "r" (0UL), [eight] "r" (8UL));
+ clac();
+ return size;
+@@ -54,12 +54,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
}
EXPORT_SYMBOL(clear_user);
- return copy_user_generic((__force void *)to, (__force void *)from, len);
- }
- return len;
-+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
-+ to += PAX_USER_SHADOW_BASE;
-+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
-+ from += PAX_USER_SHADOW_BASE;
-+#endif
-+
-+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
-+ }
++ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
++ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
+ return len;
}
EXPORT_SYMBOL(copy_in_user);
-@@ -67,7 +81,7 @@ EXPORT_SYMBOL(copy_in_user);
+@@ -69,7 +68,7 @@ EXPORT_SYMBOL(copy_in_user);
* it is not necessary to optimize tail handling.
*/
unsigned long
{
char c;
unsigned zero_len;
-@@ -84,3 +98,15 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
- break;
+@@ -87,3 +86,15 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
+ clac();
return len;
}
+
}
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index 76dcd9d..e9dffde 100644
+index 8e13ecb..60bf506 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
-@@ -13,11 +13,18 @@
+@@ -13,12 +13,19 @@
#include <linux/perf_event.h> /* perf_sw_event */
#include <linux/hugetlb.h> /* hstate_index_to_shift */
#include <linux/prefetch.h> /* prefetchw */
#include <asm/pgalloc.h> /* pgd_*(), ... */
#include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
#include <asm/fixmap.h> /* VSYSCALL_START */
+ #include <asm/rcu.h> /* exception_enter(), ... */
+#include <asm/tlbflush.h>
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
/*
* Page fault error code bits:
-@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
+@@ -56,7 +63,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
int ret = 0;
/* kprobe_running() needs smp_processor_id() */
preempt_disable();
if (kprobe_running() && kprobe_fault_handler(regs, 14))
ret = 1;
-@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
+@@ -117,7 +124,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
return !instr_lo || (instr_lo>>1) == 1;
case 0x00:
/* Prefetch instruction is 0x0F0D or 0x0F18 */
return 0;
*prefetch = (instr_lo == 0xF) &&
-@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
+@@ -151,7 +161,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
while (instr < max_instr) {
unsigned char opcode;
break;
instr++;
-@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
+@@ -182,6 +195,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
force_sig_info(si_signo, &info, tsk);
}
DEFINE_SPINLOCK(pgd_lock);
LIST_HEAD(pgd_list);
-@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
+@@ -232,10 +273,22 @@ void vmalloc_sync_all(void)
for (address = VMALLOC_START & PMD_MASK;
address >= TASK_SIZE && address < FIXADDR_TOP;
address += PMD_SIZE) {
spinlock_t *pgt_lock;
pmd_t *ret;
-@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
+@@ -243,8 +296,13 @@ void vmalloc_sync_all(void)
pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
spin_lock(pgt_lock);
if (!ret)
break;
-@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
+@@ -278,6 +336,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
* an interrupt in the middle of a task switch..
*/
pgd_paddr = read_cr3();
pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
if (!pmd_k)
return -1;
-@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
+@@ -373,7 +436,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
* happen within a race in page table update. In the later
* case just flush:
*/
pgd_ref = pgd_offset_k(address);
if (pgd_none(*pgd_ref))
return -1;
-@@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
+@@ -541,7 +611,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
static int is_errata100(struct pt_regs *regs, unsigned long address)
{
#ifdef CONFIG_X86_64
return 1;
#endif
return 0;
-@@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
+@@ -568,7 +638,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
}
static const char nx_warning[] = KERN_CRIT
static void
show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
+@@ -577,15 +647,27 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
if (!oops_may_print())
return;
+ if (init_mm.start_code <= address && address < init_mm.end_code) {
+ if (current->signal->curr_ip)
+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
-+ ¤t->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
++ ¤t->signal->curr_ip, current->comm, task_pid_nr(current),
++ from_kuid(&init_user_ns, current_uid()), from_kuid(&init_user_ns, current_euid()));
+ else
-+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
-+ current->comm, task_pid_nr(current), current_uid(), current_euid());
++ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
++ from_kuid(&init_user_ns, current_uid()), from_kuid(&init_user_ns, current_euid()));
+ }
+#endif
+
printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE)
printk(KERN_CONT "NULL pointer dereference");
-@@ -748,6 +829,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
+@@ -749,12 +831,30 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
}
#endif
+- if (unlikely(show_unhandled_signals))
+- show_signal_msg(regs, error_code, address, tsk);
+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
+ if (pax_is_fetch_fault(regs, error_code, address)) {
+
+ do_group_exit(SIGKILL);
+ }
+#endif
+
+ /* Kernel addresses are always protection faults: */
++ if (address >= TASK_SIZE)
++ error_code |= PF_PROT;
++
++ if (show_unhandled_signals)
++ show_signal_msg(regs, error_code, address, tsk);
+
- if (unlikely(show_unhandled_signals))
- show_signal_msg(regs, error_code, address, tsk);
+ tsk->thread.cr2 = address;
+- tsk->thread.error_code = error_code | (address >= TASK_SIZE);
++ tsk->thread.error_code = error_code;
+ tsk->thread.trap_nr = X86_TRAP_PF;
-@@ -844,7 +940,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
+ force_sig_info_fault(SIGSEGV, si_code, address, tsk, 0);
+@@ -845,7 +945,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
printk(KERN_ERR
"MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
code = BUS_MCEERR_AR;
}
#endif
-@@ -900,6 +996,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
+@@ -901,6 +1001,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
return 1;
}
/*
* Handle a spurious fault caused by a stale TLB entry.
*
-@@ -972,6 +1161,9 @@ int show_unhandled_signals = 1;
+@@ -973,6 +1166,9 @@ int show_unhandled_signals = 1;
static inline int
access_error(unsigned long error_code, struct vm_area_struct *vma)
{
if (error_code & PF_WRITE) {
/* write, present and write, not present: */
if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -1005,18 +1197,33 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
+@@ -1001,7 +1197,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
+ if (error_code & PF_USER)
+ return false;
+
+- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
++ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
+ return false;
+
+ return true;
+@@ -1017,18 +1213,33 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
{
struct vm_area_struct *vma;
struct task_struct *tsk;
/*
* Detect and handle instructions that would cause a page fault for
-@@ -1077,7 +1284,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
+@@ -1089,7 +1300,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
* User-mode registers count as a user access even for any
* potential system fault or CPU buglet:
*/
local_irq_enable();
error_code |= PF_USER;
} else {
-@@ -1132,6 +1339,11 @@ retry:
+@@ -1151,6 +1362,11 @@ retry:
might_sleep();
}
vma = find_vma(mm, address);
if (unlikely(!vma)) {
bad_area(regs, error_code, address);
-@@ -1143,18 +1355,24 @@ retry:
+@@ -1162,18 +1378,24 @@ retry:
bad_area(regs, error_code, address);
return;
}
if (unlikely(expand_stack(vma, address))) {
bad_area(regs, error_code, address);
return;
-@@ -1209,3 +1427,292 @@ good_area:
-
- up_read(&mm->mmap_sem);
+@@ -1237,3 +1459,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
+ __do_page_fault(regs, error_code);
+ exception_exit(regs);
}
+
+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
return (void *)vaddr;
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
-index b91e485..d00e7c9 100644
+index 937bff5..dce75ff 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
-@@ -277,13 +277,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
+@@ -276,13 +276,21 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
- unsigned long start_addr;
+ unsigned long start_addr, pax_task_size = TASK_SIZE;
++ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
}
full_search:
-@@ -291,26 +298,27 @@ full_search:
+@@ -290,26 +298,27 @@ full_search:
for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
/* At this point: (!vma || addr < vma->vm_end). */
- mm->free_area_cache = addr + len;
- return addr;
- }
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ break;
if (addr + mm->cached_hole_size < vma->vm_start)
mm->cached_hole_size = vma->vm_start - addr;
}
static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
-@@ -321,9 +329,8 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -320,9 +329,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
unsigned long base = mm->mmap_base;
+ unsigned long addr;
unsigned long largest_hole = mm->cached_hole_size;
- unsigned long start_addr;
++ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
/* don't allow allocations above current base */
if (mm->free_area_cache > base)
-@@ -333,16 +340,15 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -332,16 +341,15 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
largest_hole = 0;
mm->free_area_cache = base;
}
/*
* Lookup failure means no vma is above this address,
* i.e. return with success:
-@@ -351,10 +357,10 @@ try_again:
+@@ -350,10 +358,10 @@ try_again:
if (!vma)
return addr;
- if (addr + len <= vma->vm_start) {
-+ if (check_heap_stack_gap(vma, addr, len)) {
++ if (check_heap_stack_gap(vma, addr, len, offset)) {
/* remember the address as a hint for next time */
- mm->cached_hole_size = largest_hole;
- return (mm->free_area_cache = addr);
} else if (mm->free_area_cache == vma->vm_end) {
/* pull free_area_cache down to the first hole */
mm->free_area_cache = vma->vm_start;
-@@ -363,29 +369,34 @@ try_again:
+@@ -362,29 +370,34 @@ try_again:
/* remember the largest hole we saw so far */
if (addr + largest_hole < vma->vm_start)
/* try just below the current vma->vm_start */
- addr = (vma->vm_start - len) & huge_page_mask(h);
- } while (len <= vma->vm_start);
-+ addr = skip_heap_stack_gap(vma, len);
++ addr = skip_heap_stack_gap(vma, len, offset);
+ } while (!IS_ERR_VALUE(addr));
fail:
mm->cached_hole_size = ~0UL;
addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
len, pgoff, flags);
-@@ -393,6 +404,7 @@ fail:
+@@ -392,6 +405,7 @@ fail:
/*
* Restore the topdown base:
*/
mm->free_area_cache = base;
mm->cached_hole_size = ~0UL;
-@@ -406,10 +418,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -405,10 +419,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
+ unsigned long pax_task_size = TASK_SIZE;
++ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
if (len & ~huge_page_mask(h))
return -EINVAL;
return -ENOMEM;
if (flags & MAP_FIXED) {
-@@ -421,8 +442,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -417,11 +441,14 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+ return addr;
+ }
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
if (addr) {
addr = ALIGN(addr, huge_page_size(h));
vma = find_vma(mm, addr);
- if (TASK_SIZE - len >= addr &&
- (!vma || addr + len <= vma->vm_start))
-+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
++ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 575d86f..4987469 100644
+index 11a5800..4bd9977 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -73,36 +73,6 @@ static __init void *alloc_low_page(void)
prot = PAGE_KERNEL_EXEC;
pages_4k++;
-@@ -465,7 +466,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
+@@ -465,7 +466,7 @@ void __init native_pagetable_init(void)
pud = pud_offset(pgd, va);
pmd = pmd_offset(pud, va);
break;
pte = pte_offset_kernel(pmd, va);
-@@ -517,12 +518,10 @@ void __init early_ioremap_page_table_range_init(void)
+@@ -514,12 +515,10 @@ void __init early_ioremap_page_table_range_init(void)
static void __init pagetable_init(void)
{
EXPORT_SYMBOL_GPL(__supported_pte_mask);
/* user-defined highmem size */
-@@ -734,6 +733,12 @@ void __init mem_init(void)
+@@ -731,6 +730,12 @@ void __init mem_init(void)
pci_iommu_alloc();
#ifdef CONFIG_FLATMEM
BUG_ON(!mem_map);
#endif
-@@ -760,7 +765,7 @@ void __init mem_init(void)
+@@ -757,7 +762,7 @@ void __init mem_init(void)
reservedpages++;
codesize = (unsigned long) &_etext - (unsigned long) &_text;
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-@@ -801,10 +806,10 @@ void __init mem_init(void)
+@@ -798,10 +803,10 @@ void __init mem_init(void)
((unsigned long)&__init_end -
(unsigned long)&__init_begin) >> 10,
((unsigned long)&_etext - (unsigned long)&_text) >> 10);
/*
-@@ -882,6 +887,7 @@ void set_kernel_text_rw(void)
+@@ -879,6 +884,7 @@ void set_kernel_text_rw(void)
if (!kernel_set_to_readonly)
return;
pr_debug("Set kernel text: %lx - %lx for read write\n",
start, start+size);
-@@ -896,6 +902,7 @@ void set_kernel_text_ro(void)
+@@ -893,6 +899,7 @@ void set_kernel_text_ro(void)
if (!kernel_set_to_readonly)
return;
pr_debug("Set kernel text: %lx - %lx for read only\n",
start, start+size);
-@@ -924,6 +931,7 @@ void mark_rodata_ro(void)
+@@ -921,6 +928,7 @@ void mark_rodata_ro(void)
unsigned long start = PFN_ALIGN(_text);
unsigned long size = PFN_ALIGN(_etext) - start;
return (void *)vaddr;
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index 78fe3f1..8293b6f 100644
+index 78fe3f1..2f9433c 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
return NULL;
WARN_ON_ONCE(is_ram);
}
+@@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioremap_prot);
+ *
+ * Caller must ensure there is only one unmapping for the same pointer.
+ */
+-void iounmap(volatile void __iomem *addr)
++void iounmap(const volatile void __iomem *addr)
+ {
+ struct vm_struct *p, *o;
+
@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
/* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
mm->unmap_area = arch_unmap_area_topdown;
}
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
-index dc0b727..dc9d71a 100644
+index dc0b727..f612039 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
};
map.map_id = trace->id;
+@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
+ ioremap_trace_core(offset, size, addr);
+ }
+
+-static void iounmap_trace_core(volatile void __iomem *addr)
++static void iounmap_trace_core(const volatile void __iomem *addr)
+ {
+ struct mmiotrace_map map = {
+ .phys = 0,
+@@ -328,7 +328,7 @@ not_enabled:
+ }
+ }
+
+-void mmiotrace_iounmap(volatile void __iomem *addr)
++void mmiotrace_iounmap(const volatile void __iomem *addr)
+ {
+ might_sleep();
+ if (is_enabled()) /* recheck and proper locking in *_core() */
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index b008656..773eac2 100644
--- a/arch/x86/mm/pageattr-test.c
struct split_state {
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
-index a718e0d..45efc32 100644
+index a718e0d..77419bc 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
#endif
+#ifdef CONFIG_PAX_KERNEXEC
-+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
++ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
+ pgprot_val(forbidden) |= _PAGE_RW;
+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
+ }
static int
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index 3d68ef6..7f69136 100644
+index 0eb572e..92f5c1e 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
}
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 613cd83..3a21f1c 100644
+index 60f926c..a710970 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -48,7 +48,11 @@ void leave_mm(int cpu)
+ pax_force_retaddr
ret
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
-index 33643a8..8e44870 100644
+index 520d2bd..b895ef4 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
-@@ -120,6 +120,11 @@ static inline void bpf_flush_icache(void *start, void *end)
+@@ -11,6 +11,7 @@
+ #include <asm/cacheflush.h>
+ #include <linux/netdevice.h>
+ #include <linux/filter.h>
++#include <linux/random.h>
+
+ /*
+ * Conventions :
+@@ -48,13 +49,87 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
+ return ptr + len;
+ }
+
++#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
++#define MAX_INSTR_CODE_SIZE 96
++#else
++#define MAX_INSTR_CODE_SIZE 64
++#endif
++
+ #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
+
+ #define EMIT1(b1) EMIT(b1, 1)
+ #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
+ #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
+ #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
++
++#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
++/* original constant will appear in ecx */
++#define DILUTE_CONST_SEQUENCE(_off, _key) \
++do { \
++ /* mov ecx, randkey */ \
++ EMIT1(0xb9); \
++ EMIT(_key, 4); \
++ /* xor ecx, randkey ^ off */ \
++ EMIT2(0x81, 0xf1); \
++ EMIT((_key) ^ (_off), 4); \
++} while (0)
++
++#define EMIT1_off32(b1, _off) \
++do { \
++ switch (b1) { \
++ case 0x05: /* add eax, imm32 */ \
++ case 0x2d: /* sub eax, imm32 */ \
++ case 0x25: /* and eax, imm32 */ \
++ case 0x0d: /* or eax, imm32 */ \
++ case 0xb8: /* mov eax, imm32 */ \
++ case 0x3d: /* cmp eax, imm32 */ \
++ case 0xa9: /* test eax, imm32 */ \
++ DILUTE_CONST_SEQUENCE(_off, randkey); \
++ EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
++ break; \
++ case 0xbb: /* mov ebx, imm32 */ \
++ DILUTE_CONST_SEQUENCE(_off, randkey); \
++ /* mov ebx, ecx */ \
++ EMIT2(0x89, 0xcb); \
++ break; \
++ case 0xbe: /* mov esi, imm32 */ \
++ DILUTE_CONST_SEQUENCE(_off, randkey); \
++ /* mov esi, ecx */ \
++ EMIT2(0x89, 0xce); \
++ break; \
++ case 0xe9: /* jmp rel imm32 */ \
++ EMIT1(b1); \
++ EMIT(_off, 4); \
++ /* prevent fall-through, we're not called if off = 0 */ \
++ EMIT(0xcccccccc, 4); \
++ EMIT(0xcccccccc, 4); \
++ break; \
++ default: \
++ EMIT1(b1); \
++ EMIT(_off, 4); \
++ } \
++} while (0)
++
++#define EMIT2_off32(b1, b2, _off) \
++do { \
++ if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
++ EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
++ EMIT(randkey, 4); \
++ EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
++ EMIT((_off) - randkey, 4); \
++ } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
++ DILUTE_CONST_SEQUENCE(_off, randkey); \
++ /* imul eax, ecx */ \
++ EMIT3(0x0f, 0xaf, 0xc1); \
++ } else { \
++ EMIT2(b1, b2); \
++ EMIT(_off, 4); \
++ } \
++} while (0)
++#else
+ #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
++#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
++#endif
+
+ #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
+ #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
+@@ -89,6 +164,24 @@ do { \
+ #define X86_JBE 0x76
+ #define X86_JA 0x77
+
++#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
++#define APPEND_FLOW_VERIFY() \
++do { \
++ /* mov ecx, randkey */ \
++ EMIT1(0xb9); \
++ EMIT(randkey, 4); \
++ /* cmp ecx, randkey */ \
++ EMIT2(0x81, 0xf9); \
++ EMIT(randkey, 4); \
++ /* jz after 8 int 3s */ \
++ EMIT2(0x74, 0x08); \
++ EMIT(0xcccccccc, 4); \
++ EMIT(0xcccccccc, 4); \
++} while (0)
++#else
++#define APPEND_FLOW_VERIFY() do { } while (0)
++#endif
++
+ #define EMIT_COND_JMP(op, offset) \
+ do { \
+ if (is_near(offset)) \
+@@ -96,6 +189,7 @@ do { \
+ else { \
+ EMIT2(0x0f, op + 0x10); \
+ EMIT(offset, 4); /* jxx .+off32 */ \
++ APPEND_FLOW_VERIFY(); \
+ } \
+ } while (0)
+
+@@ -120,12 +214,17 @@ static inline void bpf_flush_icache(void *start, void *end)
set_fs(old_fs);
}
#define CHOOSE_LOAD_FUNC(K, func) \
((int)K < 0 ? ((int)K >= SKF_LL_OFF ? func##_negative_offset : func) : func##_positive_offset)
-@@ -146,6 +151,10 @@ void bpf_jit_compile(struct sk_filter *fp)
+ void bpf_jit_compile(struct sk_filter *fp)
+ {
+- u8 temp[64];
++ u8 temp[MAX_INSTR_CODE_SIZE];
+ u8 *prog;
+ unsigned int proglen, oldproglen = 0;
+ int ilen, i;
+@@ -138,6 +237,9 @@ void bpf_jit_compile(struct sk_filter *fp)
+ unsigned int *addrs;
+ const struct sock_filter *filter = fp->insns;
+ int flen = fp->len;
++#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
++ unsigned int randkey;
++#endif
+
+ if (!bpf_jit_enable)
+ return;
+@@ -146,11 +248,19 @@ void bpf_jit_compile(struct sk_filter *fp)
if (addrs == NULL)
return;
+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
+ if (!fp->work)
+ goto out;
++
++#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
++ randkey = get_random_int();
++#endif
+
/* Before first pass, make a rough estimation of addrs[]
- * each bpf instruction is translated to less than 64 bytes
+- * each bpf instruction is translated to less than 64 bytes
++ * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
*/
-@@ -593,17 +602,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
+ for (proglen = 0, i = 0; i < flen; i++) {
+- proglen += 64;
++ proglen += MAX_INSTR_CODE_SIZE;
+ addrs[i] = proglen;
+ }
+ cleanup_addr = proglen; /* epilogue address */
+@@ -258,10 +368,8 @@ void bpf_jit_compile(struct sk_filter *fp)
+ case BPF_S_ALU_MUL_K: /* A *= K */
+ if (is_imm8(K))
+ EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
+- else {
+- EMIT2(0x69, 0xc0); /* imul imm32,%eax */
+- EMIT(K, 4);
+- }
++ else
++ EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
+ break;
+ case BPF_S_ALU_DIV_X: /* A /= X; */
+ seen |= SEEN_XREG;
+@@ -301,13 +409,23 @@ void bpf_jit_compile(struct sk_filter *fp)
+ break;
+ case BPF_S_ALU_MOD_K: /* A %= K; */
+ EMIT2(0x31, 0xd2); /* xor %edx,%edx */
++#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
++ DILUTE_CONST_SEQUENCE(K, randkey);
++#else
+ EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
++#endif
+ EMIT2(0xf7, 0xf1); /* div %ecx */
+ EMIT2(0x89, 0xd0); /* mov %edx,%eax */
+ break;
+ case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
++#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
++ DILUTE_CONST_SEQUENCE(K, randkey);
++ // imul rax, rcx
++ EMIT4(0x48, 0x0f, 0xaf, 0xc1);
++#else
+ EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
+ EMIT(K, 4);
++#endif
+ EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */
+ break;
+ case BPF_S_ALU_AND_X:
+@@ -543,8 +661,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
+ if (is_imm8(K)) {
+ EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
+ } else {
+- EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
+- EMIT(K, 4);
++ EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
+ }
+ } else {
+ EMIT2(0x89,0xde); /* mov %ebx,%esi */
+@@ -627,17 +744,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
break;
default:
/* hmm, too complex filter, give up with jit compiler */
}
proglen += ilen;
addrs[i] = proglen;
-@@ -624,11 +634,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
+@@ -658,11 +776,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
break;
}
if (proglen == oldproglen) {
}
oldproglen = proglen;
}
-@@ -644,7 +652,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
+@@ -678,7 +794,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
bpf_flush_icache(image, image + proglen);
fp->bpf_func = (void *)image;
out:
kfree(addrs);
return;
-@@ -652,18 +663,20 @@ out:
+@@ -686,18 +805,20 @@ out:
static void jit_free_defer(struct work_struct *arg)
{
unsigned long stack = kernel_stack_pointer(regs);
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
+diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
+index 192397c..5ba6f9e 100644
+--- a/arch/x86/pci/acpi.c
++++ b/arch/x86/pci/acpi.c
+@@ -568,7 +568,7 @@ int __init pci_acpi_init(void)
+ acpi_irq_penalty_init();
+ pcibios_enable_irq = acpi_pci_irq_enable;
+ pcibios_disable_irq = acpi_pci_irq_disable;
+- x86_init.pci.init_irq = x86_init_noop;
++ *(void **)&x86_init.pci.init_irq = x86_init_noop;
+
+ if (pci_routeirq) {
+ /*
diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
index e14a2ff..3fd6b58 100644
--- a/arch/x86/pci/mrst.c
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
+diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
+index 56ab749..3cb792a 100644
+--- a/arch/x86/pci/xen.c
++++ b/arch/x86/pci/xen.c
+@@ -395,9 +395,9 @@ int __init pci_xen_init(void)
+ #endif
+
+ #ifdef CONFIG_PCI_MSI
+- x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
+- x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
+- x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
++ *(void **)&x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
++ *(void **)&x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
++ *(void **)&x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
+ #endif
+ return 0;
+ }
+@@ -416,8 +416,8 @@ int __init pci_xen_hvm_init(void)
+ #endif
+
+ #ifdef CONFIG_PCI_MSI
+- x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs;
+- x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
++ *(void **)&x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs;
++ *(void **)&x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
+ #endif
+ return 0;
+ }
+@@ -474,9 +474,9 @@ int __init pci_xen_initial_domain(void)
+ int irq;
+
+ #ifdef CONFIG_PCI_MSI
+- x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
+- x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
+- x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;
++ *(void **)&x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
++ *(void **)&x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
++ *(void **)&x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;
+ #endif
+ xen_setup_acpi_sci();
+ __acpi_register_gsi = acpi_register_gsi_xen;
+diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
+index 77cf009..7fe44c8 100644
+--- a/arch/x86/platform/efi/efi.c
++++ b/arch/x86/platform/efi/efi.c
+@@ -746,8 +746,8 @@ void __init efi_init(void)
+
+ #ifdef CONFIG_X86_32
+ if (efi_is_native()) {
+- x86_platform.get_wallclock = efi_get_time;
+- x86_platform.set_wallclock = efi_set_rtc_mmss;
++ *(void **)&x86_platform.get_wallclock = efi_get_time;
++ *(void **)&x86_platform.set_wallclock = efi_set_rtc_mmss;
+ }
+ #endif
+
diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
index 40e4469..1ab536e 100644
--- a/arch/x86/platform/efi/efi_32.c
ret
ENDPROC(efi_call6)
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
-index fd41a92..9c33628 100644
+index fd41a92..bc8091d 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
}
/* parse all the mtimer info to a static mtimer array */
+@@ -233,14 +235,14 @@ static void __init mrst_time_init(void)
+ case MRST_TIMER_APBT_ONLY:
+ break;
+ case MRST_TIMER_LAPIC_APBT:
+- x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
+- x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
++ *(void **)&x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
++ *(void **)&x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
+ break;
+ default:
+ if (!boot_cpu_has(X86_FEATURE_ARAT))
+ break;
+- x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
+- x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
++ *(void **)&x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
++ *(void **)&x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
+ return;
+ }
+ /* we need at least one APB timer */
+@@ -282,35 +284,35 @@ static unsigned char mrst_get_nmi_reason(void)
+ */
+ void __init x86_mrst_early_setup(void)
+ {
+- x86_init.resources.probe_roms = x86_init_noop;
+- x86_init.resources.reserve_resources = x86_init_noop;
++ *(void **)&x86_init.resources.probe_roms = x86_init_noop;
++ *(void **)&x86_init.resources.reserve_resources = x86_init_noop;
+
+- x86_init.timers.timer_init = mrst_time_init;
+- x86_init.timers.setup_percpu_clockev = x86_init_noop;
++ *(void **)&x86_init.timers.timer_init = mrst_time_init;
++ *(void **)&x86_init.timers.setup_percpu_clockev = x86_init_noop;
+
+- x86_init.irqs.pre_vector_init = x86_init_noop;
++ *(void **)&x86_init.irqs.pre_vector_init = x86_init_noop;
+
+- x86_init.oem.arch_setup = mrst_arch_setup;
++ *(void **)&x86_init.oem.arch_setup = mrst_arch_setup;
+
+- x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock;
++ *(void **)&x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock;
+
+- x86_platform.calibrate_tsc = mrst_calibrate_tsc;
+- x86_platform.i8042_detect = mrst_i8042_detect;
+- x86_init.timers.wallclock_init = mrst_rtc_init;
+- x86_platform.get_nmi_reason = mrst_get_nmi_reason;
++ *(void **)&x86_platform.calibrate_tsc = mrst_calibrate_tsc;
++ *(void **)&x86_platform.i8042_detect = mrst_i8042_detect;
++ *(void **)&x86_init.timers.wallclock_init = mrst_rtc_init;
++ *(void **)&x86_platform.get_nmi_reason = mrst_get_nmi_reason;
+
+- x86_init.pci.init = pci_mrst_init;
+- x86_init.pci.fixup_irqs = x86_init_noop;
++ *(void **)&x86_init.pci.init = pci_mrst_init;
++ *(void **)&x86_init.pci.fixup_irqs = x86_init_noop;
+
+ legacy_pic = &null_legacy_pic;
+
+ /* Moorestown specific power_off/restart method */
+ pm_power_off = mrst_power_off;
+- machine_ops.emergency_restart = mrst_reboot;
++ *(void **)&machine_ops.emergency_restart = mrst_reboot;
+
+ /* Avoid searching for BIOS MP tables */
+- x86_init.mpparse.find_smp_config = x86_init_noop;
+- x86_init.mpparse.get_smp_config = x86_init_uint_noop;
++ *(void **)&x86_init.mpparse.find_smp_config = x86_init_noop;
++ *(void **)&x86_init.mpparse.get_smp_config = x86_init_uint_noop;
+ set_bit(MP_BUS_ISA, mp_bus_not_pci);
+ }
+
+diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
+index 225bd0f..22e8086 100644
+--- a/arch/x86/platform/mrst/vrtc.c
++++ b/arch/x86/platform/mrst/vrtc.c
+@@ -120,8 +120,8 @@ void __init mrst_rtc_init(void)
+
+ vrtc_virt_base = (void __iomem *)set_fixmap_offset_nocache(FIX_LNW_VRTC,
+ vrtc_paddr);
+- x86_platform.get_wallclock = vrtc_get_time;
+- x86_platform.set_wallclock = vrtc_set_mmss;
++ *(void **)&x86_platform.get_wallclock = vrtc_get_time;
++ *(void **)&x86_platform.set_wallclock = vrtc_set_mmss;
+ }
+
+ /*
+diff --git a/arch/x86/platform/olpc/olpc.c b/arch/x86/platform/olpc/olpc.c
+index 2737608..0d62cc2 100644
+--- a/arch/x86/platform/olpc/olpc.c
++++ b/arch/x86/platform/olpc/olpc.c
+@@ -395,7 +395,7 @@ static int __init olpc_init(void)
+ * XO-1 only. */
+ if (olpc_platform_info.boardrev < olpc_board_pre(0xd0) &&
+ !cs5535_has_vsa2())
+- x86_init.pci.arch_init = pci_olpc_init;
++ *(void **)&x86_init.pci.arch_init = pci_olpc_init;
+ #endif
+
+ if (olpc_platform_info.boardrev < olpc_board_pre(0xd0)) { /* XO-1 */
+diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
+index d6ee929..3637cb5 100644
+--- a/arch/x86/platform/olpc/olpc_dt.c
++++ b/arch/x86/platform/olpc/olpc_dt.c
+@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
+ return res;
+ }
+
+-static struct of_pdt_ops prom_olpc_ops __initdata = {
++static struct of_pdt_ops prom_olpc_ops __initconst = {
+ .nextprop = olpc_dt_nextprop,
+ .getproplen = olpc_dt_getproplen,
+ .getproperty = olpc_dt_getproperty,
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
-index 218cdb1..fd55c08 100644
+index 218cdb1..c1178eb 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -132,7 +132,7 @@ static void do_fpu_end(void)
set_tss_desc(cpu, t); /*
* This just modifies memory; should not be
-@@ -142,7 +142,9 @@ static void fix_processor_context(void)
+@@ -142,8 +142,6 @@ static void fix_processor_context(void)
*/
#ifdef CONFIG_X86_64
-+ pax_open_kernel();
- get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
-+ pax_close_kernel();
-
+- get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
+-
syscall_init(); /* This sets MSR_*STAR and related */
#endif
+ load_TR_desc(); /* This does ltr */
diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
index cbca565..bae7133 100644
--- a/arch/x86/realmode/init.c
- return 0;
-}
-__setup("vdso=", vdso_setup);
+diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
+index 7005ced..530d6eb 100644
+--- a/arch/x86/xen/apic.c
++++ b/arch/x86/xen/apic.c
+@@ -30,5 +30,5 @@ static unsigned int xen_io_apic_read(unsigned apic, unsigned reg)
+
+ void __init xen_init_apic(void)
+ {
+- x86_io_apic_ops.read = xen_io_apic_read;
++ *(void **)&x86_io_apic_ops.read = xen_io_apic_read;
+ }
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index c1461de..355f120 100644
+index 586d838..9181904 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
-@@ -98,8 +98,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
+@@ -99,8 +99,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
__read_mostly int xen_have_vector_callback;
EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -917,21 +915,21 @@ static u32 xen_safe_apic_wait_icr_idle(void)
+@@ -473,8 +471,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
+ {
+ unsigned long va = dtr->address;
+ unsigned int size = dtr->size + 1;
+- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+- unsigned long frames[pages];
++ unsigned long frames[65536 / PAGE_SIZE];
+ int f;
+
+ /*
+@@ -522,8 +519,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
+ {
+ unsigned long va = dtr->address;
+ unsigned int size = dtr->size + 1;
+- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+- unsigned long frames[pages];
++ unsigned long frames[65536 / PAGE_SIZE];
+ int f;
+
+ /*
+@@ -918,21 +914,21 @@ static u32 xen_safe_apic_wait_icr_idle(void)
static void set_xen_basic_apic_ops(void)
{
#endif
}
-@@ -1221,30 +1219,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
+@@ -1222,30 +1218,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
#endif
};
{
if (pm_power_off)
pm_power_off();
-@@ -1347,7 +1345,17 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1290,14 +1286,14 @@ static const struct machine_ops xen_machine_ops __initconst = {
+ */
+ static void __init xen_setup_stackprotector(void)
+ {
+- pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
+- pv_cpu_ops.load_gdt = xen_load_gdt_boot;
++ *(void **)&pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
++ *(void **)&pv_cpu_ops.load_gdt = xen_load_gdt_boot;
+
+ setup_stack_canary_segment(0);
+ switch_to_new_gdt(0);
+
+- pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
+- pv_cpu_ops.load_gdt = xen_load_gdt;
++ *(void **)&pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
++ *(void **)&pv_cpu_ops.load_gdt = xen_load_gdt;
+ }
+
+ /* First C function to be called on Xen boot */
+@@ -1315,13 +1311,13 @@ asmlinkage void __init xen_start_kernel(void)
+
+ /* Install Xen paravirt ops */
+ pv_info = xen_info;
+- pv_init_ops = xen_init_ops;
+- pv_cpu_ops = xen_cpu_ops;
+- pv_apic_ops = xen_apic_ops;
++ memcpy((void *)&pv_init_ops, &xen_init_ops, sizeof pv_init_ops);
++ memcpy((void *)&pv_cpu_ops, &xen_cpu_ops, sizeof pv_cpu_ops);
++ memcpy((void *)&pv_apic_ops, &xen_apic_ops, sizeof pv_apic_ops);
+
+- x86_init.resources.memory_setup = xen_memory_setup;
+- x86_init.oem.arch_setup = xen_arch_setup;
+- x86_init.oem.banner = xen_banner;
++ *(void **)&x86_init.resources.memory_setup = xen_memory_setup;
++ *(void **)&x86_init.oem.arch_setup = xen_arch_setup;
++ *(void **)&x86_init.oem.banner = xen_banner;
+
+ xen_init_time_ops();
+
+@@ -1347,7 +1343,17 @@ asmlinkage void __init xen_start_kernel(void)
__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
/* Work out if we support NX */
xen_setup_features();
-@@ -1378,13 +1386,6 @@ asmlinkage void __init xen_start_kernel(void)
-
- machine_ops = xen_machine_ops;
+@@ -1376,14 +1382,7 @@ asmlinkage void __init xen_start_kernel(void)
+ pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit;
+ }
+- machine_ops = xen_machine_ops;
+-
- /*
- * The only reliable way to retain the initial address of the
- * percpu gdt_page is to remember it here, so we can go and
- * mark it RW later, when the initial percpu area is freed.
- */
- xen_initial_gdt = &per_cpu(gdt_page, 0);
--
++ memcpy((void *)&machine_ops, &xen_machine_ops, sizeof machine_ops);
+
xen_smp_init();
- #ifdef CONFIG_ACPI_NUMA
+@@ -1450,7 +1449,7 @@ asmlinkage void __init xen_start_kernel(void)
+ add_preferred_console("tty", 0, NULL);
+ add_preferred_console("hvc", 0, NULL);
+ if (pci_xen)
+- x86_init.pci.arch_init = pci_xen_init;
++ *(void **)&x86_init.pci.arch_init = pci_xen_init;
+ } else {
+ const struct dom0_vga_console_info *info =
+ (void *)((char *)xen_start_info +
+@@ -1476,8 +1475,8 @@ asmlinkage void __init xen_start_kernel(void)
+ xen_acpi_sleep_register();
+
+ /* Avoid searching for BIOS MP tables */
+- x86_init.mpparse.find_smp_config = x86_init_noop;
+- x86_init.mpparse.get_smp_config = x86_init_uint_noop;
++ *(void **)&x86_init.mpparse.find_smp_config = x86_init_noop;
++ *(void **)&x86_init.mpparse.get_smp_config = x86_init_uint_noop;
+ }
+ #ifdef CONFIG_PCI
+ /* PCI BIOS service won't work from a PV guest. */
+@@ -1583,7 +1582,7 @@ static void __init xen_hvm_guest_init(void)
+ xen_hvm_smp_init();
+ register_cpu_notifier(&xen_hvm_cpu_notifier);
+ xen_unplug_emulated_devices();
+- x86_init.irqs.intr_init = xen_init_IRQ;
++ *(void **)&x86_init.irqs.intr_init = xen_init_IRQ;
+ xen_hvm_init_time_ops();
+ xen_hvm_init_mmu_ops();
+ }
+diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c
+index 01a4dc0..3ca0cc9 100644
+--- a/arch/x86/xen/irq.c
++++ b/arch/x86/xen/irq.c
+@@ -130,5 +130,5 @@ static const struct pv_irq_ops xen_irq_ops __initconst = {
+ void __init xen_init_irq_ops(void)
+ {
+ pv_irq_ops = xen_irq_ops;
+- x86_init.irqs.intr_init = xen_init_IRQ;
++ *(void **)&x86_init.irqs.intr_init = xen_init_IRQ;
+ }
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index 5141d80..6c9fb41 100644
+index dcf5f2d..5f72fe7 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
-@@ -1765,6 +1765,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
- convert_pfn_mfn(init_level4_pgt);
- convert_pfn_mfn(level3_ident_pgt);
+@@ -1881,6 +1881,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
+ /* L3_k[510] -> level2_kernel_pgt
+ * L3_i[511] -> level2_fixmap_pgt */
convert_pfn_mfn(level3_kernel_pgt);
+ convert_pfn_mfn(level3_vmalloc_start_pgt);
+ convert_pfn_mfn(level3_vmalloc_end_pgt);
+ convert_pfn_mfn(level3_vmemmap_pgt);
+ /* We get [511][511] and have Xen's version of level2_kernel_pgt */
l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
- l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1783,7 +1786,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
+@@ -1910,8 +1913,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
+ set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
-@@ -1967,6 +1974,7 @@ static void __init xen_post_allocator_init(void)
+@@ -2097,6 +2104,7 @@ static void __init xen_post_allocator_init(void)
pv_mmu_ops.set_pud = xen_set_pud;
#if PAGETABLE_LEVELS == 4
pv_mmu_ops.set_pgd = xen_set_pgd;
#endif
/* This will work as long as patching hasn't happened yet
-@@ -2048,6 +2056,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
+@@ -2178,6 +2186,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
.pud_val = PV_CALLEE_SAVE(xen_pud_val),
.make_pud = PV_CALLEE_SAVE(xen_make_pud),
.set_pgd = xen_set_pgd_hyper,
.alloc_pud = xen_alloc_pmd_init,
.release_pud = xen_release_pmd_init,
+@@ -2197,8 +2206,8 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
+
+ void __init xen_init_mmu_ops(void)
+ {
+- x86_init.mapping.pagetable_reserve = xen_mapping_pagetable_reserve;
+- x86_init.paging.pagetable_init = xen_pagetable_init;
++ *(void **)&x86_init.mapping.pagetable_reserve = xen_mapping_pagetable_reserve;
++ *(void **)&x86_init.paging.pagetable_init = xen_pagetable_init;
+ pv_mmu_ops = xen_mmu_ops;
+
+ memset(dummy_mapping, 0xff, PAGE_SIZE);
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
-index f58dca7..ad21f52 100644
+index 353c50f..a0b9b0d 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -229,11 +229,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
#endif
xen_setup_runstate_info(cpu);
xen_setup_timer(cpu);
+@@ -637,7 +631,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
+
+ void __init xen_smp_init(void)
+ {
+- smp_ops = xen_smp_ops;
++ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
+ xen_fill_possible_map();
+ xen_init_spinlocks();
+ }
+@@ -672,10 +666,10 @@ void __init xen_hvm_smp_init(void)
+ {
+ if (!xen_have_vector_callback)
+ return;
+- smp_ops.smp_prepare_cpus = xen_hvm_smp_prepare_cpus;
+- smp_ops.smp_send_reschedule = xen_smp_send_reschedule;
+- smp_ops.cpu_up = xen_hvm_cpu_up;
+- smp_ops.cpu_die = xen_hvm_cpu_die;
+- smp_ops.send_call_func_ipi = xen_smp_send_call_function_ipi;
+- smp_ops.send_call_func_single_ipi = xen_smp_send_call_function_single_ipi;
++ *(void **)&smp_ops.smp_prepare_cpus = xen_hvm_smp_prepare_cpus;
++ *(void **)&smp_ops.smp_send_reschedule = xen_smp_send_reschedule;
++ *(void **)&smp_ops.cpu_up = xen_hvm_cpu_up;
++ *(void **)&smp_ops.cpu_die = xen_hvm_cpu_die;
++ *(void **)&smp_ops.send_call_func_ipi = xen_smp_send_call_function_ipi;
++ *(void **)&smp_ops.send_call_func_single_ipi = xen_smp_send_call_function_single_ipi;
+ }
+diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
+index 83e866d..ef60385 100644
+--- a/arch/x86/xen/spinlock.c
++++ b/arch/x86/xen/spinlock.c
+@@ -390,12 +390,12 @@ void __init xen_init_spinlocks(void)
+ {
+ BUILD_BUG_ON(sizeof(struct xen_spinlock) > sizeof(arch_spinlock_t));
+
+- pv_lock_ops.spin_is_locked = xen_spin_is_locked;
+- pv_lock_ops.spin_is_contended = xen_spin_is_contended;
+- pv_lock_ops.spin_lock = xen_spin_lock;
+- pv_lock_ops.spin_lock_flags = xen_spin_lock_flags;
+- pv_lock_ops.spin_trylock = xen_spin_trylock;
+- pv_lock_ops.spin_unlock = xen_spin_unlock;
++ *(void **)&pv_lock_ops.spin_is_locked = xen_spin_is_locked;
++ *(void **)&pv_lock_ops.spin_is_contended = xen_spin_is_contended;
++ *(void **)&pv_lock_ops.spin_lock = xen_spin_lock;
++ *(void **)&pv_lock_ops.spin_lock_flags = xen_spin_lock_flags;
++ *(void **)&pv_lock_ops.spin_trylock = xen_spin_trylock;
++ *(void **)&pv_lock_ops.spin_unlock = xen_spin_unlock;
+ }
+
+ #ifdef CONFIG_XEN_DEBUG_FS
+diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
+index 0296a95..3c51a2d 100644
+--- a/arch/x86/xen/time.c
++++ b/arch/x86/xen/time.c
+@@ -481,15 +481,15 @@ static void __init xen_time_init(void)
+
+ void __init xen_init_time_ops(void)
+ {
+- pv_time_ops = xen_time_ops;
++ memcpy((void *)&pv_time_ops, &xen_time_ops, sizeof pv_time_ops);
+
+- x86_init.timers.timer_init = xen_time_init;
+- x86_init.timers.setup_percpu_clockev = x86_init_noop;
+- x86_cpuinit.setup_percpu_clockev = x86_init_noop;
++ *(void **)&x86_init.timers.timer_init = xen_time_init;
++ *(void **)&x86_init.timers.setup_percpu_clockev = x86_init_noop;
++ *(void **)&x86_cpuinit.setup_percpu_clockev = x86_init_noop;
+
+- x86_platform.calibrate_tsc = xen_tsc_khz;
+- x86_platform.get_wallclock = xen_get_wallclock;
+- x86_platform.set_wallclock = xen_set_wallclock;
++ *(void **)&x86_platform.calibrate_tsc = xen_tsc_khz;
++ *(void **)&x86_platform.get_wallclock = xen_get_wallclock;
++ *(void **)&x86_platform.set_wallclock = xen_set_wallclock;
+ }
+
+ #ifdef CONFIG_XEN_PVHVM
+@@ -514,12 +514,12 @@ void __init xen_hvm_init_time_ops(void)
+ return;
+ }
+
+- pv_time_ops = xen_time_ops;
+- x86_init.timers.setup_percpu_clockev = xen_time_init;
+- x86_cpuinit.setup_percpu_clockev = xen_hvm_setup_cpu_clockevents;
++ memcpy((void *)&pv_time_ops, &xen_time_ops, sizeof pv_time_ops);
++ *(void **)&x86_init.timers.setup_percpu_clockev = xen_time_init;
++ *(void **)&x86_cpuinit.setup_percpu_clockev = xen_hvm_setup_cpu_clockevents;
+
+- x86_platform.calibrate_tsc = xen_tsc_khz;
+- x86_platform.get_wallclock = xen_get_wallclock;
+- x86_platform.set_wallclock = xen_set_wallclock;
++ *(void **)&x86_platform.calibrate_tsc = xen_tsc_khz;
++ *(void **)&x86_platform.get_wallclock = xen_get_wallclock;
++ *(void **)&x86_platform.set_wallclock = xen_set_wallclock;
+ }
+ #endif
diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
index f9643fc..602e8af 100644
--- a/arch/x86/xen/xen-asm_32.S
movl xen_vcpu, %eax
#endif
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
-index aaa7291..3f77960 100644
+index 7faed58..ba4427c 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
-index 202d4c1..99b072a 100644
+index a95b417..b6dbd0b 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -10,8 +10,6 @@
goto error;
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
-index 671d4d6..5f24030 100644
+index 7bdd61b..afec999 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
if (err)
return err;
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
-index 251c7b62..000462d 100644
+index 27adb09..ef98796b 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
-@@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
- size_t count, loff_t * ppos)
- {
+@@ -362,16 +362,13 @@ acpi_system_write_wakeup_device(struct file *file,
struct list_head *node, *next;
-- char strbuf[5];
-- char str[5] = "";
+ char strbuf[5];
+ char str[5] = "";
- unsigned int len = count;
-+ char strbuf[5] = {0};
- if (len > 4)
- len = 4;
- if (len < 0)
+- return -EFAULT;
+ if (count > 4)
+ count = 4;
+
+- if (copy_from_user(strbuf, buffer, len))
+ if (copy_from_user(strbuf, buffer, count))
return -EFAULT;
--
-- if (copy_from_user(strbuf, buffer, len))
-- return -EFAULT;
- strbuf[len] = '\0';
-- sscanf(strbuf, "%s", str);
+ strbuf[count] = '\0';
+ sscanf(strbuf, "%s", str);
mutex_lock(&acpi_device_lock);
- list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-@@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
- if (!dev->wakeup.flags.valid)
- continue;
-
-- if (!strncmp(dev->pnp.bus_id, str, 4)) {
-+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
- if (device_can_wakeup(&dev->dev)) {
- bool enable = !device_may_wakeup(&dev->dev);
- device_set_wakeup_enable(&dev->dev, enable);
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
-index bfc31cb..8213ce1 100644
+index bd4e5dc..0497b66 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
-@@ -551,7 +551,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
+@@ -552,7 +552,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
return 0;
#endif
/*
* Buggy BIOS check
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 8e1039c..ea9cbd4 100644
+index c8ac4fe..631818e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -4750,7 +4750,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+@@ -4779,7 +4779,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
struct ata_port *ap;
unsigned int tag;
ap = qc->ap;
qc->flags = 0;
-@@ -4766,7 +4766,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+@@ -4795,7 +4795,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
struct ata_port *ap;
struct ata_link *link;
WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
ap = qc->ap;
link = qc->dev->link;
-@@ -5828,6 +5828,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5891,6 +5891,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
return;
spin_lock(&lock);
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -5841,8 +5842,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5904,8 +5905,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
if (IS_ERR(*pp))
*pp = NULL;
}
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
-index bfaa5cb..3ba1cc3 100644
+index 371fd2c..0836c78 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
-@@ -854,7 +854,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
+@@ -861,7 +861,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
/* Handle platform specific quirks */
if (pdata->quirk) {
if (pdata->quirk & CF_BROKEN_PIO) {
return 0;
}
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
-index 89b30f3..7964211 100644
+index ff7bb8a..568fc0b 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
-index 2059ee4..faf51c7 100644
+index 81e44f7..498ea36 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
wake_up(&eni_dev->tx_wait);
dma_complete++;
}
-@@ -1567,7 +1567,7 @@ tx_complete++;
- /*--------------------------------- entries ---------------------------------*/
-
-
--static const char *media_name[] __devinitdata = {
-+static const char *media_name[] __devinitconst = {
- "MMF", "SMF", "MMF", "03?", /* 0- 3 */
- "UTP", "05?", "06?", "07?", /* 4- 7 */
- "TAXI","09?", "10?", "11?", /* 8-11 */
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 86fed1b..6dc4721 100644
--- a/drivers/atm/firestream.c
}
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
-index 9851093..adb2b1e 100644
+index 1853a45..cf2426d 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
break;
case PKT_STATUS:
-@@ -1009,7 +1009,7 @@ static uint32_t fpga_tx(struct solos_card *card)
+@@ -1010,7 +1010,7 @@ static uint32_t fpga_tx(struct solos_card *card)
vcc = SKB_CB(oldskb)->vcc;
if (vcc) {
}
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
-index deb4a45..211eff2 100644
+index 147d1a4..d0fd4b0 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -347,7 +347,7 @@ int devtmpfs_mount(const char *mntdir)
printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
else
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
-index cbb463b..babe2cf 100644
+index e6ee5e8..98ad7fc 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
*cnt = (comb >> IN_PROGRESS_BITS);
*inpr = comb & MAX_IN_PROGRESS;
-@@ -385,7 +385,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
+@@ -389,7 +389,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
ws->start_prevent_time = ws->last_time;
/* Increment the counter of events in progress. */
trace_wakeup_source_activate(ws->name, cec);
}
-@@ -511,7 +511,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
+@@ -515,7 +515,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
* Increment the counter of registered wakeup events and decrement the
* couter of wakeup events in progress simultaneously.
*/
split_counters(&cnt, &inpr);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
-index b0f553b..77b928b 100644
+index ca83f96..69d4ea9 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
/* Get the firmware version */
inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
-@@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
+@@ -5210,7 +5212,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
kfree(flush_buf);
if (return_code != IO_OK)
dev_warn(&h->pdev->dev, "Error flushing cache\n");
void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
-index f93a032..71c87bf 100644
+index f55683a..2101b96 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
-@@ -2567,7 +2567,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
+@@ -2556,7 +2556,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
p.sector = sector;
p.block_id = block_id;
p.blksize = blksize;
if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
return false;
-@@ -2865,7 +2865,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
+@@ -2854,7 +2854,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
p.sector = cpu_to_be64(req->sector);
p.block_id = (unsigned long)req;
dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
-@@ -3150,7 +3150,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
+@@ -3139,7 +3139,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
atomic_set(&mdev->unacked_cnt, 0);
atomic_set(&mdev->local_cnt, 0);
atomic_set(&mdev->net_cnt, 0);
atomic_set(&mdev->pp_in_use, 0);
atomic_set(&mdev->pp_in_use_by_net, 0);
atomic_set(&mdev->rs_sect_in, 0);
-@@ -3232,8 +3232,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
+@@ -3221,8 +3221,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
mdev->receiver.t_state);
/* no need to lock it, I'm the only thread alive */
}
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 3bba655..6151b66 100644
+index 54046e5..7759c55 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -226,7 +226,7 @@ static int __do_lo_send_write(struct file *file,
set_fs(old_fs);
if (likely(bw == len))
return 0;
+diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
+index d620b44..587561e 100644
+--- a/drivers/cdrom/cdrom.c
++++ b/drivers/cdrom/cdrom.c
+@@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
+ ENSURE(reset, CDC_RESET);
+ ENSURE(generic_packet, CDC_GENERIC_PACKET);
+ cdi->mc_flags = 0;
+- cdo->n_minors = 0;
+ cdi->options = CDO_USE_FFLAGS;
+
+ if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
+@@ -436,8 +435,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
+ else
+ cdi->cdda_method = CDDA_OLD;
+
+- if (!cdo->generic_packet)
+- cdo->generic_packet = cdrom_dummy_generic_packet;
++ if (!cdo->generic_packet) {
++ pax_open_kernel();
++ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
++ pax_close_kernel();
++ }
+
+ cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
+ mutex_lock(&cdrom_mutex);
+@@ -458,7 +460,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
+ if (cdi->exit)
+ cdi->exit(cdi);
+
+- cdi->ops->n_minors--;
+ cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
+ }
+
+diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
+index 75d485a..2809958 100644
+--- a/drivers/cdrom/gdrom.c
++++ b/drivers/cdrom/gdrom.c
+@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
+ .audio_ioctl = gdrom_audio_ioctl,
+ .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
+ CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
+- .n_minors = 1,
+ };
+
+ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index ea6f632..eafb192 100644
+index 72bedad..8181ce1 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
{
struct hpet_timer __iomem *timer;
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index 2c29942..604c5ba 100644
+index a0c84bb..9edcf60 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -420,7 +420,7 @@ struct ipmi_smi {
intf->proc_dir = NULL;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
-index 83f85cf..279e63f 100644
+index 32a6c7e..f6966a9 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -275,7 +275,7 @@ struct smi_info {
#define SI_MAX_PARMS 4
-@@ -3193,7 +3193,7 @@ static int try_smi_init(struct smi_info *new_smi)
+@@ -3225,7 +3225,7 @@ static int try_smi_init(struct smi_info *new_smi)
atomic_set(&new_smi->req_events, 0);
new_smi->run_to_completion = 0;
for (i = 0; i < SI_NUM_STATS; i++)
new_smi->interrupt_disabled = 1;
atomic_set(&new_smi->stop_operation, 0);
-diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
-index 47ff7e4..0c7d340 100644
---- a/drivers/char/mbcs.c
-+++ b/drivers/char/mbcs.c
-@@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
- return 0;
- }
-
--static const struct cx_device_id __devinitdata mbcs_id_table[] = {
-+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
- {
- .part_num = MBCS_PART_NUM,
- .mfg_num = MBCS_MFG_NUM,
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index e5eedfa..fcab50ea 100644
+index 0537903..121c699 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -18,6 +18,7 @@
*ppos = i;
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
-index 0a484b4..f48ccd1 100644
+index 21721d2..4e98777 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
-@@ -2340,9 +2340,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
+@@ -2346,9 +2346,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
if (tty_port_close_start(port, tty, filp) == 0)
goto cleanup;
-@@ -2360,7 +2360,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
+@@ -2366,7 +2366,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
cleanup:
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__,__LINE__,
}
/* Wait until the transmitter is empty.
-@@ -2502,7 +2502,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
+@@ -2508,7 +2508,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
/* If port is closing, signal caller to try again */
if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
-@@ -2522,11 +2522,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
+@@ -2528,11 +2528,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
goto cleanup;
}
spin_lock(&port->lock);
/* 1st open on this device, init hardware */
retval = startup(info, tty);
if (retval < 0)
-@@ -3891,7 +3891,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
+@@ -3886,7 +3886,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
unsigned short new_crctype;
/* return error if TTY interface open */
return -EBUSY;
switch (encoding)
-@@ -3994,7 +3994,7 @@ static int hdlcdev_open(struct net_device *dev)
+@@ -3989,7 +3989,7 @@ static int hdlcdev_open(struct net_device *dev)
/* arbitrate between network and tty opens */
spin_lock_irqsave(&info->netlock, flags);
printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
spin_unlock_irqrestore(&info->netlock, flags);
return -EBUSY;
-@@ -4083,7 +4083,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -4078,7 +4078,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
/* return error if TTY interface open */
if (cmd != SIOCWANDEV)
diff --git a/drivers/char/random.c b/drivers/char/random.c
-index b86eae9..4192a7a 100644
+index b86eae9..b9c2ed7 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -272,8 +272,13 @@
#if 0
/* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
{ 2048, 1638, 1231, 819, 411, 1 },
-@@ -527,8 +539,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
+@@ -437,6 +449,7 @@ struct entropy_store {
+ int entropy_count;
+ int entropy_total;
+ unsigned int initialized:1;
++ bool last_data_init;
+ __u8 last_data[EXTRACT_SIZE];
+ };
+
+@@ -527,8 +540,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
input_rotate += i ? 7 : 14;
}
smp_wmb();
if (out)
-@@ -799,6 +811,17 @@ void add_disk_randomness(struct gendisk *disk)
- }
- #endif
-
-+#ifdef CONFIG_PAX_LATENT_ENTROPY
-+u64 latent_entropy;
-+
-+__init void transfer_latent_entropy(void)
-+{
-+ mix_pool_bytes(&input_pool, &latent_entropy, sizeof(latent_entropy), NULL);
-+ mix_pool_bytes(&nonblocking_pool, &latent_entropy, sizeof(latent_entropy), NULL);
-+// printk(KERN_INFO "PAX: transferring latent entropy: %16llx\n", latent_entropy);
-+}
-+#endif
+@@ -957,6 +970,10 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
+ ssize_t ret = 0, i;
+ __u8 tmp[EXTRACT_SIZE];
+
++ /* if last_data isn't primed, we need EXTRACT_SIZE extra bytes */
++ if (fips_enabled && !r->last_data_init)
++ nbytes += EXTRACT_SIZE;
++
+ trace_extract_entropy(r->name, nbytes, r->entropy_count, _RET_IP_);
+ xfer_secondary_pool(r, nbytes);
+ nbytes = account(r, nbytes, min, reserved);
+@@ -967,6 +984,17 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
+ if (fips_enabled) {
+ unsigned long flags;
+
++
++ /* prime last_data value if need be, per fips 140-2 */
++ if (!r->last_data_init) {
++ spin_lock_irqsave(&r->lock, flags);
++ memcpy(r->last_data, tmp, EXTRACT_SIZE);
++ r->last_data_init = true;
++ nbytes -= EXTRACT_SIZE;
++ spin_unlock_irqrestore(&r->lock, flags);
++ extract_buf(r, tmp);
++ }
+
- /*********************************************************************
- *
- * Entropy extraction routines
-@@ -1008,7 +1031,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
+ spin_lock_irqsave(&r->lock, flags);
+ if (!memcmp(tmp, r->last_data, EXTRACT_SIZE))
+ panic("Hardware RNG duplicated output!\n");
+@@ -1008,7 +1036,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
extract_buf(r, tmp);
i = min_t(int, nbytes, EXTRACT_SIZE);
ret = -EFAULT;
break;
}
-@@ -1342,7 +1365,7 @@ EXPORT_SYMBOL(generate_random_uuid);
+@@ -1086,6 +1114,7 @@ static void init_std_data(struct entropy_store *r)
+
+ r->entropy_count = 0;
+ r->entropy_total = 0;
++ r->last_data_init = false;
+ mix_pool_bytes(r, &now, sizeof(now), NULL);
+ for (i = r->poolinfo->POOLBYTES; i > 0; i -= sizeof(rv)) {
+ if (!arch_get_random_long(&rv))
+@@ -1342,7 +1371,7 @@ EXPORT_SYMBOL(generate_random_uuid);
#include <linux/sysctl.h>
static int min_read_thresh = 8, min_write_thresh;
static char sysctl_bootid[16];
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
-index f877805..403375a 100644
+index 9b4f011..b7e0a1a 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -54,6 +54,7 @@
return 0;
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
-index 4dc8024..90108d1 100644
+index 93211df..c7805f7 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
-@@ -415,7 +415,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
+@@ -410,7 +410,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
chip->vendor.req_complete_val)
goto out_recv;
dev_err(chip->dev, "Operation Canceled\n");
rc = -ECANCELED;
goto out;
-diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
-index 0636520..169c1d0 100644
---- a/drivers/char/tpm/tpm_bios.c
-+++ b/drivers/char/tpm/tpm_bios.c
-@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
+diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
+index 56051d0..11cf3b7 100644
+--- a/drivers/char/tpm/tpm_acpi.c
++++ b/drivers/char/tpm/tpm_acpi.c
+@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
+ virt = acpi_os_map_memory(start, len);
+ if (!virt) {
+ kfree(log->bios_event_log);
++ log->bios_event_log = NULL;
+ printk("%s: ERROR - Unable to map memory\n", __func__);
+ return -EIO;
+ }
+
+- memcpy_fromio(log->bios_event_log, virt, len);
++ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
+
+ acpi_os_unmap_memory(virt, len);
+ return 0;
+diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
+index 84ddc55..1d32f1e 100644
+--- a/drivers/char/tpm/tpm_eventlog.c
++++ b/drivers/char/tpm/tpm_eventlog.c
+@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
event = addr;
if ((event->event_type == 0 && event->event_size == 0) ||
return NULL;
return addr;
-@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
+@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
return NULL;
if ((event->event_type == 0 && event->event_size == 0) ||
return NULL;
(*pos)++;
-@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
+@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
int i;
for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
return 0;
}
-@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
- log->bios_event_log_end = log->bios_event_log + len;
-
- virt = acpi_os_map_memory(start, len);
-+ if (!virt) {
-+ kfree(log->bios_event_log);
-+ log->bios_event_log = NULL;
-+ return -EFAULT;
-+ }
-
-- memcpy(log->bios_event_log, virt, len);
-+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
-
- acpi_os_unmap_memory(virt, len);
- return 0;
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
-index cdf2f54..e55c197 100644
+index 8ab9c3d..c3e65d3 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
-@@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
+@@ -622,7 +622,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
if (to_user) {
ssize_t ret;
if (ret)
return -EFAULT;
} else {
-@@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
+@@ -721,7 +721,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
if (!port_has_data(port) && !port->host_connected)
return 0;
+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
}
- static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
+ static int wait_port_writable(struct port *port, bool nonblock)
+diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
+index 75c0a1a..96ba8f6 100644
+--- a/drivers/edac/edac_mc.c
++++ b/drivers/edac/edac_mc.c
+@@ -340,7 +340,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
+ /*
+ * Alocate and fill the csrow/channels structs
+ */
+- mci->csrows = kcalloc(sizeof(*mci->csrows), tot_csrows, GFP_KERNEL);
++ mci->csrows = kcalloc(tot_csrows, sizeof(*mci->csrows), GFP_KERNEL);
+ if (!mci->csrows)
+ goto error;
+ for (row = 0; row < tot_csrows; row++) {
+@@ -351,7 +351,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
+ csr->csrow_idx = row;
+ csr->mci = mci;
+ csr->nr_channels = tot_channels;
+- csr->channels = kcalloc(sizeof(*csr->channels), tot_channels,
++ csr->channels = kcalloc(tot_channels, sizeof(*csr->channels),
+ GFP_KERNEL);
+ if (!csr->channels)
+ goto error;
+@@ -369,7 +369,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
+ /*
+ * Allocate and fill the dimm structs
+ */
+- mci->dimms = kcalloc(sizeof(*mci->dimms), tot_dimms, GFP_KERNEL);
++ mci->dimms = kcalloc(tot_dimms, sizeof(*mci->dimms), GFP_KERNEL);
+ if (!mci->dimms)
+ goto error;
+
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
-index e164c55..3aabb50 100644
+index 1bfb207..0d059c2 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
r = kmalloc(sizeof(*r), GFP_KERNEL);
diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
-index 87d6f2d..5bf9d90 100644
+index 28a94c7..58da63a 100644
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
-@@ -37,6 +37,7 @@
+@@ -38,6 +38,7 @@
#include <linux/timer.h>
#include <linux/types.h>
#include <linux/workqueue.h>
void fw_card_initialize(struct fw_card *card,
const struct fw_card_driver *driver, struct device *device);
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
-index b298158..7ed8432 100644
+index 982f1f5..d21e5da 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
-@@ -452,11 +452,6 @@ void __init dmi_scan_machine(void)
+@@ -491,11 +491,6 @@ void __init dmi_scan_machine(void)
}
}
else {
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-@@ -726,7 +721,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
+@@ -770,7 +765,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
if (buf == NULL)
return -1;
iounmap(buf);
return 0;
+diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
+index bfd8f43..133189c 100644
+--- a/drivers/firmware/efivars.c
++++ b/drivers/firmware/efivars.c
+@@ -1234,9 +1234,9 @@ efivars_init(void)
+ return -ENOMEM;
+ }
+
+- ops.get_variable = efi.get_variable;
+- ops.set_variable = efi.set_variable;
+- ops.get_next_variable = efi.get_next_variable;
++ *(void **)&ops.get_variable = efi.get_variable;
++ *(void **)&ops.set_variable = efi.set_variable;
++ *(void **)&ops.get_next_variable = efi.get_next_variable;
+ error = register_efivars(&__efivars, &ops, efi_kobj);
+ if (error)
+ goto err_put;
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index 82d5c20..44a7177 100644
--- a/drivers/gpio/gpio-vr41xx.c
return -EINVAL;
}
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index 3252e70..b5314ace 100644
+index 1227adf..f2301c2 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -286,7 +286,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
dev = crtc->dev;
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index 9238de4..a27c72a 100644
+index be174ca..0bcbb71 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -307,7 +307,7 @@ module_exit(drm_core_exit);
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 5062eec..4e3e51f 100644
+index 133b413..fd68225 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
dev->sigdata.lock = NULL;
-@@ -134,8 +134,8 @@ int drm_open(struct inode *inode, struct file *filp)
+@@ -134,7 +134,7 @@ int drm_open(struct inode *inode, struct file *filp)
+ if (drm_device_is_unplugged(dev))
+ return -ENODEV;
+- if (!dev->open_count++)
++ if (local_inc_return(&dev->open_count) == 1)
+ need_setup = 1;
+ mutex_lock(&dev->struct_mutex);
+ old_mapping = dev->dev_mapping;
+@@ -149,7 +149,7 @@ int drm_open(struct inode *inode, struct file *filp)
retcode = drm_open_helper(inode, filp, dev);
- if (!retcode) {
-- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
-- if (!dev->open_count++)
-+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
-+ if (local_inc_return(&dev->open_count) == 1)
- retcode = drm_setup(dev);
- }
- if (!retcode) {
-@@ -422,7 +422,7 @@ int drm_release(struct inode *inode, struct file *filp)
+ if (retcode)
+ goto err_undo;
+- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
+ if (need_setup) {
+ retcode = drm_setup(dev);
+ if (retcode)
+@@ -164,7 +164,7 @@ err_undo:
+ iput(container_of(dev->dev_mapping, struct inode, i_data));
+ dev->dev_mapping = old_mapping;
+ mutex_unlock(&dev->struct_mutex);
+- dev->open_count--;
++ local_dec(&dev->open_count);
+ return retcode;
+ }
+ EXPORT_SYMBOL(drm_open);
+@@ -438,7 +438,7 @@ int drm_release(struct inode *inode, struct file *filp)
mutex_lock(&drm_global_mutex);
if (dev->driver->preclose)
dev->driver->preclose(dev, file_priv);
-@@ -431,10 +431,10 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -447,10 +447,10 @@ int drm_release(struct inode *inode, struct file *filp)
* Begin inline drm_release
*/
/* Release any auth tokens that might point to this file_priv,
(do that under the drm_global_mutex) */
-@@ -530,8 +530,8 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -547,8 +547,8 @@ int drm_release(struct inode *inode, struct file *filp)
* End inline drm_release
*/
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
-index c87dc96..326055d 100644
+index f731116..629842c 100644
--- a/drivers/gpu/drm/drm_global.c
+++ b/drivers/gpu/drm/drm_global.c
@@ -36,7 +36,7 @@
item->object = NULL;
}
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
-index 8928edb..0c79258 100644
+index d4b20ce..77a8d41 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
type = "??";
else
type = types[map->type];
-@@ -254,7 +258,11 @@ int drm_vma_info(struct seq_file *m, void *data)
+@@ -253,7 +257,11 @@ int drm_vma_info(struct seq_file *m, void *data)
vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
vma->vm_flags & VM_LOCKED ? 'l' : '-',
vma->vm_flags & VM_IO ? 'i' : '-',
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
-index 637fcc3..e890b33 100644
+index 2f4c434..764794b 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
if (__put_user(count, &request->count)
|| __put_user(list, &request->list))
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
-index 64a62c6..ceab35e 100644
+index 23dd975..63e9801 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -252,7 +252,7 @@ int drm_getstats(struct drm_device *dev, void *data,
}
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
-index 3203955..c8090af 100644
+index d752c96..fe08455 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -86,7 +86,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
if (drm_lock_free(&master->lock, lock->context)) {
/* FIXME: Should really bail out here. */
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index 21bcd4a..8e074e0 100644
+index c236fd2..6b5f2e7 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -511,7 +511,7 @@ void drm_unplug_dev(struct drm_device *dev)
}
mutex_unlock(&drm_global_mutex);
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
-index 463ec68..f5bd2b5 100644
+index 004ecdf..db1f6e0 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
-@@ -946,8 +946,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
+@@ -945,8 +945,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-@@ -1107,8 +1107,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
+@@ -1106,8 +1106,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
mc->last_render);
int front_offset;
} drm_i810_private_t;
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
-index 359f6e8..ada68fd 100644
+index 3a1a495..995c093 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
-@@ -518,7 +518,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
+@@ -496,7 +496,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
I915_READ(GTIMR));
}
seq_printf(m, "Interrupts received: %d\n",
- atomic_read(&dev_priv->irq_received));
+ atomic_read_unchecked(&dev_priv->irq_received));
- for (i = 0; i < I915_NUM_RINGS; i++) {
+ for_each_ring(ring, dev_priv, i) {
if (IS_GEN6(dev) || IS_GEN7(dev)) {
- seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
+ seq_printf(m,
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 914c0df..d47d380 100644
+index 61ae104..f8a4bc1 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1269,7 +1269,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -1274,7 +1274,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
bool can_switch;
spin_lock(&dev->count_lock);
return can_switch;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 627fe35..c9a7346 100644
+index 92f1750..3beba74 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -272,12 +272,12 @@ struct drm_i915_display_funcs {
- /* render clock increase/decrease */
- /* display clock increase/decrease */
- /* pll clock increase/decrease */
--};
-+} __no_const;
+@@ -430,7 +430,7 @@ typedef struct drm_i915_private {
- struct drm_i915_gt_funcs {
- void (*force_wake_get)(struct drm_i915_private *dev_priv);
- void (*force_wake_put)(struct drm_i915_private *dev_priv);
--};
-+} __no_const;
-
- struct intel_device_info {
- u8 gen;
-@@ -408,7 +408,7 @@ typedef struct drm_i915_private {
- int current_page;
- int page_flipping;
+ struct resource mch_res;
- atomic_t irq_received;
+ atomic_unchecked_t irq_received;
/* protects the irq masks */
spinlock_t irq_lock;
-@@ -1014,7 +1014,7 @@ struct drm_i915_gem_object {
+@@ -1055,7 +1055,7 @@ struct drm_i915_gem_object {
* will be page flipped away on the next vblank. When it
* reaches 0, dev_priv->pending_flip_queue will be woken up.
*/
};
#define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
-@@ -1482,7 +1482,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter(
+@@ -1558,7 +1558,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter(
struct drm_i915_private *dev_priv, unsigned port);
extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
}
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index cdf46b5..e785624 100644
+index 67036e9..b9f1357 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
- i915_gem_clflush_object(obj);
+@@ -681,7 +681,7 @@ i915_gem_execbuffer_move_to_gpu(struct intel_ring_buffer *ring,
+ i915_gem_clflush_object(obj);
- if (obj->base.pending_write_domain)
-- cd->flips |= atomic_read(&obj->pending_flip);
-+ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
+ if (obj->base.pending_write_domain)
+- flips |= atomic_read(&obj->pending_flip);
++ flips |= atomic_read_unchecked(&obj->pending_flip);
- /* The actual obj->write_domain will be updated with
- * pending_write_domain after we emit the accumulated flush for all
-@@ -907,9 +907,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
+ flush_domains |= obj->base.write_domain;
+ }
+@@ -712,9 +712,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
static int
validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
for (i = 0; i < count; i++) {
char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 73fa3e1..ab2e9b9 100644
+index dc29ace..137d83a 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -514,7 +514,7 @@ static irqreturn_t valleyview_irq_handler(DRM_IRQ_ARGS)
+@@ -531,7 +531,7 @@ static irqreturn_t valleyview_irq_handler(DRM_IRQ_ARGS)
u32 pipe_stats[I915_MAX_PIPES];
bool blc_event;
while (true) {
iir = I915_READ(VLV_IIR);
-@@ -661,7 +661,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
+@@ -678,7 +678,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
irqreturn_t ret = IRQ_NONE;
int i;
/* disable master interrupt before clearing iir */
de_ier = I915_READ(DEIER);
-@@ -736,7 +736,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
+@@ -753,7 +753,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
u32 hotplug_mask;
/* disable master interrupt before clearing iir */
de_ier = I915_READ(DEIER);
-@@ -1717,7 +1717,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
+@@ -1762,7 +1762,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
I915_WRITE(HWSTAM, 0xeffe);
-@@ -1743,7 +1743,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
+@@ -1788,7 +1788,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int pipe;
/* VLV magic */
I915_WRITE(VLV_IMR, 0);
-@@ -2048,7 +2048,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
+@@ -2093,7 +2093,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int pipe;
for_each_pipe(pipe)
I915_WRITE(PIPESTAT(pipe), 0);
-@@ -2099,7 +2099,7 @@ static irqreturn_t i8xx_irq_handler(DRM_IRQ_ARGS)
+@@ -2144,7 +2144,7 @@ static irqreturn_t i8xx_irq_handler(DRM_IRQ_ARGS)
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
iir = I915_READ16(IIR);
if (iir == 0)
-@@ -2184,7 +2184,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
+@@ -2229,7 +2229,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int pipe;
if (I915_HAS_HOTPLUG(dev)) {
I915_WRITE(PORT_HOTPLUG_EN, 0);
-@@ -2279,7 +2279,7 @@ static irqreturn_t i915_irq_handler(DRM_IRQ_ARGS)
+@@ -2324,7 +2324,7 @@ static irqreturn_t i915_irq_handler(DRM_IRQ_ARGS)
};
int pipe, ret = IRQ_NONE;
iir = I915_READ(IIR);
do {
-@@ -2405,7 +2405,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
+@@ -2450,7 +2450,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int pipe;
I915_WRITE(PORT_HOTPLUG_EN, 0);
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
-@@ -2512,7 +2512,7 @@ static irqreturn_t i965_irq_handler(DRM_IRQ_ARGS)
+@@ -2557,7 +2557,7 @@ static irqreturn_t i965_irq_handler(DRM_IRQ_ARGS)
int irq_received;
int ret = IRQ_NONE, pipe;
iir = I915_READ(IIR);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index b634f6f..43c62f5 100644
+index 4d3c7c6..eaac87b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -2182,7 +2182,7 @@ intel_finish_fb(struct drm_framebuffer *old_fb)
+@@ -2131,7 +2131,7 @@ intel_finish_fb(struct drm_framebuffer *old_fb)
wait_event(dev_priv->pending_flip_queue,
atomic_read(&dev_priv->mm.wedged) ||
/* Big Hammer, we also need to ensure that any pending
* MI_WAIT_FOR_EVENT inside a user batch buffer on the
-@@ -6168,8 +6168,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
+@@ -6221,8 +6221,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
obj = work->old_fb_obj;
- atomic_clear_mask(1 << intel_crtc->plane,
- &obj->pending_flip.counter);
+ atomic_clear_mask_unchecked(1 << intel_crtc->plane, &obj->pending_flip);
-
wake_up(&dev_priv->pending_flip_queue);
- schedule_work(&work->work);
-@@ -6515,7 +6514,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
+
+ queue_work(dev_priv->wq, &work->work);
+@@ -6589,7 +6588,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
/* Block clients from rendering to the new back buffer until
* the flip occurs and the object is no longer visible.
*/
- atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
+ atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
+ atomic_inc(&intel_crtc->unpin_work_count);
ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
- if (ret)
-@@ -6530,7 +6529,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
- return 0;
+@@ -6606,7 +6605,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
cleanup_pending:
+ atomic_dec(&intel_crtc->unpin_work_count);
- atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
+ atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
drm_gem_object_unreference(&work->old_fb_obj->base);
unsigned int fb_cpp;
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
-index 2581202..f230a8d9 100644
+index 598c281..60d590e 100644
--- a/drivers/gpu/drm/mga/mga_irq.c
+++ b/drivers/gpu/drm/mga/mga_irq.c
-@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
+@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
if (crtc != 0)
return 0;
}
-@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
/* VBLANK interrupt */
if (status & MGA_VLINEPEN) {
MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
drm_handle_vblank(dev, 0);
handled = 1;
}
-@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
if ((prim_start & ~0x03) != (prim_end & ~0x03))
MGA_WRITE(MGA_PRIMEND, prim_end);
DRM_WAKEUP(&dev_priv->fence_queue);
handled = 1;
}
-@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
+@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
* using fences.
*/
DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
*sequence = cur_fence;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
-index a0a3fe3..209bf10 100644
+index 09fdef2..57f5c3b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -5340,7 +5340,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
+@@ -1240,7 +1240,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
struct bit_table {
const char id;
int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
#define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
-index 4f2cc95..9c6c510 100644
---- a/drivers/gpu/drm/nouveau/nouveau_drv.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -302,7 +302,7 @@ struct nouveau_exec_engine {
- u32 handle, u16 class);
- void (*set_tile_region)(struct drm_device *dev, int i);
- void (*tlb_flush)(struct drm_device *, int engine);
--};
-+} __no_const;
-
- struct nouveau_instmem_engine {
- void *priv;
-@@ -324,13 +324,13 @@ struct nouveau_instmem_engine {
- struct nouveau_mc_engine {
- int (*init)(struct drm_device *dev);
- void (*takedown)(struct drm_device *dev);
--};
-+} __no_const;
-
- struct nouveau_timer_engine {
- int (*init)(struct drm_device *dev);
- void (*takedown)(struct drm_device *dev);
- uint64_t (*read)(struct drm_device *dev);
--};
-+} __no_const;
-
- struct nouveau_fb_engine {
- int num_tiles;
-@@ -547,7 +547,7 @@ struct nouveau_vram_engine {
- void (*put)(struct drm_device *, struct nouveau_mem **);
-
- bool (*flags_valid)(struct drm_device *, u32 tile_flags);
--};
-+} __no_const;
-
- struct nouveau_engine {
- struct nouveau_instmem_engine instmem;
-@@ -693,7 +693,7 @@ struct drm_nouveau_private {
+diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
+index a101699..a163f0a 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
++++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
+@@ -80,7 +80,7 @@ struct nouveau_drm {
struct drm_global_reference mem_global_ref;
struct ttm_bo_global_ref bo_global_ref;
struct ttm_bo_device bdev;
int (*move)(struct nouveau_channel *,
struct ttm_buffer_object *,
struct ttm_mem_reg *, struct ttm_mem_reg *);
+diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h
+index cdb83ac..27f0a16 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_fence.h
++++ b/drivers/gpu/drm/nouveau/nouveau_fence.h
+@@ -43,7 +43,7 @@ struct nouveau_fence_priv {
+ int (*sync)(struct nouveau_fence *, struct nouveau_channel *,
+ struct nouveau_channel *);
+ u32 (*read)(struct nouveau_channel *);
+-};
++} __no_const;
+
+ #define nouveau_fence(drm) ((struct nouveau_fence_priv *)(drm)->fence)
+
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
-index af7cfb8..aadc2a3 100644
+index 5e2f521..0d21436 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -318,7 +318,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
+@@ -321,7 +321,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
int trycnt = 0;
int ret, i;
-- sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
-+ sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
+- sequence = atomic_add_return(1, &drm->ttm.validate_sequence);
++ sequence = atomic_add_return_unchecked(1, &drm->ttm.validate_sequence);
retry:
if (++trycnt > 100000) {
- NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
-index f5e9584..05934ba 100644
---- a/drivers/gpu/drm/nouveau/nouveau_state.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -492,7 +492,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
+ NV_ERROR(drm, "%s failed and gave up.\n", __func__);
+diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
+index 6f0ac64..9c2dfb4 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
++++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
+@@ -63,7 +63,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
bool can_switch;
spin_lock(&dev->count_lock);
spin_unlock(&dev->count_lock);
return can_switch;
}
+diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c
+index 9f6f55c..30e3a29 100644
+--- a/drivers/gpu/drm/nouveau/nv50_evo.c
++++ b/drivers/gpu/drm/nouveau/nv50_evo.c
+@@ -152,9 +152,9 @@ nv50_evo_channel_new(struct drm_device *dev, int chid,
+ kzalloc(sizeof(*evo->object->oclass), GFP_KERNEL);
+ evo->object->oclass->ofuncs =
+ kzalloc(sizeof(*evo->object->oclass->ofuncs), GFP_KERNEL);
+- evo->object->oclass->ofuncs->rd32 = nv50_evo_rd32;
+- evo->object->oclass->ofuncs->wr32 = nv50_evo_wr32;
+- evo->object->oclass->ofuncs->rd08 =
++ *(void**)&evo->object->oclass->ofuncs->rd32 = nv50_evo_rd32;
++ *(void**)&evo->object->oclass->ofuncs->wr32 = nv50_evo_wr32;
++ *(void**)&evo->object->oclass->ofuncs->rd08 =
+ ioremap(pci_resource_start(dev->pdev, 0) +
+ NV50_PDISPLAY_USER(evo->handle), PAGE_SIZE);
+ return 0;
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
-index 93240bd..c490f60 100644
+index b562b59..9d725a8 100644
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -304,7 +304,7 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode)
+@@ -317,7 +317,7 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode)
}
- if (nv_encoder->dcb->type == OUTPUT_DP) {
+ if (nv_encoder->dcb->type == DCB_OUTPUT_DP) {
- struct dp_train_func func = {
+ static struct dp_train_func func = {
.link_set = nv50_sor_dp_link_set,
.train_set = nv50_sor_dp_train_set,
.train_adj = nv50_sor_dp_train_adj
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
-index 8a2fc89..3a5cf40 100644
+index c402fca..f1d694b 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
-@@ -1367,7 +1367,7 @@ nvd0_sor_dpms(struct drm_encoder *encoder, int mode)
- nv_wait(dev, 0x61c030 + (or * 0x0800), 0x10000000, 0x00000000);
+@@ -1389,7 +1389,7 @@ nvd0_sor_dpms(struct drm_encoder *encoder, int mode)
+ nv_wait(device, 0x61c030 + (or * 0x0800), 0x10000000, 0x00000000);
- if (nv_encoder->dcb->type == OUTPUT_DP) {
+ if (nv_encoder->dcb->type == DCB_OUTPUT_DP) {
- struct dp_train_func func = {
+ static struct dp_train_func func = {
.link_set = nvd0_sor_dp_link_set,
.train_set = nvd0_sor_dp_train_set,
.train_adj = nvd0_sor_dp_train_adj
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
-index bcac90b..53bfc76 100644
+index d4660cf..70dbe65 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
-@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
+@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
/* GH: Simple idle check.
*/
u32 color_fmt;
unsigned int front_offset;
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
-index 429d5a0..7e899ed 100644
+index 2ea4f09..d391371 100644
--- a/drivers/gpu/drm/r128/r128_irq.c
+++ b/drivers/gpu/drm/r128/r128_irq.c
-@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
+@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
if (crtc != 0)
return 0;
}
irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
-@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
/* VBLANK interrupt */
if (status & R128_CRTC_VBLANK_INT) {
R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
return IRQ_HANDLED;
}
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
-index a9e33ce..09edd4b 100644
+index 19bb7e6..de7e2a2 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
-@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
+@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
{
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index 59a1531..3bab49b 100644
---- a/drivers/gpu/drm/radeon/radeon.h
-+++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -711,7 +711,7 @@ struct r600_blit_cp_primitives {
- int x2, int y2);
- void (*draw_auto)(struct radeon_device *rdev);
- void (*set_default_state)(struct radeon_device *rdev);
--};
-+} __no_const;
-
- struct r600_blit {
- struct radeon_bo *shader_obj;
-@@ -1216,7 +1216,7 @@ struct radeon_asic {
- u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
- void (*post_page_flip)(struct radeon_device *rdev, int crtc);
- } pflip;
--};
-+} __no_const;
-
- /*
- * Asic structures
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index 7a3daeb..5016171 100644
+index 008d645..de03849 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
-@@ -952,7 +952,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -941,7 +941,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
bool can_switch;
spin_lock(&dev->count_lock);
uint32_t irq_enable_reg;
uint32_t r500_disp_irq_reg;
diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
-index 48b7cea..342236f 100644
+index c180df8..cd80dd2d 100644
--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
-@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
+@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
request = compat_alloc_user_space(sizeof(*request));
if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
|| __put_user(req32.param, &request->param)
return -EFAULT;
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
-index 00da384..32f972d 100644
+index e771033..a0bc6b3 100644
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
-@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
+@@ -224,8 +224,8 @@ static int radeon_emit_irq(struct drm_device * dev)
unsigned int ret;
RING_LOCALS;
BEGIN_RING(4);
OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
-@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
+@@ -351,7 +351,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
drm_radeon_private_t *dev_priv =
(drm_radeon_private_t *) dev->dev_private;
dev->max_vblank_count = 0x001fffff;
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
-index e8422ae..d22d4a8 100644
+index 8e9057b..af6dacb 100644
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
-@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
+@@ -2166,7 +2166,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
sarea_priv->nbox * sizeof(depth_boxes[0])))
return -EFAULT;
-@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3029,7 +3029,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
{
drm_radeon_private_t *dev_priv = dev->dev_private;
drm_radeon_getparam_t *param = data;
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
-index 5b71c71..650f9e4 100644
+index 5ebe1b3..1ed9426 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -822,8 +822,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
-index 3b663fc..57850f4 100644
+index 5706d2a..17aedaa 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
-@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
+@@ -304,9 +304,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
rdev->pm.sideport_bandwidth.full)
rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
rdev->pm.k8_bandwidth.full)
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
-index ebc6fac..a8313ed 100644
+index bd2a3b4..122d9ad 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -394,9 +394,9 @@ static int ttm_pool_get_num_unused_pages(void)
int shrink_pages = sc->nr_to_scan;
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
-index 88edacc..1e5412b 100644
+index 893a650..6190d3b 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
char pci_buf[VIA_PCI_BUF_SIZE];
const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
-index d391f48..10c8ca3 100644
+index ac98964..5dbf512 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
-@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
+@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
if (crtc != 0)
return 0;
}
irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
-@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
status = VIA_READ(VIA_REG_INTERRUPT);
if (status & VIA_IRQ_VBLANK_PENDING) {
do_gettimeofday(&cur_vblank);
if (dev_priv->last_vblank_valid) {
dev_priv->usec_per_vblank =
-@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
dev_priv->last_vblank = cur_vblank;
dev_priv->last_vblank_valid = 1;
}
DRM_DEBUG("US per vblank is: %u\n",
dev_priv->usec_per_vblank);
}
-@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
for (i = 0; i < dev_priv->num_irqs; ++i) {
if (status & cur_irq->pending_mask) {
DRM_WAKEUP(&cur_irq->irq_queue);
handled = 1;
if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
-@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
+@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
masks[irq][4]));
*sequence) <= (1 << 23)));
}
*sequence = cur_irq_sequence;
-@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
+@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
}
for (i = 0; i < dev_priv->num_irqs; ++i) {
cur_irq->enable_mask = dev_priv->irq_masks[i][0];
cur_irq->pending_mask = dev_priv->irq_masks[i][1];
DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
-@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
+@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
case VIA_IRQ_RELATIVE:
irqwait->request.sequence +=
case VIA_IRQ_ABSOLUTE:
break;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-index 29c984f..4084f1a 100644
+index 88a179e..57fe50481c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -263,7 +263,7 @@ struct vmw_private {
wait_queue_head_t fifo_queue;
int fence_queue_waiters; /* Protected by hw_mutex */
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
-index a0c2f12..68ae6cb 100644
+index 3eb1486..0a47ee9 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
-index cabc95f..14b3d77 100644
+index 4640adb..e1384ed 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
marker = list_first_entry(&queue->head,
struct vmw_marker, head);
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 5de3bb3..08e5063 100644
+index 52146db..ae33762 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
-@@ -2177,7 +2177,7 @@ static bool hid_ignore(struct hid_device *hdev)
+@@ -2201,7 +2201,7 @@ static bool hid_ignore(struct hid_device *hdev)
int hid_add_device(struct hid_device *hdev)
{
int ret;
if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -2212,7 +2212,7 @@ int hid_add_device(struct hid_device *hdev)
+@@ -2236,7 +2236,7 @@ int hid_add_device(struct hid_device *hdev)
/* XXX hack, any other cleaner solution after the driver core
* is converted to allow more than 20 bytes as the device name? */
dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
if (ret)
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
-index 86f8885..ab9cb2b 100644
+index 3648f8f..30ef30d 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
-@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
+@@ -111,7 +111,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
u64 output_address = (output) ? virt_to_phys(output) : 0;
u32 output_address_hi = output_address >> 32;
u32 output_address_lo = output_address & 0xFFFFFFFF;
__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
"=a"(hv_status_lo) : "d" (control_hi),
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
-index 0614ff3..f0b2b5c 100644
+index d8d1fad..b91caf7 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
-@@ -555,7 +555,7 @@ enum vmbus_connect_state {
+@@ -594,7 +594,7 @@ enum vmbus_connect_state {
struct vmbus_connection {
enum vmbus_connect_state conn_state;
/*
* Represents channel interrupts. Each bit position represents a
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index 4748086..3abf845 100644
+index 8e1a9ec..4687821 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
-@@ -662,10 +662,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
+@@ -629,10 +629,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
{
int ret = 0;
child_device_obj->device.bus = &hv_bus;
child_device_obj->device.parent = &hv_acpi_dev->dev;
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
-index 8b011d0..3de24a1 100644
+index 07a0c1a..0cac334 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
-@@ -166,7 +166,7 @@ struct sht15_data {
+@@ -169,7 +169,7 @@ struct sht15_data {
int supply_uV;
bool supply_uV_valid;
struct work_struct update_supply_work;
};
/**
-@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
+@@ -512,13 +512,13 @@ static int sht15_measurement(struct sht15_data *data,
return ret;
gpio_direction_input(data->pdata->gpio_data);
schedule_work(&data->read_work);
}
ret = wait_event_timeout(data->wait_queue,
-@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
+@@ -785,7 +785,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
/* First disable the interrupt */
disable_irq_nosync(irq);
/* Then schedule a reading work struct */
if (data->state != SHT15_READING_NOTHING)
schedule_work(&data->read_work);
-@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
+@@ -807,11 +807,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
* If not, then start the interrupt again - care here as could
* have gone low in meantime so verify it hasn't!
*/
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(nforce2_lock);
-diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
-index 1038c38..eb92f51 100644
---- a/drivers/i2c/i2c-mux.c
-+++ b/drivers/i2c/i2c-mux.c
-@@ -30,7 +30,7 @@
- /* multiplexer per channel data */
- struct i2c_mux_priv {
- struct i2c_adapter adap;
-- struct i2c_algorithm algo;
-+ i2c_algorithm_no_const algo;
-
- struct i2c_adapter *parent;
- void *mux_priv; /* the mux chip/device */
-diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
-index 57d00ca..0145194 100644
---- a/drivers/ide/aec62xx.c
-+++ b/drivers/ide/aec62xx.c
-@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
- .cable_detect = atp86x_cable_detect,
- };
-
--static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
-+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
- { /* 0: AEC6210 */
- .name = DRV_NAME,
- .init_chipset = init_chipset_aec62xx,
-diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
-index 2c8016a..911a27c 100644
---- a/drivers/ide/alim15x3.c
-+++ b/drivers/ide/alim15x3.c
-@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
- .dma_sff_read_status = ide_dma_sff_read_status,
- };
-
--static const struct ide_port_info ali15x3_chipset __devinitdata = {
-+static const struct ide_port_info ali15x3_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_chipset = init_chipset_ali15x3,
- .init_hwif = init_hwif_ali15x3,
-diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
-index 3747b25..56fc995 100644
---- a/drivers/ide/amd74xx.c
-+++ b/drivers/ide/amd74xx.c
-@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
- .udma_mask = udma, \
- }
-
--static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
-+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
- /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
- /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
- /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
-diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
-index 15f0ead..cb43480 100644
---- a/drivers/ide/atiixp.c
-+++ b/drivers/ide/atiixp.c
-@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
- .cable_detect = atiixp_cable_detect,
- };
-
--static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
-+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
- { /* 0: IXP200/300/400/700 */
- .name = DRV_NAME,
- .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
-diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
-index 5f80312..d1fc438 100644
---- a/drivers/ide/cmd64x.c
-+++ b/drivers/ide/cmd64x.c
-@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
- .dma_sff_read_status = ide_dma_sff_read_status,
- };
-
--static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
-+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
- { /* 0: CMD643 */
- .name = DRV_NAME,
- .init_chipset = init_chipset_cmd64x,
-diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
-index 2c1e5f7..1444762 100644
---- a/drivers/ide/cs5520.c
-+++ b/drivers/ide/cs5520.c
-@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
- .set_dma_mode = cs5520_set_dma_mode,
- };
-
--static const struct ide_port_info cyrix_chipset __devinitdata = {
-+static const struct ide_port_info cyrix_chipset __devinitconst = {
- .name = DRV_NAME,
- .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
- .port_ops = &cs5520_port_ops,
-diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
-index 4dc4eb9..49b40ad 100644
---- a/drivers/ide/cs5530.c
-+++ b/drivers/ide/cs5530.c
-@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
- .udma_filter = cs5530_udma_filter,
- };
-
--static const struct ide_port_info cs5530_chipset __devinitdata = {
-+static const struct ide_port_info cs5530_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_chipset = init_chipset_cs5530,
- .init_hwif = init_hwif_cs5530,
-diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
-index 5059faf..18d4c85 100644
---- a/drivers/ide/cs5535.c
-+++ b/drivers/ide/cs5535.c
-@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
- .cable_detect = cs5535_cable_detect,
- };
-
--static const struct ide_port_info cs5535_chipset __devinitdata = {
-+static const struct ide_port_info cs5535_chipset __devinitconst = {
- .name = DRV_NAME,
- .port_ops = &cs5535_port_ops,
- .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
-diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
-index 847553f..3ffb49d 100644
---- a/drivers/ide/cy82c693.c
-+++ b/drivers/ide/cy82c693.c
-@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
- .set_dma_mode = cy82c693_set_dma_mode,
- };
-
--static const struct ide_port_info cy82c693_chipset __devinitdata = {
-+static const struct ide_port_info cy82c693_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_iops = init_iops_cy82c693,
- .port_ops = &cy82c693_port_ops,
-diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
-index 58c51cd..4aec3b8 100644
---- a/drivers/ide/hpt366.c
-+++ b/drivers/ide/hpt366.c
-@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
- }
- };
-
--static const struct hpt_info hpt36x __devinitdata = {
-+static const struct hpt_info hpt36x __devinitconst = {
- .chip_name = "HPT36x",
- .chip_type = HPT36x,
- .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
-@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
- .timings = &hpt36x_timings
- };
-
--static const struct hpt_info hpt370 __devinitdata = {
-+static const struct hpt_info hpt370 __devinitconst = {
- .chip_name = "HPT370",
- .chip_type = HPT370,
- .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
-@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt370a __devinitdata = {
-+static const struct hpt_info hpt370a __devinitconst = {
- .chip_name = "HPT370A",
- .chip_type = HPT370A,
- .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
-@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt374 __devinitdata = {
-+static const struct hpt_info hpt374 __devinitconst = {
- .chip_name = "HPT374",
- .chip_type = HPT374,
- .udma_mask = ATA_UDMA5,
-@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt372 __devinitdata = {
-+static const struct hpt_info hpt372 __devinitconst = {
- .chip_name = "HPT372",
- .chip_type = HPT372,
- .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt372a __devinitdata = {
-+static const struct hpt_info hpt372a __devinitconst = {
- .chip_name = "HPT372A",
- .chip_type = HPT372A,
- .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt302 __devinitdata = {
-+static const struct hpt_info hpt302 __devinitconst = {
- .chip_name = "HPT302",
- .chip_type = HPT302,
- .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt371 __devinitdata = {
-+static const struct hpt_info hpt371 __devinitconst = {
- .chip_name = "HPT371",
- .chip_type = HPT371,
- .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt372n __devinitdata = {
-+static const struct hpt_info hpt372n __devinitconst = {
- .chip_name = "HPT372N",
- .chip_type = HPT372N,
- .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt302n __devinitdata = {
-+static const struct hpt_info hpt302n __devinitconst = {
- .chip_name = "HPT302N",
- .chip_type = HPT302N,
- .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
- .timings = &hpt37x_timings
- };
-
--static const struct hpt_info hpt371n __devinitdata = {
-+static const struct hpt_info hpt371n __devinitconst = {
- .chip_name = "HPT371N",
- .chip_type = HPT371N,
- .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
- .dma_sff_read_status = ide_dma_sff_read_status,
- };
-
--static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
-+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
- { /* 0: HPT36x */
- .name = DRV_NAME,
- .init_chipset = init_chipset_hpt366,
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 8126824..55a2798 100644
--- a/drivers/ide/ide-cd.c
drive->dma = 0;
}
}
-diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
-index 7f56b73..dab5b67 100644
---- a/drivers/ide/ide-pci-generic.c
-+++ b/drivers/ide/ide-pci-generic.c
-@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
- .udma_mask = ATA_UDMA6, \
- }
-
--static const struct ide_port_info generic_chipsets[] __devinitdata = {
-+static const struct ide_port_info generic_chipsets[] __devinitconst = {
- /* 0: Unknown */
- DECLARE_GENERIC_PCI_DEV(0),
-
-diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
-index 560e66d..d5dd180 100644
---- a/drivers/ide/it8172.c
-+++ b/drivers/ide/it8172.c
-@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
- .set_dma_mode = it8172_set_dma_mode,
- };
-
--static const struct ide_port_info it8172_port_info __devinitdata = {
-+static const struct ide_port_info it8172_port_info __devinitconst = {
- .name = DRV_NAME,
- .port_ops = &it8172_port_ops,
- .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
-diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
-index 46816ba..1847aeb 100644
---- a/drivers/ide/it8213.c
-+++ b/drivers/ide/it8213.c
-@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
- .cable_detect = it8213_cable_detect,
- };
-
--static const struct ide_port_info it8213_chipset __devinitdata = {
-+static const struct ide_port_info it8213_chipset __devinitconst = {
- .name = DRV_NAME,
- .enablebits = { {0x41, 0x80, 0x80} },
- .port_ops = &it8213_port_ops,
-diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
-index 2e3169f..c5611db 100644
---- a/drivers/ide/it821x.c
-+++ b/drivers/ide/it821x.c
-@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
- .cable_detect = it821x_cable_detect,
- };
-
--static const struct ide_port_info it821x_chipset __devinitdata = {
-+static const struct ide_port_info it821x_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_chipset = init_chipset_it821x,
- .init_hwif = init_hwif_it821x,
-diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
-index 74c2c4a..efddd7d 100644
---- a/drivers/ide/jmicron.c
-+++ b/drivers/ide/jmicron.c
-@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
- .cable_detect = jmicron_cable_detect,
- };
-
--static const struct ide_port_info jmicron_chipset __devinitdata = {
-+static const struct ide_port_info jmicron_chipset __devinitconst = {
- .name = DRV_NAME,
- .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
- .port_ops = &jmicron_port_ops,
-diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
-index 95327a2..73f78d8 100644
---- a/drivers/ide/ns87415.c
-+++ b/drivers/ide/ns87415.c
-@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
- .dma_sff_read_status = superio_dma_sff_read_status,
- };
-
--static const struct ide_port_info ns87415_chipset __devinitdata = {
-+static const struct ide_port_info ns87415_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_hwif = init_hwif_ns87415,
- .tp_ops = &ns87415_tp_ops,
-diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
-index 1a53a4c..39edc66 100644
---- a/drivers/ide/opti621.c
-+++ b/drivers/ide/opti621.c
-@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
- .set_pio_mode = opti621_set_pio_mode,
- };
-
--static const struct ide_port_info opti621_chipset __devinitdata = {
-+static const struct ide_port_info opti621_chipset __devinitconst = {
- .name = DRV_NAME,
- .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
- .port_ops = &opti621_port_ops,
-diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
-index 9546fe2..2e5ceb6 100644
---- a/drivers/ide/pdc202xx_new.c
-+++ b/drivers/ide/pdc202xx_new.c
-@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
- .udma_mask = udma, \
- }
-
--static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
-+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
- /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
- /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
- };
-diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
-index 3a35ec6..5634510 100644
---- a/drivers/ide/pdc202xx_old.c
-+++ b/drivers/ide/pdc202xx_old.c
-@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
- .max_sectors = sectors, \
- }
-
--static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
-+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
- { /* 0: PDC20246 */
- .name = DRV_NAME,
- .init_chipset = init_chipset_pdc202xx,
-diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
-index 1892e81..fe0fd60 100644
---- a/drivers/ide/piix.c
-+++ b/drivers/ide/piix.c
-@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
- .udma_mask = udma, \
- }
-
--static const struct ide_port_info piix_pci_info[] __devinitdata = {
-+static const struct ide_port_info piix_pci_info[] __devinitconst = {
- /* 0: MPIIX */
- { /*
- * MPIIX actually has only a single IDE channel mapped to
-diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
-index a6414a8..c04173e 100644
---- a/drivers/ide/rz1000.c
-+++ b/drivers/ide/rz1000.c
-@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
- }
- }
-
--static const struct ide_port_info rz1000_chipset __devinitdata = {
-+static const struct ide_port_info rz1000_chipset __devinitconst = {
- .name = DRV_NAME,
- .host_flags = IDE_HFLAG_NO_DMA,
- };
-diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
-index 356b9b5..d4758eb 100644
---- a/drivers/ide/sc1200.c
-+++ b/drivers/ide/sc1200.c
-@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
- .dma_sff_read_status = ide_dma_sff_read_status,
- };
-
--static const struct ide_port_info sc1200_chipset __devinitdata = {
-+static const struct ide_port_info sc1200_chipset __devinitconst = {
- .name = DRV_NAME,
- .port_ops = &sc1200_port_ops,
- .dma_ops = &sc1200_dma_ops,
-diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
-index b7f5b0c..9701038 100644
---- a/drivers/ide/scc_pata.c
-+++ b/drivers/ide/scc_pata.c
-@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
- .dma_sff_read_status = scc_dma_sff_read_status,
- };
-
--static const struct ide_port_info scc_chipset __devinitdata = {
-+static const struct ide_port_info scc_chipset __devinitconst = {
- .name = "sccIDE",
- .init_iops = init_iops_scc,
- .init_dma = scc_init_dma,
-diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
-index 35fb8da..24d72ef 100644
---- a/drivers/ide/serverworks.c
-+++ b/drivers/ide/serverworks.c
-@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
- .cable_detect = svwks_cable_detect,
- };
-
--static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
-+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
- { /* 0: OSB4 */
- .name = DRV_NAME,
- .init_chipset = init_chipset_svwks,
-diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
-index ddeda44..46f7e30 100644
---- a/drivers/ide/siimage.c
-+++ b/drivers/ide/siimage.c
-@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
- .udma_mask = ATA_UDMA6, \
- }
-
--static const struct ide_port_info siimage_chipsets[] __devinitdata = {
-+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
- /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
- /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
- };
-diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
-index 4a00225..09e61b4 100644
---- a/drivers/ide/sis5513.c
-+++ b/drivers/ide/sis5513.c
-@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
- .cable_detect = sis_cable_detect,
- };
-
--static const struct ide_port_info sis5513_chipset __devinitdata = {
-+static const struct ide_port_info sis5513_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_chipset = init_chipset_sis5513,
- .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
-diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
-index f21dc2a..d051cd2 100644
---- a/drivers/ide/sl82c105.c
-+++ b/drivers/ide/sl82c105.c
-@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
- .dma_sff_read_status = ide_dma_sff_read_status,
- };
-
--static const struct ide_port_info sl82c105_chipset __devinitdata = {
-+static const struct ide_port_info sl82c105_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_chipset = init_chipset_sl82c105,
- .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
-diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
-index 864ffe0..863a5e9 100644
---- a/drivers/ide/slc90e66.c
-+++ b/drivers/ide/slc90e66.c
-@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
- .cable_detect = slc90e66_cable_detect,
- };
-
--static const struct ide_port_info slc90e66_chipset __devinitdata = {
-+static const struct ide_port_info slc90e66_chipset __devinitconst = {
- .name = DRV_NAME,
- .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
- .port_ops = &slc90e66_port_ops,
-diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
-index 4799d5c..1794678 100644
---- a/drivers/ide/tc86c001.c
-+++ b/drivers/ide/tc86c001.c
-@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
- .dma_sff_read_status = ide_dma_sff_read_status,
- };
-
--static const struct ide_port_info tc86c001_chipset __devinitdata = {
-+static const struct ide_port_info tc86c001_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_hwif = init_hwif_tc86c001,
- .port_ops = &tc86c001_port_ops,
-diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
-index 281c914..55ce1b8 100644
---- a/drivers/ide/triflex.c
-+++ b/drivers/ide/triflex.c
-@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
- .set_dma_mode = triflex_set_mode,
- };
-
--static const struct ide_port_info triflex_device __devinitdata = {
-+static const struct ide_port_info triflex_device __devinitconst = {
- .name = DRV_NAME,
- .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
- .port_ops = &triflex_port_ops,
-diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
-index 4b42ca0..e494a98 100644
---- a/drivers/ide/trm290.c
-+++ b/drivers/ide/trm290.c
-@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
- .dma_check = trm290_dma_check,
- };
-
--static const struct ide_port_info trm290_chipset __devinitdata = {
-+static const struct ide_port_info trm290_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_hwif = init_hwif_trm290,
- .tp_ops = &trm290_tp_ops,
-diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
-index f46f49c..eb77678 100644
---- a/drivers/ide/via82cxxx.c
-+++ b/drivers/ide/via82cxxx.c
-@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
- .cable_detect = via82cxxx_cable_detect,
- };
-
--static const struct ide_port_info via82cxxx_chipset __devinitdata = {
-+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
- .name = DRV_NAME,
- .init_chipset = init_chipset_via82cxxx,
- .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
-diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
-index 73d4531..c90cd2d 100644
---- a/drivers/ieee802154/fakehard.c
-+++ b/drivers/ieee802154/fakehard.c
-@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
- phy->transmit_power = 0xbf;
-
- dev->netdev_ops = &fake_ops;
-- dev->ml_priv = &fake_mlme;
-+ dev->ml_priv = (void *)&fake_mlme;
-
- priv = netdev_priv(dev);
- priv->phy = phy;
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
-index d67999f..4c5d083 100644
+index 394fea2..c833880 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
}
}
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
-index 57e07c6..56d09d4 100644
+index afd8179..598063f 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
sdata, wqe->wr.wr.atomic.swap);
goto send_comp;
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
-index 7140199..da60063 100644
+index 748db2d..5f75cc3 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
-@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
+@@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
LIST_HEAD(nes_adapter_list);
static LIST_HEAD(nes_dev_list);
static unsigned int ee_flsh_adapter;
static unsigned int sysfs_nonidx_addr;
-@@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
+@@ -267,7 +267,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
struct nes_adapter *nesadapter = nesdev->nesadapter;
/* Free the control structures */
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
-index c438e46..ca30356 100644
+index 33cc589..3bd6538 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
+@@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
extern unsigned int wqm_quanta;
extern struct list_head nes_adapter_list;
extern u32 mh_detected;
extern u32 mh_pauses_sent;
extern u32 cm_packets_sent;
-@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
+@@ -196,16 +196,16 @@ extern u32 cm_packets_created;
extern u32 cm_packets_received;
extern u32 cm_packets_dropped;
extern u32 cm_packets_retrans;
extern u32 int_mod_timer_init;
extern u32 int_mod_cq_depth_256;
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
-index 020e95c..fbb3450 100644
+index cfaacaf..fa0722e 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
{
-@@ -1279,7 +1279,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
+@@ -1281,7 +1281,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
kfree(listener);
listener = NULL;
ret = 0;
} else {
spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
}
-@@ -1482,7 +1482,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
+@@ -1480,7 +1480,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
cm_node->rem_mac);
add_hte_node(cm_core, cm_node);
return cm_node;
}
-@@ -1540,7 +1540,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
+@@ -1538,7 +1538,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
}
atomic_dec(&cm_core->node_cnt);
nesqp = cm_node->nesqp;
if (nesqp) {
nesqp->cm_node = NULL;
-@@ -1604,7 +1604,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
+@@ -1602,7 +1602,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
static void drop_packet(struct sk_buff *skb)
{
dev_kfree_skb_any(skb);
}
-@@ -1667,7 +1667,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
+@@ -1665,7 +1665,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
{
int reset = 0; /* whether to send reset in case of err.. */
nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
" refcnt=%d\n", cm_node, cm_node->state,
atomic_read(&cm_node->ref_count));
-@@ -2308,7 +2308,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
+@@ -2306,7 +2306,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
rem_ref_cm_node(cm_node->cm_core, cm_node);
return NULL;
}
loopbackremotenode->loopbackpartner = cm_node;
loopbackremotenode->tcp_cntxt.rcv_wscale =
NES_CM_DEFAULT_RCV_WND_SCALE;
-@@ -2583,7 +2583,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
+@@ -2581,7 +2581,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
else {
rem_ref_cm_node(cm_core, cm_node);
dev_kfree_skb_any(skb);
}
break;
-@@ -2891,7 +2891,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
+@@ -2889,7 +2889,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
if ((cm_id) && (cm_id->event_handler)) {
if (issue_disconn) {
cm_event.event = IW_CM_EVENT_DISCONNECT;
cm_event.status = disconn_status;
cm_event.local_addr = cm_id->local_addr;
-@@ -2913,7 +2913,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
+@@ -2911,7 +2911,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
}
if (issue_close) {
nes_disconnect(nesqp, 1);
cm_id->provider_data = nesqp;
-@@ -3049,7 +3049,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+@@ -3047,7 +3047,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
netdev_refcnt_read(nesvnic->netdev));
-@@ -3251,7 +3251,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
+@@ -3242,7 +3242,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
struct nes_cm_core *cm_core;
u8 *start_buff;
cm_node = (struct nes_cm_node *)cm_id->provider_data;
loopback = cm_node->loopbackpartner;
cm_core = cm_node->cm_core;
-@@ -3311,7 +3311,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+@@ -3302,7 +3302,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
ntohl(cm_id->local_addr.sin_addr.s_addr),
ntohs(cm_id->local_addr.sin_port));
nesqp->active_conn = 1;
/* cache the cm_id in the qp */
-@@ -3421,7 +3421,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
+@@ -3412,7 +3412,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
return err;
}
}
cm_id->add_ref(cm_id);
-@@ -3522,7 +3522,7 @@ static void cm_event_connected(struct nes_cm_event *event)
+@@ -3513,7 +3513,7 @@ static void cm_event_connected(struct nes_cm_event *event)
if (nesqp->destroyed)
return;
nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
" local port 0x%04X. jiffies = %lu.\n",
nesqp->hwqp.qp_id,
-@@ -3709,7 +3709,7 @@ static void cm_event_reset(struct nes_cm_event *event)
+@@ -3693,7 +3693,7 @@ static void cm_event_reset(struct nes_cm_event *event)
cm_id->add_ref(cm_id);
ret = cm_id->event_handler(cm_id, &cm_event);
cm_event.event = IW_CM_EVENT_CLOSE;
cm_event.status = 0;
cm_event.provider_data = cm_id->provider_data;
-@@ -3745,7 +3745,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
+@@ -3729,7 +3729,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
return;
cm_id = cm_node->cm_id;
nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
cm_node, cm_id, jiffies);
-@@ -3785,7 +3785,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
+@@ -3769,7 +3769,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
return;
cm_id = cm_node->cm_id;
}
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
-index f3a3ecf..57d311d 100644
+index 0564be7..f68b0f1 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
-@@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
+@@ -1272,39 +1272,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
target_stat_values[++index] = mh_detected;
target_stat_values[++index] = mh_pauses_sent;
target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
/**
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
-index 8b8812d..a5e1133 100644
+index 07e4fba..685f041 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -46,9 +46,9 @@
switch (init_attr->qp_type) {
case IB_QPT_RC:
if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
-@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
+@@ -1462,7 +1462,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
struct iw_cm_event cm_event;
int ret = 0;
/* Blow away the connection if it exists. */
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
-index 7b1b8669..4b69f85 100644
+index 4d11575..3e890e5 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -51,6 +51,7 @@
gameport->dev.release = gameport_release_port;
if (gameport->parent)
diff --git a/drivers/input/input.c b/drivers/input/input.c
-index 8921c61..f5cd63d 100644
+index 53a0dde..abffda7 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
-@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
+@@ -1902,7 +1902,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
*/
int input_register_device(struct input_dev *dev)
{
- static atomic_t input_no = ATOMIC_INIT(0);
+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
struct input_handler *handler;
+ unsigned int packet_size;
const char *path;
- int error;
-@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
+@@ -1945,7 +1945,7 @@ int input_register_device(struct input_dev *dev)
dev->setkeycode = input_default_setkeycode;
dev_set_name(&dev->dev, "input%ld",
snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
led->xpad = xpad;
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
-index 0110b5a..d3ad144 100644
+index 4c842c3..590b0bf 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
-@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
+@@ -738,7 +738,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
spin_unlock_irq(&client->packet_lock);
serio->dev.bus = &serio_bus;
serio->dev.release = serio_release_port;
serio->dev.groups = serio_device_attr_groups;
+diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
+index faf10ba..7cfaba9 100644
+--- a/drivers/iommu/amd_iommu_init.c
++++ b/drivers/iommu/amd_iommu_init.c
+@@ -1922,7 +1922,7 @@ static int __init state_next(void)
+ case IOMMU_ACPI_FINISHED:
+ early_enable_iommus();
+ register_syscore_ops(&amd_iommu_syscore_ops);
+- x86_platform.iommu_shutdown = disable_iommus;
++ *(void **)&x86_platform.iommu_shutdown = disable_iommus;
+ init_state = IOMMU_ENABLED;
+ break;
+ case IOMMU_ENABLED:
+@@ -2064,7 +2064,7 @@ int __init amd_iommu_detect(void)
+
+ amd_iommu_detected = true;
+ iommu_detected = 1;
+- x86_init.iommu.iommu_init = amd_iommu_init;
++ *(void **)&x86_init.iommu.iommu_init = amd_iommu_init;
+
+ return 0;
+ }
+diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
+index 86e2f4a..d1cec5d 100644
+--- a/drivers/iommu/dmar.c
++++ b/drivers/iommu/dmar.c
+@@ -555,7 +555,7 @@ int __init detect_intel_iommu(void)
+
+ #ifdef CONFIG_X86
+ if (ret)
+- x86_init.iommu.iommu_init = intel_iommu_init;
++ *(void **)&x86_init.iommu.iommu_init = intel_iommu_init;
+ #endif
+ }
+ early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
-index 38c4bd8..58965d9 100644
+index c679867..6e2e34d 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -83,8 +83,8 @@ struct capiminor {
struct tty_port port;
int ttyinstop;
-@@ -392,7 +392,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
+@@ -393,7 +393,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
capimsg_setu16(s, 2, mp->ap->applid);
capimsg_setu8 (s, 4, CAPI_DATA_B3);
capimsg_setu8 (s, 5, CAPI_RESP);
capimsg_setu32(s, 8, mp->ncci);
capimsg_setu16(s, 12, datahandle);
}
-@@ -513,14 +513,14 @@ static void handle_minor_send(struct capiminor *mp)
+@@ -514,14 +514,14 @@ static void handle_minor_send(struct capiminor *mp)
mp->outbytes -= len;
spin_unlock_bh(&mp->outlock);
capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
capimsg_setu16(skb->data, 16, len); /* Data length */
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
-index a6d9fd2..afdb8a3 100644
+index 67abf3f..076b3a6 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -160,9 +160,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
return -EFAULT;
} else {
memcpy(buf, dp, left);
-diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
-index dd6b53a..19d9ee6 100644
---- a/drivers/isdn/hardware/eicon/divasync.h
-+++ b/drivers/isdn/hardware/eicon/divasync.h
-@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
- } diva_didd_add_adapter_t;
- typedef struct _diva_didd_remove_adapter {
- IDI_CALL p_request;
--} diva_didd_remove_adapter_t;
-+} __no_const diva_didd_remove_adapter_t;
- typedef struct _diva_didd_read_adapter_array {
- void *buffer;
- dword length;
-diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
-index d303e65..28bcb7b 100644
---- a/drivers/isdn/hardware/eicon/xdi_adapter.h
-+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
-@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
- typedef struct _diva_os_idi_adapter_interface {
- diva_init_card_proc_t cleanup_adapter_proc;
- diva_cmd_card_proc_t cmd_proc;
--} diva_os_idi_adapter_interface_t;
-+} __no_const diva_os_idi_adapter_interface_t;
-
- typedef struct _diva_os_xdi_adapter {
- struct list_head link;
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
-index 7bc5067..fd36232 100644
+index b817809..409caff 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
-@@ -1505,9 +1505,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
- port = &info->port;
+@@ -1513,9 +1513,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
+
#ifdef ISDN_DEBUG_MODEM_OPEN
printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
- port->count);
-+ atomic_read(&port->count))
++ atomic_read(&port->count));
#endif
- port->count++;
+ atomic_inc(&port->count);
- tty->driver_data = info;
port->tty = tty;
- tty->port = port;
-@@ -1553,7 +1553,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
+ /*
+ * Start up serial port
+@@ -1559,7 +1559,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
#endif
return;
}
/*
* Uh, oh. tty->count is 1, which means that the tty
* structure will be freed. Info->count should always
-@@ -1562,15 +1562,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
+@@ -1568,15 +1568,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
* serial port won't be shutdown.
*/
printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
#ifdef ISDN_DEBUG_MODEM_OPEN
printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
#endif
-@@ -1624,7 +1624,7 @@ isdn_tty_hangup(struct tty_struct *tty)
+@@ -1630,7 +1630,7 @@ isdn_tty_hangup(struct tty_struct *tty)
if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
return;
isdn_tty_shutdown(info);
port->flags &= ~ASYNC_NORMAL_ACTIVE;
port->tty = NULL;
wake_up_interruptible(&port->open_wait);
-@@ -1964,7 +1964,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
+@@ -1971,7 +1971,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
modem_info *info = &dev->mdm.info[i];
printk(KERN_INFO "lguest: mapped switcher at %p\n",
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
-index 39809035..ce25c5e 100644
+index 4af12e1..0e89afe 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -59,7 +59,7 @@ static struct {
/*
* Set up the Guest's page tables to see this CPU's pages (and no
* other CPU's pages).
-@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
+@@ -476,7 +482,7 @@ void __init lguest_arch_host_init(void)
* compiled-in switcher code and the high-mapped copy we just made.
*/
for (i = 0; i < IDT_ENTRIES; i++)
/*
* Set up the Switcher's per-cpu areas.
-@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
+@@ -559,7 +565,7 @@ void __init lguest_arch_host_init(void)
* it will be undisturbed when we switch. To change %cs and jump we
* need this structure to feed to Intel's "lcall" instruction.
*/
// Every interrupt can come to us here
// But we must truly tell each apart.
-diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
-index 20e5c2c..9e849a9 100644
---- a/drivers/macintosh/macio_asic.c
-+++ b/drivers/macintosh/macio_asic.c
-@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
- * MacIO is matched against any Apple ID, it's probe() function
- * will then decide wether it applies or not
- */
--static const struct pci_device_id __devinitdata pci_ids [] = { {
-+static const struct pci_device_id __devinitconst pci_ids [] = { {
- .vendor = PCI_VENDOR_ID_APPLE,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
-index 94e7f6b..2f4a0d8 100644
+index 7155945..4bcc562 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
-@@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
+@@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
chunk_kb ? "KB" : "B");
if (bitmap->storage.file) {
seq_printf(seq, ", file: ");
seq_printf(seq, "\n");
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
-index afd9598..528d8f9 100644
+index a651d52..82f8a95 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
-@@ -1593,7 +1593,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
+@@ -1601,7 +1601,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
cmd == DM_LIST_VERSIONS_CMD)
return 0;
DMWARN("name not supplied when creating device");
return -EINVAL;
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
-index bc5ddba8..b961159 100644
+index fd61f98..8050783 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -40,7 +40,7 @@ enum dm_raid1_error {
return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
-index a087bf2..4c94786 100644
+index e2f87653..f279abe 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -20,7 +20,7 @@ struct stripe {
schedule_work(&sc->trigger_event);
}
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
-index 100368e..64262ce 100644
+index fa29557..d24a5b7 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -390,7 +390,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
pmd->bl_info.value_type.inc = data_block_inc;
pmd->bl_info.value_type.dec = data_block_dec;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
-index 67ffa39..cb3b1dd 100644
+index 77e6eff..913d695 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
-@@ -176,9 +176,9 @@ struct mapped_device {
+@@ -182,9 +182,9 @@ struct mapped_device {
/*
* Event handling.
*/
struct list_head uevent_list;
spinlock_t uevent_lock; /* Protect access to uevent_list */
-@@ -1887,8 +1887,8 @@ static struct mapped_device *alloc_dev(int minor)
+@@ -1847,8 +1847,8 @@ static struct mapped_device *alloc_dev(int minor)
rwlock_init(&md->map_lock);
atomic_set(&md->holders, 1);
atomic_set(&md->open_count, 0);
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
-@@ -2022,7 +2022,7 @@ static void event_callback(void *context)
+@@ -1982,7 +1982,7 @@ static void event_callback(void *context)
dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
wake_up(&md->eventq);
}
-@@ -2677,18 +2677,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
+@@ -2637,18 +2637,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
uint32_t dm_next_uevent_seq(struct mapped_device *md)
{
void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 308e87b..7f365d6 100644
+index 6120071..31d9be2 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -277,10 +277,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
+@@ -240,10 +240,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
* start build, activate spare
*/
static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
wake_up(&md_event_waiters);
}
EXPORT_SYMBOL_GPL(md_new_event);
-@@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
+@@ -253,7 +253,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
*/
static void md_new_event_inintr(struct mddev *mddev)
{
wake_up(&md_event_waiters);
}
-@@ -1519,7 +1519,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
+@@ -1504,7 +1504,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
(le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1763,7 +1763,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
+@@ -1748,7 +1748,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
else
sb->resync_offset = cpu_to_le64(0);
sb->raid_disks = cpu_to_le32(mddev->raid_disks);
sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2757,7 +2757,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
+@@ -2748,7 +2748,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
static ssize_t
errors_show(struct md_rdev *rdev, char *page)
{
}
static ssize_t
-@@ -2766,7 +2766,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
+@@ -2757,7 +2757,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
char *e;
unsigned long n = simple_strtoul(buf, &e, 10);
if (*buf && (*e == 0 || *e == '\n')) {
return len;
}
return -EINVAL;
-@@ -3213,8 +3213,8 @@ int md_rdev_init(struct md_rdev *rdev)
+@@ -3204,8 +3204,8 @@ int md_rdev_init(struct md_rdev *rdev)
rdev->sb_loaded = 0;
rdev->bb_page = NULL;
atomic_set(&rdev->nr_pending, 0);
INIT_LIST_HEAD(&rdev->same_set);
init_waitqueue_head(&rdev->blocked_wait);
-@@ -6947,7 +6947,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
+@@ -6984,7 +6984,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
spin_unlock(&pers_lock);
seq_printf(seq, "\n");
return 0;
}
if (v == (void*)2) {
-@@ -7050,7 +7050,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
+@@ -7087,7 +7087,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
return error;
seq = file->private_data;
return error;
}
-@@ -7064,7 +7064,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
+@@ -7101,7 +7101,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
/* always allow read */
mask = POLLIN | POLLRDNORM;
mask |= POLLERR | POLLPRI;
return mask;
}
-@@ -7108,7 +7108,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
+@@ -7145,7 +7145,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
(int)part_stat_read(&disk->part0, sectors[1]) -
* as sync_io is counted when a request starts, and
* disk_stats is counted when it completes.
diff --git a/drivers/md/md.h b/drivers/md/md.h
-index f385b03..b600be8 100644
+index af443ab..0f93be3 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -94,13 +94,13 @@ struct md_rdev {
}
struct md_personality
-diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
-index f6d29e6..7917f5e 100644
---- a/drivers/md/persistent-data/dm-space-map-disk.c
-+++ b/drivers/md/persistent-data/dm-space-map-disk.c
-@@ -22,7 +22,7 @@
- * Space map interface.
- */
- struct sm_disk {
-- struct dm_space_map sm;
-+ dm_space_map_no_const sm;
-
- struct ll_disk ll;
- struct ll_disk old_ll;
-diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
-index e89ae5e..062e4c2 100644
---- a/drivers/md/persistent-data/dm-space-map-metadata.c
-+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
-@@ -43,7 +43,7 @@ struct block_op {
- };
-
- struct sm_metadata {
-- struct dm_space_map sm;
-+ dm_space_map_no_const sm;
-
- struct ll_disk ll;
- struct ll_disk old_ll;
diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
index 1cbfc6b..56e1dbb 100644
--- a/drivers/md/persistent-data/dm-space-map.h
/*----------------------------------------------------------------*/
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
-index 05bb49e..84d7ce6 100644
+index a0f7309..5599dbc 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
-@@ -1810,7 +1810,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
+@@ -1819,7 +1819,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
if (r1_sync_page_io(rdev, sect, s,
bio->bi_io_vec[idx].bv_page,
READ) != 0)
}
sectors -= s;
sect += s;
-@@ -2032,7 +2032,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
+@@ -2041,7 +2041,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
test_bit(In_sync, &rdev->flags)) {
if (r1_sync_page_io(rdev, sect, s,
conf->tmppage, READ)) {
"md/raid1:%s: read error corrected "
"(%d sectors at %llu on %s)\n",
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
-index a48c215..6bda6f4 100644
+index c9acbd7..386cd3e 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
-@@ -1810,7 +1810,7 @@ static void end_sync_read(struct bio *bio, int error)
+@@ -1878,7 +1878,7 @@ static void end_sync_read(struct bio *bio, int error)
/* The write handler will notice the lack of
* R10BIO_Uptodate and record any errors etc
*/
&conf->mirrors[d].rdev->corrected_errors);
/* for reconstruct, we always reschedule after a read.
-@@ -2159,7 +2159,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -2227,7 +2227,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
{
struct timespec cur_time_mon;
unsigned long hours_since_last;
ktime_get_ts(&cur_time_mon);
-@@ -2181,9 +2181,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -2249,9 +2249,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
* overflowing the shift of read_errors by hours_since_last.
*/
if (hours_since_last >= 8 * sizeof(read_errors))
}
static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
-@@ -2237,8 +2237,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2305,8 +2305,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
return;
check_decay_read_errors(mddev, rdev);
char b[BDEVNAME_SIZE];
bdevname(rdev->bdev, b);
-@@ -2246,7 +2246,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2314,7 +2314,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
"md/raid10:%s: %s: Raid device exceeded "
"read_error threshold [cur %d:max %d]\n",
mdname(mddev), b,
printk(KERN_NOTICE
"md/raid10:%s: %s: Failing raid device\n",
mdname(mddev), b);
-@@ -2401,7 +2401,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2469,7 +2469,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
sect +
choose_data_offset(r10_bio, rdev)),
bdevname(rdev->bdev, b));
rdev_dec_pending(rdev, mddev);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index 0689173..35df76c 100644
+index a450268..c4168a9 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
-@@ -1756,21 +1756,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -1789,21 +1789,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
mdname(conf->mddev), STRIPE_SECTORS,
(unsigned long long)s,
bdevname(rdev->bdev, b));
if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
printk_ratelimited(
KERN_WARNING
-@@ -1798,7 +1798,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -1831,7 +1831,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
mdname(conf->mddev),
(unsigned long long)s,
bdn);
> conf->max_nr_stripes)
printk(KERN_WARNING
"md/raid:%s: Too many read errors, failing device %s.\n",
-diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
-index ebf3f05..b1f3e77 100644
---- a/drivers/media/dvb/ddbridge/ddbridge-core.c
-+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
-@@ -1679,7 +1679,7 @@ static struct ddb_info ddb_v6 = {
- .subvendor = _subvend, .subdevice = _subdev, \
- .driver_data = (unsigned long)&_driverdata }
-
--static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
-+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
- DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
- DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
- DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
-diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
-index fa7188a..04a045e 100644
---- a/drivers/media/dvb/dvb-core/dvb_demux.h
-+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
-@@ -73,7 +73,7 @@ struct dvb_demux_feed {
- union {
- dmx_ts_cb ts;
- dmx_section_cb sec;
-- } cb;
-+ } __no_const cb;
-
- struct dvb_demux *demux;
- void *priv;
-diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
-index 39eab73..60033e7 100644
---- a/drivers/media/dvb/dvb-core/dvbdev.c
-+++ b/drivers/media/dvb/dvb-core/dvbdev.c
+diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
+index d33101a..6b13069 100644
+--- a/drivers/media/dvb-core/dvbdev.c
++++ b/drivers/media/dvb-core/dvbdev.c
@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
const struct dvb_device *template, void *priv, int type)
{
struct device *clsdev;
int minor;
int id;
-diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
-index 3940bb0..fb3952a 100644
---- a/drivers/media/dvb/dvb-usb/cxusb.c
-+++ b/drivers/media/dvb/dvb-usb/cxusb.c
-@@ -1068,7 +1068,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
-
- struct dib0700_adapter_state {
- int (*set_param_save) (struct dvb_frontend *);
--};
-+} __no_const;
-
- static int dib7070_set_param_override(struct dvb_frontend *fe)
- {
-diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
-index 9382895..ac8093c 100644
---- a/drivers/media/dvb/dvb-usb/dw2102.c
-+++ b/drivers/media/dvb/dvb-usb/dw2102.c
-@@ -95,7 +95,7 @@ struct su3000_state {
-
- struct s6x0_state {
- int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
--};
-+} __no_const;
-
- /* debug */
- static int dvb_usb_dw2102_debug;
-diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
+diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
index 404f63a..4796533 100644
---- a/drivers/media/dvb/frontends/dib3000.h
-+++ b/drivers/media/dvb/frontends/dib3000.h
+--- a/drivers/media/dvb-frontends/dib3000.h
++++ b/drivers/media/dvb-frontends/dib3000.h
@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
#if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
-diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
-index 72ee8de..eae0c80 100644
---- a/drivers/media/dvb/ngene/ngene-cards.c
-+++ b/drivers/media/dvb/ngene/ngene-cards.c
-@@ -479,7 +479,7 @@ static struct ngene_info ngene_info_m780 = {
+diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
+index 3aa6856..435ad25 100644
+--- a/drivers/media/pci/cx88/cx88-alsa.c
++++ b/drivers/media/pci/cx88/cx88-alsa.c
+@@ -749,7 +749,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
+ * Only boards with eeprom and byte 1 at eeprom=1 have it
+ */
+
+-static const struct pci_device_id cx88_audio_pci_tbl[] __devinitdata = {
++static const struct pci_device_id cx88_audio_pci_tbl[] __devinitconst = {
+ {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
+ {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
+ {0, }
+diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
+index feff57e..66a2c67 100644
+--- a/drivers/media/pci/ddbridge/ddbridge-core.c
++++ b/drivers/media/pci/ddbridge/ddbridge-core.c
+@@ -1679,7 +1679,7 @@ static struct ddb_info ddb_v6 = {
+ .subvendor = _subvend, .subdevice = _subdev, \
+ .driver_data = (unsigned long)&_driverdata }
+
+-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
++static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
+ DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
+ DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
+ DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
+diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
+index 96a13ed..6df45b4 100644
+--- a/drivers/media/pci/ngene/ngene-cards.c
++++ b/drivers/media/pci/ngene/ngene-cards.c
+@@ -741,7 +741,7 @@ static struct ngene_info ngene_info_terratec = {
/****************************************************************************/
NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
-diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
-index 697a421..16c5a5f 100644
---- a/drivers/media/radio/radio-cadet.c
-+++ b/drivers/media/radio/radio-cadet.c
-@@ -302,6 +302,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
- unsigned char readbuf[RDS_BUFFER];
- int i = 0;
-
-+ if (count > RDS_BUFFER)
-+ return -EFAULT;
- mutex_lock(&dev->lock);
- if (dev->rdsstat == 0)
- cadet_start_rds(dev);
-@@ -317,7 +319,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
- while (i < count && dev->rdsin != dev->rdsout)
- readbuf[i++] = dev->rdsbuf[dev->rdsout++];
-
-- if (i && copy_to_user(data, readbuf, i))
-+ if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
- i = -EFAULT;
- unlock:
- mutex_unlock(&dev->lock);
-diff --git a/drivers/media/radio/radio-tea5777.h b/drivers/media/radio/radio-tea5777.h
-index 55cbd78..428b0da 100644
---- a/drivers/media/radio/radio-tea5777.h
-+++ b/drivers/media/radio/radio-tea5777.h
-@@ -63,7 +63,7 @@ struct radio_tea5777_ops {
-
- struct radio_tea5777 {
- struct v4l2_device *v4l2_dev;
-- struct v4l2_file_operations fops;
-+ v4l2_file_operations_no_const fops;
- struct video_device vd; /* video device */
- bool has_am; /* Device can tune to AM freqs */
- bool write_before_read; /* must write before read quirk */
-diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
-index 9cde353..8c6a1c3 100644
---- a/drivers/media/video/au0828/au0828.h
-+++ b/drivers/media/video/au0828/au0828.h
-@@ -191,7 +191,7 @@ struct au0828_dev {
-
- /* I2C */
- struct i2c_adapter i2c_adap;
-- struct i2c_algorithm i2c_algo;
-+ i2c_algorithm_no_const i2c_algo;
- struct i2c_client i2c_client;
- u32 i2c_rc;
-
-diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
-index dfac6e3..c26de31 100644
---- a/drivers/media/video/cx88/cx88-alsa.c
-+++ b/drivers/media/video/cx88/cx88-alsa.c
-@@ -749,7 +749,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
- * Only boards with eeprom and byte 1 at eeprom=1 have it
- */
-
--static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
-+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
- {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
- {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
- {0, }
-diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
-index 88cf9d9..bbc4b2c 100644
---- a/drivers/media/video/omap/omap_vout.c
-+++ b/drivers/media/video/omap/omap_vout.c
-@@ -64,7 +64,6 @@ enum omap_vout_channels {
+diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
+index a3b1a34..71ce0e3 100644
+--- a/drivers/media/platform/omap/omap_vout.c
++++ b/drivers/media/platform/omap/omap_vout.c
+@@ -65,7 +65,6 @@ enum omap_vout_channels {
OMAP_VIDEO2,
};
/* Variables configurable through module params*/
static u32 video1_numbuffers = 3;
static u32 video2_numbuffers = 3;
-@@ -1000,6 +999,12 @@ static int omap_vout_open(struct file *file)
+@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
{
struct videobuf_queue *q;
struct omap_vout_device *vout = NULL;
vout = video_drvdata(file);
v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
-@@ -1017,10 +1022,6 @@ static int omap_vout_open(struct file *file)
+@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
q = &vout->vbq;
spin_lock_init(&vout->vbq_lock);
videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
-diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
-index 036952f..80d356d 100644
---- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
-+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
-@@ -196,7 +196,7 @@ struct pvr2_hdw {
-
- /* I2C stuff */
- struct i2c_adapter i2c_adap;
-- struct i2c_algorithm i2c_algo;
-+ i2c_algorithm_no_const i2c_algo;
- pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
- int i2c_cx25840_hack_state;
- int i2c_linked;
-diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
-index 02194c0..091733b 100644
---- a/drivers/media/video/timblogiw.c
-+++ b/drivers/media/video/timblogiw.c
+diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
+index ddb422e..8cf008e 100644
+--- a/drivers/media/platform/s5p-tv/mixer.h
++++ b/drivers/media/platform/s5p-tv/mixer.h
+@@ -155,7 +155,7 @@ struct mxr_layer {
+ /** layer index (unique identifier) */
+ int idx;
+ /** callbacks for layer methods */
+- struct mxr_layer_ops ops;
++ struct mxr_layer_ops *ops;
+ /** format array */
+ const struct mxr_format **fmt_array;
+ /** size of format array */
+diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
+index b93a21f..2535195 100644
+--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
++++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
+@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
+ {
+ struct mxr_layer *layer;
+ int ret;
+- struct mxr_layer_ops ops = {
++ static struct mxr_layer_ops ops = {
+ .release = mxr_graph_layer_release,
+ .buffer_set = mxr_graph_buffer_set,
+ .stream_set = mxr_graph_stream_set,
+diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
+index 3b1670a..595c939 100644
+--- a/drivers/media/platform/s5p-tv/mixer_reg.c
++++ b/drivers/media/platform/s5p-tv/mixer_reg.c
+@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
+ layer->update_buf = next;
+ }
+
+- layer->ops.buffer_set(layer, layer->update_buf);
++ layer->ops->buffer_set(layer, layer->update_buf);
+
+ if (done && done != layer->shadow_buf)
+ vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
+diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
+index 0c1cd89..6574647 100644
+--- a/drivers/media/platform/s5p-tv/mixer_video.c
++++ b/drivers/media/platform/s5p-tv/mixer_video.c
+@@ -209,7 +209,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
+ layer->geo.src.height = layer->geo.src.full_height;
+
+ mxr_geometry_dump(mdev, &layer->geo);
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+ }
+
+@@ -227,7 +227,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
+ layer->geo.dst.full_width = mbus_fmt.width;
+ layer->geo.dst.full_height = mbus_fmt.height;
+ layer->geo.dst.field = mbus_fmt.field;
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
+
+ mxr_geometry_dump(mdev, &layer->geo);
+ }
+@@ -333,7 +333,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
+ /* set source size to highest accepted value */
+ geo->src.full_width = max(geo->dst.full_width, pix->width);
+ geo->src.full_height = max(geo->dst.full_height, pix->height);
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+ /* set cropping to total visible screen */
+ geo->src.width = pix->width;
+@@ -341,12 +341,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
+ geo->src.x_offset = 0;
+ geo->src.y_offset = 0;
+ /* assure consistency of geometry */
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
+ mxr_geometry_dump(mdev, &layer->geo);
+ /* set full size to lowest possible value */
+ geo->src.full_width = 0;
+ geo->src.full_height = 0;
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+
+ /* returning results */
+@@ -473,7 +473,7 @@ static int mxr_s_selection(struct file *file, void *fh,
+ target->width = s->r.width;
+ target->height = s->r.height;
+
+- layer->ops.fix_geometry(layer, stage, s->flags);
++ layer->ops->fix_geometry(layer, stage, s->flags);
+
+ /* retrieve update selection rectangle */
+ res.left = target->x_offset;
+@@ -928,13 +928,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
+ mxr_output_get(mdev);
+
+ mxr_layer_update_output(layer);
+- layer->ops.format_set(layer);
++ layer->ops->format_set(layer);
+ /* enabling layer in hardware */
+ spin_lock_irqsave(&layer->enq_slock, flags);
+ layer->state = MXR_LAYER_STREAMING;
+ spin_unlock_irqrestore(&layer->enq_slock, flags);
+
+- layer->ops.stream_set(layer, MXR_ENABLE);
++ layer->ops->stream_set(layer, MXR_ENABLE);
+ mxr_streamer_get(mdev);
+
+ return 0;
+@@ -1004,7 +1004,7 @@ static int stop_streaming(struct vb2_queue *vq)
+ spin_unlock_irqrestore(&layer->enq_slock, flags);
+
+ /* disabling layer in hardware */
+- layer->ops.stream_set(layer, MXR_DISABLE);
++ layer->ops->stream_set(layer, MXR_DISABLE);
+ /* remove one streamer */
+ mxr_streamer_put(mdev);
+ /* allow changes in output configuration */
+@@ -1043,8 +1043,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
+
+ void mxr_layer_release(struct mxr_layer *layer)
+ {
+- if (layer->ops.release)
+- layer->ops.release(layer);
++ if (layer->ops->release)
++ layer->ops->release(layer);
+ }
+
+ void mxr_base_layer_release(struct mxr_layer *layer)
+@@ -1070,7 +1070,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
+
+ layer->mdev = mdev;
+ layer->idx = idx;
+- layer->ops = *ops;
++ layer->ops = ops;
+
+ spin_lock_init(&layer->enq_slock);
+ INIT_LIST_HEAD(&layer->enq_list);
+diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
+index 3d13a63..da31bf1 100644
+--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
++++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
+@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
+ {
+ struct mxr_layer *layer;
+ int ret;
+- struct mxr_layer_ops ops = {
++ static struct mxr_layer_ops ops = {
+ .release = mxr_vp_layer_release,
+ .buffer_set = mxr_vp_buffer_set,
+ .stream_set = mxr_vp_stream_set,
+diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c
+index 02194c0..36d69c1 100644
+--- a/drivers/media/platform/timblogiw.c
++++ b/drivers/media/platform/timblogiw.c
@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
/* Platform device functions */
-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
-+static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
++static struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
.vidioc_querycap = timblogiw_querycap,
.vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
.vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
};
-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
-+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
++static struct v4l2_file_operations timblogiw_fops = {
.owner = THIS_MODULE,
.open = timblogiw_open,
.release = timblogiw_close,
+diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
+index 697a421..16c5a5f 100644
+--- a/drivers/media/radio/radio-cadet.c
++++ b/drivers/media/radio/radio-cadet.c
+@@ -302,6 +302,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
+ unsigned char readbuf[RDS_BUFFER];
+ int i = 0;
+
++ if (count > RDS_BUFFER)
++ return -EFAULT;
+ mutex_lock(&dev->lock);
+ if (dev->rdsstat == 0)
+ cadet_start_rds(dev);
+@@ -317,7 +319,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
+ while (i < count && dev->rdsin != dev->rdsout)
+ readbuf[i++] = dev->rdsbuf[dev->rdsout++];
+
+- if (i && copy_to_user(data, readbuf, i))
++ if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
+ i = -EFAULT;
+ unlock:
+ mutex_unlock(&dev->lock);
+diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
+index 3940bb0..fb3952a 100644
+--- a/drivers/media/usb/dvb-usb/cxusb.c
++++ b/drivers/media/usb/dvb-usb/cxusb.c
+@@ -1068,7 +1068,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
+
+ struct dib0700_adapter_state {
+ int (*set_param_save) (struct dvb_frontend *);
+-};
++} __no_const;
+
+ static int dib7070_set_param_override(struct dvb_frontend *fe)
+ {
+diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
+index 9382895..ac8093c 100644
+--- a/drivers/media/usb/dvb-usb/dw2102.c
++++ b/drivers/media/usb/dvb-usb/dw2102.c
+@@ -95,7 +95,7 @@ struct su3000_state {
+
+ struct s6x0_state {
+ int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
+-};
++} __no_const;
+
+ /* debug */
+ static int dvb_usb_dw2102_debug;
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
-index d99db56..a16b959 100644
+index fb69baa..cf7ad22 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
-@@ -6751,8 +6751,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
+@@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
INIT_LIST_HEAD(&c->context_list);
#endif
-diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
-index 7ce65f4..e66e9bc 100644
---- a/drivers/mfd/abx500-core.c
-+++ b/drivers/mfd/abx500-core.c
-@@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
-
- struct abx500_device_entry {
- struct list_head list;
-- struct abx500_ops ops;
-+ abx500_ops_no_const ops;
- struct device *dev;
- };
-
diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
index 965c480..71f2db9 100644
--- a/drivers/mfd/janz-cmodio.c
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
+diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
+index 3aa9a96..59cf685 100644
+--- a/drivers/misc/kgdbts.c
++++ b/drivers/misc/kgdbts.c
+@@ -832,7 +832,7 @@ static void run_plant_and_detach_test(int is_early)
+ char before[BREAK_INSTR_SIZE];
+ char after[BREAK_INSTR_SIZE];
+
+- probe_kernel_read(before, (char *)kgdbts_break_test,
++ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
+ BREAK_INSTR_SIZE);
+ init_simple_test();
+ ts.tst = plant_and_detach_test;
+@@ -840,7 +840,7 @@ static void run_plant_and_detach_test(int is_early)
+ /* Activate test with initial breakpoint */
+ if (!is_early)
+ kgdb_breakpoint();
+- probe_kernel_read(after, (char *)kgdbts_break_test,
++ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
+ BREAK_INSTR_SIZE);
+ if (memcmp(before, after, BREAK_INSTR_SIZE)) {
+ printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
-index a981e2a..5ca0c8b 100644
+index 4a87e5c..76bdf5c 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
-@@ -466,7 +466,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
+@@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
* the lid is closed. This leads to interrupts as soon as a little move
* is done.
*/
wake_up_interruptible(&lis3->misc_wait);
kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
-@@ -552,7 +552,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
+@@ -584,7 +584,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
if (lis3->pm_dev)
pm_runtime_get_sync(lis3->pm_dev);
return 0;
}
-@@ -585,7 +585,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
+@@ -617,7 +617,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
add_wait_queue(&lis3->misc_wait, &wait);
while (true) {
set_current_state(TASK_INTERRUPTIBLE);
if (data)
break;
-@@ -626,7 +626,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
+@@ -658,7 +658,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
struct lis3lv02d, miscdev);
poll_wait(file, &lis3->misc_wait, wait);
return 0;
}
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
-index 2b1482a..5d33616 100644
+index c439c82..1f20f57 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.h
+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
-@@ -266,7 +266,7 @@ struct lis3lv02d {
+@@ -297,7 +297,7 @@ struct lis3lv02d {
struct input_polled_dev *idev; /* input device */
struct platform_device *pdev; /* platform device */
struct regulator_bulk_data regulators[2];
extern int xpc_disengage_timedout;
extern int xpc_activate_IRQ_rcvd;
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
-index 8d082b4..aa749ae 100644
+index d971817..33bdca5 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
-@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
+@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
.notifier_call = xpc_system_die,
};
/*
* Timer function to enforce the timelimit on the partition disengage.
-diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
-index 504da71..9722d43 100644
---- a/drivers/mmc/host/sdhci-pci.c
-+++ b/drivers/mmc/host/sdhci-pci.c
-@@ -653,7 +653,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
- .probe = via_probe,
- };
+@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
--static const struct pci_device_id pci_ids[] __devinitdata = {
-+static const struct pci_device_id pci_ids[] __devinitconst = {
- {
- .vendor = PCI_VENDOR_ID_RICOH,
- .device = PCI_DEVICE_ID_RICOH_R5C822,
+ if (((die_args->trapnr == X86_TRAP_MF) ||
+ (die_args->trapnr == X86_TRAP_XF)) &&
+- !user_mode_vm(die_args->regs))
++ !user_mode(die_args->regs))
+ xpc_die_deactivate();
+
+ break;
+diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
+index a0e1720..ee63d0b 100644
+--- a/drivers/mmc/core/mmc_ops.c
++++ b/drivers/mmc/core/mmc_ops.c
+@@ -245,7 +245,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
+ void *data_buf;
+ int is_on_stack;
+
+- is_on_stack = object_is_on_stack(buf);
++ is_on_stack = object_starts_on_stack(buf);
+ if (is_on_stack) {
+ /*
+ * dma onto stack is unsafe/nonportable, but callers to this
+diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
+index 53b8fd9..615b462 100644
+--- a/drivers/mmc/host/dw_mmc.h
++++ b/drivers/mmc/host/dw_mmc.h
+@@ -205,5 +205,5 @@ struct dw_mci_drv_data {
+ int (*parse_dt)(struct dw_mci *host);
+ int (*setup_bus)(struct dw_mci *host,
+ struct device_node *slot_np, u8 bus_width);
+-};
++} __do_const;
+ #endif /* _DW_MMC_H_ */
+diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
+index c9ec725..178e79a 100644
+--- a/drivers/mmc/host/sdhci-s3c.c
++++ b/drivers/mmc/host/sdhci-s3c.c
+@@ -719,9 +719,11 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
+ * we can use overriding functions instead of default.
+ */
+ if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
+- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
+- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
+- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
++ pax_open_kernel();
++ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
++ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
++ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
++ pax_close_kernel();
+ }
+
+ /* It supports additional host capabilities if needed */
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index a4eb8b5..8c0628f 100644
--- a/drivers/mtd/devices/doc2000.c
"ECC needs a full sector write (adr: %lx size %lx)\n",
(long) to, (long) len);
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
-index 0650aaf..7718762 100644
+index e706a23..b3d262f 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -26,6 +26,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/nftl.h>
-diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
-index dc15d24..ef8d2a0 100644
---- a/drivers/net/bonding/bond_sysfs.c
-+++ b/drivers/net/bonding/bond_sysfs.c
-@@ -1060,7 +1060,7 @@ static ssize_t bonding_store_primary(struct device *d,
- goto out;
- }
-
-- sscanf(buf, "%16s", ifname); /* IFNAMSIZ */
-+ sscanf(buf, "%15s", ifname); /* IFNAMSIZ */
+diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
+index 203ff9d..0968ca8 100644
+--- a/drivers/net/ethernet/8390/ax88796.c
++++ b/drivers/net/ethernet/8390/ax88796.c
+@@ -872,9 +872,11 @@ static int ax_probe(struct platform_device *pdev)
+ if (ax->plat->reg_offsets)
+ ei_local->reg_offset = ax->plat->reg_offsets;
+ else {
++ resource_size_t _mem_size = mem_size;
++ do_div(_mem_size, 0x18);
+ ei_local->reg_offset = ax->reg_offsets;
+ for (ret = 0; ret < 0x18; ret++)
+- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
++ ax->reg_offsets[ret] = _mem_size * ret;
+ }
+
+ if (!request_mem_region(mem->start, mem_size, pdev->name)) {
+diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+index 9c5ea6c..eaad276 100644
+--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+@@ -1046,7 +1046,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
+ static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
+ {
+ /* RX_MODE controlling object */
+- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
++ bnx2x_init_rx_mode_obj(bp);
+
+ /* multicast configuration controlling object */
+ bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
+diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+index 614981c..11216c7 100644
+--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+@@ -2375,15 +2375,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
+ return rc;
+ }
- /* check to see if we are clearing primary */
- if (!strlen(ifname) || buf[0] == '\n') {
-@@ -1237,7 +1237,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
- goto out;
+-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
+- struct bnx2x_rx_mode_obj *o)
++void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
+ {
+ if (CHIP_IS_E1x(bp)) {
+- o->wait_comp = bnx2x_empty_rx_mode_wait;
+- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
++ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
++ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
+ } else {
+- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
+- o->config_rx_mode = bnx2x_set_rx_mode_e2;
++ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
++ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
}
+ }
-- sscanf(buf, "%16s", ifname); /* IFNAMSIZ */
-+ sscanf(buf, "%15s", ifname); /* IFNAMSIZ */
-
- /* check to see if we are clearing active */
- if (!strlen(ifname) || buf[0] == '\n') {
-diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
-index 57d64b8..623dd86 100644
---- a/drivers/net/ethernet/atheros/atlx/atl2.c
-+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
-@@ -2845,7 +2845,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
- */
-
- #define ATL2_PARAM(X, desc) \
-- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
-+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
- MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
- MODULE_PARM_DESC(X, desc);
- #else
-diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-index 0875ecf..794cdf3 100644
---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-@@ -3051,9 +3051,8 @@ static void bnx2x_drv_info_ether_stat(struct bnx2x *bp)
- struct eth_stats_info *ether_stat =
- &bp->slowpath->drv_info_to_mcp.ether_stat;
-
-- /* leave last char as NULL */
-- memcpy(ether_stat->version, DRV_MODULE_VERSION,
-- ETH_STAT_INFO_VERSION_LEN - 1);
-+ strlcpy(ether_stat->version, DRV_MODULE_VERSION,
-+ ETH_STAT_INFO_VERSION_LEN);
-
- bp->sp_objs[0].mac_obj.get_n_elements(bp, &bp->sp_objs[0].mac_obj,
- DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-index f83e033..8b4f43a 100644
+index acf2fe4..efb96df 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-@@ -486,7 +486,7 @@ struct bnx2x_rx_mode_obj {
+@@ -1281,8 +1281,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
- int (*wait_comp)(struct bnx2x *bp,
- struct bnx2x_rx_mode_ramrod_params *p);
--};
-+} __no_const;
+ /********************* RX MODE ****************/
- /********************** Set multicast group ***********************************/
+-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
+- struct bnx2x_rx_mode_obj *o);
++void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
+ /**
+ * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
-index 6d52cb2..bc95640 100644
+index d9308c32..d87b824 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -140,6 +140,7 @@
return -EFAULT;
break;
}
-diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
-index ed7d1dc..d426748 100644
---- a/drivers/net/ethernet/dec/tulip/eeprom.c
-+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
-@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
- {NULL}};
-
-
--static const char *block_name[] __devinitdata = {
-+static const char *block_name[] __devinitconst = {
- "21140 non-MII",
- "21140 MII PHY",
- "21142 Serial PHY",
-diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
-index 75d45f8..3d9c55b 100644
---- a/drivers/net/ethernet/dec/tulip/uli526x.c
-+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
-@@ -129,7 +129,7 @@ struct uli526x_board_info {
- struct uli_phy_ops {
- void (*write)(struct uli526x_board_info *, u8, u8, u16);
- u16 (*read)(struct uli526x_board_info *, u8, u8);
-- } phy;
-+ } __no_const phy;
- struct net_device *next_dev; /* next device */
- struct pci_dev *pdev; /* PCI device */
- spinlock_t lock;
-diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
-index 4d1ffca..7c1ec4d 100644
---- a/drivers/net/ethernet/dec/tulip/winbond-840.c
-+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
-@@ -236,7 +236,7 @@ struct pci_id_info {
- int drv_flags; /* Driver use, intended as capability flags. */
- };
-
--static const struct pci_id_info pci_id_tbl[] __devinitdata = {
-+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
- { /* Sometime a Level-One switch card. */
- "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
- { "Winbond W89c840", CanHaveMII | HasBrokenTx},
-diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
-index d7bb52a..3b83588 100644
---- a/drivers/net/ethernet/dlink/sundance.c
-+++ b/drivers/net/ethernet/dlink/sundance.c
-@@ -218,7 +218,7 @@ enum {
- struct pci_id_info {
- const char *name;
- };
--static const struct pci_id_info pci_id_tbl[] __devinitdata = {
-+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
- {"D-Link DFE-550TX FAST Ethernet Adapter"},
- {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
- {"D-Link DFE-580TX 4 port Server Adapter"},
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
-index 78b8aa8..dd6323a 100644
+index d1b6cc5..cde0d97 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -403,7 +403,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
#include "ftmac100.h"
-diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
-index 9d71c9c..0e4a0ac 100644
---- a/drivers/net/ethernet/fealnx.c
-+++ b/drivers/net/ethernet/fealnx.c
-@@ -150,7 +150,7 @@ struct chip_info {
- int flags;
- };
-
--static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
-+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
- { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
- { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
- { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
-diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
-index ed5b409..ec37828 100644
---- a/drivers/net/ethernet/intel/e1000e/hw.h
-+++ b/drivers/net/ethernet/intel/e1000e/hw.h
-@@ -797,6 +797,7 @@ struct e1000_mac_operations {
- void (*rar_set)(struct e1000_hw *, u8 *, u32);
- s32 (*read_mac_addr)(struct e1000_hw *);
- };
-+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
-
- /*
- * When to use various PHY register access functions:
-@@ -837,6 +838,7 @@ struct e1000_phy_operations {
- void (*power_up)(struct e1000_hw *);
- void (*power_down)(struct e1000_hw *);
- };
-+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
-
- /* Function pointers for the NVM. */
- struct e1000_nvm_operations {
-@@ -849,9 +851,10 @@ struct e1000_nvm_operations {
- s32 (*validate)(struct e1000_hw *);
- s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
- };
-+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
-
- struct e1000_mac_info {
-- struct e1000_mac_operations ops;
-+ e1000_mac_operations_no_const ops;
- u8 addr[ETH_ALEN];
- u8 perm_addr[ETH_ALEN];
-
-@@ -892,7 +895,7 @@ struct e1000_mac_info {
- };
-
- struct e1000_phy_info {
-- struct e1000_phy_operations ops;
-+ e1000_phy_operations_no_const ops;
-
- enum e1000_phy_type type;
-
-@@ -926,7 +929,7 @@ struct e1000_phy_info {
- };
-
- struct e1000_nvm_info {
-- struct e1000_nvm_operations ops;
-+ e1000_nvm_operations_no_const ops;
-
- enum e1000_nvm_type type;
- enum e1000_nvm_override override;
-diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
-index c2a51dc..c2bd262 100644
---- a/drivers/net/ethernet/intel/igb/e1000_hw.h
-+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
-@@ -327,6 +327,7 @@ struct e1000_mac_operations {
- void (*release_swfw_sync)(struct e1000_hw *, u16);
-
- };
-+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
-
- struct e1000_phy_operations {
- s32 (*acquire)(struct e1000_hw *);
-@@ -343,6 +344,7 @@ struct e1000_phy_operations {
- s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
- s32 (*write_reg)(struct e1000_hw *, u32, u16);
- };
-+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
-
- struct e1000_nvm_operations {
- s32 (*acquire)(struct e1000_hw *);
-@@ -353,6 +355,7 @@ struct e1000_nvm_operations {
- s32 (*validate)(struct e1000_hw *);
- s32 (*valid_led_default)(struct e1000_hw *, u16 *);
- };
-+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
-
- struct e1000_info {
- s32 (*get_invariants)(struct e1000_hw *);
-@@ -364,7 +367,7 @@ struct e1000_info {
- extern const struct e1000_info e1000_82575_info;
-
- struct e1000_mac_info {
-- struct e1000_mac_operations ops;
-+ e1000_mac_operations_no_const ops;
-
- u8 addr[6];
- u8 perm_addr[6];
-@@ -402,7 +405,7 @@ struct e1000_mac_info {
- };
-
- struct e1000_phy_info {
-- struct e1000_phy_operations ops;
-+ e1000_phy_operations_no_const ops;
-
- enum e1000_phy_type type;
-
-@@ -437,7 +440,7 @@ struct e1000_phy_info {
- };
-
- struct e1000_nvm_info {
-- struct e1000_nvm_operations ops;
-+ e1000_nvm_operations_no_const ops;
- enum e1000_nvm_type type;
- enum e1000_nvm_override override;
-
-@@ -482,6 +485,7 @@ struct e1000_mbx_operations {
- s32 (*check_for_ack)(struct e1000_hw *, u16);
- s32 (*check_for_rst)(struct e1000_hw *, u16);
- };
-+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
-
- struct e1000_mbx_stats {
- u32 msgs_tx;
-@@ -493,7 +497,7 @@ struct e1000_mbx_stats {
- };
-
- struct e1000_mbx_info {
-- struct e1000_mbx_operations ops;
-+ e1000_mbx_operations_no_const ops;
- struct e1000_mbx_stats stats;
- u32 timeout;
- u32 usec_delay;
-diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
-index 57db3c6..aa825fc 100644
---- a/drivers/net/ethernet/intel/igbvf/vf.h
-+++ b/drivers/net/ethernet/intel/igbvf/vf.h
-@@ -189,9 +189,10 @@ struct e1000_mac_operations {
- s32 (*read_mac_addr)(struct e1000_hw *);
- s32 (*set_vfta)(struct e1000_hw *, u16, bool);
- };
-+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
-
- struct e1000_mac_info {
-- struct e1000_mac_operations ops;
-+ e1000_mac_operations_no_const ops;
- u8 addr[6];
- u8 perm_addr[6];
-
-@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
- s32 (*check_for_ack)(struct e1000_hw *);
- s32 (*check_for_rst)(struct e1000_hw *);
- };
-+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
-
- struct e1000_mbx_stats {
- u32 msgs_tx;
-@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
- };
-
- struct e1000_mbx_info {
-- struct e1000_mbx_operations ops;
-+ e1000_mbx_operations_no_const ops;
- struct e1000_mbx_stats stats;
- u32 timeout;
- u32 usec_delay;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-index 3456d56..b688d81 100644
+index d929131..aed108f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-@@ -884,7 +884,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
+@@ -865,7 +865,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
/* store the new cycle speed */
adapter->cycle_speed = cycle_speed;
smp_mb();
/* grab the ptp lock */
-diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
-index 400f86a..7f2e062 100644
---- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
-+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
-@@ -2799,6 +2799,7 @@ struct ixgbe_eeprom_operations {
- s32 (*update_checksum)(struct ixgbe_hw *);
- u16 (*calc_checksum)(struct ixgbe_hw *);
- };
-+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
-
- struct ixgbe_mac_operations {
- s32 (*init_hw)(struct ixgbe_hw *);
-@@ -2865,6 +2866,7 @@ struct ixgbe_mac_operations {
- s32 (*get_thermal_sensor_data)(struct ixgbe_hw *);
- s32 (*init_thermal_sensor_thresh)(struct ixgbe_hw *hw);
- };
-+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
-
- struct ixgbe_phy_operations {
- s32 (*identify)(struct ixgbe_hw *);
-@@ -2884,9 +2886,10 @@ struct ixgbe_phy_operations {
- s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
- s32 (*check_overtemp)(struct ixgbe_hw *);
- };
-+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
-
- struct ixgbe_eeprom_info {
-- struct ixgbe_eeprom_operations ops;
-+ ixgbe_eeprom_operations_no_const ops;
- enum ixgbe_eeprom_type type;
- u32 semaphore_delay;
- u16 word_size;
-@@ -2896,7 +2899,7 @@ struct ixgbe_eeprom_info {
-
- #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
- struct ixgbe_mac_info {
-- struct ixgbe_mac_operations ops;
-+ ixgbe_mac_operations_no_const ops;
- enum ixgbe_mac_type type;
- u8 addr[ETH_ALEN];
- u8 perm_addr[ETH_ALEN];
-@@ -2926,7 +2929,7 @@ struct ixgbe_mac_info {
- };
-
- struct ixgbe_phy_info {
-- struct ixgbe_phy_operations ops;
-+ ixgbe_phy_operations_no_const ops;
- struct mdio_if_info mdio;
- enum ixgbe_phy_type type;
- u32 id;
-@@ -2954,6 +2957,7 @@ struct ixgbe_mbx_operations {
- s32 (*check_for_ack)(struct ixgbe_hw *, u16);
- s32 (*check_for_rst)(struct ixgbe_hw *, u16);
- };
-+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
-
- struct ixgbe_mbx_stats {
- u32 msgs_tx;
-@@ -2965,7 +2969,7 @@ struct ixgbe_mbx_stats {
- };
-
- struct ixgbe_mbx_info {
-- struct ixgbe_mbx_operations ops;
-+ ixgbe_mbx_operations_no_const ops;
- struct ixgbe_mbx_stats stats;
- u32 timeout;
- u32 usec_delay;
-diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
-index 25c951d..cc7cf33 100644
---- a/drivers/net/ethernet/intel/ixgbevf/vf.h
-+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
-@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
- s32 (*clear_vfta)(struct ixgbe_hw *);
- s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
- };
-+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
-
- enum ixgbe_mac_type {
- ixgbe_mac_unknown = 0,
-@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
- };
-
- struct ixgbe_mac_info {
-- struct ixgbe_mac_operations ops;
-+ ixgbe_mac_operations_no_const ops;
- u8 addr[6];
- u8 perm_addr[6];
-
-@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
- s32 (*check_for_ack)(struct ixgbe_hw *);
- s32 (*check_for_rst)(struct ixgbe_hw *);
- };
-+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
-
- struct ixgbe_mbx_stats {
- u32 msgs_tx;
-@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
- };
-
- struct ixgbe_mbx_info {
-- struct ixgbe_mbx_operations ops;
-+ ixgbe_mbx_operations_no_const ops;
- struct ixgbe_mbx_stats stats;
- u32 timeout;
- u32 udelay;
-diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
-index 9e0c1ee..8471f77 100644
---- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
-+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
-@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
- void (*link_down)(struct __vxge_hw_device *devh);
- void (*crit_err)(struct __vxge_hw_device *devh,
- enum vxge_hw_event type, u64 ext_data);
--};
-+} __no_const;
+diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
+index c2e420a..26a75e0 100644
+--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
++++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
+@@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
+ struct __vxge_hw_fifo *fifo;
+ struct vxge_hw_fifo_config *config;
+ u32 txdl_size, txdl_per_memblock;
+- struct vxge_hw_mempool_cbs fifo_mp_callback;
++ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
++ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
++ };
++
+ struct __vxge_hw_virtualpath *vpath;
- /*
- * struct __vxge_hw_blockpool_entry - Block private data structure
-diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
-index 4a518a3..936b334 100644
---- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
-+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
-@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
- struct vxge_hw_mempool_dma *dma_object,
- u32 index,
- u32 is_last);
--};
-+} __no_const;
+ if ((vp == NULL) || (attr == NULL)) {
+@@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
+ goto exit;
+ }
- #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
- ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
-diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
-index 53743f7..af8b414 100644
---- a/drivers/net/ethernet/nxp/lpc_eth.c
-+++ b/drivers/net/ethernet/nxp/lpc_eth.c
-@@ -1524,6 +1524,7 @@ static int lpc_eth_drv_remove(struct platform_device *pdev)
- pldat->dma_buff_base_p);
- free_irq(ndev->irq, ndev);
- iounmap(pldat->net_base);
-+ mdiobus_unregister(pldat->mii_bus);
- mdiobus_free(pldat->mii_bus);
- clk_disable(pldat->clk);
- clk_put(pldat->clk);
+- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
+-
+ fifo->mempool =
+ __vxge_hw_mempool_create(vpath->hldev,
+ fifo->config->memblock_size,
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index b47d5b3..273a516 100644
+index 927aa33..a6c2518 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -745,22 +745,22 @@ struct rtl8169_private {
+@@ -747,22 +747,22 @@ struct rtl8169_private {
struct mdio_ops {
void (*write)(struct rtl8169_private *, int, int);
int (*read)(struct rtl8169_private *, int);
int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
int (*get_settings)(struct net_device *, struct ethtool_cmd *);
-diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
-index 4613591..d816601 100644
---- a/drivers/net/ethernet/sis/sis190.c
-+++ b/drivers/net/ethernet/sis/sis190.c
-@@ -1618,7 +1618,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
- static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
- struct net_device *dev)
- {
-- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
-+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
- struct sis190_private *tp = netdev_priv(dev);
- struct pci_dev *isa_bridge;
- u8 reg, tmp8;
+diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
+index 0767043f..08c2553 100644
+--- a/drivers/net/ethernet/sfc/ptp.c
++++ b/drivers/net/ethernet/sfc/ptp.c
+@@ -553,7 +553,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
+ (u32)((u64)ptp->start.dma_addr >> 32));
+
+ /* Clear flag that signals MC ready */
+- ACCESS_ONCE(*start) = 0;
++ ACCESS_ONCE_RW(*start) = 0;
+ efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
+ MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
+
diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
index 0c74a70..3bc6f68 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
/* To mask all all interrupts.*/
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
-index 95ceb35..318fc12 100644
+index 5fd6f46..ee1f265 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
-@@ -99,7 +99,7 @@ struct rndis_device {
+@@ -101,7 +101,7 @@ struct rndis_device {
enum rndis_device_state state;
bool link_state;
spinlock_t request_lock;
struct list_head req_list;
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
-index 1e88a10..1b01736 100644
+index 928148c..d83298e 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
-@@ -99,7 +99,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
+@@ -107,7 +107,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
* template
*/
set = &rndis_msg->msg.set_req;
/* Add to the request list */
spin_lock_irqsave(&dev->request_lock, flags);
-@@ -730,7 +730,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
+@@ -760,7 +760,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
/* Setup the rndis set */
halt = &request->request_msg.msg.halt_req;
/* Ignore return since this msg is optional. */
rndis_filter_send_request(dev, request);
+diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
+index 7d39add..037e1da 100644
+--- a/drivers/net/ieee802154/fakehard.c
++++ b/drivers/net/ieee802154/fakehard.c
+@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
+ phy->transmit_power = 0xbf;
+
+ dev->netdev_ops = &fake_ops;
+- dev->ml_priv = &fake_mlme;
++ dev->ml_priv = (void *)&fake_mlme;
+
+ priv = netdev_priv(dev);
+ priv->phy = phy;
+diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
+index 0f0f9ce..0ca5819 100644
+--- a/drivers/net/macvtap.c
++++ b/drivers/net/macvtap.c
+@@ -1100,7 +1100,7 @@ static int macvtap_device_event(struct notifier_block *unused,
+ return NOTIFY_DONE;
+ }
+
+-static struct notifier_block macvtap_notifier_block __read_mostly = {
++static struct notifier_block macvtap_notifier_block = {
+ .notifier_call = macvtap_device_event,
+ };
+
diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
index daec9b0..6428fcb 100644
--- a/drivers/net/phy/mdio-bitbang.c
}
EXPORT_SYMBOL(free_mdio_bitbang);
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
-index 5c05572..389610b 100644
+index eb3f5ce..d773730 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
-@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -999,7 +999,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
struct ppp_stats stats;
struct ppp_comp_stats cstats;
switch (cmd) {
case SIOCGPPPSTATS:
-@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -1021,8 +1020,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
break;
case SIOCGPPPVER:
break;
err = 0;
break;
+diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
+index ad86660..9fd0884 100644
+--- a/drivers/net/team/team.c
++++ b/drivers/net/team/team.c
+@@ -2601,7 +2601,7 @@ static int team_device_event(struct notifier_block *unused,
+ return NOTIFY_DONE;
+ }
+
+-static struct notifier_block team_notifier_block __read_mostly = {
++static struct notifier_block team_notifier_block = {
+ .notifier_call = team_device_event,
+ };
+
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
-index 3a16d4f..a311cec 100644
+index 0873cdc..ddb178e 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
-@@ -1367,7 +1367,7 @@ static int set_offload(struct tun_struct *tun, unsigned long arg)
+@@ -1374,7 +1374,7 @@ static int set_offload(struct tun_struct *tun, unsigned long arg)
}
static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
{
struct tun_file *tfile = file->private_data;
struct tun_struct *tun;
-@@ -1378,6 +1378,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
+@@ -1387,6 +1387,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
int vnet_hdr_sz;
int ret;
if (copy_from_user(&ifr, argp, ifreq_len))
return -EFAULT;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
-index 62f30b4..ff99dfd 100644
+index 605a4ba..a883dd1 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -71,7 +71,7 @@
#define MOD_AUTHOR "Option Wireless"
#define MOD_DESCRIPTION "USB High Speed Option driver"
-@@ -1182,7 +1182,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
+@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
struct urb *urb;
urb = serial->rx_urb[0];
count = put_rxbuf_data(urb, serial);
if (count == -1)
return;
-@@ -1218,7 +1218,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
+@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
DUMP1(urb->transfer_buffer, urb->actual_length);
/* Anyone listening? */
return;
if (status == 0) {
-@@ -1300,8 +1300,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1298,8 +1298,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
tty_port_tty_set(&serial->port, tty);
/* check for port already opened, if not set the termios */
serial->rx_state = RX_IDLE;
/* Force default termio settings */
_hso_serial_set_termios(tty, NULL);
-@@ -1313,7 +1312,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1311,7 +1310,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
result = hso_start_serial_device(serial->parent, GFP_KERNEL);
if (result) {
hso_stop_serial_device(serial->parent);
kref_put(&serial->parent->ref, hso_serial_ref_free);
}
} else {
-@@ -1350,10 +1349,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
+@@ -1348,10 +1347,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
/* reset the rts and dtr */
/* do the actual close */
tty_port_tty_set(&serial->port, NULL);
if (!usb_gone)
hso_stop_serial_device(serial->parent);
-@@ -1429,7 +1428,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
+@@ -1427,7 +1426,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
/* the actual setup */
spin_lock_irqsave(&serial->serial_lock, flags);
+ if (atomic_read(&serial->port.count))
_hso_serial_set_termios(tty, old);
else
- tty->termios = old;
-@@ -1888,7 +1887,7 @@ static void intr_callback(struct urb *urb)
+ tty->termios = *old;
+@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
D1("Pending read interrupt on port %d\n", i);
spin_lock(&serial->serial_lock);
if (serial->rx_state == RX_IDLE &&
/* Setup and send a ctrl req read on
* port i */
if (!serial->rx_urb_filled[0]) {
-@@ -3079,7 +3078,7 @@ static int hso_resume(struct usb_interface *iface)
+@@ -3078,7 +3077,7 @@ static int hso_resume(struct usb_interface *iface)
/* Start all serial ports */
for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
if (serial_table[i] && (serial_table[i]->interface == iface)) {
result =
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
-diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
-index 6169fbd..40e8422 100644
---- a/drivers/net/wireless/ath/ath.h
-+++ b/drivers/net/wireless/ath/ath.h
-@@ -119,6 +119,7 @@ struct ath_ops {
- void (*write_flush) (void *);
- u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
- };
-+typedef struct ath_ops __no_const ath_ops_no_const;
+diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
+index edb81ed..ab8931c 100644
+--- a/drivers/net/usb/usbnet.c
++++ b/drivers/net/usb/usbnet.c
+@@ -380,6 +380,12 @@ static int rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
+ unsigned long lockflags;
+ size_t size = dev->rx_urb_size;
+
++ /* prevent rx skb allocation when error ratio is high */
++ if (test_bit(EVENT_RX_KILL, &dev->flags)) {
++ usb_free_urb(urb);
++ return -ENOLINK;
++ }
++
+ skb = __netdev_alloc_skb_ip_align(dev->net, size, flags);
+ if (!skb) {
+ netif_dbg(dev, rx_err, dev->net, "no rx skb\n");
+@@ -539,6 +545,17 @@ block:
+ break;
+ }
- struct ath_common;
- struct ath_bus_ops;
-diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
-index 2aab20e..b761ef8 100644
---- a/drivers/net/wireless/ath/ath5k/base.c
-+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -1803,7 +1803,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
- {
- int ret;
- struct ath5k_hw *ah = hw->priv;
-- struct ath5k_vif *avf = (void *)vif->drv_priv;
-+ struct ath5k_vif *avf;
- struct sk_buff *skb;
++ /* stop rx if packet error rate is high */
++ if (++dev->pkt_cnt > 30) {
++ dev->pkt_cnt = 0;
++ dev->pkt_err = 0;
++ } else {
++ if (state == rx_cleanup)
++ dev->pkt_err++;
++ if (dev->pkt_err > 20)
++ set_bit(EVENT_RX_KILL, &dev->flags);
++ }
++
+ state = defer_bh(dev, skb, &dev->rxq, state);
- if (WARN_ON(!vif)) {
-@@ -1818,6 +1818,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
- goto out;
+ if (urb) {
+@@ -790,6 +807,11 @@ int usbnet_open (struct net_device *net)
+ (dev->driver_info->flags & FLAG_FRAMING_AX) ? "ASIX" :
+ "simple");
+
++ /* reset rx error state */
++ dev->pkt_cnt = 0;
++ dev->pkt_err = 0;
++ clear_bit(EVENT_RX_KILL, &dev->flags);
++
+ // delay posting reads until we're fully open
+ tasklet_schedule (&dev->bh);
+ if (info->manage_power) {
+@@ -1253,6 +1275,9 @@ static void usbnet_bh (unsigned long param)
+ }
}
-+ avf = (void *)vif->drv_priv;
- ath5k_txbuf_free_skb(ah, avf->bbuf);
- avf->bbuf->skb = skb;
- ret = ath5k_beacon_setup(ah, avf->bbuf);
++ /* restart RX again after disabling due to high error rate */
++ clear_bit(EVENT_RX_KILL, &dev->flags);
++
+ // waiting for all pending urbs to complete?
+ if (dev->wait) {
+ if ((dev->txq.qlen + dev->rxq.qlen + dev->done.qlen) == 0) {
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
index 8d78253..bebbb68 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
| set11nRateFlags(i->rates, 2)
| set11nRateFlags(i->rates, 3)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-index 78816b8..1fcdfae 100644
+index 301bf72..3f5654f 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
-index de6968f..29ac4c1 100644
+index dbc1b7a..67e2ca2 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -656,7 +656,7 @@ struct ath_hw_private_ops {
+@@ -657,7 +657,7 @@ struct ath_hw_private_ops {
/* ANI */
void (*ani_cache_ini_regs)(struct ath_hw *ah);
/**
* struct ath_hw_ops - callbacks used by hardware code and driver code
-@@ -686,7 +686,7 @@ struct ath_hw_ops {
+@@ -687,7 +687,7 @@ struct ath_hw_ops {
void (*antdiv_comb_conf_set)(struct ath_hw *ah,
struct ath_hw_antcomb_conf *antconf);
-
+ void (*antctrl_shared_chain_lnadiv)(struct ath_hw *hw, bool enable);
-};
+} __no_const;
struct ath_nf_limits {
s16 max;
-@@ -706,7 +706,7 @@ enum ath_cal_list {
- #define AH_FASTCC 0x4
-
- struct ath_hw {
-- struct ath_ops reg_ops;
-+ ath_ops_no_const reg_ops;
-
- struct ieee80211_hw *hw;
- struct ath_common common;
-diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
-index af00e2c..ab04d34 100644
---- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
-@@ -545,7 +545,7 @@ struct phy_func_ptr {
- void (*carrsuppr)(struct brcms_phy *);
- s32 (*rxsigpwr)(struct brcms_phy *, s32);
- void (*detach)(struct brcms_phy *);
+diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+index 71ced17..cd82b12 100644
+--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
++++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+@@ -184,7 +184,7 @@ struct brcmf_cfg80211_event_loop {
+ struct net_device *ndev,
+ const struct brcmf_event_msg *e,
+ void *data);
+-};
++} __no_const;
+
+ /* basic structure of scan request */
+ struct brcmf_cfg80211_scan_req {
+@@ -239,7 +239,7 @@ struct brcmf_cfg80211_profile {
+ struct brcmf_cfg80211_iscan_eloop {
+ s32 (*handler[WL_SCAN_ERSULTS_LAST])
+ (struct brcmf_cfg80211_info *cfg);
-};
+} __no_const;
- struct brcms_phy {
- struct brcms_phy_pub pubpi_ro;
+ /* dongle iscan controller */
+ struct brcmf_cfg80211_iscan_ctrl {
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
-index faec404..a5277f1 100644
+index e252acb..6ad1e65 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
-@@ -3611,7 +3611,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+@@ -3615,7 +3615,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
*/
if (il3945_mod_params.disable_hw_scan) {
D_INFO("Disabling hw_scan\n");
D_INFO("*** LOAD DRIVER ***\n");
diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-index a47b306..297daf2 100644
+index 1a98fa3..51e6661 100644
--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -203,7 +203,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
memset(buf, 0, sizeof(buf));
buf_size = min(count, sizeof(buf) - 1);
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
-index dbeebef..b45a152 100644
+index fe0fffd..b4c5724 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
-@@ -1944,7 +1944,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
+@@ -1967,7 +1967,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
char buf[8];
u32 reset_flag;
memset(buf, 0, sizeof(buf));
-@@ -1965,7 +1965,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
+@@ -1988,7 +1988,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
{
struct iwl_trans *trans = file->private_data;
char buf[8];
memset(buf, 0, sizeof(buf));
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
-index 0083839..fcb7225 100644
+index 429ca32..f86236b 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1748,9 +1748,11 @@ static int __init init_mac80211_hwsim(void)
+@@ -1751,9 +1751,11 @@ static int __init init_mac80211_hwsim(void)
return -EINVAL;
if (fake_hw_scan) {
}
spin_lock_init(&hwsim_radio_lock);
-diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
-index e7c2a82..582e228 100644
---- a/drivers/net/wireless/mwifiex/main.h
-+++ b/drivers/net/wireless/mwifiex/main.h
-@@ -571,7 +571,7 @@ struct mwifiex_if_ops {
- int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
- int (*data_complete) (struct mwifiex_adapter *, struct sk_buff *);
- int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *);
--};
-+} __no_const;
-
- struct mwifiex_adapter {
- u8 iface_type;
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
-index 7a4ae9e..56e00bd 100644
+index bd1f0cb..db85ab0 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1235,7 +1235,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
tmp = cpu_to_le32(rts_threshold);
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
-index 8afb546..0c0dc5c 100644
+index 0751b35..246ba3e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -397,7 +397,7 @@ struct rt2x00_intf {
+@@ -398,7 +398,7 @@ struct rt2x00_intf {
* for hardware which doesn't support hardware
* sequence counting.
*/
static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
-index f7e74a0..da71431 100644
+index e488b94..14b6a0c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -240,9 +240,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
hdr->seq_ctrl |= cpu_to_le16(seqno);
-diff --git a/drivers/net/wireless/ti/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h
-index fd02060..74ee481 100644
---- a/drivers/net/wireless/ti/wl1251/wl1251.h
-+++ b/drivers/net/wireless/ti/wl1251/wl1251.h
-@@ -266,7 +266,7 @@ struct wl1251_if_operations {
- void (*reset)(struct wl1251 *wl);
- void (*enable_irq)(struct wl1251 *wl);
- void (*disable_irq)(struct wl1251 *wl);
--};
-+} __no_const;
+diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
+index e2750a1..797e179 100644
+--- a/drivers/net/wireless/ti/wl1251/sdio.c
++++ b/drivers/net/wireless/ti/wl1251/sdio.c
+@@ -269,13 +269,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
- struct wl1251 {
- struct ieee80211_hw *hw;
-diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
-index 0ce7a8e..56a0ccf 100644
---- a/drivers/net/wireless/ti/wlcore/wlcore.h
-+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
-@@ -81,7 +81,7 @@ struct wlcore_ops {
- struct ieee80211_sta *sta,
- struct ieee80211_key_conf *key_conf);
- u32 (*pre_pkt_send)(struct wl1271 *wl, u32 buf_offset, u32 last_len);
--};
-+} __no_const;
+ irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
+
+- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
+- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
++ pax_open_kernel();
++ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
++ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
++ pax_close_kernel();
+
+ wl1251_info("using dedicated interrupt line");
+ } else {
+- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
+- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
++ pax_open_kernel();
++ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
++ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
++ pax_close_kernel();
+
+ wl1251_info("using SDIO interrupt");
+ }
+diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
+index dadf1db..d9db7a7 100644
+--- a/drivers/net/wireless/ti/wl12xx/main.c
++++ b/drivers/net/wireless/ti/wl12xx/main.c
+@@ -644,7 +644,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
+ sizeof(wl->conf.mem));
- enum wlcore_partitions {
- PART_DOWN,
+ /* read data preparation is only needed by wl127x */
+- wl->ops->prepare_read = wl127x_prepare_read;
++ pax_open_kernel();
++ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
++ pax_close_kernel();
+
+ wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER, WL127X_IFTYPE_VER,
+ WL127X_MAJOR_VER, WL127X_SUBTYPE_VER,
+@@ -665,7 +667,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
+ sizeof(wl->conf.mem));
+
+ /* read data preparation is only needed by wl127x */
+- wl->ops->prepare_read = wl127x_prepare_read;
++ pax_open_kernel();
++ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
++ pax_close_kernel();
+
+ wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER, WL127X_IFTYPE_VER,
+ WL127X_MAJOR_VER, WL127X_SUBTYPE_VER,
+diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
+index a39682a..1e8220c 100644
+--- a/drivers/net/wireless/ti/wl18xx/main.c
++++ b/drivers/net/wireless/ti/wl18xx/main.c
+@@ -1489,8 +1489,10 @@ static int wl18xx_setup(struct wl1271 *wl)
+ }
+
+ if (!checksum_param) {
+- wl18xx_ops.set_rx_csum = NULL;
+- wl18xx_ops.init_vif = NULL;
++ pax_open_kernel();
++ *(void **)&wl18xx_ops.set_rx_csum = NULL;
++ *(void **)&wl18xx_ops.init_vif = NULL;
++ pax_close_kernel();
+ }
+
+ /* Enable 11a Band only if we have 5G antennas */
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
-index f34b5b2..b5abb9f 100644
+index d93b2b6..ae50401 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
-@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
+@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
if (cookie == NO_COOKIE)
offset = pc;
if (cookie == INVALID_COOKIE) {
offset = pc;
}
if (cookie != last_cookie) {
-@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
+@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
/* add userspace sample */
if (!mm) {
return 0;
}
-@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
+@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
/* ignore backtraces if failed to add a sample */
if (state == sb_bt_start) {
state = sb_bt_ignore;
}
#endif /* IEEE1284.3 support. */
-diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
-index 9fff878..ad0ad53 100644
---- a/drivers/pci/hotplug/cpci_hotplug.h
-+++ b/drivers/pci/hotplug/cpci_hotplug.h
-@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
- int (*hardware_test) (struct slot* slot, u32 value);
- u8 (*get_power) (struct slot* slot);
- int (*set_power) (struct slot* slot, int value);
--};
-+} __no_const;
+diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
+index a6a71c4..c91097b 100644
+--- a/drivers/pci/hotplug/cpcihp_generic.c
++++ b/drivers/pci/hotplug/cpcihp_generic.c
+@@ -73,7 +73,6 @@ static u16 port;
+ static unsigned int enum_bit;
+ static u8 enum_mask;
+
+-static struct cpci_hp_controller_ops generic_hpc_ops;
+ static struct cpci_hp_controller generic_hpc;
- struct cpci_hp_controller {
- unsigned int irq;
+ static int __init validate_parameters(void)
+@@ -139,6 +138,10 @@ static int query_enum(void)
+ return ((value & enum_mask) == enum_mask);
+ }
+
++static struct cpci_hp_controller_ops generic_hpc_ops = {
++ .query_enum = query_enum,
++};
++
+ static int __init cpcihp_generic_init(void)
+ {
+ int status;
+@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
+ pci_dev_put(dev);
+
+ memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
+- generic_hpc_ops.query_enum = query_enum;
+ generic_hpc.ops = &generic_hpc_ops;
+
+ status = cpci_hp_register_controller(&generic_hpc);
+diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
+index 6bf8d2a..9711ce0 100644
+--- a/drivers/pci/hotplug/cpcihp_zt5550.c
++++ b/drivers/pci/hotplug/cpcihp_zt5550.c
+@@ -59,7 +59,6 @@
+ /* local variables */
+ static bool debug;
+ static bool poll;
+-static struct cpci_hp_controller_ops zt5550_hpc_ops;
+ static struct cpci_hp_controller zt5550_hpc;
+
+ /* Primary cPCI bus bridge device */
+@@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
+ return 0;
+ }
+
++static struct cpci_hp_controller_ops zt5550_hpc_ops = {
++ .query_enum = zt5550_hc_query_enum,
++};
++
+ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
+ {
+ int status;
+@@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
+ dbg("returned from zt5550_hc_config");
+
+ memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
+- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
+ zt5550_hpc.ops = &zt5550_hpc_ops;
+ if(!poll) {
+ zt5550_hpc.irq = hc_dev->irq;
+ zt5550_hpc.irq_flags = IRQF_SHARED;
+ zt5550_hpc.dev_id = hc_dev;
+
+- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
+- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
+- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
++ pax_open_kernel();
++ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
++ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
++ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
++ pax_open_kernel();
+ } else {
+ info("using ENUM# polling mode");
+ }
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index 76ba8a1..20ca857 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
/* initialize our int15 lock */
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
-index b500840..d7159d3 100644
+index 449f257..0731e96 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -27,9 +27,9 @@
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 61859d0..124539e 100644
+index ec909af..e7517f3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -173,7 +173,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
/* No printks while decoding is disabled! */
if (!dev->mmio_always_on) {
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
-index 27911b5..5b6db88 100644
+index 9b8505c..f00870a 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
-@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
+@@ -465,7 +465,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
static int __init pci_proc_init(void)
{
struct pci_dev *dev = NULL;
&proc_bus_pci_dev_operations);
proc_initialized = 1;
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
-index 52daaa8..d6b81eb 100644
+index 75dd651..2af4c9a 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2097,7 +2097,7 @@ static int hotkey_mask_get(void)
return 0;
/* check if the resource is reserved */
-diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
-index 181ddec..774b6da 100644
---- a/drivers/power/bq27x00_battery.c
-+++ b/drivers/power/bq27x00_battery.c
-@@ -80,7 +80,7 @@
- struct bq27x00_device_info;
- struct bq27x00_access_methods {
- int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
--};
-+} __no_const;
+diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
+index 7df7c5f..bd48c47 100644
+--- a/drivers/power/pda_power.c
++++ b/drivers/power/pda_power.c
+@@ -37,7 +37,11 @@ static int polling;
+
+ #ifdef CONFIG_USB_OTG_UTILS
+ static struct usb_phy *transceiver;
+-static struct notifier_block otg_nb;
++static int otg_handle_notification(struct notifier_block *nb,
++ unsigned long event, void *unused);
++static struct notifier_block otg_nb = {
++ .notifier_call = otg_handle_notification
++};
+ #endif
- enum bq27x00_chip { BQ27000, BQ27500, BQ27425};
+ static struct regulator *ac_draw;
+@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
+ #ifdef CONFIG_USB_OTG_UTILS
+ if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
+- otg_nb.notifier_call = otg_handle_notification;
+ ret = usb_register_notifier(transceiver, &otg_nb);
+ if (ret) {
+ dev_err(dev, "failure to register otg notifier\n");
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index 8d53174..04c65de 100644
--- a/drivers/regulator/max8660.c
/*
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
-index b388b74..ed82573 100644
+index 1fa6381..f58834e 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
-@@ -565,10 +565,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
+@@ -540,10 +540,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
}
mc13xxx_unlock(mc13892);
return rtc_set_time(rtc, &tm);
case RTC_PIE_ON:
-diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 9e933a8..4f969f7 100644
---- a/drivers/scsi/aacraid/aacraid.h
-+++ b/drivers/scsi/aacraid/aacraid.h
-@@ -503,7 +503,7 @@ struct adapter_ops
- int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
- /* Administrative operations */
- int (*adapter_comm)(struct aac_dev * dev, int comm);
--};
-+} __no_const;
-
- /*
- * Define which interrupt handler needs to be installed
-diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 7199534..cb7f158 100644
---- a/drivers/scsi/aacraid/linit.c
-+++ b/drivers/scsi/aacraid/linit.c
-@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
- #elif defined(__devinitconst)
- static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
- #else
--static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
-+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
- #endif
- { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
- { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
-diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
-index ff80552..1c4120c 100644
---- a/drivers/scsi/aic94xx/aic94xx_init.c
-+++ b/drivers/scsi/aic94xx/aic94xx_init.c
-@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
- .lldd_ata_set_dmamode = asd_set_dmamode,
- };
-
--static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
-+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
- {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
- {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
- {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
index 4ad7e36..d004679 100644
--- a/drivers/scsi/bfa/bfa.h
typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
struct bfa_faa_cbfn_s {
-diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
-index f0f80e2..8ec946b 100644
---- a/drivers/scsi/bfa/bfa_fcpim.c
-+++ b/drivers/scsi/bfa/bfa_fcpim.c
-@@ -3715,7 +3715,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
-
- bfa_iotag_attach(fcp);
-
-- fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
-+ fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
- bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
- (fcp->num_itns * sizeof(struct bfa_itn_s));
- memset(fcp->itn_arr, 0,
-@@ -3773,7 +3773,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
- void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
- {
- struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
-- struct bfa_itn_s *itn;
-+ bfa_itn_s_no_const *itn;
-
- itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
- itn->isr = isr;
diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
-index 36f26da..38a34a8 100644
+index e693af6..2e525b6 100644
--- a/drivers/scsi/bfa/bfa_fcpim.h
+++ b/drivers/scsi/bfa/bfa_fcpim.h
-@@ -37,6 +37,7 @@ struct bfa_iotag_s {
+@@ -36,7 +36,7 @@ struct bfa_iotag_s {
+
struct bfa_itn_s {
bfa_isr_func_t isr;
- };
-+typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
+-};
++} __no_const;
void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
-@@ -147,7 +148,7 @@ struct bfa_fcp_mod_s {
- struct list_head iotag_tio_free_q; /* free IO resources */
- struct list_head iotag_unused_q; /* unused IO resources*/
- struct bfa_iotag_s *iotag_arr;
-- struct bfa_itn_s *itn_arr;
-+ bfa_itn_s_no_const *itn_arr;
- int num_ioim_reqs;
- int num_fwtio_reqs;
- int num_itns;
diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
-index 1a99d4b..e85d64b 100644
+index 23a90e7..9cf04ee 100644
--- a/drivers/scsi/bfa/bfa_ioc.h
+++ b/drivers/scsi/bfa/bfa_ioc.h
@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
/* These three are default values which can be overridden */
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index f9823f2..7bc3e81 100644
+index 4217e49..9c77e3e 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
-@@ -536,7 +536,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
+@@ -554,7 +554,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
unsigned long flags;
if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
a = rq->head[rq->current_entry];
-@@ -3355,7 +3355,7 @@ static void start_io(struct ctlr_info *h)
+@@ -3374,7 +3374,7 @@ static void start_io(struct ctlr_info *h)
while (!list_empty(&h->reqQ)) {
c = list_entry(h->reqQ.next, struct CommandList, list);
/* can't do anything if fifo is full */
dev_warn(&h->pdev->dev, "fifo full\n");
break;
}
-@@ -3377,7 +3377,7 @@ static void start_io(struct ctlr_info *h)
+@@ -3396,7 +3396,7 @@ static void start_io(struct ctlr_info *h)
/* Tell the controller execute command */
spin_unlock_irqrestore(&h->lock, flags);
spin_lock_irqsave(&h->lock, flags);
}
spin_unlock_irqrestore(&h->lock, flags);
-@@ -3385,17 +3385,17 @@ static void start_io(struct ctlr_info *h)
+@@ -3404,17 +3404,17 @@ static void start_io(struct ctlr_info *h)
static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
{
(h->interrupts_enabled == 0);
}
-@@ -4299,7 +4299,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
+@@ -4318,7 +4318,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
if (prod_index < 0)
return -ENODEV;
h->product_name = products[prod_index].product_name;
pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
-@@ -4581,7 +4581,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
+@@ -4600,7 +4600,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
assert_spin_locked(&lockup_detector_lock);
remove_ctlr_from_lockup_detector_list(h);
spin_lock_irqsave(&h->lock, flags);
h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
spin_unlock_irqrestore(&h->lock, flags);
-@@ -4759,7 +4759,7 @@ reinit_after_soft_reset:
+@@ -4778,7 +4778,7 @@ reinit_after_soft_reset:
}
/* make sure the board interrupts are off */
if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
goto clean2;
-@@ -4793,7 +4793,7 @@ reinit_after_soft_reset:
+@@ -4812,7 +4812,7 @@ reinit_after_soft_reset:
* fake ones to scoop up any residual completions.
*/
spin_lock_irqsave(&h->lock, flags);
spin_unlock_irqrestore(&h->lock, flags);
free_irqs(h);
rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4812,9 +4812,9 @@ reinit_after_soft_reset:
+@@ -4831,9 +4831,9 @@ reinit_after_soft_reset:
dev_info(&h->pdev->dev, "Board READY.\n");
dev_info(&h->pdev->dev,
"Waiting for stale completions to drain.\n");
rc = controller_reset_failed(h->cfgtable);
if (rc)
-@@ -4835,7 +4835,7 @@ reinit_after_soft_reset:
+@@ -4854,7 +4854,7 @@ reinit_after_soft_reset:
}
/* Turn the interrupts on so we can service requests */
hpsa_hba_inquiry(h);
hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
-@@ -4887,7 +4887,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
+@@ -4906,7 +4906,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
* To write all data in the battery backed cache to disks
*/
hpsa_flush_cache(h);
hpsa_free_irqs_and_disable_msix(h);
}
-@@ -5056,7 +5056,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
+@@ -5075,7 +5075,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
return;
}
/* Change the access methods to the performant access methods */
/* queue and queue Info */
struct list_head reqQ;
-diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
-index f2df059..a3a9930 100644
---- a/drivers/scsi/ips.h
-+++ b/drivers/scsi/ips.h
-@@ -1027,7 +1027,7 @@ typedef struct {
- int (*intr)(struct ips_ha *);
- void (*enableint)(struct ips_ha *);
- uint32_t (*statupd)(struct ips_ha *);
--} ips_hw_func_t;
-+} __no_const ips_hw_func_t;
-
- typedef struct ips_ha {
- uint8_t ha_id[IPS_MAX_CHANNELS+1];
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index c772d8d..35c362c 100644
--- a/drivers/scsi/libfc/fc_exch.c
}
EXPORT_SYMBOL(fc_exch_update_stats);
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
-index a59fcdc..abe55f3 100644
+index bdb81cd..d3c7c2c 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
.qc_issue = sas_ata_qc_issue,
.qc_fill_rtf = sas_ata_qc_fill_rtf,
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
-index a65c05a..a39e402 100644
+index 69b5993..1ac9dce 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
-@@ -420,7 +420,7 @@ struct lpfc_vport {
+@@ -424,7 +424,7 @@ struct lpfc_vport {
struct dentry *debug_nodelist;
struct dentry *vport_debugfs_root;
struct lpfc_debugfs_trc *disc_trc;
#endif
uint8_t stat_data_enabled;
uint8_t stat_data_blocked;
-@@ -834,8 +834,8 @@ struct lpfc_hba {
+@@ -840,8 +840,8 @@ struct lpfc_hba {
struct timer_list fabric_block_timer;
unsigned long bit_flags;
#define FABRIC_COMANDS_BLOCKED 0
unsigned long last_rsrc_error_time;
unsigned long last_ramp_down_time;
unsigned long last_ramp_up_time;
-@@ -871,7 +871,7 @@ struct lpfc_hba {
+@@ -877,7 +877,7 @@ struct lpfc_hba {
struct dentry *debug_slow_ring_trc;
struct lpfc_debugfs_trc *slow_ring_trc;
struct dentry *idiag_root;
struct dentry *idiag_pci_cfg;
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
-index 3217d63..c417981 100644
+index f63f5ff..de29189 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
(lpfc_debugfs_max_slow_ring_trc - 1);
for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
dtp = phba->slow_ring_trc + i;
-@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
+@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
!vport || !vport->disc_trc)
return;
dtp->jif = jiffies;
#endif
return;
-@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
+@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
!phba || !phba->slow_ring_trc)
return;
dtp->jif = jiffies;
#endif
return;
-@@ -4090,7 +4090,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -4182,7 +4182,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
"slow_ring buffer\n");
goto debug_failed;
}
memset(phba->slow_ring_trc, 0,
(sizeof(struct lpfc_debugfs_trc) *
lpfc_debugfs_max_slow_ring_trc));
-@@ -4136,7 +4136,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -4228,7 +4228,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
"buffer\n");
goto debug_failed;
}
snprintf(name, sizeof(name), "discovery_trace");
vport->debug_disc_trc =
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
-index 45c1520..35ba744 100644
+index 7dc4218..3436f08 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
-@@ -10478,8 +10478,10 @@ lpfc_init(void)
+@@ -10589,8 +10589,10 @@ lpfc_init(void)
"misc_register returned with status %d", error);
if (lpfc_enable_npiv) {
lpfc_transport_template =
fc_attach_transport(&lpfc_transport_functions);
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
-index 925975d..0f1fc07 100644
+index 7f45ac9..cf62eda 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
-@@ -311,7 +311,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
+@@ -305,7 +305,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
uint32_t evt_posted;
spin_lock_irqsave(&phba->hbalock, flags);
phba->last_rsrc_error_time = jiffies;
if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
-@@ -352,7 +352,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
+@@ -346,7 +346,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
unsigned long flags;
struct lpfc_hba *phba = vport->phba;
uint32_t evt_posted;
if (vport->cfg_lun_queue_depth <= queue_depth)
return;
-@@ -396,8 +396,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
+@@ -390,8 +390,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
unsigned long num_rsrc_err, num_cmd_success;
int i;
/*
* The error and success command counters are global per
-@@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
+@@ -419,8 +419,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
}
}
lpfc_destroy_vport_work_array(phba, vports);
}
/**
-@@ -460,8 +460,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
+@@ -454,8 +454,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
}
}
lpfc_destroy_vport_work_array(phba, vports);
/**
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
-index ea8a0b4..812a124 100644
+index af763ea..41904f7 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
/* To indicate add/delete/modify during CCN */
u8 change_detected;
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
-index 5ab9530..2dd80f7 100644
+index 83d7984..a27d947 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
-@@ -1855,7 +1855,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
+@@ -1969,7 +1969,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
return 0;
}
.show_host_node_name = 1,
.show_host_port_name = 1,
-@@ -1902,7 +1902,7 @@ struct fc_function_template qla2xxx_transport_functions = {
+@@ -2016,7 +2016,7 @@ struct fc_function_template qla2xxx_transport_functions = {
.bsg_timeout = qla24xx_bsg_timeout,
};
.show_host_node_name = 1,
.show_host_port_name = 1,
-diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
-index 39007f5..7fafc64 100644
---- a/drivers/scsi/qla2xxx/qla_def.h
-+++ b/drivers/scsi/qla2xxx/qla_def.h
-@@ -2284,7 +2284,7 @@ struct isp_operations {
- int (*start_scsi) (srb_t *);
- int (*abort_isp) (struct scsi_qla_host *);
- int (*iospace_config)(struct qla_hw_data*);
--};
-+} __no_const;
-
- /* MSI-X Support *************************************************************/
-
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
-index 9eacd2d..d79629c 100644
+index 6acb397..d86e3e0 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
-@@ -484,8 +484,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
+@@ -515,8 +515,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
struct device_attribute;
extern struct device_attribute *qla2x00_host_attrs[];
struct fc_function_template;
extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
extern void qla2x00_init_host_attr(scsi_qla_host_t *);
+diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
+index f4b1fc8..a1ce4dd 100644
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -1462,8 +1462,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
+ !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
+ /* Ok, a 64bit DMA mask is applicable. */
+ ha->flags.enable_64bit_addressing = 1;
+- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
+- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
++ pax_open_kernel();
++ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
++ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
++ pax_close_kernel();
+ return;
+ }
+ }
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
-index 7fdba7f..1b4b2c2 100644
+index 329d553..f20d31d 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
-@@ -268,7 +268,7 @@ struct ddb_entry {
+@@ -273,7 +273,7 @@ struct ddb_entry {
* (4000 only) */
atomic_t relogin_timer; /* Max Time to wait for
* relogin to complete */
uint32_t default_time2wait; /* Default Min time between
* relogins (+aens) */
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
-index 9da4266..377b3b6 100644
+index fbc546e..c7d1b48 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
-@@ -2615,12 +2615,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
+@@ -2621,12 +2621,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
*/
if (!iscsi_is_session_online(cls_sess)) {
/* Reset retry relogin timer */
ddb_entry->default_time2wait + 4));
set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
atomic_set(&ddb_entry->retry_relogin_timer,
-@@ -4635,7 +4635,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
+@@ -4738,7 +4738,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
atomic_set(&ddb_entry->relogin_timer, 0);
ddb_entry->default_relogin_timeout =
(def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index 2936b44..546ecdb 100644
+index 2c0d0ec..4e8681a 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
-@@ -660,7 +660,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
+@@ -661,7 +661,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
unsigned long timeout;
int rtn = 0;
/* check if the device is still usable */
if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index faa790f..7e351ddd 100644
+index 9032e91..7a805d0 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
-@@ -1442,7 +1442,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
+@@ -1454,7 +1454,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
shost = sdev->host;
scsi_init_cmd_errh(cmd);
cmd->result = DID_NO_CONNECT << 16;
/*
* SCSI request completion path will do scsi_device_unbusy(),
-@@ -1468,9 +1468,9 @@ static void scsi_softirq_done(struct request *rq)
+@@ -1480,9 +1480,9 @@ static void scsi_softirq_done(struct request *rq)
INIT_LIST_HEAD(&cmd->eh_entry);
disposition = scsi_decide_disposition(cmd);
if (disposition != SUCCESS &&
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
-index ce5224c..8c6d071 100644
+index 931a7d9..0c2a754 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
-@@ -661,7 +661,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
+@@ -658,7 +658,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
struct scsi_device *sdev = to_scsi_device(dev); \
/*
* Check for overflow; dev_loss_tmo is u32
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
-index fa1dfaa..4bb620c 100644
+index 31969f2..2b348f0 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -79,7 +79,7 @@ struct iscsi_internal {
transport_setup_device(&rport->dev);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 4df73e5..b691c58 100644
+index a45e12a..d9120cb 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
-@@ -2709,7 +2709,7 @@ static int sd_probe(struct device *dev)
+@@ -2899,7 +2899,7 @@ static int sd_probe(struct device *dev)
sdkp->disk = gd;
sdkp->index = index;
atomic_set(&sdkp->openers, 0);
if (!sdp->request_queue->rq_timeout) {
if (sdp->type != TYPE_MOD)
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
-index 9c5c5f2..8414557 100644
+index be2c9a6..275525c 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1101,7 +1101,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
#endif
}
-diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
-index 4beab94..44149ee 100644
---- a/drivers/staging/omapdrm/omap_drv.c
-+++ b/drivers/staging/omapdrm/omap_drv.c
-@@ -761,7 +761,6 @@ static struct drm_driver omap_drm_driver = {
- .irq_postinstall = dev_irq_postinstall,
- .irq_uninstall = dev_irq_uninstall,
- .irq_handler = dev_irq_handler,
-- .reclaim_buffers = drm_core_reclaim_buffers,
- #ifdef CONFIG_DEBUG_FS
- .debugfs_init = omap_debugfs_init,
- .debugfs_cleanup = omap_debugfs_cleanup,
+diff --git a/drivers/staging/ramster/tmem.c b/drivers/staging/ramster/tmem.c
+index a2b7e03..aaf3630 100644
+--- a/drivers/staging/ramster/tmem.c
++++ b/drivers/staging/ramster/tmem.c
+@@ -50,25 +50,25 @@
+ * A tmem host implementation must use this function to register callbacks
+ * for memory allocation.
+ */
+-static struct tmem_hostops tmem_hostops;
++static struct tmem_hostops *tmem_hostops;
+
+ static void tmem_objnode_tree_init(void);
+
+ void tmem_register_hostops(struct tmem_hostops *m)
+ {
+ tmem_objnode_tree_init();
+- tmem_hostops = *m;
++ tmem_hostops = m;
+ }
+
+ /*
+ * A tmem host implementation must use this function to register
+ * callbacks for a page-accessible memory (PAM) implementation.
+ */
+-static struct tmem_pamops tmem_pamops;
++static struct tmem_pamops *tmem_pamops;
+
+ void tmem_register_pamops(struct tmem_pamops *m)
+ {
+- tmem_pamops = *m;
++ tmem_pamops = m;
+ }
+
+ /*
+@@ -174,7 +174,7 @@ static void tmem_obj_init(struct tmem_obj *obj, struct tmem_hashbucket *hb,
+ obj->pampd_count = 0;
+ #ifdef CONFIG_RAMSTER
+ if (tmem_pamops.new_obj != NULL)
+- (*tmem_pamops.new_obj)(obj);
++ (tmem_pamops->new_obj)(obj);
+ #endif
+ SET_SENTINEL(obj, OBJ);
+
+@@ -210,7 +210,7 @@ static void tmem_pool_flush(struct tmem_pool *pool, bool destroy)
+ rbnode = rb_next(rbnode);
+ tmem_pampd_destroy_all_in_obj(obj, true);
+ tmem_obj_free(obj, hb);
+- (*tmem_hostops.obj_free)(obj, pool);
++ (tmem_hostops->obj_free)(obj, pool);
+ }
+ spin_unlock(&hb->lock);
+ }
+@@ -261,7 +261,7 @@ static struct tmem_objnode *tmem_objnode_alloc(struct tmem_obj *obj)
+ ASSERT_SENTINEL(obj, OBJ);
+ BUG_ON(obj->pool == NULL);
+ ASSERT_SENTINEL(obj->pool, POOL);
+- objnode = (*tmem_hostops.objnode_alloc)(obj->pool);
++ objnode = (tmem_hostops->objnode_alloc)(obj->pool);
+ if (unlikely(objnode == NULL))
+ goto out;
+ objnode->obj = obj;
+@@ -290,7 +290,7 @@ static void tmem_objnode_free(struct tmem_objnode *objnode)
+ ASSERT_SENTINEL(pool, POOL);
+ objnode->obj->objnode_count--;
+ objnode->obj = NULL;
+- (*tmem_hostops.objnode_free)(objnode, pool);
++ (tmem_hostops->objnode_free)(objnode, pool);
+ }
+
+ /*
+@@ -348,7 +348,7 @@ static void *tmem_pampd_replace_in_obj(struct tmem_obj *obj, uint32_t index,
+ void *old_pampd = *(void **)slot;
+ *(void **)slot = new_pampd;
+ if (!no_free)
+- (*tmem_pamops.free)(old_pampd, obj->pool,
++ (tmem_pamops->free)(old_pampd, obj->pool,
+ NULL, 0, false);
+ ret = new_pampd;
+ }
+@@ -505,7 +505,7 @@ static void tmem_objnode_node_destroy(struct tmem_obj *obj,
+ if (objnode->slots[i]) {
+ if (ht == 1) {
+ obj->pampd_count--;
+- (*tmem_pamops.free)(objnode->slots[i],
++ (tmem_pamops->free)(objnode->slots[i],
+ obj->pool, NULL, 0, true);
+ objnode->slots[i] = NULL;
+ continue;
+@@ -524,7 +524,7 @@ static void tmem_pampd_destroy_all_in_obj(struct tmem_obj *obj,
+ return;
+ if (obj->objnode_tree_height == 0) {
+ obj->pampd_count--;
+- (*tmem_pamops.free)(obj->objnode_tree_root,
++ (tmem_pamops->free)(obj->objnode_tree_root,
+ obj->pool, NULL, 0, true);
+ } else {
+ tmem_objnode_node_destroy(obj, obj->objnode_tree_root,
+@@ -535,7 +535,7 @@ static void tmem_pampd_destroy_all_in_obj(struct tmem_obj *obj,
+ obj->objnode_tree_root = NULL;
+ #ifdef CONFIG_RAMSTER
+ if (tmem_pamops.free_obj != NULL)
+- (*tmem_pamops.free_obj)(obj->pool, obj, pool_destroy);
++ (tmem_pamops->free_obj)(obj->pool, obj, pool_destroy);
+ #endif
+ }
+
+@@ -574,7 +574,7 @@ int tmem_put(struct tmem_pool *pool, struct tmem_oid *oidp, uint32_t index,
+ /* if found, is a dup put, flush the old one */
+ pampd_del = tmem_pampd_delete_from_obj(obj, index);
+ BUG_ON(pampd_del != pampd);
+- (*tmem_pamops.free)(pampd, pool, oidp, index, true);
++ (tmem_pamops->free)(pampd, pool, oidp, index, true);
+ if (obj->pampd_count == 0) {
+ objnew = obj;
+ objfound = NULL;
+@@ -582,7 +582,7 @@ int tmem_put(struct tmem_pool *pool, struct tmem_oid *oidp, uint32_t index,
+ pampd = NULL;
+ }
+ } else {
+- obj = objnew = (*tmem_hostops.obj_alloc)(pool);
++ obj = objnew = (tmem_hostops->obj_alloc)(pool);
+ if (unlikely(obj == NULL)) {
+ ret = -ENOMEM;
+ goto out;
+@@ -597,16 +597,16 @@ int tmem_put(struct tmem_pool *pool, struct tmem_oid *oidp, uint32_t index,
+ if (unlikely(ret == -ENOMEM))
+ /* may have partially built objnode tree ("stump") */
+ goto delete_and_free;
+- (*tmem_pamops.create_finish)(pampd, is_ephemeral(pool));
++ (tmem_pamops->create_finish)(pampd, is_ephemeral(pool));
+ goto out;
+
+ delete_and_free:
+ (void)tmem_pampd_delete_from_obj(obj, index);
+ if (pampd)
+- (*tmem_pamops.free)(pampd, pool, NULL, 0, true);
++ (tmem_pamops->free)(pampd, pool, NULL, 0, true);
+ if (objnew) {
+ tmem_obj_free(objnew, hb);
+- (*tmem_hostops.obj_free)(objnew, pool);
++ (tmem_hostops->obj_free)(objnew, pool);
+ }
+ out:
+ spin_unlock(&hb->lock);
+@@ -651,7 +651,7 @@ void tmem_localify_finish(struct tmem_obj *obj, uint32_t index,
+ if (pampd != NULL) {
+ BUG_ON(obj == NULL);
+ (void)tmem_pampd_replace_in_obj(obj, index, pampd, 1);
+- (*tmem_pamops.create_finish)(pampd, is_ephemeral(obj->pool));
++ (tmem_pamops->create_finish)(pampd, is_ephemeral(obj->pool));
+ } else if (delete) {
+ BUG_ON(obj == NULL);
+ (void)tmem_pampd_delete_from_obj(obj, index);
+@@ -671,7 +671,7 @@ static int tmem_repatriate(void **ppampd, struct tmem_hashbucket *hb,
+ int ret = 0;
+
+ if (!is_ephemeral(pool))
+- new_pampd = (*tmem_pamops.repatriate_preload)(
++ new_pampd = (tmem_pamops->repatriate_preload)(
+ old_pampd, pool, oidp, index, &intransit);
+ if (intransit)
+ ret = -EAGAIN;
+@@ -680,7 +680,7 @@ static int tmem_repatriate(void **ppampd, struct tmem_hashbucket *hb,
+ /* must release the hb->lock else repatriate can't sleep */
+ spin_unlock(&hb->lock);
+ if (!intransit)
+- ret = (*tmem_pamops.repatriate)(old_pampd, new_pampd, pool,
++ ret = (tmem_pamops->repatriate)(old_pampd, new_pampd, pool,
+ oidp, index, free, data);
+ if (ret == -EAGAIN) {
+ /* rare I think, but should cond_resched()??? */
+@@ -714,7 +714,7 @@ int tmem_replace(struct tmem_pool *pool, struct tmem_oid *oidp,
+ new_pampd = tmem_pampd_replace_in_obj(obj, index, new_pampd, 0);
+ /* if we bug here, pamops wasn't properly set up for ramster */
+ BUG_ON(tmem_pamops.replace_in_obj == NULL);
+- ret = (*tmem_pamops.replace_in_obj)(new_pampd, obj);
++ ret = (tmem_pamops->replace_in_obj)(new_pampd, obj);
+ out:
+ spin_unlock(&hb->lock);
+ return ret;
+@@ -776,15 +776,15 @@ int tmem_get(struct tmem_pool *pool, struct tmem_oid *oidp, uint32_t index,
+ if (free) {
+ if (obj->pampd_count == 0) {
+ tmem_obj_free(obj, hb);
+- (*tmem_hostops.obj_free)(obj, pool);
++ (tmem_hostops->obj_free)(obj, pool);
+ obj = NULL;
+ }
+ }
+ if (free)
+- ret = (*tmem_pamops.get_data_and_free)(
++ ret = (tmem_pamops->get_data_and_free)(
+ data, sizep, raw, pampd, pool, oidp, index);
+ else
+- ret = (*tmem_pamops.get_data)(
++ ret = (tmem_pamops->get_data)(
+ data, sizep, raw, pampd, pool, oidp, index);
+ if (ret < 0)
+ goto out;
+@@ -816,10 +816,10 @@ int tmem_flush_page(struct tmem_pool *pool,
+ pampd = tmem_pampd_delete_from_obj(obj, index);
+ if (pampd == NULL)
+ goto out;
+- (*tmem_pamops.free)(pampd, pool, oidp, index, true);
++ (tmem_pamops->free)(pampd, pool, oidp, index, true);
+ if (obj->pampd_count == 0) {
+ tmem_obj_free(obj, hb);
+- (*tmem_hostops.obj_free)(obj, pool);
++ (tmem_hostops->obj_free)(obj, pool);
+ }
+ ret = 0;
+
+@@ -844,7 +844,7 @@ int tmem_flush_object(struct tmem_pool *pool, struct tmem_oid *oidp)
+ goto out;
+ tmem_pampd_destroy_all_in_obj(obj, false);
+ tmem_obj_free(obj, hb);
+- (*tmem_hostops.obj_free)(obj, pool);
++ (tmem_hostops->obj_free)(obj, pool);
+ ret = 0;
+
+ out:
diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
index dc23395..cf7e9b1 100644
--- a/drivers/staging/rtl8712/rtl871x_io.h
struct io_req {
struct list_head list;
diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
-index c7b5e8b..783d6cb 100644
+index 180c963..1f18377 100644
--- a/drivers/staging/sbe-2t3e3/netdev.c
+++ b/drivers/staging/sbe-2t3e3/netdev.c
-@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
t3e3_if_config(sc, cmd_2t3e3, (char *)¶m, &resp, &rlen);
if (rlen)
return -EFAULT;
return 0;
-diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
-index 5d89c0f..9261317 100644
---- a/drivers/staging/usbip/usbip_common.h
-+++ b/drivers/staging/usbip/usbip_common.h
-@@ -289,7 +289,7 @@ struct usbip_device {
- void (*shutdown)(struct usbip_device *);
- void (*reset)(struct usbip_device *);
- void (*unusable)(struct usbip_device *);
-- } eh_ops;
-+ } __no_const eh_ops;
- };
-
- #define kthread_get_run(threadfn, data, namefmt, ...) \
diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
index c66b8b3..a4a035b 100644
--- a/drivers/staging/usbip/vhci.h
/*
* NOTE:
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
-index 12a9a5f..afd8295 100644
+index 620d1be..1cd6711 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -471,7 +471,7 @@ static void vhci_tx_urb(struct urb *urb)
if (unlink->seqnum == 0xffff)
pr_info("seqnum max\n");
-@@ -911,7 +911,7 @@ static int vhci_start(struct usb_hcd *hcd)
+@@ -924,7 +924,7 @@ static int vhci_start(struct usb_hcd *hcd)
vdev->rhport = rhport;
}
return;
}
diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
-index 6ac6f45..1b208ba 100644
+index 67b1b88..6392fe9 100644
--- a/drivers/staging/vt6655/hostap.c
+++ b/drivers/staging/vt6655/hostap.c
@@ -73,14 +73,13 @@ static int msglevel =MSG_LEVEL_INFO;
pDevice->apdev->type = ARPHRD_IEEE80211;
diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
-index 682002a..35ed5cf 100644
+index 0a73d40..6fda560 100644
--- a/drivers/staging/vt6656/hostap.c
+++ b/drivers/staging/vt6656/hostap.c
@@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
pDevice->apdev->netdev_ops = &apdev_netdev_ops;
pDevice->apdev->type = ARPHRD_IEEE80211;
-diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
-index 7843dfd..3db105f 100644
---- a/drivers/staging/wlan-ng/hfa384x_usb.c
-+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
-@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
-
- struct usbctlx_completor {
- int (*complete) (struct usbctlx_completor *);
--};
-+} __no_const;
-
- static int
- hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
-index eaa9021..43f023b 100644
+index 56c8e60..1920c63 100644
--- a/drivers/staging/zcache/tmem.c
+++ b/drivers/staging/zcache/tmem.c
@@ -39,7 +39,7 @@
extern void tmem_register_hostops(struct tmem_hostops *m);
/* core tmem accessor functions */
-diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
-index 9fc9a60..68d4c10 100644
---- a/drivers/target/target_core_device.c
-+++ b/drivers/target/target_core_device.c
-@@ -850,20 +850,20 @@ int se_dev_check_shutdown(struct se_device *dev)
-
- static u32 se_dev_align_max_sectors(u32 max_sectors, u32 block_size)
- {
-- u32 tmp, aligned_max_sectors;
-+ u32 aligned_max_sectors;
-+ u32 alignment;
- /*
- * Limit max_sectors to a PAGE_SIZE aligned value for modern
- * transport_allocate_data_tasks() operation.
- */
-- tmp = rounddown((max_sectors * block_size), PAGE_SIZE);
-- aligned_max_sectors = (tmp / block_size);
-- if (max_sectors != aligned_max_sectors) {
-- printk(KERN_INFO "Rounding down aligned max_sectors from %u"
-- " to %u\n", max_sectors, aligned_max_sectors);
-- return aligned_max_sectors;
-- }
-+ alignment = max(1ul, PAGE_SIZE / block_size);
-+ aligned_max_sectors = rounddown(max_sectors, alignment);
-
-- return max_sectors;
-+ if (max_sectors != aligned_max_sectors)
-+ pr_info("Rounding down aligned max_sectors from %u to %u\n",
-+ max_sectors, aligned_max_sectors);
-+
-+ return aligned_max_sectors;
- }
-
- void se_dev_set_default_attribs(
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
-index 7502660..f214d9f 100644
+index 13fe16c..cbdc39a 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
-@@ -1098,7 +1098,7 @@ struct se_device *transport_add_device_to_core_hba(
+@@ -1085,7 +1085,7 @@ struct se_device *transport_add_device_to_core_hba(
spin_lock_init(&dev->se_port_lock);
spin_lock_init(&dev->se_tmr_lock);
spin_lock_init(&dev->qf_cmd_lock);
se_dev_set_default_attribs(dev, dev_limits);
-@@ -1288,7 +1288,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
+@@ -1275,7 +1275,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
* Used to determine when ORDERED commands should go from
* Dormant to Active status.
*/
pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
cmd->se_ordered_id, cmd->sam_task_attr,
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
-index e61cabd..7617d26 100644
+index 0a6a0bc..5501b06 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -1589,10 +1589,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
#endif
/*
-@@ -3987,7 +3987,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
+@@ -3989,7 +3989,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
for (j = 0; j < cy_card[i].nports; j++) {
info = &cy_card[i].ports[j];
struct tty_struct *tty;
struct tty_ldisc *ld;
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
-index 2d691eb..be02ebd 100644
+index 13ee53b..418d164 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
-@@ -315,7 +315,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
+@@ -338,7 +338,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
spin_lock_irqsave(&hp->port.lock, flags);
/* Check and then increment for fast path open. */
spin_unlock_irqrestore(&hp->port.lock, flags);
hvc_kick();
return 0;
-@@ -366,7 +366,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
+@@ -388,7 +388,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
spin_lock_irqsave(&hp->port.lock, flags);
spin_unlock_irqrestore(&hp->port.lock, flags);
/* We are done with the tty pointer now. */
tty_port_tty_set(&hp->port, NULL);
-@@ -384,9 +384,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
+@@ -406,9 +406,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
*/
tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
} else {
+ hp->vtermno, atomic_read(&hp->port.count));
spin_unlock_irqrestore(&hp->port.lock, flags);
}
-
-@@ -412,13 +412,13 @@ static void hvc_hangup(struct tty_struct *tty)
+ }
+@@ -438,12 +438,12 @@ static void hvc_hangup(struct tty_struct *tty)
* open->hangup case this can be called after the final close so prevent
* that from happening for now.
*/
return;
}
-- temp_open_count = hp->port.count;
- hp->port.count = 0;
-+ temp_open_count = atomic_read(&hp->port.count);
+ atomic_set(&hp->port.count, 0);
spin_unlock_irqrestore(&hp->port.lock, flags);
tty_port_tty_set(&hp->port, NULL);
-@@ -471,7 +471,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
+@@ -491,7 +491,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
return -EPIPE;
/* FIXME what's this (unprotected) check for? */
spin_lock_irqsave(&hp->lock, flags);
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
-index d56788c..12d8f85 100644
+index cab5c7a..4cc66ea 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -83,6 +83,7 @@
spin_unlock_irqrestore(&hvcsd->lock, flags);
printk(KERN_INFO "HVCS: vterm state unchanged. "
"The hvcs device node is still in use.\n");
-@@ -1134,7 +1135,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
- if ((retval = hvcs_partner_connect(hvcsd)))
- goto error_release;
+@@ -1132,7 +1133,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
+ }
+ }
-- hvcsd->port.count = 1;
-+ atomic_set(&hvcsd->port.count, 1);
+- hvcsd->port.count = 0;
++ atomic_set(&hvcsd->port.count, 0);
hvcsd->port.tty = tty;
tty->driver_data = hvcsd;
-@@ -1168,7 +1169,7 @@ fast_open:
+@@ -1185,7 +1186,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
+ unsigned long flags;
spin_lock_irqsave(&hvcsd->lock, flags);
- tty_port_get(&hvcsd->port);
- hvcsd->port.count++;
+ atomic_inc(&hvcsd->port.count);
hvcsd->todo_mask |= HVCS_SCHED_READ;
spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1212,7 +1213,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
+@@ -1221,7 +1222,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
hvcsd = tty->driver_data;
spin_lock_irqsave(&hvcsd->lock, flags);
vio_disable_interrupts(hvcsd->vdev);
-@@ -1238,10 +1239,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
+@@ -1246,10 +1247,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
+
free_irq(irq, hvcsd);
- tty_port_put(&hvcsd->port);
return;
- } else if (hvcsd->port.count < 0) {
+ } else if (atomic_read(&hvcsd->port.count) < 0) {
}
spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1257,7 +1258,7 @@ static void hvcs_hangup(struct tty_struct * tty)
+@@ -1271,7 +1272,7 @@ static void hvcs_hangup(struct tty_struct * tty)
spin_lock_irqsave(&hvcsd->lock, flags);
/* Preserve this so that we know how many kref refs to put */
/*
* Don't kref put inside the spinlock because the destruction
-@@ -1272,7 +1273,7 @@ static void hvcs_hangup(struct tty_struct * tty)
+@@ -1286,7 +1287,7 @@ static void hvcs_hangup(struct tty_struct * tty)
tty->driver_data = NULL;
hvcsd->port.tty = NULL;
/* This will drop any buffered data on the floor which is OK in a hangup
* scenario. */
-@@ -1343,7 +1344,7 @@ static int hvcs_write(struct tty_struct *tty,
+@@ -1357,7 +1358,7 @@ static int hvcs_write(struct tty_struct *tty,
* the middle of a write operation? This is a crummy place to do this
* but we want to keep it all in the spinlock.
*/
spin_unlock_irqrestore(&hvcsd->lock, flags);
return -ENODEV;
}
-@@ -1417,7 +1418,7 @@ static int hvcs_write_room(struct tty_struct *tty)
+@@ -1431,7 +1432,7 @@ static int hvcs_write_room(struct tty_struct *tty)
{
struct hvcs_struct *hvcsd = tty->driver_data;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
-index f8b5fa0..4ba9f89 100644
+index 160f0ad..588b853 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -29,6 +29,7 @@
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
-index 324467d..504cc25 100644
+index 56e616b..9d9f10a 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
-@@ -1172,7 +1172,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
+@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
}
ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
tty_port_tty_set(&ch->port, tty);
mutex_lock(&ch->port.mutex);
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
-index 90dff82..08119c3 100644
+index 1e8e8ce..a9efc93 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
-@@ -1639,7 +1639,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
+@@ -1638,7 +1638,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
kref_init(&dlci->ref);
mutex_init(&dlci->mutex);
dlci->fifo = &dlci->_fifo;
kfree(dlci);
return NULL;
}
-@@ -2909,7 +2909,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
- if (dlci == NULL)
- return -ENOMEM;
- port = &dlci->port;
+@@ -2925,7 +2925,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
+ struct gsm_dlci *dlci = tty->driver_data;
+ struct tty_port *port = &dlci->port;
+
- port->count++;
+ atomic_inc(&port->count);
- tty->driver_data = dlci;
dlci_get(dlci);
dlci_get(dlci->gsm->dlci[0]);
+ mux_get(dlci->gsm);
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
-index 26f0d0e..b7c4273 100644
+index 8c0b7b4..e88f052 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
-@@ -2124,6 +2124,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
+@@ -2142,6 +2142,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
{
*ops = tty_ldisc_N_TTY;
ops->owner = NULL;
}
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
-index 5505ffc..7affff9 100644
+index 8cf8d0a..4ef9ed0 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
-@@ -718,8 +718,10 @@ static void __init unix98_pty_init(void)
+@@ -730,8 +730,10 @@ static void __init unix98_pty_init(void)
panic("Couldn't register Unix98 pts driver");
/* Now create the /dev/ptmx special device */
cdev_init(&ptmx_cdev, &ptmx_fops);
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
-index 777d5f9..56d67ca 100644
+index 9700d34..df7520c 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -924,7 +924,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
spin_unlock_irqrestore(&info->port.lock, flags);
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
-index 2b42a01..32a2ed3 100644
+index 1002054..dd644a8 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -24,8 +24,9 @@
static int configured = -1;
static char config[MAX_CONFIG_LEN];
-@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
+@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
kgdboc_unregister_kbd();
if (configured == 1)
kgdb_unregister_io_module(&kgdboc_io_ops);
}
static int configure_kgdboc(void)
-@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
+@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
int err;
char *cptr = config;
struct console *cons;
kgdb_tty_driver = NULL;
kgdboc_use_kms = 0;
-@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
+@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
int idx;
if (cons->device && cons->device(cons, &idx) == p &&
idx == tty_line) {
break;
}
cons = cons->next;
-@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
+@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
kgdb_tty_line = tty_line;
do_register:
if (err)
goto noconfig;
+@@ -205,8 +214,6 @@ do_register:
+ if (err)
+ goto nmi_con_failed;
+
- configured = 1;
-
return 0;
- noconfig:
-@@ -213,7 +220,7 @@ noconfig:
+ nmi_con_failed:
+@@ -223,7 +230,7 @@ noconfig:
static int __init init_kgdboc(void)
{
/* Already configured? */
return 0;
return configure_kgdboc();
-@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
+@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
if (config[len - 1] == '\n')
config[len - 1] = '\0';
cleanup_kgdboc();
/* Go and configure with the new params. */
-@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
+@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
.post_exception = kgdboc_post_exp_handler,
};
#ifdef CONFIG_KGDB_SERIAL_CONSOLE
/* This is only available if kgdboc is a built in for early debugging */
static int __init kgdboc_early_init(char *opt)
+diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
+index 7f04717..0f3794f 100644
+--- a/drivers/tty/serial/samsung.c
++++ b/drivers/tty/serial/samsung.c
+@@ -445,11 +445,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
+ }
+ }
+
++static int s3c64xx_serial_startup(struct uart_port *port);
+ static int s3c24xx_serial_startup(struct uart_port *port)
+ {
+ struct s3c24xx_uart_port *ourport = to_ourport(port);
+ int ret;
+
++ /* Startup sequence is different for s3c64xx and higher SoC's */
++ if (s3c24xx_serial_has_interrupt_mask(port))
++ return s3c64xx_serial_startup(port);
++
+ dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
+ port->mapbase, port->membase);
+
+@@ -1115,10 +1120,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
+ /* setup info for port */
+ port->dev = &platdev->dev;
+
+- /* Startup sequence is different for s3c64xx and higher SoC's */
+- if (s3c24xx_serial_has_interrupt_mask(port))
+- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
+-
+ port->uartclk = 1;
+
+ if (cfg->uart_flags & UPF_CONS_FLOW) {
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
-index a21dc8e..fe43e9e 100644
+index 0fcfd98..8244fce 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
-@@ -1392,7 +1392,7 @@ static void uart_hangup(struct tty_struct *tty)
+@@ -1408,7 +1408,7 @@ static void uart_hangup(struct tty_struct *tty)
uart_flush_buffer(tty);
uart_shutdown(tty, state);
spin_lock_irqsave(&port->lock, flags);
clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
spin_unlock_irqrestore(&port->lock, flags);
tty_port_tty_set(port, NULL);
-@@ -1488,7 +1488,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1504,7 +1504,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
goto end;
}
if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
retval = -ENXIO;
goto err_dec_count;
-@@ -1515,7 +1515,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1531,7 +1531,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
/*
* Make sure the device is in D0 state.
*/
uart_change_pm(state, 0);
/*
-@@ -1533,7 +1533,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1549,7 +1549,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
end:
return retval;
err_dec_count:
goto end;
}
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
-index 593d40a..bdc61f3 100644
+index 70e3a52..5742052 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -3095,7 +3095,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
- __FILE__,__LINE__, tty->driver->name, port->count );
+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
- tty_unlock();
+ tty_unlock(tty);
schedule();
@@ -3348,12 +3348,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
if (!retval)
port->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -3398,7 +3398,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
+@@ -3405,7 +3405,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
/* If port is closing, signal caller to try again */
if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-@@ -3417,10 +3417,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
+@@ -3424,10 +3424,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
spin_unlock_irqrestore(&info->netlock, flags);
goto cleanup;
}
/* 1st open on this device, init hardware */
retval = startup(info);
if (retval < 0)
-@@ -3444,8 +3444,8 @@ cleanup:
+@@ -3451,8 +3451,8 @@ cleanup:
if (retval) {
if (tty->count == 1)
info->port.tty = NULL; /* tty layer will release tty struct */
}
return retval;
-@@ -7653,7 +7653,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
+@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
unsigned short new_crctype;
/* return error if TTY interface open */
return -EBUSY;
switch (encoding)
-@@ -7748,7 +7748,7 @@ static int hdlcdev_open(struct net_device *dev)
+@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
/* arbitrate between network and tty opens */
spin_lock_irqsave(&info->netlock, flags);
printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
spin_unlock_irqrestore(&info->netlock, flags);
return -EBUSY;
-@@ -7834,7 +7834,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
/* return error if TTY interface open */
if (cmd != SIOCWANDEV)
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
-index aa1debf..9297a16 100644
+index b38e954..ce45b38 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -671,7 +671,7 @@ static int open(struct tty_struct *tty, struct file *filp)
if (!retval)
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
-index a3dddc1..8905ab2 100644
+index f17d9f3..27a041b 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
-@@ -742,7 +742,7 @@ static int open(struct tty_struct *tty, struct file *filp)
+@@ -751,7 +751,7 @@ static int open(struct tty_struct *tty, struct file *filp)
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):%s open(), old ref count = %d\n",
/* If port is closing, signal caller to try again */
if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-@@ -761,10 +761,10 @@ static int open(struct tty_struct *tty, struct file *filp)
+@@ -770,10 +770,10 @@ static int open(struct tty_struct *tty, struct file *filp)
spin_unlock_irqrestore(&info->netlock, flags);
goto cleanup;
}
/* 1st open on this device, init hardware */
retval = startup(info);
if (retval < 0)
-@@ -788,8 +788,8 @@ cleanup:
+@@ -797,8 +797,8 @@ cleanup:
if (retval) {
if (tty->count == 1)
info->port.tty = NULL; /* tty layer will release tty struct */
}
return retval;
-@@ -807,7 +807,7 @@ static void close(struct tty_struct *tty, struct file *filp)
+@@ -816,7 +816,7 @@ static void close(struct tty_struct *tty, struct file *filp)
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):%s close() entry, count=%d\n",
if (tty_port_close_start(&info->port, tty, filp) == 0)
goto cleanup;
-@@ -826,7 +826,7 @@ static void close(struct tty_struct *tty, struct file *filp)
+@@ -835,7 +835,7 @@ static void close(struct tty_struct *tty, struct file *filp)
cleanup:
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
}
/* Called by tty_hangup() when a hangup is signaled.
-@@ -849,7 +849,7 @@ static void hangup(struct tty_struct *tty)
+@@ -858,7 +858,7 @@ static void hangup(struct tty_struct *tty)
shutdown(info);
spin_lock_irqsave(&info->port.lock, flags);
info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
info->port.tty = NULL;
spin_unlock_irqrestore(&info->port.lock, flags);
-@@ -1557,7 +1557,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
+@@ -1566,7 +1566,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
unsigned short new_crctype;
/* return error if TTY interface open */
return -EBUSY;
switch (encoding)
-@@ -1652,7 +1652,7 @@ static int hdlcdev_open(struct net_device *dev)
+@@ -1661,7 +1661,7 @@ static int hdlcdev_open(struct net_device *dev)
/* arbitrate between network and tty opens */
spin_lock_irqsave(&info->netlock, flags);
printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
spin_unlock_irqrestore(&info->netlock, flags);
return -EBUSY;
-@@ -1738,7 +1738,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -1747,7 +1747,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
/* return error if TTY interface open */
return -EBUSY;
if (cmd != SIOCWANDEV)
-@@ -2623,7 +2623,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
+@@ -2632,7 +2632,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
* do not request bottom half processing if the
* device is not open in a normal mode.
*/
port->pending_bh && !port->bh_running &&
!port->bh_requested ) {
if ( debug_level >= DEBUG_LEVEL_ISR )
-@@ -3321,12 +3321,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+@@ -3330,12 +3330,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):%s block_til_ready() before block, count=%d\n",
}
spin_unlock_irqrestore(&info->lock, flags);
port->blocked_open++;
-@@ -3355,7 +3355,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+@@ -3364,7 +3364,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):%s block_til_ready() count=%d\n",
- __FILE__,__LINE__, tty->driver->name, port->count );
+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
- tty_unlock();
+ tty_unlock(tty);
schedule();
-@@ -3366,12 +3366,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
+@@ -3375,12 +3375,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
remove_wait_queue(&port->open_wait, &wait);
if (extra_count)
if (!retval)
port->flags |= ASYNC_NORMAL_ACTIVE;
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 05728894..b9d44c6 100644
+index 16ee6ce..bfcac57 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
-@@ -865,7 +865,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
+@@ -866,7 +866,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
if (get_user(c, buf))
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index b425c79..08a3f06 100644
+index 2ea176b..2877bc8 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
-@@ -3283,7 +3283,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
+@@ -3395,7 +3395,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
void tty_default_fops(struct file_operations *fops)
{
/*
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
-index 6f99c99..8947bc4 100644
+index 0f2a2c5..471e228 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -56,7 +56,7 @@ static void put_ldisc(struct tty_ldisc *ld)
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
-index bf6e238..d401c04 100644
+index d7bdd8d..feaef30 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
-@@ -138,7 +138,7 @@ void tty_port_hangup(struct tty_port *port)
+@@ -202,7 +202,7 @@ void tty_port_hangup(struct tty_port *port)
unsigned long flags;
spin_lock_irqsave(&port->lock, flags);
port->flags &= ~ASYNC_NORMAL_ACTIVE;
if (port->tty) {
set_bit(TTY_IO_ERROR, &port->tty->flags);
-@@ -264,7 +264,7 @@ int tty_port_block_til_ready(struct tty_port *port,
+@@ -328,7 +328,7 @@ int tty_port_block_til_ready(struct tty_port *port,
/* The port lock protects the port counts */
spin_lock_irqsave(&port->lock, flags);
if (!tty_hung_up_p(filp))
port->blocked_open++;
spin_unlock_irqrestore(&port->lock, flags);
-@@ -306,7 +306,7 @@ int tty_port_block_til_ready(struct tty_port *port,
+@@ -370,7 +370,7 @@ int tty_port_block_til_ready(struct tty_port *port,
we must not mess that up further */
spin_lock_irqsave(&port->lock, flags);
if (!tty_hung_up_p(filp))
port->blocked_open--;
if (retval == 0)
port->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -326,19 +326,19 @@ int tty_port_close_start(struct tty_port *port,
+@@ -390,19 +390,19 @@ int tty_port_close_start(struct tty_port *port,
return 0;
}
spin_unlock_irqrestore(&port->lock, flags);
if (port->ops->drop)
port->ops->drop(port);
-@@ -418,7 +418,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
+@@ -500,7 +500,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
{
spin_lock_irq(&port->lock);
if (!tty_hung_up_p(filp))
tty_port_tty_set(port, tty);
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
-index 770a854..e5d3db3 100644
+index 681765b..d3ccdf2 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
-@@ -659,6 +659,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
+@@ -660,6 +660,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
kbd->kbdmode == VC_OFF) &&
value != KVAL(K_SAK))
return; /* SAK is allowed even in raw mode */
fn_handler[value](vc);
}
-@@ -1805,9 +1815,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
+@@ -1808,9 +1818,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
switch (cmd) {
case KDGKBENT:
/* Ensure another thread doesn't free it under us */
-@@ -1822,6 +1829,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
+@@ -1825,6 +1832,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
spin_unlock_irqrestore(&kbd_event_lock, flags);
return put_user(val, &user_kbe->kb_value);
case KDSKBENT:
if (!perm)
return -EPERM;
if (!i && v == K_NOSUCHMAP) {
-@@ -1912,9 +1922,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+@@ -1915,9 +1925,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
int i, j, k;
int ret;
kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
if (!kbs) {
ret = -ENOMEM;
-@@ -1948,6 +1955,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+@@ -1951,6 +1958,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
kfree(kbs);
return ((p && *p) ? -EOVERFLOW : 0);
case KDSKBSENT:
ret = -EPERM;
goto reterr;
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
-index a783d53..cb30d94 100644
+index 5110f36..8dc0a74 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -25,6 +25,7 @@
}
static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-@@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
+@@ -819,7 +820,7 @@ int __uio_register_device(struct module *owner,
idev->owner = owner;
idev->info = info;
init_waitqueue_head(&idev->wait);
pos += tmp;
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
-index ee62b35..b663594 100644
+index 35f10bf..6a38a0b 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
goto out;
}
-@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -389,7 +389,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
if (printk_ratelimit())
atm_err(instance, "%s: no memory for skb (length: %u)!\n",
__func__, length);
goto out;
}
-@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -417,7 +417,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
vcc->push(vcc, skb);
out:
skb_trim(sarb, 0);
}
-@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
+@@ -623,7 +623,7 @@ static void usbatm_tx_process(unsigned long data)
struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
usbatm_pop(vcc, skb);
skb = skb_dequeue(&instance->sndqueue);
}
-@@ -770,11 +770,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
+@@ -779,11 +779,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
if (!left--)
return sprintf(page,
"AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
if (!left--) {
if (instance->disconnected)
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
-index 3440812..2a4ef1f 100644
+index f460de3..95ba1f6 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -126,7 +126,7 @@ static const char format_endpt[] =
wake_up(&device_event.wait);
}
-@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
+@@ -647,7 +647,7 @@ static unsigned int usb_device_poll(struct file *file,
poll_wait(file, &device_event.wait, wait);
if (file->f_version != event_count) {
file->f_version = event_count;
return POLLIN | POLLRDNORM;
+diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
+index f034716..aed0368 100644
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -1478,7 +1478,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
+ */
+ usb_get_urb(urb);
+ atomic_inc(&urb->use_count);
+- atomic_inc(&urb->dev->urbnum);
++ atomic_inc_unchecked(&urb->dev->urbnum);
+ usbmon_urb_submit(&hcd->self, urb);
+
+ /* NOTE requirements on root-hub callers (usbfs and the hub
+@@ -1505,7 +1505,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
+ urb->hcpriv = NULL;
+ INIT_LIST_HEAD(&urb->urb_list);
+ atomic_dec(&urb->use_count);
+- atomic_dec(&urb->dev->urbnum);
++ atomic_dec_unchecked(&urb->dev->urbnum);
+ if (atomic_read(&urb->reject))
+ wake_up(&usb_kill_urb_queue);
+ usb_put_urb(urb);
+diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
+index 818e4a0..0fc9589 100644
+--- a/drivers/usb/core/sysfs.c
++++ b/drivers/usb/core/sysfs.c
+@@ -226,7 +226,7 @@ show_urbnum(struct device *dev, struct device_attribute *attr, char *buf)
+ struct usb_device *udev;
+
+ udev = to_usb_device(dev);
+- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
++ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
+ }
+ static DEVICE_ATTR(urbnum, S_IRUGO, show_urbnum, NULL);
+
+diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
+index cd8fb44..17fbe0c 100644
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -397,7 +397,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
+ set_dev_node(&dev->dev, dev_to_node(bus->controller));
+ dev->state = USB_STATE_ATTACHED;
+ dev->lpm_disable_count = 1;
+- atomic_set(&dev->urbnum, 0);
++ atomic_set_unchecked(&dev->urbnum, 0);
+
+ INIT_LIST_HEAD(&dev->ep0.urb_list);
+ dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
-index 89dcf15..481800b 100644
+index 4bfa78a..902bfbd 100644
--- a/drivers/usb/early/ehci-dbgp.c
+++ b/drivers/usb/early/ehci-dbgp.c
-@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
+@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
#ifdef CONFIG_KGDB
static struct kgdb_io kgdbdbgp_io_ops;
#else
#define dbgp_kgdb_mode (0)
#endif
-@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
+@@ -1047,6 +1048,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
.write_char = kgdbdbgp_write_char,
};
static int kgdbdbgp_wait_time;
static int __init kgdbdbgp_parse_config(char *str)
-@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
+@@ -1062,8 +1070,10 @@ static int __init kgdbdbgp_parse_config(char *str)
ptr++;
kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
}
return 0;
}
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
-index da6d479..80ed10b 100644
+index f173952..83d6ec0 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -735,9 +735,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
gser = port->port_usb;
if (gser && gser->disconnect)
-@@ -1156,7 +1156,7 @@ static int gs_closed(struct gs_port *port)
+@@ -1157,7 +1157,7 @@ static int gs_closed(struct gs_port *port)
int cond;
spin_lock_irq(&port->port_lock);
spin_unlock_irq(&port->port_lock);
return cond;
}
-@@ -1269,7 +1269,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
+@@ -1270,7 +1270,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
/* if it's already open, start I/O ... and notify the serial
* protocol about open/close status (connect/disconnect).
*/
pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
gs_start_io(port);
if (gser->connect)
-@@ -1316,7 +1316,7 @@ void gserial_disconnect(struct gserial *gser)
+@@ -1317,7 +1317,7 @@ void gserial_disconnect(struct gserial *gser)
port->port_usb = NULL;
gser->ioport = NULL;
wake_up_interruptible(&port->drain_wait);
if (port->port.tty)
tty_hangup(port->port.tty);
-@@ -1332,7 +1332,7 @@ void gserial_disconnect(struct gserial *gser)
+@@ -1333,7 +1333,7 @@ void gserial_disconnect(struct gserial *gser)
/* finally, free any unused/unusable I/O buffers */
spin_lock_irqsave(&port->port_lock, flags);
gs_free_requests(gser->out, &port->read_pool, NULL);
gs_free_requests(gser->out, &port->read_queue, NULL);
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
-index b9cca6d..75c75df 100644
+index 5f3bcd3..bfca43f 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
-@@ -127,7 +127,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options)
info->port = port;
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
if (serial->type->set_termios) {
/*
-@@ -177,7 +177,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -174,7 +174,7 @@ static int usb_console_setup(struct console *co, char *options)
}
/* Now that any required fake tty operations are completed restore
* the tty port count */
/* The console is special in terms of closing the device so
* indicate this port is now acting as a system console. */
port->port.console = 1;
-@@ -190,7 +190,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -187,7 +187,7 @@ static int usb_console_setup(struct console *co, char *options)
free_tty:
kfree(tty);
reset_open_count:
/*
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
-index ef82a0d..da8a0b3 100644
+index dedaf81..b0f11ab 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -634,7 +634,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
+static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
{
- struct file *eventfp, *filep = NULL,
- *pollstart = NULL, *pollstop = NULL;
+ struct file *eventfp, *filep = NULL;
+ bool pollstart = false, pollstop = false;
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
-index 747442d..7c0c434 100644
+index 0fefa84..7a9d581 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -149,7 +149,7 @@ enum {
};
/* Must match above enum */
--static const char *r128_family[] __devinitdata = {
-+static const char *r128_family[] __devinitconst = {
+-static char * const r128_family[] __devinitconst = {
++static const char * const r128_family[] __devinitconst = {
"AGP",
"PCI",
"PRO AGP",
goto out1;
}
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
-index 0dff12a..2ef47b3 100644
+index 3ff0105..7589d98 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
-index 5a5d092..265c5ed 100644
---- a/drivers/video/geode/gx1fb_core.c
-+++ b/drivers/video/geode/gx1fb_core.c
-@@ -29,7 +29,7 @@ static int crt_option = 1;
- static char panel_option[32] = "";
-
- /* Modes relevant to the GX1 (taken from modedb.c) */
--static const struct fb_videomode __devinitdata gx1_modedb[] = {
-+static const struct fb_videomode __devinitconst gx1_modedb[] = {
- /* 640x480-60 VESA */
- { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
- 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
-diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
-index 0fad23f..0e9afa4 100644
---- a/drivers/video/gxt4500.c
-+++ b/drivers/video/gxt4500.c
-@@ -156,7 +156,7 @@ struct gxt4500_par {
- static char *mode_option;
-
- /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
--static const struct fb_videomode defaultmode __devinitdata = {
-+static const struct fb_videomode defaultmode __devinitconst = {
- .refresh = 60,
- .xres = 1280,
- .yres = 1024,
-@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
- return 0;
- }
-
--static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
-+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
- .id = "IBM GXT4500P",
- .type = FB_TYPE_PACKED_PIXELS,
- .visual = FB_VISUAL_PSEUDOCOLOR,
diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
index 7672d2e..b56437f 100644
--- a/drivers/video/i810/i810_accel.c
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
-diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
-index b83f361..2b05a91 100644
---- a/drivers/video/i810/i810_main.c
-+++ b/drivers/video/i810/i810_main.c
-@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
- static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
-
- /* PCI */
--static const char *i810_pci_list[] __devinitdata = {
-+static const char *i810_pci_list[] __devinitconst = {
- "Intel(R) 810 Framebuffer Device" ,
- "Intel(R) 810-DC100 Framebuffer Device" ,
- "Intel(R) 810E Framebuffer Device" ,
-diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
-index de36693..3c63fc2 100644
---- a/drivers/video/jz4740_fb.c
-+++ b/drivers/video/jz4740_fb.c
-@@ -136,7 +136,7 @@ struct jzfb {
- uint32_t pseudo_palette[16];
- };
-
--static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
-+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
- .id = "JZ4740 FB",
- .type = FB_TYPE_PACKED_PIXELS,
- .visual = FB_VISUAL_TRUECOLOR,
diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
index 3c14e43..eafa544 100644
--- a/drivers/video/logo/logo_linux_clut224.ppm
+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
+4 4 4 4 4 4
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
-index 38fcfff..0072dcd 100644
+index 86d449e..af6a7f7 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
-@@ -620,11 +620,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
+@@ -619,11 +619,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
dlfb_urb_completion(urb);
error:
>> 10)), /* Kcycles */
&dev->cpu_kcycles_used);
-@@ -745,11 +745,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
+@@ -744,11 +744,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
dlfb_urb_completion(urb);
error:
>> 10)), /* Kcycles */
&dev->cpu_kcycles_used);
}
-@@ -1373,7 +1373,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
+@@ -1372,7 +1372,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par;
return snprintf(buf, PAGE_SIZE, "%u\n",
}
static ssize_t metrics_bytes_identical_show(struct device *fbdev,
-@@ -1381,7 +1381,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
+@@ -1380,7 +1380,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par;
return snprintf(buf, PAGE_SIZE, "%u\n",
}
static ssize_t metrics_bytes_sent_show(struct device *fbdev,
-@@ -1389,7 +1389,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
+@@ -1388,7 +1388,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par;
return snprintf(buf, PAGE_SIZE, "%u\n",
}
static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
-@@ -1397,7 +1397,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
+@@ -1396,7 +1396,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par;
return snprintf(buf, PAGE_SIZE, "%u\n",
}
static ssize_t edid_show(
-@@ -1457,10 +1457,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
+@@ -1456,10 +1456,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par;
return count;
}
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
-index b0e2a42..e2df3ad 100644
+index 2f8f82d..191de37 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -19,6 +19,7 @@
printk(KERN_INFO "uvesafb: protected mode interface info at "
"%04x:%04x\n",
(u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -816,13 +839,14 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
+@@ -818,13 +841,14 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
par->ypan = ypan;
if (par->pmi_setpal || par->ypan) {
}
#else
/* The protected mode interface is not available on non-x86. */
-@@ -1836,6 +1860,11 @@ out:
+@@ -1838,6 +1862,11 @@ out:
if (par->vbe_modes)
kfree(par->vbe_modes);
framebuffer_release(info);
return err;
}
-@@ -1862,6 +1891,12 @@ static int uvesafb_remove(struct platform_device *dev)
+@@ -1864,6 +1893,12 @@ static int uvesafb_remove(struct platform_device *dev)
kfree(par->vbe_state_orig);
if (par->vbe_state_saved)
kfree(par->vbe_state_saved);
static inline u32 get_pll_internal_frequency(u32 ref_freq,
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
-index 453db0c..604973e 100644
+index 6b1b7e1..b2fa4d5 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
-@@ -521,7 +521,7 @@ static int vm_cmdline_set(const char *device,
+@@ -530,7 +530,7 @@ static int vm_cmdline_set(const char *device,
resources[0].end = memparse(device, &str) - 1;
&base, &resources[1].start, &consumed,
&vm_cmdline_id, &consumed);
-diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
-index e56c934..fc22f4b 100644
---- a/drivers/xen/xen-pciback/conf_space.h
-+++ b/drivers/xen/xen-pciback/conf_space.h
-@@ -44,15 +44,15 @@ struct config_field {
- struct {
- conf_dword_write write;
- conf_dword_read read;
-- } dw;
-+ } __no_const dw;
- struct {
- conf_word_write write;
- conf_word_read read;
-- } w;
-+ } __no_const w;
- struct {
- conf_byte_write write;
- conf_byte_read read;
-- } b;
-+ } __no_const b;
- } u;
- struct list_head list;
- };
-diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
-index 89f7625..ac72702 100644
---- a/drivers/xen/xenbus/xenbus_dev_frontend.c
-+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
-@@ -458,7 +458,7 @@ static ssize_t xenbus_file_write(struct file *filp,
- goto out;
-
- /* Can't write a xenbus message larger we can buffer */
-- if ((len + u->len) > sizeof(u->u.buffer)) {
-+ if (len > sizeof(u->u.buffer) - u->len) {
- /* On error, dump existing buffer */
- u->len = 0;
- rc = -EINVAL;
diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
index fef20db..d28b1ab 100644
--- a/drivers/xen/xenfs/xenstored.c
return -ENOMEM;
return 0;
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
-index cbf9dbb..35c3af7 100644
+index 890bed5..17ae73e 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -1329,7 +1329,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
p9_debug(P9_DEBUG_VFS, " %s %s\n",
dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
-index 0225742..1cd4732 100644
+index 0efd152..b5802ad 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -89,7 +89,7 @@ config HAVE_AOUT
kiocb->ki_cur_seg = 0;
/* ki_nbytes/left now reflect bytes instead of segs */
diff --git a/fs/attr.c b/fs/attr.c
-index 29e38a1..2bc037b 100644
+index cce7df5..eaa2731 100644
--- a/fs/attr.c
+++ b/fs/attr.c
-@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
+@@ -100,6 +100,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
unsigned long limit;
limit = rlimit(RLIMIT_FSIZE);
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
-index da8876d..4456166 100644
+index dce436e..55e670d 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -61,7 +61,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
ssize_t wr = 0;
sigpipe = sigismember(¤t->pending.signal, SIGPIPE);
-@@ -348,6 +348,10 @@ static int validate_request(struct autofs_wait_queue **wait,
+@@ -347,6 +347,10 @@ static int validate_request(struct autofs_wait_queue **wait,
return 1;
}
int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
enum autofs_notify notify)
{
-@@ -381,7 +385,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
+@@ -380,7 +384,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
/* If this is a direct mount request create a dummy name */
if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
+#ifdef CONFIG_GRKERNSEC_HIDESYM
+ /* this name does get written to userland via autofs4_write() */
-+ qstr.len = sprintf(name, "%08lx", atomic_inc_return_unchecked(&autofs_dummy_name_id));
++ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
+#else
qstr.len = sprintf(name, "%p", dentry);
+#endif
qstr.len = autofs4_getpath(sbi, dentry, &name);
if (!qstr.len) {
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
-index cf7f3c6..f61080d 100644
+index 2b3bda8..6a2d4be 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
-@@ -502,7 +502,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
+@@ -510,7 +510,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
kfree(link);
}
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
-index d146e18..12d1bd1 100644
+index 0e7a6f8..332b1ca 100644
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -16,6 +16,7 @@
#include <linux/stat.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
-@@ -83,6 +84,8 @@ static int aout_core_dump(struct coredump_params *cprm)
+@@ -59,6 +60,8 @@ static int aout_core_dump(struct coredump_params *cprm)
#endif
# define START_STACK(u) ((void __user *)u.start_stack)
fs = get_fs();
set_fs(KERNEL_DS);
has_dumped = 1;
-@@ -94,10 +97,12 @@ static int aout_core_dump(struct coredump_params *cprm)
+@@ -70,10 +73,12 @@ static int aout_core_dump(struct coredump_params *cprm)
/* If the size of the dump file exceeds the rlimit, then see what would happen
if we wrote the stack, but not the data area. */
if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
dump.u_ssize = 0;
-@@ -231,6 +236,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
+@@ -233,6 +238,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
rlim = rlimit(RLIMIT_DATA);
if (rlim >= RLIM_INFINITY)
rlim = ~0;
if (ex.a_data + ex.a_bss > rlim)
return -ENOMEM;
-@@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
+@@ -267,6 +274,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
install_exec_creds(bprm);
if (N_MAGIC(ex) == OMAGIC) {
unsigned long text_addr, map_size;
loff_t pos;
-@@ -330,7 +358,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
+@@ -332,7 +360,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
}
error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
fd_offset + ex.a_text);
if (error != N_DATADDR(ex)) {
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 0225fdd..08bda99 100644
+index fbd9f60..0b845dd 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
#include <linux/elf.h>
#include <linux/utsname.h>
#include <linux/coredump.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-@@ -52,6 +53,10 @@ static int elf_core_dump(struct coredump_params *cprm);
+@@ -59,6 +60,10 @@ static int elf_core_dump(struct coredump_params *cprm);
#define elf_core_dump NULL
#endif
#if ELF_EXEC_PAGESIZE > PAGE_SIZE
#define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
#else
-@@ -71,6 +76,11 @@ static struct linux_binfmt elf_format = {
+@@ -78,6 +83,11 @@ static struct linux_binfmt elf_format = {
.load_binary = load_elf_binary,
.load_shlib = load_elf_library,
.core_dump = elf_core_dump,
.min_coredump = ELF_EXEC_PAGESIZE,
};
-@@ -78,6 +88,8 @@ static struct linux_binfmt elf_format = {
+@@ -85,6 +95,8 @@ static struct linux_binfmt elf_format = {
static int set_brk(unsigned long start, unsigned long end)
{
start = ELF_PAGEALIGN(start);
end = ELF_PAGEALIGN(end);
if (end > start) {
-@@ -86,7 +98,7 @@ static int set_brk(unsigned long start, unsigned long end)
+@@ -93,7 +105,7 @@ static int set_brk(unsigned long start, unsigned long end)
if (BAD_ADDR(addr))
return addr;
}
return 0;
}
-@@ -147,12 +159,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -154,12 +166,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
elf_addr_t __user *u_rand_bytes;
const char *k_platform = ELF_PLATFORM;
const char *k_base_platform = ELF_BASE_PLATFORM;
/*
* In some cases (e.g. Hyper-Threading), we want to avoid L1
-@@ -194,8 +207,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -201,8 +214,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
* Generate 16 random bytes for userspace PRNG seeding.
*/
get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
return -EFAULT;
-@@ -307,9 +324,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -314,9 +331,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
return -EFAULT;
current->mm->env_end = p;
return -EFAULT;
return 0;
}
-@@ -373,15 +392,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
+@@ -380,15 +399,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
an ELF header */
static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
unsigned long total_size;
int retval, i, size;
-@@ -427,6 +445,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -434,6 +452,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
goto out_close;
}
eppnt = elf_phdata;
for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
if (eppnt->p_type == PT_LOAD) {
-@@ -450,8 +473,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -457,8 +480,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
map_addr = elf_map(interpreter, load_addr + vaddr,
eppnt, elf_prot, elf_type, total_size);
total_size = 0;
error = map_addr;
if (BAD_ADDR(map_addr))
goto out_close;
-@@ -470,8 +491,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -477,8 +498,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
k = load_addr + eppnt->p_vaddr;
if (BAD_ADDR(k) ||
eppnt->p_filesz > eppnt->p_memsz ||
error = -ENOMEM;
goto out_close;
}
-@@ -523,6 +544,311 @@ out:
+@@ -530,6 +551,315 @@ out:
return error;
}
+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
+
+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
-+ if (xattr_size <= 0)
++ if (xattr_size <= 0 || xattr_size > 5)
+ return ~0UL;
+
+ for (i = 0; i < xattr_size; i++)
+
+#define parse_flag(option1, option2, flag) \
+ case option1: \
++ if (pax_flags_hardmode & MF_PAX_##flag) \
++ return ~0UL; \
+ pax_flags_hardmode |= MF_PAX_##flag; \
+ break; \
+ case option2: \
++ if (pax_flags_softmode & MF_PAX_##flag) \
++ return ~0UL; \
+ pax_flags_softmode |= MF_PAX_##flag; \
+ break;
+
/*
* These are the functions used to load ELF style executables and shared
* libraries. There is no binary dependent code anywhere else.
-@@ -539,6 +865,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
+@@ -546,6 +876,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
{
unsigned int random_variable = 0;
+#ifdef CONFIG_PAX_RANDUSTACK
-+ if (randomize_va_space)
++ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
+ return stack_top - current->mm->delta_stack;
+#endif
+
if ((current->flags & PF_RANDOMIZE) &&
!(current->personality & ADDR_NO_RANDOMIZE)) {
random_variable = get_random_int() & STACK_RND_MASK;
-@@ -557,7 +888,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -564,7 +899,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
unsigned long load_addr = 0, load_bias = 0;
int load_addr_set = 0;
char * elf_interpreter = NULL;
struct elf_phdr *elf_ppnt, *elf_phdata;
unsigned long elf_bss, elf_brk;
int retval, i;
-@@ -567,11 +898,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -574,11 +909,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
unsigned long start_code, end_code, start_data, end_data;
unsigned long reloc_func_desc __maybe_unused = 0;
int executable_stack = EXSTACK_DEFAULT;
loc = kmalloc(sizeof(*loc), GFP_KERNEL);
if (!loc) {
-@@ -707,11 +1038,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -714,11 +1049,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
goto out_free_dentry;
/* OK, This is the point of no return */
if (elf_read_implies_exec(loc->elf_ex, executable_stack))
current->personality |= READ_IMPLIES_EXEC;
-@@ -802,6 +1203,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -809,6 +1214,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
#else
load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
#endif
}
error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -834,9 +1249,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -841,9 +1260,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
* allowed task size. Note that p_filesz must always be
* <= p_memsz so it is only necessary to check p_memsz.
*/
/* set_brk can never work. Avoid overflows. */
send_sig(SIGKILL, current, 0);
retval = -EINVAL;
-@@ -875,17 +1290,44 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -882,17 +1301,44 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
goto out_free_dentry;
}
if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
+#endif
+
if (elf_interpreter) {
-- unsigned long uninitialized_var(interp_map_addr);
+- unsigned long interp_map_addr = 0;
-
elf_entry = load_elf_interp(&loc->interp_elf_ex,
interpreter,
load_bias);
if (!IS_ERR((void *)elf_entry)) {
/*
-@@ -1107,7 +1549,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
+@@ -1114,7 +1560,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
* Decide what to dump of a segment, part, all or none.
*/
static unsigned long vma_dump_size(struct vm_area_struct *vma,
{
#define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
-@@ -1144,7 +1586,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
+@@ -1151,7 +1597,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
if (vma->vm_file == NULL)
return 0;
goto whole;
/*
-@@ -1366,9 +1808,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
+@@ -1373,9 +1819,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
{
elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
int i = 0;
fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
}
-@@ -1879,14 +2321,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
+@@ -2003,14 +2449,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
}
static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
for (vma = first_vma(current, gate_vma); vma != NULL;
vma = next_vma(vma, gate_vma))
- size += vma_dump_size(vma, mm_flags);
-+ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
++ size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
return size;
}
-@@ -1980,7 +2422,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2104,7 +2550,7 @@ static int elf_core_dump(struct coredump_params *cprm)
dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
offset += elf_core_extra_data_size();
e_shoff = offset;
-@@ -1994,10 +2436,12 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2118,10 +2564,12 @@ static int elf_core_dump(struct coredump_params *cprm)
offset = dataoff;
size += sizeof(*elf);
if (size > cprm->limit
|| !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
goto end_coredump;
-@@ -2011,7 +2455,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2135,7 +2583,7 @@ static int elf_core_dump(struct coredump_params *cprm)
phdr.p_offset = offset;
phdr.p_vaddr = vma->vm_start;
phdr.p_paddr = 0;
- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
-+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
++ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
phdr.p_memsz = vma->vm_end - vma->vm_start;
offset += phdr.p_filesz;
phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -2022,6 +2466,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2146,6 +2594,7 @@ static int elf_core_dump(struct coredump_params *cprm)
phdr.p_align = ELF_EXEC_PAGESIZE;
size += sizeof(phdr);
if (size > cprm->limit
|| !dump_write(cprm->file, &phdr, sizeof(phdr)))
goto end_coredump;
-@@ -2046,7 +2491,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2170,7 +2619,7 @@ static int elf_core_dump(struct coredump_params *cprm)
unsigned long addr;
unsigned long end;
- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
-+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
++ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
struct page *page;
-@@ -2055,6 +2500,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2179,6 +2628,7 @@ static int elf_core_dump(struct coredump_params *cprm)
page = get_dump_page(addr);
if (page) {
void *kaddr = kmap(page);
stop = ((size += PAGE_SIZE) > cprm->limit) ||
!dump_write(cprm->file, kaddr,
PAGE_SIZE);
-@@ -2072,6 +2518,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2196,6 +2646,7 @@ static int elf_core_dump(struct coredump_params *cprm)
if (e_phnum == PN_XNUM) {
size += sizeof(*shdr4extnum);
if (size > cprm->limit
|| !dump_write(cprm->file, shdr4extnum,
sizeof(*shdr4extnum)))
-@@ -2092,6 +2539,97 @@ out:
+@@ -2216,6 +2667,97 @@ out:
#endif /* CONFIG_ELF_CORE */
{
register_binfmt(&elf_format);
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
-index 178cb70..8972997 100644
+index e280352..7b2f231 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -562,7 +562,9 @@ static int load_flat_file(struct linux_binprm * bprm,
goto err;
}
diff --git a/fs/bio.c b/fs/bio.c
-index 71072ab..439851b 100644
+index b96fc6c..431d628 100644
--- a/fs/bio.c
+++ b/fs/bio.c
-@@ -842,7 +842,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
+@@ -818,7 +818,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
/*
* Overflow, abort
*/
return ERR_PTR(-EINVAL);
nr_pages += end - start;
-@@ -976,7 +976,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
+@@ -952,7 +952,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
/*
* Overflow, abort
*/
return ERR_PTR(-EINVAL);
nr_pages += end - start;
-@@ -1238,7 +1238,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
+@@ -1214,7 +1214,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
const int read = bio_data_dir(bio) == READ;
struct bio_map_data *bmd = bio->bi_private;
int i;
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 38e721b..7a9c5bc 100644
+index ab3a456..7da538b 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
-@@ -704,7 +704,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
+@@ -651,7 +651,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
else if (bdev->bd_contains == bdev)
return true; /* is a whole device which isn't held */
return true; /* is a partition of a device that is being partitioned */
else if (whole->bd_holder != NULL)
return false; /* is a partition of a held device */
-diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
-index 9197e2e..7f731f8 100644
---- a/fs/btrfs/check-integrity.c
-+++ b/fs/btrfs/check-integrity.c
-@@ -155,7 +155,7 @@ struct btrfsic_block {
- union {
- bio_end_io_t *bio;
- bh_end_io_t *bh;
-- } orig_bio_bh_end_io;
-+ } __no_const orig_bio_bh_end_io;
- int submit_bio_bh_rw;
- u64 flush_gen; /* only valid if !never_written */
- };
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
-index 6d183f6..f47cc7a 100644
+index cdfb4c4..da736d4 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
-@@ -1037,9 +1037,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
+@@ -1035,9 +1035,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
free_extent_buffer(buf);
add_root_to_dirty_list(root);
} else {
WARN_ON(trans->transid != btrfs_header_generation(parent));
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
-index ec154f9..bf617a7 100644
+index 95542a1..95a8727 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
-@@ -7126,7 +7126,7 @@ fail:
+@@ -7243,7 +7243,7 @@ fail:
return -ENOMEM;
}
struct dentry *dentry, struct kstat *stat)
{
struct inode *inode = dentry->d_inode;
-@@ -7140,6 +7140,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
+@@ -7257,6 +7257,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
return 0;
}
* If a file is moved, it will inherit the cow and compression flags of the new
* directory.
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 9df50fa..6cd20d0 100644
+index 8fcf9a5..a200000 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
-@@ -2942,9 +2942,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -2965,9 +2965,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
for (i = 0; i < num_types; i++) {
struct btrfs_space_info *tmp;
info = NULL;
rcu_read_lock();
list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -2966,10 +2969,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -2989,10 +2992,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
memcpy(dest, &space, sizeof(space));
dest++;
space_args.total_spaces++;
up_read(&info->groups_sem);
}
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
-index 4da0865..01c4778 100644
+index 776f0aa..3aad281 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1269,7 +1269,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
server->ops->print_stats(m, tcon);
}
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
-index db8a404..c712e2e 100644
+index e7931cc..76a1ab9 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
-@@ -1003,7 +1003,7 @@ cifs_init_request_bufs(void)
+@@ -999,7 +999,7 @@ cifs_init_request_bufs(void)
/* cERROR(1, "CIFSMaxBufSize %d 0x%x",CIFSMaxBufSize,CIFSMaxBufSize); */
cifs_req_cachep = kmem_cache_create("cifs_request",
CIFSMaxBufSize + max_hdr_size, 0,
if (cifs_req_cachep == NULL)
return -ENOMEM;
-@@ -1030,7 +1030,7 @@ cifs_init_request_bufs(void)
+@@ -1026,7 +1026,7 @@ cifs_init_request_bufs(void)
efficient to alloc 1 per page off the slab compared to 17K (5page)
alloc of large cifs buffers even when page debugging is on */
cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
NULL);
if (cifs_sm_req_cachep == NULL) {
mempool_destroy(cifs_req_poolp);
-@@ -1115,8 +1115,8 @@ init_cifs(void)
+@@ -1111,8 +1111,8 @@ init_cifs(void)
atomic_set(&bufAllocCount, 0);
atomic_set(&smBufAllocCount, 0);
#ifdef CONFIG_CIFS_STATS2
atomic_set(&midCount, 0);
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
-index 977dc0e..ba48ab9 100644
+index f5af252..489b5f2 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
-@@ -590,35 +590,35 @@ struct cifs_tcon {
+@@ -751,35 +751,35 @@ struct cifs_tcon {
__u16 Flags; /* optional support bits */
enum statusEnum tidStatus;
#ifdef CONFIG_CIFS_STATS
} smb2_stats;
#endif /* CONFIG_CIFS_SMB2 */
} stats;
-@@ -862,7 +862,7 @@ build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
+@@ -1094,7 +1094,7 @@ build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
}
#ifdef CONFIG_CIFS_STATS
static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
unsigned int bytes)
-@@ -1227,8 +1227,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
+@@ -1459,8 +1459,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
/* Various Debug counters */
GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
#ifdef CONFIG_CIFS_STATS2
GLOBAL_EXTERN atomic_t smBufAllocCount;
GLOBAL_EXTERN atomic_t midCount;
diff --git a/fs/cifs/link.c b/fs/cifs/link.c
-index e6ce3b1..adc21fd 100644
+index 51dc2fb..1e12a33 100644
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
-@@ -602,7 +602,7 @@ symlink_exit:
+@@ -616,7 +616,7 @@ symlink_exit:
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
{
kfree(p);
}
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
-index ce41fee..ac0d27a 100644
+index 3a00c0d..42d901c 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -169,7 +169,7 @@ cifs_buf_get(void)
}
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
-index 3129ac7..cc4a948 100644
+index 591bf19..690d600 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
-@@ -524,27 +524,27 @@ static void
+@@ -617,27 +617,27 @@ static void
cifs_clear_stats(struct cifs_tcon *tcon)
{
#ifdef CONFIG_CIFS_STATS
#endif
}
-@@ -553,36 +553,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
+@@ -646,36 +646,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
{
#ifdef CONFIG_CIFS_STATS
seq_printf(m, " Oplocks breaks: %d",
}
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
-index 826209b..fa460f4 100644
+index 4d9dbe0..0af4601 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
-@@ -219,8 +219,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
+@@ -291,8 +291,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
#ifdef CONFIG_CIFS_STATS
int i;
for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
}
#endif
}
-@@ -229,66 +229,66 @@ static void
+@@ -301,66 +301,66 @@ static void
smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
{
#ifdef CONFIG_CIFS_STATS
return hit;
diff --git a/fs/compat.c b/fs/compat.c
-index 1bdb350..9f28287 100644
+index 015e1e1..5ce8e54 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -490,7 +490,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
buf->result++;
dirent = buf->dirent;
if (!access_ok(VERIFY_WRITE, dirent,
-@@ -880,6 +885,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
+@@ -878,6 +883,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
buf.result = 0;
buf.dirent = dirent;
-+ buf.file = file;
++ buf.file = f.file;
- error = vfs_readdir(file, compat_fillonedir, &buf);
+ error = vfs_readdir(f.file, compat_fillonedir, &buf);
if (buf.result)
-@@ -899,6 +905,7 @@ struct compat_linux_dirent {
+@@ -897,6 +903,7 @@ struct compat_linux_dirent {
struct compat_getdents_callback {
struct compat_linux_dirent __user *current_dir;
struct compat_linux_dirent __user *previous;
int count;
int error;
};
-@@ -920,6 +927,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
+@@ -918,6 +925,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
buf->error = -EOVERFLOW;
return -EOVERFLOW;
}
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -966,6 +977,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
+@@ -963,6 +974,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
buf.previous = NULL;
buf.count = count;
buf.error = 0;
-+ buf.file = file;
++ buf.file = f.file;
- error = vfs_readdir(file, compat_filldir, &buf);
+ error = vfs_readdir(f.file, compat_filldir, &buf);
if (error >= 0)
-@@ -986,6 +998,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
+@@ -983,6 +995,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
struct compat_getdents_callback64 {
struct linux_dirent64 __user *current_dir;
struct linux_dirent64 __user *previous;
int count;
int error;
};
-@@ -1002,6 +1015,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
+@@ -999,6 +1012,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
buf->error = -EINVAL; /* only used if we fail.. */
if (reclen > buf->count)
return -EINVAL;
dirent = buf->previous;
if (dirent) {
-@@ -1052,13 +1069,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
+@@ -1048,13 +1065,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
buf.previous = NULL;
buf.count = count;
buf.error = 0;
-+ buf.file = file;
++ buf.file = f.file;
- error = vfs_readdir(file, compat_filldir64, &buf);
+ error = vfs_readdir(f.file, compat_filldir64, &buf);
if (error >= 0)
error = buf.error;
lastdirent = buf.previous;
if (lastdirent) {
-- typeof(lastdirent->d_off) d_off = file->f_pos;
-+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
+- typeof(lastdirent->d_off) d_off = f.file->f_pos;
++ typeof(((struct linux_dirent64 *)0)->d_off) d_off = f.file->f_pos;
if (__put_user_unaligned(d_off, &lastdirent->d_off))
error = -EFAULT;
else
diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
-index 112e45a..b59845b 100644
+index a81147e..20bf2b5 100644
--- a/fs/compat_binfmt_elf.c
+++ b/fs/compat_binfmt_elf.c
@@ -30,11 +30,13 @@
/*
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
-index 5d2069f..75d31d4 100644
+index 4c6285f..b7a2411 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -623,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
return -EFAULT;
return ioctl_preallocate(file, p);
-@@ -1612,8 +1612,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
+@@ -1617,8 +1617,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
{
unsigned int a, b;
/*
* We'll have a dentry and an inode for
+diff --git a/fs/coredump.c b/fs/coredump.c
+index ce47379..68c8e43 100644
+--- a/fs/coredump.c
++++ b/fs/coredump.c
+@@ -52,7 +52,7 @@ struct core_name {
+ char *corename;
+ int used, size;
+ };
+-static atomic_t call_count = ATOMIC_INIT(1);
++static atomic_unchecked_t call_count = ATOMIC_INIT(1);
+
+ /* The maximal length of core_pattern is also specified in sysctl.c */
+
+@@ -60,7 +60,7 @@ static int expand_corename(struct core_name *cn)
+ {
+ char *old_corename = cn->corename;
+
+- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
++ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
+ cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
+
+ if (!cn->corename) {
+@@ -157,7 +157,7 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm)
+ int pid_in_pattern = 0;
+ int err = 0;
+
+- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
++ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
+ cn->corename = kmalloc(cn->size, GFP_KERNEL);
+ cn->used = 0;
+
+@@ -414,17 +414,17 @@ static void wait_for_dump_helpers(struct file *file)
+ pipe = file->f_path.dentry->d_inode->i_pipe;
+
+ pipe_lock(pipe);
+- pipe->readers++;
+- pipe->writers--;
++ atomic_inc(&pipe->readers);
++ atomic_dec(&pipe->writers);
+
+- while ((pipe->readers > 1) && (!signal_pending(current))) {
++ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
+ wake_up_interruptible_sync(&pipe->wait);
+ kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
+ pipe_wait(pipe);
+ }
+
+- pipe->readers--;
+- pipe->writers++;
++ atomic_dec(&pipe->readers);
++ atomic_inc(&pipe->writers);
+ pipe_unlock(pipe);
+
+ }
+@@ -471,7 +471,8 @@ void do_coredump(siginfo_t *siginfo, struct pt_regs *regs)
+ int ispipe;
+ struct files_struct *displaced;
+ bool need_nonrelative = false;
+- static atomic_t core_dump_count = ATOMIC_INIT(0);
++ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
++ long signr = siginfo->si_signo;
+ struct coredump_params cprm = {
+ .siginfo = siginfo,
+ .regs = regs,
+@@ -484,7 +485,10 @@ void do_coredump(siginfo_t *siginfo, struct pt_regs *regs)
+ .mm_flags = mm->flags,
+ };
+
+- audit_core_dumps(siginfo->si_signo);
++ audit_core_dumps(signr);
++
++ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
++ gr_handle_brute_attach(cprm.mm_flags);
+
+ binfmt = mm->binfmt;
+ if (!binfmt || !binfmt->core_dump)
+@@ -508,7 +512,7 @@ void do_coredump(siginfo_t *siginfo, struct pt_regs *regs)
+ need_nonrelative = true;
+ }
+
+- retval = coredump_wait(siginfo->si_signo, &core_state);
++ retval = coredump_wait(signr, &core_state);
+ if (retval < 0)
+ goto fail_creds;
+
+@@ -556,7 +560,7 @@ void do_coredump(siginfo_t *siginfo, struct pt_regs *regs)
+ }
+ cprm.limit = RLIM_INFINITY;
+
+- dump_count = atomic_inc_return(&core_dump_count);
++ dump_count = atomic_inc_return_unchecked(&core_dump_count);
+ if (core_pipe_limit && (core_pipe_limit < dump_count)) {
+ printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
+ task_tgid_vnr(current), current->comm);
+@@ -583,6 +587,8 @@ void do_coredump(siginfo_t *siginfo, struct pt_regs *regs)
+ } else {
+ struct inode *inode;
+
++ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
++
+ if (cprm.limit < binfmt->min_coredump)
+ goto fail_unlock;
+
+@@ -640,7 +646,7 @@ close_fail:
+ filp_close(cprm.file, NULL);
+ fail_dropcount:
+ if (ispipe)
+- atomic_dec(&core_dump_count);
++ atomic_dec_unchecked(&core_dump_count);
+ fail_unlock:
+ kfree(cn.corename);
+ fail_corename:
+@@ -659,7 +665,7 @@ fail:
+ */
+ int dump_write(struct file *file, const void *addr, int nr)
+ {
+- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
++ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
+ }
+ EXPORT_SYMBOL(dump_write);
+
diff --git a/fs/dcache.c b/fs/dcache.c
-index 693f95b..95f1223 100644
+index 0d0adb6..f4646e9 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3164,7 +3164,7 @@ void __init vfs_caches_init(unsigned long mempages)
dcache_init();
inode_init();
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
-index 4733eab..71ef6fa 100644
+index b607d92..41fda09 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
-@@ -406,7 +406,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
+@@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
*/
struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
{
return rc;
}
diff --git a/fs/exec.c b/fs/exec.c
-index fab2c6d..4fa20c0 100644
+index c6e6de4..45e71ad 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -55,6 +55,15 @@
+@@ -55,6 +55,17 @@
#include <linux/pipe_fs_i.h>
#include <linux/oom.h>
#include <linux/compat.h>
+#include <linux/random.h>
+#include <linux/seq_file.h>
++#include <linux/coredump.h>
++#include <linux/mman.h>
+
+#ifdef CONFIG_PAX_REFCOUNT
+#include <linux/kallsyms.h>
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
-@@ -66,6 +75,18 @@
+@@ -66,6 +77,18 @@
#include <trace/events/sched.h>
+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
+{
-+ WARN_ONCE(1, "PAX: PAX_HAVE_ACL_FLAGS was enabled without providing the pax_set_initial_flags callback, this is probably not what you wanted.\n");
++ pr_warn_once("PAX: PAX_HAVE_ACL_FLAGS was enabled without providing the pax_set_initial_flags callback, this is probably not what you wanted.\n");
+}
+#endif
+
+EXPORT_SYMBOL(pax_set_initial_flags_func);
+#endif
+
- int core_uses_pid;
- char core_pattern[CORENAME_MAX_SIZE] = "core";
- unsigned int core_pipe_limit;
-@@ -75,7 +96,7 @@ struct core_name {
- char *corename;
- int used, size;
- };
--static atomic_t call_count = ATOMIC_INIT(1);
-+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
-
- /* The maximal length of core_pattern is also specified in sysctl.c */
+ int suid_dumpable = 0;
-@@ -191,18 +212,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+ static LIST_HEAD(formats);
+@@ -180,18 +203,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
int write)
{
struct page *page;
return NULL;
if (write) {
-@@ -218,6 +231,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+@@ -207,6 +222,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
if (size <= ARG_MAX)
return page;
/*
* Limit to 1/4-th the stack size for the argv+env strings.
* This ensures that:
-@@ -277,6 +301,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -266,6 +292,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
vma->vm_end = STACK_TOP_MAX;
vma->vm_start = vma->vm_end - PAGE_SIZE;
vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
INIT_LIST_HEAD(&vma->anon_vma_chain);
-@@ -287,6 +316,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -276,6 +307,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
mm->stack_vm = mm->total_vm = 1;
up_write(&mm->mmap_sem);
bprm->p = vma->vm_end - sizeof(void *);
return 0;
err:
up_write(&mm->mmap_sem);
-@@ -395,19 +430,7 @@ err:
+@@ -384,19 +421,7 @@ err:
return err;
}
- union {
- const char __user *const __user *native;
-#ifdef CONFIG_COMPAT
-- compat_uptr_t __user *compat;
+- const compat_uptr_t __user *compat;
-#endif
- } ptr;
-};
{
const char __user *native;
-@@ -416,14 +439,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
+@@ -405,14 +430,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
compat_uptr_t compat;
if (get_user(compat, argv.ptr.compat + nr))
return native;
}
-@@ -442,7 +465,7 @@ static int count(struct user_arg_ptr argv, int max)
+@@ -431,11 +456,12 @@ static int count(struct user_arg_ptr argv, int max)
if (!p)
break;
+ if (IS_ERR((const char __force_kernel *)p))
return -EFAULT;
- if (i++ >= max)
-@@ -476,7 +499,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
+- if (i++ >= max)
++ if (i >= max)
+ return -E2BIG;
++ ++i;
+
+ if (fatal_signal_pending(current))
+ return -ERESTARTNOHAND;
+@@ -465,7 +491,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
ret = -EFAULT;
str = get_user_arg_ptr(argv, argc);
goto out;
len = strnlen_user(str, MAX_ARG_STRLEN);
-@@ -558,7 +581,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
+@@ -547,7 +573,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
int r;
mm_segment_t oldfs = get_fs();
struct user_arg_ptr argv = {
};
set_fs(KERNEL_DS);
-@@ -593,7 +616,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -582,7 +608,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
unsigned long new_end = old_end - shift;
struct mmu_gather tlb;
/*
* ensure there are no vmas between where we want to go
-@@ -602,6 +626,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -591,6 +618,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
if (vma != find_vma(mm, new_start))
return -EFAULT;
/*
* cover the whole range: [new_start, old_end)
*/
-@@ -682,10 +710,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -671,10 +702,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
stack_top = arch_align_stack(stack_top);
stack_top = PAGE_ALIGN(stack_top);
stack_shift = vma->vm_end - stack_top;
bprm->p -= stack_shift;
-@@ -697,8 +721,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -686,8 +713,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
bprm->exec -= stack_shift;
down_write(&mm->mmap_sem);
/*
* Adjust stack execute permissions; explicitly enable for
* EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -717,13 +761,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -706,13 +753,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
goto out_unlock;
BUG_ON(prev != vma);
/* mprotect_fixup is overkill to remove the temporary stack flags */
vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
-@@ -781,6 +818,8 @@ struct file *open_exec(const char *name)
+@@ -736,6 +776,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
+ #endif
+ current->mm->start_stack = bprm->p;
+ ret = expand_stack(vma, stack_base);
++
++#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_ASLR)
++ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
++ unsigned long size, flags, vm_flags;
++
++ size = STACK_TOP - vma->vm_end;
++ flags = MAP_FIXED | MAP_PRIVATE;
++ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
++
++ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, flags, vm_flags, 0);
++
++#ifdef CONFIG_X86
++ if (!ret) {
++ size = mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
++ ret = 0 != mmap_region(NULL, 0, size, flags, vm_flags, 0);
++ }
++#endif
++
++ }
++#endif
++
+ if (ret)
+ ret = -EFAULT;
+
+@@ -771,6 +832,8 @@ struct file *open_exec(const char *name)
fsnotify_open(file);
err = deny_write_access(file);
if (err)
goto exit;
-@@ -804,7 +843,7 @@ int kernel_read(struct file *file, loff_t offset,
+@@ -794,7 +857,7 @@ int kernel_read(struct file *file, loff_t offset,
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
set_fs(old_fs);
return result;
}
-@@ -1258,7 +1297,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
+@@ -1246,7 +1309,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
}
rcu_read_unlock();
bprm->unsafe |= LSM_UNSAFE_SHARE;
} else {
res = -EAGAIN;
-@@ -1461,6 +1500,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
+@@ -1449,6 +1512,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
EXPORT_SYMBOL(search_binary_handler);
/*
* sys_execve() executes a new program.
*/
-@@ -1469,6 +1530,11 @@ static int do_execve_common(const char *filename,
+@@ -1457,6 +1542,11 @@ static int do_execve_common(const char *filename,
struct user_arg_ptr envp,
struct pt_regs *regs)
{
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
-@@ -1476,6 +1542,8 @@ static int do_execve_common(const char *filename,
+@@ -1464,6 +1554,8 @@ static int do_execve_common(const char *filename,
int retval;
const struct cred *cred = current_cred();
/*
* We move the actual failure in case of RLIMIT_NPROC excess from
* set*uid() to execve() because too many poorly written programs
-@@ -1516,12 +1584,27 @@ static int do_execve_common(const char *filename,
+@@ -1504,12 +1596,27 @@ static int do_execve_common(const char *filename,
if (IS_ERR(file))
goto out_unmark;
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1538,24 +1621,65 @@ static int do_execve_common(const char *filename,
+@@ -1526,24 +1633,65 @@ static int do_execve_common(const char *filename,
if (retval < 0)
goto out;
current->fs->in_exec = 0;
current->in_execve = 0;
acct_update_integrals(current);
-@@ -1564,6 +1688,14 @@ static int do_execve_common(const char *filename,
+@@ -1552,6 +1700,14 @@ static int do_execve_common(const char *filename,
put_files_struct(displaced);
return retval;
out:
if (bprm->mm) {
acct_arg_size(bprm, 0);
-@@ -1637,7 +1769,7 @@ static int expand_corename(struct core_name *cn)
- {
- char *old_corename = cn->corename;
-
-- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
-+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
- cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
-
- if (!cn->corename) {
-@@ -1734,7 +1866,7 @@ static int format_corename(struct core_name *cn, long signr)
- int pid_in_pattern = 0;
- int err = 0;
-
-- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
-+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
- cn->corename = kmalloc(cn->size, GFP_KERNEL);
- cn->used = 0;
-
-@@ -1831,6 +1963,250 @@ out:
- return ispipe;
+@@ -1727,3 +1883,253 @@ int kernel_execve(const char *filename,
+ ret_from_kernel_execve(p);
}
-
+ #endif
++
+int pax_check_flags(unsigned long *flags)
+{
+ int retval = 0;
+ char *path_exec = NULL;
+ char *path_fault = NULL;
+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
++ siginfo_t info = { };
+
+ if (buffer_exec && buffer_fault) {
+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
+ down_read(&mm->mmap_sem);
+ vma = mm->mmap;
+ while (vma && (!vma_exec || !vma_fault)) {
-+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
++ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
+ vma_exec = vma;
+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
+ vma_fault = vma;
+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
+ else
+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
-+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
-+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
-+ task_uid(tsk), task_euid(tsk), pc, sp);
++ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
++ from_kuid(&init_user_ns, task_uid(tsk)), from_kuid(&init_user_ns, task_euid(tsk)), pc, sp);
+ free_page((unsigned long)buffer_exec);
+ free_page((unsigned long)buffer_fault);
+ pax_report_insns(regs, pc, sp);
-+ do_coredump(SIGKILL, SIGKILL, regs);
++ info.si_signo = SIGKILL;
++ info.si_errno = 0;
++ info.si_code = SI_KERNEL;
++ info.si_pid = 0;
++ info.si_uid = 0;
++ do_coredump(&info, regs);
+}
+#endif
+
+{
+ if (current->signal->curr_ip)
+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
-+ ¤t->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
++ ¤t->signal->curr_ip, current->comm, task_pid_nr(current),
++ from_kuid(&init_user_ns, current_uid()), from_kuid(&init_user_ns, current_euid()));
+ else
-+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
-+ current->comm, task_pid_nr(current), current_uid(), current_euid());
++ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
++ from_kuid(&init_user_ns, current_uid()), from_kuid(&init_user_ns, current_euid()));
+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
+ show_regs(regs);
+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
+}
+#endif
+
-+void check_object_size(const void *ptr, unsigned long n, bool to)
++void __check_object_size(const void *ptr, unsigned long n, bool to)
+{
+
+#ifdef CONFIG_PAX_USERCOPY
+ if (!n)
+ return;
+
-+ type = check_heap_object(ptr, n, to);
++ type = check_heap_object(ptr, n);
+ if (!type) {
+ if (check_stack_object(ptr, n) != -1)
+ return;
+#endif
+
+}
-+EXPORT_SYMBOL(check_object_size);
++EXPORT_SYMBOL(__check_object_size);
+
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
+void pax_track_stack(void)
+}
+EXPORT_SYMBOL(report_size_overflow);
+#endif
-+
- static int zap_process(struct task_struct *start, int exit_code)
- {
- struct task_struct *t;
-@@ -2041,17 +2417,17 @@ static void wait_for_dump_helpers(struct file *file)
- pipe = file->f_path.dentry->d_inode->i_pipe;
-
- pipe_lock(pipe);
-- pipe->readers++;
-- pipe->writers--;
-+ atomic_inc(&pipe->readers);
-+ atomic_dec(&pipe->writers);
-
-- while ((pipe->readers > 1) && (!signal_pending(current))) {
-+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
- wake_up_interruptible_sync(&pipe->wait);
- kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
- pipe_wait(pipe);
- }
-
-- pipe->readers--;
-- pipe->writers++;
-+ atomic_dec(&pipe->readers);
-+ atomic_inc(&pipe->writers);
- pipe_unlock(pipe);
-
- }
-@@ -2106,7 +2482,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
- int flag = 0;
- int ispipe;
- bool need_nonrelative = false;
-- static atomic_t core_dump_count = ATOMIC_INIT(0);
-+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
- struct coredump_params cprm = {
- .signr = signr,
- .regs = regs,
-@@ -2121,6 +2497,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
-
- audit_core_dumps(signr);
-
-+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
-+ gr_handle_brute_attach(current, cprm.mm_flags);
-+
- binfmt = mm->binfmt;
- if (!binfmt || !binfmt->core_dump)
- goto fail;
-@@ -2191,7 +2570,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
- }
- cprm.limit = RLIM_INFINITY;
-
-- dump_count = atomic_inc_return(&core_dump_count);
-+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
- if (core_pipe_limit && (core_pipe_limit < dump_count)) {
- printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
- task_tgid_vnr(current), current->comm);
-@@ -2218,6 +2597,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
- } else {
- struct inode *inode;
-
-+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
-+
- if (cprm.limit < binfmt->min_coredump)
- goto fail_unlock;
-
-@@ -2269,7 +2650,7 @@ close_fail:
- filp_close(cprm.file, NULL);
- fail_dropcount:
- if (ispipe)
-- atomic_dec(&core_dump_count);
-+ atomic_dec_unchecked(&core_dump_count);
- fail_unlock:
- kfree(cn.corename);
- fail_corename:
-@@ -2288,7 +2669,7 @@ fail:
- */
- int dump_write(struct file *file, const void *addr, int nr)
- {
-- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
-+ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
- }
- EXPORT_SYMBOL(dump_write);
-
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
-index 376aa77..59a129c 100644
+index 2616d0e..2ffdec9 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -1190,10 +1190,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
}
return 1;
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
-index 90d901f..159975f 100644
+index 22548f5..41521d8 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
if (free_clusters >= (nclusters + dirty_clusters))
return 1;
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 5c69f2b..05dec7f 100644
+index 3c20de1..6ff2460 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
-@@ -1248,19 +1248,19 @@ struct ext4_sb_info {
+@@ -1247,19 +1247,19 @@ struct ext4_sb_info {
unsigned long s_mb_last_start;
/* stats for buddy allocator */
/* locality groups */
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index b26410c..7383d90 100644
+index 526e553..3f2de85 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
-@@ -1746,7 +1746,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
+@@ -1747,7 +1747,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
if (EXT4_SB(sb)->s_mb_stats)
break;
}
-@@ -2040,7 +2040,7 @@ repeat:
+@@ -2044,7 +2044,7 @@ repeat:
ac->ac_status = AC_STATUS_CONTINUE;
ac->ac_flags |= EXT4_MB_HINT_FIRST;
cr = 3;
goto repeat;
}
}
-@@ -2551,25 +2551,25 @@ int ext4_mb_release(struct super_block *sb)
+@@ -2552,25 +2552,25 @@ int ext4_mb_release(struct super_block *sb)
if (sbi->s_mb_stats) {
ext4_msg(sb, KERN_INFO,
"mballoc: %u blocks %u reqs (%u success)",
}
free_percpu(sbi->s_locality_groups);
-@@ -3051,16 +3051,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
+@@ -3052,16 +3052,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
}
if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
-@@ -3460,7 +3460,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
+@@ -3461,7 +3461,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
trace_ext4_mb_new_inode_pa(ac, pa);
ext4_mb_use_inode_pa(ac, pa);
ei = EXT4_I(ac->ac_inode);
grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
-@@ -3520,7 +3520,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
+@@ -3521,7 +3521,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
trace_ext4_mb_new_group_pa(ac, pa);
ext4_mb_use_group_pa(ac, pa);
grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
lg = ac->ac_lg;
-@@ -3609,7 +3609,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
+@@ -3610,7 +3610,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
* from the bitmap and continue.
*/
}
return err;
}
-@@ -3627,7 +3627,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
+@@ -3628,7 +3628,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
return 0;
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index d59b351..775f8c8 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -3212,7 +3212,6 @@ int ext4_calculate_overhead(struct super_block *sb)
+ ext4_fsblk_t overhead = 0;
+ char *buf = (char *) get_zeroed_page(GFP_KERNEL);
+
+- memset(buf, 0, PAGE_SIZE);
+ if (!buf)
+ return -ENOMEM;
+
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 887b5ba..0e3f2c3 100644
+index 71a600a..20d87b1 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -225,6 +225,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
+@@ -107,6 +107,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
if (err)
return err;
f_modown(filp, pid, type, force);
return 0;
}
-@@ -267,7 +272,7 @@ pid_t f_getown(struct file *filp)
-
- static int f_setown_ex(struct file *filp, unsigned long arg)
- {
-- struct f_owner_ex * __user owner_p = (void * __user)arg;
-+ struct f_owner_ex __user *owner_p = (void __user *)arg;
- struct f_owner_ex owner;
- struct pid *pid;
- int type;
-@@ -307,7 +312,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
-
- static int f_getown_ex(struct file *filp, unsigned long arg)
- {
-- struct f_owner_ex * __user owner_p = (void * __user)arg;
-+ struct f_owner_ex __user *owner_p = (void __user *)arg;
- struct f_owner_ex owner;
- int ret = 0;
-
-@@ -374,6 +379,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
- switch (cmd) {
- case F_DUPFD:
- case F_DUPFD_CLOEXEC:
-+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
- if (arg >= rlimit(RLIMIT_NOFILE))
- break;
- err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
+diff --git a/fs/fhandle.c b/fs/fhandle.c
+index f775bfd..629bd4c 100644
+--- a/fs/fhandle.c
++++ b/fs/fhandle.c
+@@ -67,8 +67,7 @@ static long do_sys_name_to_handle(struct path *path,
+ } else
+ retval = 0;
+ /* copy the mount id */
+- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
+- sizeof(*mnt_id)) ||
++ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
+ copy_to_user(ufh, handle,
+ sizeof(struct file_handle) + handle_bytes))
+ retval = -EFAULT;
diff --git a/fs/fifo.c b/fs/fifo.c
index cf6f434..3d7942c 100644
--- a/fs/fifo.c
err_nocleanup:
diff --git a/fs/file.c b/fs/file.c
-index ba3f605..fade102 100644
+index eff2316..8c8930c 100644
--- a/fs/file.c
+++ b/fs/file.c
-@@ -15,6 +15,7 @@
+@@ -16,6 +16,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/file.h>
#include <linux/fdtable.h>
#include <linux/bitops.h>
#include <linux/interrupt.h>
-@@ -255,6 +256,7 @@ int expand_files(struct files_struct *files, int nr)
- * N.B. For clone tasks sharing a files structure, this test
- * will limit the total number of files that can be opened.
- */
-+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
- if (nr >= rlimit(RLIMIT_NOFILE))
- return -EMFILE;
+@@ -898,6 +899,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
+ if (!file)
+ return __close_fd(files, fd);
++ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
+ if (fd >= rlimit(RLIMIT_NOFILE))
+ return -EBADF;
+
+@@ -924,6 +926,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
+ if (unlikely(oldfd == newfd))
+ return -EINVAL;
+
++ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
+ if (newfd >= rlimit(RLIMIT_NOFILE))
+ return -EBADF;
+
+@@ -979,6 +982,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
+ int f_dupfd(unsigned int from, struct file *file, unsigned flags)
+ {
+ int err;
++ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
+ if (from >= rlimit(RLIMIT_NOFILE))
+ return -EINVAL;
+ err = alloc_fd(from, flags);
diff --git a/fs/filesystems.c b/fs/filesystems.c
-index 96f2428..f5eeb8e 100644
+index da165f6..3671bdb 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -273,7 +273,12 @@ struct file_system_type *get_fs_type(const char *name)
cuse_class = class_create(THIS_MODULE, "cuse");
if (IS_ERR(cuse_class))
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index f4246cf..b4aed1d 100644
+index 8c23fa7..0e3aac7 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
-@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
+@@ -1241,7 +1241,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
ret = 0;
pipe_lock(pipe);
if (!IS_ERR(link))
free_page((unsigned long) link);
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
-index 753af3d..f7b021a 100644
+index 381893c..3793318 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
-@@ -1498,7 +1498,7 @@ out:
+@@ -1490,7 +1490,7 @@ out:
static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
{
kfree(s);
}
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
-index 8349a89..51a0254 100644
+index c5bc355..163a13e 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
-@@ -920,7 +920,7 @@ static struct file_system_type hugetlbfs_fs_type = {
+@@ -153,6 +153,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+ struct vm_area_struct *vma;
+ unsigned long start_addr;
+ struct hstate *h = hstate_file(file);
++ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
+
+ if (len & ~huge_page_mask(h))
+ return -EINVAL;
+@@ -165,18 +166,21 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+ return addr;
+ }
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
+ if (addr) {
+ addr = ALIGN(addr, huge_page_size(h));
+ vma = find_vma(mm, addr);
+- if (TASK_SIZE - len >= addr &&
+- (!vma || addr + len <= vma->vm_start))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
+ return addr;
+ }
+
+ if (len > mm->cached_hole_size)
+ start_addr = mm->free_area_cache;
+ else {
+- start_addr = TASK_UNMAPPED_BASE;
++ start_addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
+ }
+
+@@ -190,15 +194,15 @@ full_search:
+ * Start a new search - just in case we missed
+ * some holes.
+ */
+- if (start_addr != TASK_UNMAPPED_BASE) {
+- start_addr = TASK_UNMAPPED_BASE;
++ if (start_addr != mm->mmap_base) {
++ start_addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
+ goto full_search;
+ }
+ return -ENOMEM;
+ }
+
+- if (!vma || addr + len <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, addr, len, offset)) {
+ mm->free_area_cache = addr + len;
+ return addr;
+ }
+@@ -923,7 +927,7 @@ static struct file_system_type hugetlbfs_fs_type = {
.kill_sb = kill_litter_super,
};
static int can_do_hugetlb_shm(void)
{
diff --git a/fs/inode.c b/fs/inode.c
-index ac8d904..9f45d40 100644
+index 64999f1..8fad608 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -867,8 +867,8 @@ unsigned int get_next_ino(void)
+@@ -880,8 +880,8 @@ unsigned int get_next_ino(void)
#ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
/*
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
-index c55c745..f67ee56 100644
+index 1a543be..d803c40 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
-@@ -806,7 +806,7 @@ static int __init init_jfs_fs(void)
+@@ -855,7 +855,7 @@ static int __init init_jfs_fs(void)
jfs_inode_cachep =
kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
if (jfs_inode_cachep == NULL)
return -ENOMEM;
diff --git a/fs/libfs.c b/fs/libfs.c
-index a74cb17..37fcbe4 100644
+index 7cc37ca..b3e3eec 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
memcpy(c->data, &cookie, 4);
c->len=4;
diff --git a/fs/locks.c b/fs/locks.c
-index 7e81bfc..c3649aa 100644
+index a94e331..060bce3 100644
--- a/fs/locks.c
+++ b/fs/locks.c
-@@ -2066,16 +2066,16 @@ void locks_remove_flock(struct file *filp)
+@@ -2064,16 +2064,16 @@ void locks_remove_flock(struct file *filp)
return;
if (filp->f_op && filp->f_op->flock) {
lock_flocks();
diff --git a/fs/namei.c b/fs/namei.c
-index 091c4b7..fbcb268 100644
+index 5f4cdf3..959a013 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -265,16 +265,32 @@ int generic_permission(struct inode *inode, int mask)
+@@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask)
if (ret != -EACCES)
return ret;
* Read/write DACs are always overridable.
* Executable DACs are overridable when there is
* at least one exec bit set.
-@@ -283,14 +299,6 @@ int generic_permission(struct inode *inode, int mask)
+@@ -337,14 +353,6 @@ int generic_permission(struct inode *inode, int mask)
if (inode_capable(inode, CAP_DAC_OVERRIDE))
return 0;
return -EACCES;
}
-@@ -772,7 +780,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+@@ -826,7 +834,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
{
struct dentry *dentry = link->dentry;
int error;
BUG_ON(nd->flags & LOOKUP_RCU);
-@@ -793,6 +801,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+@@ -847,6 +855,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
if (error)
goto out_put_nd_path;
nd->last_type = LAST_BIND;
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(*p);
-@@ -1550,6 +1564,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
+@@ -1605,6 +1619,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
break;
res = walk_component(nd, path, &nd->last,
nd->last_type, LOOKUP_FOLLOW);
put_link(nd, &link, cookie);
} while (res > 0);
-@@ -1648,7 +1664,7 @@ EXPORT_SYMBOL(full_name_hash);
+@@ -1703,7 +1719,7 @@ EXPORT_SYMBOL(full_name_hash);
static inline unsigned long hash_name(const char *name, unsigned int *hashp)
{
unsigned long a, b, adata, bdata, mask, hash, len;
hash = a = 0;
len = -sizeof(unsigned long);
-@@ -1943,6 +1959,8 @@ static int path_lookupat(int dfd, const char *name,
+@@ -1993,6 +2009,8 @@ static int path_lookupat(int dfd, const char *name,
if (err)
break;
err = lookup_last(nd, &path);
put_link(nd, &link, cookie);
}
}
-@@ -1950,6 +1968,21 @@ static int path_lookupat(int dfd, const char *name,
+@@ -2000,6 +2018,21 @@ static int path_lookupat(int dfd, const char *name,
if (!err)
err = complete_walk(nd);
if (!err && nd->flags & LOOKUP_DIRECTORY) {
if (!nd->inode->i_op->lookup) {
path_put(&nd->path);
-@@ -1977,6 +2010,15 @@ static int do_path_lookup(int dfd, const char *name,
- retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
+@@ -2027,8 +2060,17 @@ static int filename_lookup(int dfd, struct filename *name,
+ retval = path_lookupat(dfd, name->name,
+ flags | LOOKUP_REVAL, nd);
- if (likely(!retval)) {
-+ if (*name != '/' && nd->path.dentry && nd->inode) {
+- if (likely(!retval))
++ if (likely(!retval)) {
++ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
+#ifdef CONFIG_GRKERNSEC
+ if (flags & LOOKUP_RCU)
+ return -ECHILD;
+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
+ return -ENOENT;
+ }
-+
- if (unlikely(!audit_dummy_context())) {
- if (nd->path.dentry && nd->inode)
- audit_inode(name, nd->path.dentry);
-@@ -2336,6 +2378,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
+ audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
++ }
+ return retval;
+ }
+
+@@ -2402,6 +2444,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
if (flag & O_NOATIME && !inode_owner_or_capable(inode))
return -EPERM;
return 0;
}
-@@ -2557,7 +2606,7 @@ looked_up:
+@@ -2623,7 +2672,7 @@ looked_up:
* cleared otherwise prior to returning.
*/
static int lookup_open(struct nameidata *nd, struct path *path,
const struct open_flags *op,
bool got_write, int *opened)
{
-@@ -2592,6 +2641,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -2658,6 +2707,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
/* Negative dentry, just create the file */
if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
umode_t mode = op->mode;
if (!IS_POSIXACL(dir->d_inode))
mode &= ~current_umask();
/*
-@@ -2613,6 +2673,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -2679,6 +2739,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
nd->flags & LOOKUP_EXCL);
if (error)
goto out_dput;
}
out_no_open:
path->dentry = dentry;
-@@ -2627,7 +2689,7 @@ out_dput:
+@@ -2693,7 +2755,7 @@ out_dput:
/*
* Handle the last step of open()
*/
-static int do_last(struct nameidata *nd, struct path *path,
+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
struct file *file, const struct open_flags *op,
- int *opened, const char *pathname)
+ int *opened, struct filename *name)
{
-@@ -2656,16 +2718,44 @@ static int do_last(struct nameidata *nd, struct path *path,
+@@ -2722,16 +2784,44 @@ static int do_last(struct nameidata *nd, struct path *path,
error = complete_walk(nd);
if (error)
return error;
+ error = -ENOENT;
+ goto out;
+ }
- audit_inode(pathname, nd->path.dentry);
+ audit_inode(name, nd->path.dentry, 0);
if (open_flag & O_CREAT) {
error = -EISDIR;
goto out;
+ error = -EACCES;
+ goto out;
+ }
- audit_inode(pathname, dir);
+ audit_inode(name, dir, 0);
goto finish_open;
}
-@@ -2714,7 +2804,7 @@ retry_lookup:
+@@ -2780,7 +2870,7 @@ retry_lookup:
*/
}
mutex_lock(&dir->d_inode->i_mutex);
mutex_unlock(&dir->d_inode->i_mutex);
if (error <= 0) {
-@@ -2738,11 +2828,28 @@ retry_lookup:
+@@ -2804,11 +2894,28 @@ retry_lookup:
goto finish_open_created;
}
+ goto exit_dput;
+ }
+
- audit_inode(pathname, path->dentry);
+ audit_inode(name, path->dentry, 0);
+ }
/*
* If atomic_open() acquired write access it is dropped now due to
-@@ -2783,6 +2890,11 @@ finish_lookup:
+@@ -2849,6 +2956,11 @@ finish_lookup:
}
}
BUG_ON(inode != path->dentry->d_inode);
return 1;
}
-@@ -2792,7 +2904,6 @@ finish_lookup:
+@@ -2858,7 +2970,6 @@ finish_lookup:
save_parent.dentry = nd->path.dentry;
save_parent.mnt = mntget(path->mnt);
nd->path.dentry = path->dentry;
}
nd->inode = inode;
/* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
-@@ -2801,6 +2912,22 @@ finish_lookup:
+@@ -2867,6 +2978,22 @@ finish_lookup:
path_put(&save_parent);
return error;
}
error = -EISDIR;
if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
goto out;
-@@ -2899,7 +3026,7 @@ static struct file *path_openat(int dfd, const char *pathname,
+@@ -2965,7 +3092,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
if (unlikely(error))
goto out;
while (unlikely(error > 0)) { /* trailing symlink */
struct path link = path;
void *cookie;
-@@ -2917,7 +3044,7 @@ static struct file *path_openat(int dfd, const char *pathname,
+@@ -2983,7 +3110,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
error = follow_link(&link, nd, &cookie);
if (unlikely(error))
break;
put_link(nd, &link, cookie);
}
out:
-@@ -3006,8 +3133,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
+@@ -3073,8 +3200,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
goto unlock;
error = -EEXIST;
/*
* Special case - lookup gave negative, but... we had foo/bar/
* From the vfs_mknod() POV we just have a negative dentry -
-@@ -3058,6 +3189,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
+@@ -3125,6 +3256,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
}
EXPORT_SYMBOL(user_path_create);
-+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
++static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, int is_dir)
+{
-+ char *tmp = getname(pathname);
++ struct filename *tmp = getname(pathname);
+ struct dentry *res;
+ if (IS_ERR(tmp))
+ return ERR_CAST(tmp);
-+ res = kern_path_create(dfd, tmp, path, is_dir);
++ res = kern_path_create(dfd, tmp->name, path, is_dir);
+ if (IS_ERR(res))
+ putname(tmp);
+ else
int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
{
int error = may_create(dir, dentry);
-@@ -3119,6 +3264,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
+@@ -3186,6 +3331,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
if (!IS_POSIXACL(path.dentry->d_inode))
mode &= ~current_umask();
error = security_path_mknod(&path, dentry, mode, dev);
if (error)
goto out;
-@@ -3135,6 +3291,8 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
+@@ -3202,6 +3358,8 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
break;
}
out:
done_path_create(&path, dentry);
return error;
}
-@@ -3181,9 +3339,18 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
+@@ -3248,9 +3406,18 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
if (!IS_POSIXACL(path.dentry->d_inode))
mode &= ~current_umask();
done_path_create(&path, dentry);
return error;
}
-@@ -3260,6 +3427,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
- char * name;
+@@ -3327,6 +3494,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
+ struct filename *name;
struct dentry *dentry;
struct nameidata nd;
+ ino_t saved_ino = 0;
+ dev_t saved_dev = 0;
- error = user_path_parent(dfd, pathname, &nd, &name);
- if (error)
-@@ -3291,10 +3460,21 @@ static long do_rmdir(int dfd, const char __user *pathname)
+ name = user_path_parent(dfd, pathname, &nd);
+ if (IS_ERR(name))
+@@ -3358,10 +3527,21 @@ static long do_rmdir(int dfd, const char __user *pathname)
error = -ENOENT;
goto exit3;
}
exit3:
dput(dentry);
exit2:
-@@ -3356,6 +3536,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+@@ -3423,6 +3603,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
struct dentry *dentry;
struct nameidata nd;
struct inode *inode = NULL;
+ ino_t saved_ino = 0;
+ dev_t saved_dev = 0;
- error = user_path_parent(dfd, pathname, &nd, &name);
- if (error)
-@@ -3381,10 +3563,22 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+ name = user_path_parent(dfd, pathname, &nd);
+ if (IS_ERR(name))
+@@ -3448,10 +3630,22 @@ static long do_unlinkat(int dfd, const char __user *pathname)
if (!inode)
goto slashes;
ihold(inode);
exit2:
dput(dentry);
}
-@@ -3456,9 +3650,17 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
+@@ -3523,9 +3717,17 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
if (IS_ERR(dentry))
goto out_putname;
+ goto out;
+ }
+
- error = security_path_symlink(&path, dentry, from);
+ error = security_path_symlink(&path, dentry, from->name);
if (!error)
- error = vfs_symlink(path.dentry->d_inode, dentry, from);
+ error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
+ if (!error)
+ gr_handle_create(dentry, path.mnt);
+out:
done_path_create(&path, dentry);
out_putname:
putname(from);
-@@ -3528,6 +3730,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+@@ -3595,6 +3797,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
{
struct dentry *new_dentry;
struct path old_path, new_path;
-+ char *to = NULL;
++ struct filename *to = NULL;
int how = 0;
int error;
-@@ -3551,7 +3754,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+@@ -3618,7 +3821,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
if (error)
return error;
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
goto out;
-@@ -3562,11 +3765,28 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+@@ -3629,11 +3832,28 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
error = may_linkat(&old_path);
if (unlikely(error))
goto out_dput;
done_path_create(&new_path, new_dentry);
out:
path_put(&old_path);
-@@ -3802,12 +4022,21 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
+@@ -3873,12 +4093,21 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
if (new_dentry == trap)
goto exit5;
exit5:
dput(new_dentry);
exit4:
-@@ -3832,6 +4061,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
+@@ -3903,6 +4132,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
{
int len;
len = PTR_ERR(link);
-@@ -3841,7 +4072,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
+@@ -3912,7 +4143,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
len = strlen(link);
if (len > (unsigned) buflen)
len = buflen;
out:
return len;
diff --git a/fs/namespace.c b/fs/namespace.c
-index 7bdf790..eb79c4b 100644
+index 2496062..e26f6d6 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1212,6 +1212,9 @@ static int do_umount(struct mount *mnt, int flags)
return retval;
}
-@@ -2244,6 +2250,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
+@@ -2244,6 +2250,16 @@ long do_mount(const char *dev_name, const char *dir_name,
MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
MS_STRICTATIME);
if (flags & MS_REMOUNT)
retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
data_page);
-@@ -2258,6 +2274,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
+@@ -2258,6 +2274,9 @@ long do_mount(const char *dev_name, const char *dir_name,
dev_name, data_page);
dput_out:
path_put(&path);
error = lock_mount(&old);
if (error)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index 9b47610..066975e 100644
+index 6fa01ae..2790820 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
-@@ -1026,16 +1026,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
+@@ -1029,16 +1029,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
}
void nfs_fattr_init(struct nfs_fattr *fattr)
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index a9269f1..5490437 100644
+index f59169e..fd7d359 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -941,7 +941,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
set_fs(oldfs);
if (host_err < 0)
goto out_nfserr;
-@@ -1581,7 +1581,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
+@@ -1587,7 +1587,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
*/
oldfs = get_fs(); set_fs(KERNEL_DS);
-- host_err = inode->i_op->readlink(path.dentry, buf, *lenp);
+- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
set_fs(oldfs);
if (host_err < 0)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
-index d438036..0ecadde 100644
+index 6fcaeb8..9d16d04 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
-@@ -274,7 +274,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
- goto out_close_fd;
+@@ -250,8 +250,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
+ fd = fanotify_event_metadata.fd;
ret = -EFAULT;
- if (copy_to_user(buf, &fanotify_event_metadata,
+- fanotify_event_metadata.event_len))
+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
-+ copy_to_user(buf, &fanotify_event_metadata,
- fanotify_event_metadata.event_len))
- goto out_kill_access_response;
++ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
+ goto out_close_fd;
+ ret = prepare_for_access_response(group, event, fd);
diff --git a/fs/notify/notification.c b/fs/notify/notification.c
index c887b13..0fdf472 100644
--- a/fs/notify/notification.c
}
}
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
-index 68f4541..89cfe6a 100644
+index 0e91ec2..f4b3fc6 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
out += snprintf(buf + out, len - out,
"%10s => State: %u Descriptor: %llu Size: %u bits "
-@@ -2116,11 +2116,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
+@@ -2121,11 +2121,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
spin_lock_init(&osb->osb_xattr_lock);
ocfs2_init_steal_slots(osb);
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
diff --git a/fs/open.c b/fs/open.c
-index e1f2cdb..3bd5f39 100644
+index 59071f5..c6229a0 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -31,6 +31,8 @@
if (!error)
error = do_truncate(path.dentry, length, 0, NULL);
-@@ -364,6 +370,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
+@@ -362,6 +368,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
if (__mnt_is_readonly(path.mnt))
res = -EROFS;
out_path_release:
path_put(&path);
out:
-@@ -390,6 +399,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
+@@ -388,6 +397,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
if (error)
goto dput_and_out;
set_fs_pwd(current->fs, &path);
dput_and_out:
-@@ -416,6 +427,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
+@@ -413,6 +424,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
goto out_putf;
error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
+
-+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
++ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
+ error = -EPERM;
+
+ if (!error)
-+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
++ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
+
if (!error)
- set_fs_pwd(current->fs, &file->f_path);
+ set_fs_pwd(current->fs, &f.file->f_path);
out_putf:
-@@ -444,7 +462,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
+@@ -441,7 +459,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
if (error)
goto dput_and_out;
error = 0;
dput_and_out:
path_put(&path);
-@@ -462,6 +486,16 @@ static int chmod_common(struct path *path, umode_t mode)
+@@ -459,6 +483,16 @@ static int chmod_common(struct path *path, umode_t mode)
if (error)
return error;
mutex_lock(&inode->i_mutex);
error = security_path_chmod(path, mode);
if (error)
goto out_unlock;
-@@ -517,6 +551,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
+@@ -514,6 +548,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
uid = make_kuid(current_user_ns(), user);
gid = make_kgid(current_user_ns(), group);
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
if (!uid_valid(uid))
-@@ -958,6 +995,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
+@@ -925,6 +962,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
} else {
fsnotify_open(f);
fd_install(fd, f);
-+ trace_do_sys_open(tmp, flags, mode);
++ trace_do_sys_open(tmp->name, flags, mode);
}
}
putname(tmp);
diff --git a/fs/pipe.c b/fs/pipe.c
-index 8d85d70..581036b 100644
+index bd3479d..fb92c4d 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -438,9 +438,9 @@ redo:
help
Various /proc files exist to monitor process memory utilization:
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index c1c207c..01ce725 100644
+index bd31e02..15cae71 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -60,6 +60,7 @@
static struct pid *
get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 1b6c84c..66b738b 100644
+index 9e28356..c485b3c 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
-@@ -110,6 +110,14 @@ struct pid_entry {
+@@ -111,6 +111,14 @@ struct pid_entry {
union proc_op op;
};
#define NOD(NAME, MODE, IOP, FOP, OP) { \
.name = (NAME), \
.len = sizeof(NAME) - 1, \
-@@ -209,6 +217,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+@@ -208,6 +216,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
if (!mm->arg_end)
goto out_mm; /* Shh! No looking before we're done */
len = mm->arg_end - mm->arg_start;
if (len > PAGE_SIZE)
-@@ -236,12 +247,28 @@ out:
+@@ -235,12 +246,28 @@ out:
return res;
}
do {
nwords += 2;
} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -255,7 +282,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
+@@ -254,7 +281,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
}
/*
* Provides a wchan file via kallsyms in a proper one-value-per-file format.
* Returns the resolved symbol. If that fails, simply return the address.
-@@ -294,7 +321,7 @@ static void unlock_trace(struct task_struct *task)
+@@ -293,7 +320,7 @@ static void unlock_trace(struct task_struct *task)
mutex_unlock(&task->signal->cred_guard_mutex);
}
#define MAX_STACK_TRACE_DEPTH 64
-@@ -486,7 +513,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
+@@ -485,7 +512,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
return count;
}
static int proc_pid_syscall(struct task_struct *task, char *buffer)
{
long nr;
-@@ -515,7 +542,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
+@@ -514,7 +541,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
/************************************************************************/
/* permission checks */
{
struct task_struct *task;
int allowed = 0;
-@@ -525,7 +552,10 @@ static int proc_fd_access_allowed(struct inode *inode)
+@@ -524,7 +551,10 @@ static int proc_fd_access_allowed(struct inode *inode)
*/
task = get_proc_task(inode);
if (task) {
put_task_struct(task);
}
return allowed;
-@@ -563,10 +593,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
+@@ -562,10 +592,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
struct task_struct *task,
int hide_pid_min)
{
return ptrace_may_access(task, PTRACE_MODE_READ);
}
-@@ -584,7 +639,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
+@@ -583,7 +638,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
put_task_struct(task);
if (!has_perms) {
/*
* Let's make getdents(), stat(), and open()
* consistent with each other. If a process
-@@ -682,6 +741,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
+@@ -681,6 +740,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
if (!task)
return -ESRCH;
mm = mm_access(task, mode);
put_task_struct(task);
-@@ -697,6 +761,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
+@@ -696,6 +760,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
file->private_data = mm;
return 0;
}
-@@ -718,6 +786,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
+@@ -717,6 +785,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
ssize_t copied;
char *page;
if (!mm)
return 0;
-@@ -822,6 +901,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
+@@ -821,6 +900,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
if (!mm)
return 0;
page = (char *)__get_free_page(GFP_TEMPORARY);
if (!page)
return -ENOMEM;
-@@ -1435,7 +1521,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -1436,7 +1522,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
int error = -EACCES;
/* Are we allowed to snoop on the tasks file descriptors? */
goto out;
error = PROC_I(inode)->op.proc_get_link(dentry, &path);
-@@ -1479,8 +1565,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
+@@ -1480,8 +1566,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
struct path path;
/* Are we allowed to snoop on the tasks file descriptors? */
error = PROC_I(inode)->op.proc_get_link(dentry, &path);
if (error)
-@@ -1545,7 +1641,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
+@@ -1531,7 +1627,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
rcu_read_lock();
cred = __task_cred(task);
inode->i_uid = cred->euid;
rcu_read_unlock();
}
security_task_to_inode(task, inode);
-@@ -1581,10 +1681,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+@@ -1567,10 +1667,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
return -ENOENT;
}
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
}
}
rcu_read_unlock();
-@@ -1622,11 +1731,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
+@@ -1608,11 +1717,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
rcu_read_unlock();
} else {
inode->i_uid = GLOBAL_ROOT_UID;
-@@ -1744,7 +1862,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
- int fd = proc_fd(inode);
-
- if (task) {
-- files = get_files_struct(task);
-+ if (!gr_acl_handle_procpidmem(task))
-+ files = get_files_struct(task);
- put_task_struct(task);
- }
- if (files) {
-@@ -2343,11 +2462,21 @@ static const struct file_operations proc_map_files_operations = {
- */
- static int proc_fd_permission(struct inode *inode, int mask)
- {
-+ struct task_struct *task;
- int rv = generic_permission(inode, mask);
-- if (rv == 0)
-- return 0;
-+
- if (task_pid(current) == proc_pid(inode))
- rv = 0;
-+
-+ task = get_proc_task(inode);
-+ if (task == NULL)
-+ return rv;
-+
-+ if (gr_acl_handle_procpidmem(task))
-+ rv = -EACCES;
-+
-+ put_task_struct(task);
-+
- return rv;
- }
-
-@@ -2457,6 +2586,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
+@@ -2065,6 +2183,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2501,6 +2633,9 @@ static int proc_pident_readdir(struct file *filp,
+@@ -2109,6 +2230,9 @@ static int proc_pident_readdir(struct file *filp,
if (!task)
goto out_no_task;
ret = 0;
i = filp->f_pos;
switch (i) {
-@@ -2771,7 +2906,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -2380,7 +2504,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
- char *s = nd_get_link(nd);
+ const char *s = nd_get_link(nd);
if (!IS_ERR(s))
- __putname(s);
+ kfree(s);
}
-@@ -3040,7 +3175,7 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2662,7 +2786,7 @@ static const struct pid_entry tgid_base_stuff[] = {
REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
#endif
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
INF("syscall", S_IRUGO, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -3065,10 +3200,10 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2687,10 +2811,10 @@ static const struct pid_entry tgid_base_stuff[] = {
#ifdef CONFIG_SECURITY
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
#endif
ONE("stack", S_IRUGO, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-@@ -3102,6 +3237,9 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2724,6 +2848,9 @@ static const struct pid_entry tgid_base_stuff[] = {
#ifdef CONFIG_HARDWALL
INF("hardwall", S_IRUGO, proc_pid_hardwall),
#endif
#ifdef CONFIG_USER_NS
REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
-@@ -3233,7 +3371,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
+@@ -2856,7 +2983,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
if (!inode)
goto out;
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -3275,7 +3420,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
+@@ -2898,7 +3032,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
if (!task)
goto out;
put_task_struct(task);
out:
return result;
-@@ -3338,6 +3487,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
+@@ -2961,6 +3099,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
static int fake_filldir(void *buf, const char *name, int namelen,
loff_t offset, u64 ino, unsigned d_type)
{
return 0;
}
-@@ -3404,7 +3555,7 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -3027,7 +3167,7 @@ static const struct pid_entry tid_base_stuff[] = {
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
INF("syscall", S_IRUGO, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -3431,10 +3582,10 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -3054,10 +3194,10 @@ static const struct pid_entry tid_base_stuff[] = {
#ifdef CONFIG_SECURITY
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
#endif
return 0;
}
module_init(proc_devices_init);
+diff --git a/fs/proc/fd.c b/fs/proc/fd.c
+index f28a875..c467953 100644
+--- a/fs/proc/fd.c
++++ b/fs/proc/fd.c
+@@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v)
+ if (!task)
+ return -ENOENT;
+
+- files = get_files_struct(task);
++ if (!gr_acl_handle_procpidmem(task))
++ files = get_files_struct(task);
+ put_task_struct(task);
+
+ if (files) {
+@@ -300,11 +301,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
+ */
+ int proc_fd_permission(struct inode *inode, int mask)
+ {
++ struct task_struct *task;
+ int rv = generic_permission(inode, mask);
+- if (rv == 0)
+- return 0;
++
+ if (task_pid(current) == proc_pid(inode))
+ rv = 0;
++
++ task = get_proc_task(inode);
++ if (task == NULL)
++ return rv;
++
++ if (gr_acl_handle_procpidmem(task))
++ rv = -EACCES;
++
++ put_task_struct(task);
++
+ return rv;
+ }
+
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
-index 7ac817b..c5c9eb0 100644
+index 3b22bbd..895b58c 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -21,11 +21,17 @@
}
static struct kmem_cache * proc_inode_cachep;
-@@ -456,7 +469,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
+@@ -455,7 +468,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
if (de->mode) {
inode->i_mode = de->mode;
inode->i_uid = de->uid;
if (de->size)
inode->i_size = de->size;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
-index e1167a1..bd24f20 100644
+index 43973b0..a20e704 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
-@@ -52,6 +52,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+@@ -54,6 +54,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task);
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task);
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index eb7cc91..7327a46 100644
+index a781bdf..6665284 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -12,11 +12,15 @@
void proc_sys_poll_notify(struct ctl_table_poll *poll)
{
-@@ -467,6 +471,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
+@@ -465,6 +469,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
err = NULL;
d_set_d_op(dentry, &proc_sys_dentry_operations);
d_add(dentry, inode);
out:
-@@ -482,18 +489,20 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
+@@ -480,18 +487,20 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
struct inode *inode = filp->f_path.dentry->d_inode;
struct ctl_table_header *head = grab_header(inode);
struct ctl_table *table = PROC_I(inode)->sysctl_entry;
goto out;
/* if that can happen at all, it should be -EINVAL, not -EISDIR */
-@@ -501,6 +510,22 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
+@@ -499,6 +508,22 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
if (!table->proc_handler)
goto out;
/* careful: calling conventions are nasty here */
res = count;
error = table->proc_handler(table, write, buf, &res, ppos);
-@@ -598,6 +623,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
+@@ -596,6 +621,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
return -ENOMEM;
} else {
d_set_d_op(child, &proc_sys_dentry_operations);
d_add(child, inode);
}
} else {
-@@ -641,6 +669,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
+@@ -639,6 +667,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
if ((*pos)++ < file->f_pos)
return 0;
if (unlikely(S_ISLNK(table->mode)))
res = proc_sys_link_fill_cache(file, dirent, filldir, head, table);
else
-@@ -758,6 +789,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
+@@ -756,6 +787,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
if (IS_ERR(head))
return PTR_ERR(head);
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-@@ -780,13 +814,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
+@@ -778,13 +812,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
.llseek = generic_file_llseek,
};
.permission = proc_sys_permission,
.setattr = proc_sys_setattr,
diff --git a/fs/proc/root.c b/fs/proc/root.c
-index 9a2d9fd..ddfc92a 100644
+index 9889a92..2613b48 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -187,7 +187,15 @@ void __init proc_root_init(void)
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 4540b8f..1b9772f 100644
+index 90c63f9..e662cfc 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -11,12 +11,19 @@
+#endif
+
+ ,hiwater_vm << (PAGE_SHIFT-10),
- (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
+ total_vm << (PAGE_SHIFT-10),
mm->locked_vm << (PAGE_SHIFT-10),
mm->pinned_vm << (PAGE_SHIFT-10),
@@ -62,7 +74,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
}
unsigned long task_vsize(struct mm_struct *mm)
-@@ -231,13 +255,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -277,13 +301,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
}
seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
start,
-@@ -246,7 +270,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -292,7 +316,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
flags & VM_WRITE ? 'w' : '-',
flags & VM_EXEC ? 'x' : '-',
flags & VM_MAYSHARE ? 's' : 'p',
MAJOR(dev), MINOR(dev), ino, &len);
/*
-@@ -255,7 +283,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -301,7 +329,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
*/
if (file) {
pad_len_spaces(m, len);
goto done;
}
-@@ -281,8 +309,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -327,8 +355,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
* Thread stack in /proc/PID/task/TID/maps or
* the main process stack.
*/
name = "[stack]";
} else {
/* Thread stack in /proc/PID/maps */
-@@ -306,6 +335,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
+@@ -352,6 +381,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
struct proc_maps_private *priv = m->private;
struct task_struct *task = priv->task;
show_map_vma(m, vma, is_pid);
if (m->count < m->size) /* vma is copied successfully */
-@@ -492,12 +528,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -538,12 +574,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
.private = &mss,
};
show_map_vma(m, vma, is_pid);
seq_printf(m,
-@@ -515,7 +562,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -561,7 +608,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
"KernelPageSize: %8lu kB\n"
"MMUPageSize: %8lu kB\n"
"Locked: %8lu kB\n",
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-@@ -1164,6 +1215,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1211,6 +1262,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
int n;
char buffer[50];
if (!mm)
return 0;
-@@ -1181,11 +1239,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1228,11 +1286,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
mpol_to_str(buffer, sizeof(buffer), pol, 0);
mpol_cond_put(pol);
} else if (mm) {
pid_t tid = vm_is_stack(priv->task, vma, is_pid);
+diff --git a/fs/pstore/ftrace.c b/fs/pstore/ftrace.c
+index 2d57e1a..43b1280 100644
+--- a/fs/pstore/ftrace.c
++++ b/fs/pstore/ftrace.c
+@@ -28,7 +28,9 @@
+ #include "internal.h"
+
+ static void notrace pstore_ftrace_call(unsigned long ip,
+- unsigned long parent_ip)
++ unsigned long parent_ip,
++ struct ftrace_ops *op,
++ struct pt_regs *regs)
+ {
+ unsigned long flags;
+ struct pstore_ftrace_record rec = {};
diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
-index d67908b..d13f6a6 100644
+index 16e8abb..2dcf914 100644
--- a/fs/quota/netlink.c
+++ b/fs/quota/netlink.c
@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
- void quota_send_warning(short type, unsigned int id, dev_t dev,
+ void quota_send_warning(struct kqid qid, dev_t dev,
const char warntype)
{
- static atomic_t seq;
struct sk_buff *skb;
void *msg_head;
int ret;
-@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
+@@ -49,7 +49,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
"VFS: Not enough memory to send quota warning.\n");
return;
}
"a_genl_family, 0, QUOTA_NL_C_WARNING);
if (!msg_head) {
printk(KERN_ERR
+diff --git a/fs/read_write.c b/fs/read_write.c
+index d065348..8e2b43d 100644
+--- a/fs/read_write.c
++++ b/fs/read_write.c
+@@ -935,6 +935,8 @@ ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, size_t count,
+ if (retval > 0) {
+ add_rchar(current, retval);
+ add_wchar(current, retval);
++ fsnotify_access(in.file);
++ fsnotify_modify(out.file);
+ }
+
+ inc_syscr(current);
diff --git a/fs/readdir.c b/fs/readdir.c
-index 39e3370..20d446d 100644
+index 5e69ef5..e5d9099 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -17,6 +17,7 @@
buf->result++;
dirent = buf->dirent;
if (!access_ok(VERIFY_WRITE, dirent,
-@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
+@@ -114,6 +120,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
buf.result = 0;
buf.dirent = dirent;
-+ buf.file = file;
++ buf.file = f.file;
- error = vfs_readdir(file, fillonedir, &buf);
+ error = vfs_readdir(f.file, fillonedir, &buf);
if (buf.result)
-@@ -141,6 +148,7 @@ struct linux_dirent {
+@@ -139,6 +146,7 @@ struct linux_dirent {
struct getdents_callback {
struct linux_dirent __user * current_dir;
struct linux_dirent __user * previous;
int count;
int error;
};
-@@ -162,6 +170,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -160,6 +168,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
buf->error = -EOVERFLOW;
return -EOVERFLOW;
}
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
+@@ -205,6 +217,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
buf.previous = NULL;
buf.count = count;
buf.error = 0;
-+ buf.file = file;
++ buf.file = f.file;
- error = vfs_readdir(file, filldir, &buf);
+ error = vfs_readdir(f.file, filldir, &buf);
if (error >= 0)
-@@ -226,6 +239,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
+@@ -223,6 +236,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
struct getdents_callback64 {
struct linux_dirent64 __user * current_dir;
struct linux_dirent64 __user * previous;
int count;
int error;
};
-@@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -238,6 +252,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
buf->error = -EINVAL; /* only used if we fail.. */
if (reclen > buf->count)
return -EINVAL;
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -287,6 +305,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
+@@ -283,6 +301,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
buf.current_dir = dirent;
buf.previous = NULL;
-+ buf.file = file;
++ buf.file = f.file;
buf.count = count;
buf.error = 0;
-@@ -295,7 +314,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
+@@ -291,7 +310,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
error = buf.error;
lastdirent = buf.previous;
if (lastdirent) {
-- typeof(lastdirent->d_off) d_off = file->f_pos;
-+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
+- typeof(lastdirent->d_off) d_off = f.file->f_pos;
++ typeof(((struct linux_dirent64 *)0)->d_off) d_off = f.file->f_pos;
if (__put_user(d_off, &lastdirent->d_off))
error = -EFAULT;
else
#define __fs_changed(gen,s) (gen != get_generation (s))
#define fs_changed(gen,s) \
diff --git a/fs/select.c b/fs/select.c
-index db14c78..3aae1bd 100644
+index 2ef72d9..f213b17 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -20,6 +20,7 @@
#include <linux/personality.h> /* for STICKY_TIMEOUTS */
#include <linux/file.h>
#include <linux/fdtable.h>
-@@ -831,6 +832,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
+@@ -826,6 +827,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
struct poll_list *walk = head;
unsigned long todo = nfds;
return -EINVAL;
diff --git a/fs/seq_file.c b/fs/seq_file.c
-index 14cf9de..adc4d5b 100644
+index 99dffab..e4fcb71 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
-@@ -9,6 +9,7 @@
- #include <linux/export.h>
+@@ -10,6 +10,7 @@
#include <linux/seq_file.h>
#include <linux/slab.h>
+ #include <linux/cred.h>
+#include <linux/sched.h>
#include <asm/uaccess.h>
#include <asm/page.h>
-@@ -56,6 +57,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
- memset(p, 0, sizeof(*p));
- mutex_init(&p->lock);
- p->op = op;
+@@ -60,6 +61,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
+ #ifdef CONFIG_USER_NS
+ p->user_ns = file->f_cred->user_ns;
+ #endif
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ p->exec_id = current->exec_id;
+#endif
/*
* Wrappers around seq_open(e.g. swaps_open) need to be
-@@ -92,7 +96,7 @@ static int traverse(struct seq_file *m, loff_t offset)
+@@ -96,7 +100,7 @@ static int traverse(struct seq_file *m, loff_t offset)
return 0;
}
if (!m->buf) {
if (!m->buf)
return -ENOMEM;
}
-@@ -132,7 +136,7 @@ static int traverse(struct seq_file *m, loff_t offset)
+@@ -136,7 +140,7 @@ static int traverse(struct seq_file *m, loff_t offset)
Eoverflow:
m->op->stop(m, p);
kfree(m->buf);
return !m->buf ? -ENOMEM : -EAGAIN;
}
-@@ -187,7 +191,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
+@@ -191,7 +195,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
/* grab buffer if we didn't have one */
if (!m->buf) {
if (!m->buf)
goto Enomem;
}
-@@ -228,7 +232,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
+@@ -232,7 +236,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
goto Fill;
m->op->stop(m, p);
kfree(m->buf);
if (!m->buf)
goto Enomem;
m->count = 0;
-@@ -577,7 +581,7 @@ static void single_stop(struct seq_file *p, void *v)
+@@ -581,7 +585,7 @@ static void single_stop(struct seq_file *p, void *v)
int single_open(struct file *file, int (*show)(struct seq_file *, void *),
void *data)
{
- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
-+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
++ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
int res = -ENOMEM;
if (op) {
diff --git a/fs/splice.c b/fs/splice.c
-index 41514dd..6564a93 100644
+index 48c7bd1..d0740e4 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
vec[i].iov_len = this_len;
spd.pages[i] = page;
spd.nr_pages++;
-@@ -849,10 +849,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -851,10 +851,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
{
while (!pipe->nrbufs) {
return 0;
if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1190,7 +1190,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+@@ -1192,7 +1192,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
* out of the pipe right after the splice_to_pipe(). So set
* PIPE_READERS appropriately.
*/
current->splice_pipe = pipe;
}
-@@ -1743,9 +1743,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1741,9 +1741,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
ret = -ERESTARTSYS;
break;
}
if (flags & SPLICE_F_NONBLOCK) {
ret = -EAGAIN;
break;
-@@ -1777,7 +1777,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1775,7 +1775,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
pipe_lock(pipe);
while (pipe->nrbufs >= pipe->buffers) {
send_sig(SIGPIPE, current, 0);
ret = -EPIPE;
break;
-@@ -1790,9 +1790,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1788,9 +1788,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
ret = -ERESTARTSYS;
break;
}
}
pipe_unlock(pipe);
-@@ -1828,14 +1828,14 @@ retry:
+@@ -1826,14 +1826,14 @@ retry:
pipe_double_lock(ipipe, opipe);
do {
break;
/*
-@@ -1932,7 +1932,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1930,7 +1930,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
pipe_double_lock(ipipe, opipe);
do {
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -1977,7 +1977,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1975,7 +1975,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
* return EAGAIN if we have the potential of some data in the
* future, otherwise just return 0
*/
ret = -EAGAIN;
pipe_unlock(ipipe);
+diff --git a/fs/stat.c b/fs/stat.c
+index eae4946..6198f55 100644
+--- a/fs/stat.c
++++ b/fs/stat.c
+@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
+ stat->gid = inode->i_gid;
+ stat->rdev = inode->i_rdev;
+ stat->size = i_size_read(inode);
+- stat->atime = inode->i_atime;
+- stat->mtime = inode->i_mtime;
++ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
++ stat->atime = inode->i_ctime;
++ stat->mtime = inode->i_ctime;
++ } else {
++ stat->atime = inode->i_atime;
++ stat->mtime = inode->i_mtime;
++ }
+ stat->ctime = inode->i_ctime;
+ stat->blksize = (1 << inode->i_blkbits);
+ stat->blocks = inode->i_blocks;
+@@ -46,8 +51,14 @@ int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+ if (retval)
+ return retval;
+
+- if (inode->i_op->getattr)
+- return inode->i_op->getattr(mnt, dentry, stat);
++ if (inode->i_op->getattr) {
++ retval = inode->i_op->getattr(mnt, dentry, stat);
++ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
++ stat->atime = stat->ctime;
++ stat->mtime = stat->ctime;
++ }
++ return retval;
++ }
+
+ generic_fillattr(inode, stat);
+ return 0;
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 2fbdff6..5530a61 100644
--- a/fs/sysfs/dir.c
}
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
-index a7ac78f..02158e1 100644
+index 3c9eb56..9dea5be 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
int i;
for (i = 0; i < sizeof(struct tag); ++i)
diff --git a/fs/utimes.c b/fs/utimes.c
-index fa4dbe4..e12d1b9 100644
+index bb0696a..552054b 100644
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -1,6 +1,7 @@
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
diff --git a/fs/xattr.c b/fs/xattr.c
-index 4d45b71..2ec08e10 100644
+index e21c119..21dfc7c 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
-@@ -316,7 +316,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
+@@ -319,7 +319,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
static long
size_t size, int flags)
{
int error;
-@@ -349,7 +349,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
- }
+@@ -355,7 +355,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
+ posix_acl_fix_xattr_from_user(kvalue, size);
}
- error = vfs_setxattr(d, kname, kvalue, size, flags);
out:
if (vvalue)
vfree(vvalue);
-@@ -370,7 +375,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
+@@ -376,7 +381,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
return error;
error = mnt_want_write(path.mnt);
if (!error) {
mnt_drop_write(path.mnt);
}
path_put(&path);
-@@ -389,7 +394,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
+@@ -395,7 +400,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
return error;
error = mnt_want_write(path.mnt);
if (!error) {
mnt_drop_write(path.mnt);
}
path_put(&path);
-@@ -401,17 +406,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
+@@ -406,16 +411,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
+ const void __user *,value, size_t, size, int, flags)
{
- int fput_needed;
- struct file *f;
+ struct fd f = fdget(fd);
- struct dentry *dentry;
int error = -EBADF;
- f = fget_light(fd, &fput_needed);
- if (!f)
+ if (!f.file)
return error;
-- dentry = f->f_path.dentry;
-- audit_inode(NULL, dentry);
-+ audit_inode(NULL, f->f_path.dentry);
- error = mnt_want_write_file(f);
+- dentry = f.file->f_path.dentry;
+- audit_inode(NULL, dentry, 0);
++ audit_inode(NULL, f.file->f_path.dentry, 0);
+ error = mnt_want_write_file(f.file);
if (!error) {
- error = setxattr(dentry, name, value, size, flags);
-+ error = setxattr(&f->f_path, name, value, size, flags);
- mnt_drop_write_file(f);
++ error = setxattr(&f.file->f_path, name, value, size, flags);
+ mnt_drop_write_file(f.file);
}
- fput_light(f, fput_needed);
+ fdput(f);
diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
-index 69d06b0..c0996e5 100644
+index 9fbea87..6b19972 100644
--- a/fs/xattr_acl.c
+++ b/fs/xattr_acl.c
-@@ -17,8 +17,8 @@
- struct posix_acl *
- posix_acl_from_xattr(const void *value, size_t size)
+@@ -76,8 +76,8 @@ struct posix_acl *
+ posix_acl_from_xattr(struct user_namespace *user_ns,
+ const void *value, size_t size)
{
- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
struct posix_acl *acl;
struct posix_acl_entry *acl_e;
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
-index 848ffa7..1f249bf 100644
+index 83d0cf3..2ef526b 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -189,7 +189,7 @@ xfs_bmap_validate_ret(
*offset = off & 0x7fffffff;
return 0;
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
-index 0e0232c..fa5c3fe 100644
+index c1df3c6..f987db6 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -126,7 +126,7 @@ xfs_find_handle(
kfree(s);
diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
new file mode 100644
-index 0000000..d38b430
+index 0000000..92247e4
--- /dev/null
+++ b/grsecurity/Kconfig
-@@ -0,0 +1,947 @@
+@@ -0,0 +1,1021 @@
+#
+# grecurity configuration
+#
+ help
+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
+ be written to or read from to modify or leak the contents of the running
-+ kernel. /dev/port will also not be allowed to be opened. If you have module
-+ support disabled, enabling this will close up four ways that are
++ kernel. /dev/port will also not be allowed to be opened and support
++ for /dev/cpu/*/msr will be removed. If you have module
++ support disabled, enabling this will close up five ways that are
+ currently used to insert malicious code into the running kernel.
++
+ Even with all these features enabled, we still highly recommend that
+ you use the RBAC system, as it is still possible for an attacker to
+ modify the running kernel through privileged I/O granted by ioperm/iopl.
++
+ If you are not using XFree86, you may be able to stop this additional
+ case by enabling the 'Disable privileged I/O' option. Though nothing
+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
+ but only to video memory, which is the only writing we allow in this
+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
+ not be allowed to mprotect it with PROT_WRITE later.
++ Enabling this feature will prevent the "cpupower" and "powertop" tools
++ from working.
++
+ It is highly recommended that you say Y here if you meet all the
+ conditions above.
+
+ IF YOU USE XFree86. If you use XFree86 and you still want to
+ protect your kernel against modification, use the RBAC system.
+
++config GRKERNSEC_JIT_HARDEN
++ bool "Harden BPF JIT against spray attacks"
++ default y if GRKERNSEC_CONFIG_AUTO
++ depends on BPF_JIT
++ help
++ If you say Y here, the native code generated by the kernel's Berkeley
++ Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
++ attacks that attempt to fit attacker-beneficial instructions in
++ 32bit immediate fields of JIT-generated native instructions. The
++ attacker will generally aim to cause an unintended instruction sequence
++ of JIT-generated native code to execute by jumping into the middle of
++ a generated instruction. This feature effectively randomizes the 32bit
++ immediate constants present in the generated code to thwart such attacks.
++
++ If you're using KERNEXEC, it's recommended that you enable this option
++ to supplement the hardening of the kernel.
++
++config GRKERNSEC_RAND_THREADSTACK
++ bool "Insert random gaps between thread stacks"
++ default y if GRKERNSEC_CONFIG_AUTO
++ depends on PAX_RANDMMAP && !PPC
++ help
++ If you say Y here, a random-sized gap will be enforced between allocated
++ thread stacks. Glibc's NPTL and other threading libraries that
++ pass MAP_STACK to the kernel for thread stack allocation are supported.
++ The implementation currently provides 8 bits of entropy for the gap.
++
++ Many distributions do not compile threaded remote services with the
++ -fstack-check argument to GCC, causing the variable-sized stack-based
++ allocator, alloca(), to not probe the stack on allocation. This
++ permits an unbounded alloca() to skip over any guard page and potentially
++ modify another thread's stack reliably. An enforced random gap
++ reduces the reliability of such an attack and increases the chance
++ that such a read/write to another thread's stack instead lands in
++ an unmapped area, causing a crash and triggering grsecurity's
++ anti-bruteforcing logic.
++
+config GRKERNSEC_PROC_MEMMAP
+ bool "Harden ASLR against information leaks and entropy reduction"
+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
+ behavior if this option is enabled in an init script on a read-only
+ filesystem. This feature is mainly intended for secure embedded systems.
+
++config GRKERNSEC_DEVICE_SIDECHANNEL
++ bool "Eliminate stat/notify-based device sidechannels"
++ default y if GRKERNSEC_CONFIG_AUTO
++ help
++ If you say Y here, timing analyses on block or character
++ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
++ will be thwarted for unprivileged users. If a process without
++ CAP_MKNOD stats such a device, the last access and last modify times
++ will match the device's create time. No access or modify events
++ will be triggered through inotify/dnotify/fanotify for such devices.
++ This feature will prevent attacks that may at a minimum
++ allow an attacker to determine the administrator's password length.
++
+config GRKERNSEC_CHROOT
+ bool "Chroot jail restrictions"
+ default y if GRKERNSEC_CONFIG_AUTO
+config GRKERNSEC_AUDIT_GROUP
+ bool "Single group for auditing"
+ help
-+ If you say Y here, the exec, chdir, and (un)mount logging features
-+ will only operate on a group you specify. This option is recommended
-+ if you only want to watch certain users instead of having a large
-+ amount of logs from the entire system. If the sysctl option is enabled,
-+ a sysctl option with name "audit_group" is created.
++ If you say Y here, the exec and chdir logging features will only operate
++ on a group you specify. This option is recommended if you only want to
++ watch certain users instead of having a large amount of logs from the
++ entire system. If the sysctl option is enabled, a sysctl option with
++ name "audit_group" is created.
+
+config GRKERNSEC_AUDIT_GID
+ int "GID for auditing"
+ default y if GRKERNSEC_CONFIG_AUTO
+ help
+ If you say Y here, non-root users will not be able to use dmesg(8)
-+ to view up to the last 4kb of messages in the kernel's log buffer.
++ to view the contents of the kernel's circular log buffer.
+ The kernel's log buffer often contains kernel addresses and other
+ identifying information useful to an attacker in fingerprinting a
+ system for a targeted exploit.
+ prevents a socket from lasting more than 45 seconds in LAST_ACK
+ state.
+
++config GRKERNSEC_NO_SIMULT_CONNECT
++ bool "Disable TCP Simultaneous Connect"
++ default y if GRKERNSEC_CONFIG_AUTO
++ depends on NET
++ help
++ If you say Y here, a feature by Willy Tarreau will be enabled that
++ removes a weakness in Linux's strict implementation of TCP that
++ allows two clients to connect to each other without either entering
++ a listening state. The weakness allows an attacker to easily prevent
++ a client from connecting to a known server provided the source port
++ for the connection is guessed correctly.
++
++ As the weakness could be used to prevent an antivirus or IPS from
++ fetching updates, or prevent an SSL gateway from fetching a CRL,
++ it should be eliminated by enabling this option. Though Linux is
++ one of few operating systems supporting simultaneous connect, it
++ has no legitimate use in practice and is rarely supported by firewalls.
++
+config GRKERNSEC_SOCKET
+ bool "Socket restrictions"
+ depends on NET
+endif
diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
new file mode 100644
-index 0000000..3d58260
+index 0000000..960766a
--- /dev/null
+++ b/grsecurity/gracl.c
-@@ -0,0 +1,4029 @@
+@@ -0,0 +1,4003 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
+extern void gr_clear_learn_entries(void);
+
-+#ifdef CONFIG_GRKERNSEC_RESLOG
-+extern void gr_log_resource(const struct task_struct *task,
-+ const int res, const unsigned long wanted, const int gt);
-+#endif
-+
+unsigned char *gr_system_salt;
+unsigned char *gr_system_sum;
+
+struct acl_subject_label *
+lookup_subject_map(const struct acl_subject_label *userp)
+{
-+ unsigned int index = shash(userp, subj_map_set.s_size);
++ unsigned int index = gr_shash(userp, subj_map_set.s_size);
+ struct subject_map *match;
+
+ match = subj_map_set.s_hash[index];
+static void
+insert_subj_map_entry(struct subject_map *subjmap)
+{
-+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
++ unsigned int index = gr_shash(subjmap->user, subj_map_set.s_size);
+ struct subject_map **curr;
+
+ subjmap->prev = NULL;
+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
+ const gid_t gid)
+{
-+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
++ unsigned int index = gr_rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
+ struct acl_role_label *match;
+ struct role_allowed_ip *ipp;
+ unsigned int x;
+found:
+ if (match == NULL) {
+ try_group:
-+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
++ index = gr_rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
+ match = acl_role_set.r_hash[index];
+
+ while (match) {
+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
+ const struct acl_role_label *role)
+{
-+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
++ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
+ struct acl_subject_label *match;
+
+ match = role->subj_hash[index];
+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
+ const struct acl_role_label *role)
+{
-+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
++ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
+ struct acl_subject_label *match;
+
+ match = role->subj_hash[index];
+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
+ const struct acl_subject_label *subj)
+{
-+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
++ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
+ struct acl_object_label *match;
+
+ match = subj->obj_hash[index];
+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
+ const struct acl_subject_label *subj)
+{
-+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
++ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
+ struct acl_object_label *match;
+
+ match = subj->obj_hash[index];
+static struct inodev_entry *
+lookup_inodev_entry(const ino_t ino, const dev_t dev)
+{
-+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
++ unsigned int index = gr_fhash(ino, dev, inodev_set.i_size);
+ struct inodev_entry *match;
+
+ match = inodev_set.i_hash[index];
+static void
+insert_inodev_entry(struct inodev_entry *entry)
+{
-+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
++ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
+ inodev_set.i_size);
+ struct inodev_entry **curr;
+
+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
+{
+ unsigned int index =
-+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
++ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
+ struct acl_role_label **curr;
+ struct acl_role_label *tmp, *tmp2;
+
+ struct acl_subject_label *subj)
+{
+ unsigned int index =
-+ fhash(obj->inode, obj->device, subj->obj_hash_size);
++ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
+ struct acl_object_label **curr;
+
+
+insert_acl_subj_label(struct acl_subject_label *obj,
+ struct acl_role_label *role)
+{
-+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
++ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
+ struct acl_subject_label **curr;
+
+ obj->prev = NULL;
+}
+
+static struct acl_subject_label *
-+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
++do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
+
+static int
+copy_user_glob(struct acl_object_label *obj)
+ return ret;
+
+ if (o_tmp->nested) {
-+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
++ int already_copied;
++
++ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
+ if (IS_ERR(o_tmp->nested))
+ return PTR_ERR(o_tmp->nested);
+
-+ /* insert into nested subject list */
-+ o_tmp->nested->next = role->hash->first;
-+ role->hash->first = o_tmp->nested;
++ /* insert into nested subject list if we haven't copied this one yet
++ to prevent duplicate entries */
++ if (!already_copied) {
++ o_tmp->nested->next = role->hash->first;
++ role->hash->first = o_tmp->nested;
++ }
+ }
+ }
+
+ break;
+
+ userp = s_tmp.prev;
-+ /* do not count nested subjects against this count, since
-+ they are not included in the hash table, but are
-+ attached to objects. We have already counted
-+ the subjects in userspace for the allocation
-+ stack
-+ */
-+ if (!(s_tmp.mode & GR_NESTED))
-+ num++;
+ }
+
+ return num;
+}
+
+static struct acl_subject_label *
-+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
++do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
+{
+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
+ unsigned int len;
+ unsigned int i_num;
+ int err;
+
++ if (already_copied != NULL)
++ *already_copied = 0;
++
+ s_tmp = lookup_subject_map(userp);
+
+ /* we've already copied this subject into the kernel, just return
+ the reference to it, and don't copy it over again
+ */
-+ if (s_tmp)
++ if (s_tmp) {
++ if (already_copied != NULL)
++ *already_copied = 1;
+ return(s_tmp);
++ }
+
+ if ((s_tmp = (struct acl_subject_label *)
+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
+
+ /* set pointer for parent subject */
+ if (s_tmp->parent_subject) {
-+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
++ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
+
+ if (IS_ERR(s_tmp2))
+ return s_tmp2;
+ sizeof (struct acl_subject_label)))
+ return -EFAULT;
+
-+ /* do not add nested subjects here, add
-+ while parsing objects
-+ */
-+
-+ if (s_pre.mode & GR_NESTED) {
-+ userp = s_pre.prev;
-+ continue;
-+ }
-+
-+ ret = do_copy_user_subj(userp, role);
++ ret = do_copy_user_subj(userp, role, NULL);
+
+ err = PTR_ERR(ret);
+ if (IS_ERR(ret))
+ const ino_t newinode, const dev_t newdevice,
+ struct acl_subject_label *subj)
+{
-+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
++ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
+ struct acl_object_label *match;
+
+ match = subj->obj_hash[index];
+ const ino_t newinode, const dev_t newdevice,
+ struct acl_role_label *role)
+{
-+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
++ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
+ struct acl_subject_label *match;
+
+ match = role->subj_hash[index];
+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
+ const ino_t newinode, const dev_t newdevice)
+{
-+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
++ unsigned int index = gr_fhash(oldinode, olddevice, inodev_set.i_size);
+ struct inodev_entry *match;
+
+ match = inodev_set.i_hash[index];
+ return 0;
+}
+
++#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
++static const unsigned long res_learn_bumps[GR_NLIMITS] = {
++ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
++ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
++ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
++ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
++ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
++ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
++ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
++ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
++ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
++ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
++ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
++ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
++ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
++ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
++ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
++ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
++};
++
+void
+gr_learn_resource(const struct task_struct *task,
+ const int res, const unsigned long wanted, const int gt)
+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
+ goto skip_reslog;
+
-+#ifdef CONFIG_GRKERNSEC_RESLOG
+ gr_log_resource(task, res, wanted, gt);
-+#endif
-+ skip_reslog:
++skip_reslog:
+
+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
+ return;
+ if (wanted >= acl->res[res].rlim_cur) {
+ unsigned long res_add;
+
-+ res_add = wanted;
-+ switch (res) {
-+ case RLIMIT_CPU:
-+ res_add += GR_RLIM_CPU_BUMP;
-+ break;
-+ case RLIMIT_FSIZE:
-+ res_add += GR_RLIM_FSIZE_BUMP;
-+ break;
-+ case RLIMIT_DATA:
-+ res_add += GR_RLIM_DATA_BUMP;
-+ break;
-+ case RLIMIT_STACK:
-+ res_add += GR_RLIM_STACK_BUMP;
-+ break;
-+ case RLIMIT_CORE:
-+ res_add += GR_RLIM_CORE_BUMP;
-+ break;
-+ case RLIMIT_RSS:
-+ res_add += GR_RLIM_RSS_BUMP;
-+ break;
-+ case RLIMIT_NPROC:
-+ res_add += GR_RLIM_NPROC_BUMP;
-+ break;
-+ case RLIMIT_NOFILE:
-+ res_add += GR_RLIM_NOFILE_BUMP;
-+ break;
-+ case RLIMIT_MEMLOCK:
-+ res_add += GR_RLIM_MEMLOCK_BUMP;
-+ break;
-+ case RLIMIT_AS:
-+ res_add += GR_RLIM_AS_BUMP;
-+ break;
-+ case RLIMIT_LOCKS:
-+ res_add += GR_RLIM_LOCKS_BUMP;
-+ break;
-+ case RLIMIT_SIGPENDING:
-+ res_add += GR_RLIM_SIGPENDING_BUMP;
-+ break;
-+ case RLIMIT_MSGQUEUE:
-+ res_add += GR_RLIM_MSGQUEUE_BUMP;
-+ break;
-+ case RLIMIT_NICE:
-+ res_add += GR_RLIM_NICE_BUMP;
-+ break;
-+ case RLIMIT_RTPRIO:
-+ res_add += GR_RLIM_RTPRIO_BUMP;
-+ break;
-+ case RLIMIT_RTTIME:
-+ res_add += GR_RLIM_RTTIME_BUMP;
-+ break;
-+ }
++ res_add = wanted + res_learn_bumps[res];
+
+ acl->res[res].rlim_cur = res_add;
+
+
+ return;
+}
++EXPORT_SYMBOL(gr_learn_resource);
++#endif
+
+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
+void
+ return (obj->mode & GR_FIND) ? 1 : 0;
+}
+
++void gr_put_exec_file(struct task_struct *task)
++{
++ struct file *filp;
++
++ write_lock(&grsec_exec_file_lock);
++ filp = task->exec_file;
++ task->exec_file = NULL;
++ write_unlock(&grsec_exec_file_lock);
++
++ if (filp)
++ fput(filp);
++
++ return;
++}
++
++
+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
+EXPORT_SYMBOL(gr_acl_is_enabled);
+#endif
-+EXPORT_SYMBOL(gr_learn_resource);
+EXPORT_SYMBOL(gr_set_kernel_label);
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_check_user_change);
+
diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
new file mode 100644
-index 0000000..d28e241
+index 0000000..a340c17
--- /dev/null
+++ b/grsecurity/gracl_fs.c
-@@ -0,0 +1,437 @@
+@@ -0,0 +1,431 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/types.h>
+ const struct dentry * parent_dentry,
+ const struct vfsmount * parent_mnt,
+ const struct dentry * old_dentry,
-+ const struct vfsmount * old_mnt, const char *to)
++ const struct vfsmount * old_mnt, const struct filename *to)
+{
+ __u32 mode;
+ __u32 needmode = GR_CREATE | GR_LINK;
+ old_mnt);
+
+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
-+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
++ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
+ return mode;
+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
-+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
++ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
+ return 0;
+ } else if (unlikely((mode & needmode) != needmode))
+ return 0;
+__u32
+gr_acl_handle_symlink(const struct dentry * new_dentry,
+ const struct dentry * parent_dentry,
-+ const struct vfsmount * parent_mnt, const char *from)
++ const struct vfsmount * parent_mnt, const struct filename *from)
+{
+ __u32 needmode = GR_WRITE | GR_CREATE;
+ __u32 mode;
+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
+
+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
-+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
++ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
+ return mode;
+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
-+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
++ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
+ return 0;
+ } else if (unlikely((mode & needmode) != needmode))
+ return 0;
+ const struct vfsmount *parent_mnt,
+ struct dentry *old_dentry,
+ struct inode *old_parent_inode,
-+ struct vfsmount *old_mnt, const char *newname)
++ struct vfsmount *old_mnt, const struct filename *newname)
+{
+ __u32 comp1, comp2;
+ int error = 0;
+
+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
-+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
++ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
+ && !(comp2 & GR_SUPPRESS)) {
-+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
++ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
+ error = -EACCES;
+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
+ error = -EACCES;
+{
+ u16 id;
+ char *rolename;
-+ struct file *exec_file;
+
+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
+ !(current->role->roletype & GR_ROLE_PERSIST))) {
+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
+ }
+
-+ write_lock(&grsec_exec_file_lock);
-+ exec_file = current->exec_file;
-+ current->exec_file = NULL;
-+ write_unlock(&grsec_exec_file_lock);
-+
-+ if (exec_file)
-+ fput(exec_file);
++ gr_put_exec_file(current);
++ return;
+}
+
+int
+}
diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
new file mode 100644
-index 0000000..9807ee2
+index 0000000..70fe0ae
--- /dev/null
+++ b/grsecurity/grsec_chroot.c
-@@ -0,0 +1,368 @@
+@@ -0,0 +1,357 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+}
+
+int
-+gr_handle_chroot_rawio(const struct inode *inode)
-+{
-+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
-+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
-+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
-+ return 1;
-+#endif
-+ return 0;
-+}
-+
-+int
+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
+}
diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
new file mode 100644
-index 0000000..213ad8b
+index 0000000..e6796b3
--- /dev/null
+++ b/grsecurity/grsec_disabled.c
-@@ -0,0 +1,437 @@
+@@ -0,0 +1,434 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+ return 0;
+}
+
-+void
-+gr_learn_resource(const struct task_struct *task,
-+ const int res, const unsigned long wanted, const int gt)
-+{
-+ return;
-+}
-+
+int
+gr_set_acls(const int type)
+{
+__u32
+gr_acl_handle_symlink(const struct dentry * new_dentry,
+ const struct dentry * parent_dentry,
-+ const struct vfsmount * parent_mnt, const char *from)
++ const struct vfsmount * parent_mnt, const struct filename *from)
+{
+ return 1;
+}
+ const struct dentry * parent_dentry,
+ const struct vfsmount * parent_mnt,
+ const struct dentry * old_dentry,
-+ const struct vfsmount * old_mnt, const char *to)
++ const struct vfsmount * old_mnt, const struct filename *to)
+{
+ return 1;
+}
+ const struct vfsmount *parent_mnt,
+ const struct dentry *old_dentry,
+ const struct inode *old_parent_inode,
-+ const struct vfsmount *old_mnt, const char *newname)
++ const struct vfsmount *old_mnt, const struct filename *newname)
+{
+ return 0;
+}
+ return dentry->d_inode->i_sb->s_dev;
+}
+
-+EXPORT_SYMBOL(gr_learn_resource);
++void gr_put_exec_file(struct task_struct *task)
++{
++ return;
++}
++
+EXPORT_SYMBOL(gr_set_kernel_label);
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_check_user_change);
+}
diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
new file mode 100644
-index 0000000..589481f
+index 0000000..6095407
--- /dev/null
+++ b/grsecurity/grsec_link.c
@@ -0,0 +1,58 @@
+int
+gr_handle_hardlink(const struct dentry *dentry,
+ const struct vfsmount *mnt,
-+ struct inode *inode, const int mode, const char *to)
++ struct inode *inode, const int mode, const struct filename *to)
+{
+#ifdef CONFIG_GRKERNSEC_LINK
+ const struct cred *cred = current_cred();
+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
+ !capable(CAP_FOWNER) && !uid_eq(cred->uid, GLOBAL_ROOT_UID)) {
-+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
++ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
+ return -EPERM;
+ }
+#endif
+}
diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
new file mode 100644
-index 0000000..a45d2e9
+index 0000000..7bd6c2b
--- /dev/null
+++ b/grsecurity/grsec_log.c
-@@ -0,0 +1,322 @@
+@@ -0,0 +1,329 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/file.h>
+#define ENABLE_PREEMPT()
+#endif
+
++#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
++#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
++
+#define BEGIN_LOCKS(x) \
+ DISABLE_PREEMPT(); \
+ rcu_read_lock(); \
+static void gr_log_end(int audit, int append_default)
+{
+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
-+
+ if (append_default) {
++ struct task_struct *task = current;
++ struct task_struct *parent = task->real_parent;
++ const struct cred *cred = __task_cred(task);
++ const struct cred *pcred = __task_cred(parent);
+ unsigned int len = strlen(buf);
-+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
++
++ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
+ }
+
+ printk("%s\n", buf);
+ switch (argtypes) {
+ case GR_TTYSNIFF:
+ task = va_arg(ap, struct task_struct *);
-+ 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);
++ gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task_pid_nr(task), gr_parent_task_fullpath0(task), task->real_parent->comm, task_pid_nr(task->real_parent));
+ break;
+ case GR_SYSCTL_HIDDEN:
+ str1 = va_arg(ap, char *);
+ break;
+ case GR_PTRACE:
+ task = va_arg(ap, struct task_struct *);
-+ 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);
++ 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_nr(task));
+ break;
+ case GR_RESOURCE:
+ task = va_arg(ap, struct task_struct *);
+ ulong1 = va_arg(ap, unsigned long);
+ str1 = va_arg(ap, char *);
+ ulong2 = va_arg(ap, unsigned long);
-+ 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);
++ gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
+ break;
+ case GR_CAP:
+ task = va_arg(ap, struct task_struct *);
+ cred = __task_cred(task);
+ pcred = __task_cred(task->real_parent);
+ str1 = va_arg(ap, char *);
-+ 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);
++ gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
+ break;
+ case GR_SIG:
+ str1 = va_arg(ap, char *);
+ cred = __task_cred(task);
+ pcred = __task_cred(task->real_parent);
+ num1 = va_arg(ap, int);
-+ 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);
++ gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath0(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
+ break;
+ case GR_CRASH1:
+ task = va_arg(ap, struct task_struct *);
+ cred = __task_cred(task);
+ pcred = __task_cred(task->real_parent);
+ ulong1 = va_arg(ap, unsigned long);
-+ 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);
++ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid), GR_GLOBAL_UID(cred->uid), ulong1);
+ break;
+ case GR_CRASH2:
+ task = va_arg(ap, struct task_struct *);
+ cred = __task_cred(task);
+ pcred = __task_cred(task->real_parent);
+ ulong1 = va_arg(ap, unsigned long);
-+ 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);
++ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid), ulong1);
+ break;
+ case GR_RWXMAP:
+ file = va_arg(ap, struct file *);
+ cred = __task_cred(task);
+ pcred = __task_cred(task->real_parent);
+
-+ 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);
++ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task_pid_nr(task), &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_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_pid_nr(task->real_parent), &task->real_parent->signal->curr_ip, tty_name(task->real_parent->signal->tty, parent_tty), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
+ }
+ break;
+ default:
+}
diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
new file mode 100644
-index 0000000..b4ac94c
+index 0000000..5c00416
--- /dev/null
+++ b/grsecurity/grsec_sig.c
-@@ -0,0 +1,209 @@
+@@ -0,0 +1,222 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+
+#ifdef CONFIG_GRKERNSEC_BRUTE
+#define GR_USER_BAN_TIME (15 * 60)
++#define GR_DAEMON_BRUTE_TIME (30 * 60)
+
+static int __get_dumpable(unsigned long mm_flags)
+{
+}
+#endif
+
-+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
++void gr_handle_brute_attach(unsigned long mm_flags)
+{
+#ifdef CONFIG_GRKERNSEC_BRUTE
++ struct task_struct *p = current;
+ kuid_t uid = GLOBAL_ROOT_UID;
++ int daemon = 0;
+
+ if (!grsec_enable_brute)
+ return;
+ rcu_read_lock();
+ read_lock(&tasklist_lock);
+ read_lock(&grsec_exec_file_lock);
-+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
++ if (p->real_parent && p->real_parent->exec_file == p->exec_file) {
++ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
+ p->real_parent->brute = 1;
-+ else {
++ daemon = 1;
++ } else {
+ const struct cred *cred = __task_cred(p), *cred2;
+ struct task_struct *tsk, *tsk2;
+
+ if (!uid_eq(uid, GLOBAL_ROOT_UID))
+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n",
+ from_kuid_munged(&init_user_ns, uid), GR_USER_BAN_TIME / 60);
++ else if (daemon)
++ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
+
+#endif
+ return;
+void gr_handle_brute_check(void)
+{
+#ifdef CONFIG_GRKERNSEC_BRUTE
-+ if (current->brute)
-+ msleep(30 * 1000);
++ struct task_struct *p = current;
++
++ if (unlikely(p->brute)) {
++ if (!grsec_enable_brute)
++ p->brute = 0;
++ else if (time_before(get_seconds(), p->brute_expires))
++ msleep(30 * 1000);
++ }
+#endif
+ return;
+}
+
+ return retval;
+}
-diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
-index bde976e..a1cc32a 100644
---- a/include/acpi/acpi_bus.h
-+++ b/include/acpi/acpi_bus.h
-@@ -136,7 +136,7 @@ struct acpi_device_ops {
- acpi_op_bind bind;
- acpi_op_unbind unbind;
- acpi_op_notify notify;
--};
-+} __no_const;
-
- #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
-
diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
index 77ff547..181834f 100644
--- a/include/asm-generic/4level-fixup.h
#define pud_none(pud) 0
#define pud_bad(pud) 0
diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
-index b7babf0..3ba8aee 100644
+index b7babf0..04ad282 100644
--- a/include/asm-generic/atomic-long.h
+++ b/include/asm-generic/atomic-long.h
@@ -22,6 +22,12 @@
static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
{
atomic64_t *v = (atomic64_t *)l;
-@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
+@@ -101,6 +161,15 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
+ return (long)atomic64_add_return(i, v);
+ }
+
++#ifdef CONFIG_PAX_REFCOUNT
++static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
++{
++ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
++
++ return (long)atomic64_add_return_unchecked(i, v);
++}
++#endif
++
+ static inline long atomic_long_sub_return(long i, atomic_long_t *l)
+ {
+ atomic64_t *v = (atomic64_t *)l;
+@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
return (long)atomic64_inc_return(v);
}
static inline long atomic_long_dec_return(atomic_long_t *l)
{
atomic64_t *v = (atomic64_t *)l;
-@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
+@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
typedef atomic_t atomic_long_t;
#define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
static inline long atomic_long_read(atomic_long_t *l)
{
-@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
+@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
return (long)atomic_read(v);
}
static inline void atomic_long_set(atomic_long_t *l, long i)
{
atomic_t *v = (atomic_t *)l;
-@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
+@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
atomic_set(v, i);
}
static inline void atomic_long_inc(atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
+@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
atomic_inc(v);
}
static inline void atomic_long_dec(atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
+@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
atomic_dec(v);
}
static inline void atomic_long_add(long i, atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
+@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
atomic_add(i, v);
}
static inline void atomic_long_sub(long i, atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
+@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
atomic_sub(i, v);
}
static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
+@@ -218,6 +356,16 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
+ return (long)atomic_add_return(i, v);
+ }
+
++#ifdef CONFIG_PAX_REFCOUNT
++static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
++{
++ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
++
++ return (long)atomic_add_return_unchecked(i, v);
++}
++
++#endif
++
+ static inline long atomic_long_sub_return(long i, atomic_long_t *l)
+ {
+ atomic_t *v = (atomic_t *)l;
+@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
return (long)atomic_inc_return(v);
}
static inline long atomic_long_dec_return(atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -255,4 +393,55 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
+@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
#endif /* BITS_PER_LONG == 64 */
+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
++ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
+}
+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
++#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
+#endif
#endif
diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
-index 9ceb03b..2efbcbd 100644
+index 9ceb03b..62b0b8f 100644
--- a/include/asm-generic/local.h
+++ b/include/asm-generic/local.h
-@@ -39,6 +39,7 @@ typedef struct
+@@ -23,24 +23,37 @@ typedef struct
+ atomic_long_t a;
+ } local_t;
+
++typedef struct {
++ atomic_long_unchecked_t a;
++} local_unchecked_t;
++
+ #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
+
+ #define local_read(l) atomic_long_read(&(l)->a)
++#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
+ #define local_set(l,i) atomic_long_set((&(l)->a),(i))
++#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
+ #define local_inc(l) atomic_long_inc(&(l)->a)
++#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
+ #define local_dec(l) atomic_long_dec(&(l)->a)
++#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
+ #define local_add(i,l) atomic_long_add((i),(&(l)->a))
++#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
+ #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
++#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
+
+ #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
+ #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
+ #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
+ #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
#define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
++#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
#define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
#define local_inc_return(l) atomic_long_inc_return(&(l)->a)
+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
#define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
++#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
#define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
+ #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
+ #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
index 725612b..9cc513a 100644
--- a/include/asm-generic/pgtable-nopmd.h
* (puds are folded into pgds so this doesn't get actually called,
* but the define is needed for a generic inline function.)
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index ff4947b..f48183f 100644
+index b36ce40..019426d 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
-@@ -530,6 +530,14 @@ static inline int pmd_trans_unstable(pmd_t *pmd)
+@@ -554,6 +554,14 @@ static inline int pmd_trans_unstable(pmd_t *pmd)
#endif
}
#endif /* !__ASSEMBLY__ */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index 4e2e1cc..12c266b 100644
+index d1ea7ce..b1ebf2a 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -218,6 +218,7 @@
*(__vermagic) /* Kernel version magic */ \
. = ALIGN(8); \
VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
-@@ -716,17 +717,18 @@
+@@ -725,17 +726,18 @@
* section in the linker script will go there too. @phdr should have
* a leading colon.
*
/**
* PERCPU_SECTION - define output section for percpu area, simple version
+diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
+index 418d270..bfd2794 100644
+--- a/include/crypto/algapi.h
++++ b/include/crypto/algapi.h
+@@ -34,7 +34,7 @@ struct crypto_type {
+ unsigned int maskclear;
+ unsigned int maskset;
+ unsigned int tfmsize;
+-};
++} __do_const;
+
+ struct crypto_instance {
+ struct crypto_alg alg;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index d6b67bb..a272c29 100644
+index 3fd8280..2b3c415 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -72,6 +72,7 @@
#include <linux/poll.h>
#include <asm/pgalloc.h>
+#include <asm/local.h>
- #include "drm.h"
+ #include <drm/drm.h>
+ #include <drm/drm_sarea.h>
- #include <linux/idr.h>
-@@ -1067,7 +1068,7 @@ struct drm_device {
+@@ -1068,7 +1069,7 @@ struct drm_device {
/** \name Usage Counters */
/*@{ */
atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
atomic_t vma_count; /**< Outstanding vma areas open */
int buf_use; /**< Buffers in use -- cannot alloc */
-@@ -1078,7 +1079,7 @@ struct drm_device {
+@@ -1079,7 +1080,7 @@ struct drm_device {
/*@{ */
unsigned long counters;
enum drm_stat_type types[15];
struct list_head filelist;
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index e01cc80..319855d 100644
+index e01cc80..6fb6f25 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
-@@ -81,7 +81,7 @@ struct drm_crtc_helper_funcs {
-
- /* disable crtc when not in use - more explicit than dpms off */
- void (*disable)(struct drm_crtc *crtc);
--};
-+} __no_const;
-
- /**
- * drm_encoder_helper_funcs - helper operations for encoders
@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
struct drm_connector *connector);
/* disable encoder when not in use - more explicit than dpms off */
/**
* struct ttm_mem_global - Global memory accounting structure.
-diff --git a/include/linux/a.out.h b/include/linux/a.out.h
-index e86dfca..40cc55f 100644
---- a/include/linux/a.out.h
-+++ b/include/linux/a.out.h
-@@ -39,6 +39,14 @@ enum machine_type {
- M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
- };
-
-+/* Constants for the N_FLAGS field */
-+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
-+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
-+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
-+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
-+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
-+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
-+
- #if !defined (N_MAGIC)
- #define N_MAGIC(exec) ((exec).a_info & 0xffff)
- #endif
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
-index 06fd4bb..1caec0d 100644
+index 22ef21c..75904ba 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
-@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
+@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
#endif
struct k_atm_aal_stats {
#undef __HANDLE_ITEM
};
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
-index 366422b..1fa7f84 100644
+index de0628e..38f42eb 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
-@@ -89,6 +89,7 @@ struct linux_binfmt {
+@@ -75,6 +75,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
int (*core_dump)(struct coredump_params *cprm);
};
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index 4a2ab7c..a2de7a8 100644
+index 1756001..ab117ec 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
-@@ -1420,7 +1420,7 @@ struct block_device_operations {
+@@ -1478,7 +1478,7 @@ struct block_device_operations {
/* this callback is with swap_lock and sometimes page table lock held */
void (*swap_slot_free_notify) (struct block_device *, unsigned long);
struct module *owner;
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
unsigned long);
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
-index 4d1a074..88f929a 100644
+index 7c2e030..b72475d 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
-@@ -162,7 +162,7 @@ struct blk_trace {
+@@ -23,7 +23,7 @@ struct blk_trace {
struct dentry *dir;
struct dentry *dropped_file;
struct dentry *msg_file;
};
extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
-index 83195fb..0b0f77d 100644
---- a/include/linux/byteorder/little_endian.h
-+++ b/include/linux/byteorder/little_endian.h
-@@ -42,51 +42,51 @@
-
- static inline __le64 __cpu_to_le64p(const __u64 *p)
- {
-- return (__force __le64)*p;
-+ return (__force const __le64)*p;
- }
- static inline __u64 __le64_to_cpup(const __le64 *p)
- {
-- return (__force __u64)*p;
-+ return (__force const __u64)*p;
- }
- static inline __le32 __cpu_to_le32p(const __u32 *p)
- {
-- return (__force __le32)*p;
-+ return (__force const __le32)*p;
- }
- static inline __u32 __le32_to_cpup(const __le32 *p)
- {
-- return (__force __u32)*p;
-+ return (__force const __u32)*p;
- }
- static inline __le16 __cpu_to_le16p(const __u16 *p)
- {
-- return (__force __le16)*p;
-+ return (__force const __le16)*p;
- }
- static inline __u16 __le16_to_cpup(const __le16 *p)
- {
-- return (__force __u16)*p;
-+ return (__force const __u16)*p;
- }
- static inline __be64 __cpu_to_be64p(const __u64 *p)
- {
-- return (__force __be64)__swab64p(p);
-+ return (__force const __be64)__swab64p(p);
- }
- static inline __u64 __be64_to_cpup(const __be64 *p)
- {
-- return __swab64p((__u64 *)p);
-+ return __swab64p((const __u64 *)p);
- }
- static inline __be32 __cpu_to_be32p(const __u32 *p)
- {
-- return (__force __be32)__swab32p(p);
-+ return (__force const __be32)__swab32p(p);
- }
- static inline __u32 __be32_to_cpup(const __be32 *p)
- {
-- return __swab32p((__u32 *)p);
-+ return __swab32p((const __u32 *)p);
- }
- static inline __be16 __cpu_to_be16p(const __u16 *p)
- {
-- return (__force __be16)__swab16p(p);
-+ return (__force const __be16)__swab16p(p);
- }
- static inline __u16 __be16_to_cpup(const __be16 *p)
- {
-- return __swab16p((__u16 *)p);
-+ return __swab16p((const __u16 *)p);
- }
- #define __cpu_to_le64s(x) do { (void)(x); } while (0)
- #define __le64_to_cpus(x) do { (void)(x); } while (0)
diff --git a/include/linux/cache.h b/include/linux/cache.h
index 4c57065..4307975 100644
--- a/include/linux/cache.h
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
diff --git a/include/linux/capability.h b/include/linux/capability.h
-index d10b7ed..0288b79 100644
+index 98503b7..cc36d18 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
-@@ -553,10 +553,15 @@ extern bool capable(int cap);
+@@ -211,8 +211,13 @@ extern bool capable(int cap);
extern bool ns_capable(struct user_namespace *ns, int cap);
extern bool nsown_capable(int cap);
extern bool inode_capable(const struct inode *inode, int cap);
+extern int is_privileged_binary(const struct dentry *dentry);
+
- #endif /* __KERNEL__ */
-
#endif /* !_LINUX_CAPABILITY_H */
+diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
+index 8609d57..86e4d79 100644
+--- a/include/linux/cdrom.h
++++ b/include/linux/cdrom.h
+@@ -87,7 +87,6 @@ struct cdrom_device_ops {
+
+ /* driver specifications */
+ const int capability; /* capability flags */
+- int n_minors; /* number of active minor devices */
+ /* handle uniform packets for scsi type devices (scsi,atapi) */
+ int (*generic_packet) (struct cdrom_device_info *,
+ struct packet_command *);
diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
index 42e55de..1cd0e66 100644
--- a/include/linux/cleancache.h
extern struct cleancache_ops
cleancache_register_ops(struct cleancache_ops *ops);
-diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
-index 77335fa..6cbe7dd 100644
---- a/include/linux/clk-provider.h
-+++ b/include/linux/clk-provider.h
-@@ -111,6 +111,7 @@ struct clk_ops {
- unsigned long);
- void (*init)(struct clk_hw *hw);
- };
-+typedef struct clk_ops __no_const clk_ops_no_const;
-
- /**
- * struct clk_init_data - holds init data that's common to all clocks and is
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
-index 934bc34..1b47129 100644
+index 412bc6c..c31666e 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -32,6 +32,21 @@
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
-index 9c02a45..89fdd73 100644
+index d3201e4..8281e63 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
-@@ -1017,9 +1017,9 @@ struct dma_pinned_list {
+@@ -1018,9 +1018,9 @@ struct dma_pinned_list {
struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
struct dma_pinned_list *pinned_list, struct page *page,
unsigned int offset, size_t len);
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 5782114..e9b1ba1 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -640,7 +640,7 @@ struct efivar_operations {
- efi_get_variable_t *get_variable;
- efi_get_next_variable_t *get_next_variable;
- efi_set_variable_t *set_variable;
--};
-+} __no_const;
-
- struct efivars {
- /*
diff --git a/include/linux/elf.h b/include/linux/elf.h
-index 999b4f5..57753b4 100644
+index 8c9048e..16a4665 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
-@@ -40,6 +40,17 @@ typedef __s64 Elf64_Sxword;
- #define PT_GNU_EH_FRAME 0x6474e550
-
- #define PT_GNU_STACK (PT_LOOS + 0x474e551)
-+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
-+
-+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
-+
-+/* Constants for the e_flags field */
-+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
-+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
-+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
-+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
-+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
-+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
-
- /*
- * Extended Numbering
-@@ -97,6 +108,8 @@ typedef __s64 Elf64_Sxword;
- #define DT_DEBUG 21
- #define DT_TEXTREL 22
- #define DT_JMPREL 23
-+#define DT_FLAGS 30
-+ #define DF_TEXTREL 0x00000004
- #define DT_ENCODING 32
- #define OLD_DT_LOOS 0x60000000
- #define DT_LOOS 0x6000000d
-@@ -243,6 +256,19 @@ typedef struct elf64_hdr {
- #define PF_W 0x2
- #define PF_X 0x1
-
-+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
-+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
-+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
-+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
-+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
-+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
-+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
-+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
-+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
-+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
-+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
-+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
-+
- typedef struct elf32_phdr{
- Elf32_Word p_type;
- Elf32_Off p_offset;
-@@ -335,6 +361,8 @@ typedef struct elf64_shdr {
- #define EI_OSABI 7
- #define EI_PAD 8
-
-+#define EI_PAX 14
-+
- #define ELFMAG0 0x7f /* EI_MAG */
- #define ELFMAG1 'E'
- #define ELFMAG2 'L'
-@@ -421,6 +449,7 @@ extern Elf32_Dyn _DYNAMIC [];
+@@ -20,6 +20,7 @@ extern Elf32_Dyn _DYNAMIC [];
#define elf_note elf32_note
#define elf_addr_t Elf32_Off
#define Elf_Half Elf32_Half
#else
-@@ -431,6 +460,7 @@ extern Elf64_Dyn _DYNAMIC [];
+@@ -30,6 +31,7 @@ extern Elf64_Dyn _DYNAMIC [];
#define elf_note elf64_note
#define elf_addr_t Elf64_Off
#define Elf_Half Elf64_Half
#endif
diff --git a/include/linux/filter.h b/include/linux/filter.h
-index 82b0135..917914d 100644
+index 24d251f..7afb83d 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
-@@ -146,6 +146,7 @@ struct compat_sock_fprog {
+@@ -20,6 +20,7 @@ struct compat_sock_fprog {
struct sk_buff;
struct sock;
struct sk_filter
{
-@@ -153,6 +154,9 @@ struct sk_filter
+@@ -27,6 +28,9 @@ struct sk_filter
unsigned int len; /* Number of filter blocks */
unsigned int (*bpf_func)(const struct sk_buff *skb,
const struct sock_filter *filter);
struct rcu_head rcu;
struct sock_filter insns[0];
};
-diff --git a/include/linux/firewire.h b/include/linux/firewire.h
-index db04ec5..f6ed627 100644
---- a/include/linux/firewire.h
-+++ b/include/linux/firewire.h
-@@ -430,7 +430,7 @@ struct fw_iso_context {
- union {
- fw_iso_callback_t sc;
- fw_iso_mc_callback_t mc;
-- } callback;
-+ } __no_const callback;
- void *callback_data;
- };
-
diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
-index 0e4e2ee..4ff4312 100644
+index 3044254..9767f41 100644
--- a/include/linux/frontswap.h
+++ b/include/linux/frontswap.h
@@ -11,7 +11,7 @@ struct frontswap_ops {
extern bool frontswap_enabled;
extern struct frontswap_ops
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index aa11047..7d046d0 100644
+index 75fe9a1..8417cac 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1802,7 +1802,8 @@ struct file_operations {
+@@ -1543,7 +1543,8 @@ struct file_operations {
int (*setlease)(struct file *, long, struct file_lock **);
long (*fallocate)(struct file *file, int mode, loff_t offset,
loff_t len);
struct inode_operations {
struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
+@@ -2667,4 +2668,14 @@ static inline void inode_has_no_xattr(struct inode *inode)
+ inode->i_flags |= S_NOSEC;
+ }
+
++static inline bool is_sidechannel_device(const struct inode *inode)
++{
++#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
++ umode_t mode = inode->i_mode;
++ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
++#else
++ return false;
++#endif
++}
++
+ #endif /* _LINUX_FS_H */
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index 003dc0f..3c4ea97 100644
--- a/include/linux/fs_struct.h
op->release = release;
INIT_LIST_HEAD(&op->pend_link);
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
-index a6dfe69..569586df 100644
+index 0fbfb46..508eb0d 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
-@@ -315,7 +315,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
+@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
+ struct inode *inode = path->dentry->d_inode;
+ __u32 mask = FS_ACCESS;
+
++ if (is_sidechannel_device(inode))
++ return;
++
+ if (S_ISDIR(inode->i_mode))
+ mask |= FS_ISDIR;
+
+@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
+ struct inode *inode = path->dentry->d_inode;
+ __u32 mask = FS_MODIFY;
+
++ if (is_sidechannel_device(inode))
++ return;
++
+ if (S_ISDIR(inode->i_mode))
+ mask |= FS_ISDIR;
+
+@@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
*/
static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
{
}
/*
-diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
-index 63d966d..cdcb717 100644
---- a/include/linux/fsnotify_backend.h
-+++ b/include/linux/fsnotify_backend.h
-@@ -105,6 +105,7 @@ struct fsnotify_ops {
- void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
- void (*free_event_priv)(struct fsnotify_event_private_data *priv);
- };
-+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
-
- /*
- * A group is a "thing" that wants to receive notification about filesystem
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
-index 642928c..e6c83a7 100644
+index 642928c..93afe6a 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
-@@ -97,7 +97,7 @@ struct trace_event_functions {
- trace_print_func raw;
- trace_print_func hex;
- trace_print_func binary;
--};
-+} __no_const;
-
- struct trace_event {
- struct hlist_node node;
@@ -266,7 +266,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
extern int trace_add_event_call(struct ftrace_event_call *call);
extern void trace_remove_event_call(struct ftrace_event_call *call);
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
-index 4883f39..26688a8 100644
+index d0a7967..63c4c47 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
-@@ -39,6 +39,12 @@ struct vm_area_struct;
+@@ -35,6 +35,12 @@ struct vm_area_struct;
#define ___GFP_OTHER_NODE 0x800000u
#define ___GFP_WRITE 0x1000000u
/*
* GFP bitmasks..
*
-@@ -93,6 +99,7 @@ struct vm_area_struct;
+@@ -89,6 +95,7 @@ struct vm_area_struct;
#define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
#define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
#define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
/*
* This may seem redundant, but it's a way of annotating false positives vs.
-@@ -100,7 +107,7 @@ struct vm_area_struct;
+@@ -96,7 +103,7 @@ struct vm_area_struct;
*/
#define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
/* This equals 0, but use constants in case they ever change */
-@@ -154,6 +161,8 @@ struct vm_area_struct;
+@@ -150,6 +157,8 @@ struct vm_area_struct;
/* 4GB DMA on some platforms */
#define GFP_DMA32 __GFP_DMA32
{
diff --git a/include/linux/gracl.h b/include/linux/gracl.h
new file mode 100644
-index 0000000..c938b1f
+index 0000000..ebe6d72
--- /dev/null
+++ b/include/linux/gracl.h
@@ -0,0 +1,319 @@
+ Shift/add algorithm with modulus of table size and an XOR*/
+
+static __inline__ unsigned int
-+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
++gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
+{
+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
+}
+
+ static __inline__ unsigned int
-+shash(const struct acl_subject_label *userp, const unsigned int sz)
++gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
+{
+ return ((const unsigned long)userp % sz);
+}
+
+static __inline__ unsigned int
-+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
++gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
+{
+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
+}
+
+static __inline__ unsigned int
-+nhash(const char *name, const __u16 len, const unsigned int sz)
++gr_nhash(const char *name, const __u16 len, const unsigned int sz)
+{
+ return full_name_hash((const unsigned char *)name, len) % sz;
+}
+#endif
diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
new file mode 100644
-index 0000000..b30e9bc
+index 0000000..be66033
--- /dev/null
+++ b/include/linux/grdefs.h
@@ -0,0 +1,140 @@
+ GR_PROTPROCFD = 0x00000400,
+ GR_PROCACCT = 0x00000800,
+ GR_RELAXPTRACE = 0x00001000,
-+ GR_NESTED = 0x00002000,
++ //GR_NESTED = 0x00002000,
+ GR_INHERITLEARN = 0x00004000,
+ GR_PROCFIND = 0x00008000,
+ GR_POVERRIDE = 0x00010000,
+#endif
diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
new file mode 100644
-index 0000000..c9292f7
+index 0000000..baa6e96
--- /dev/null
+++ b/include/linux/grinternal.h
-@@ -0,0 +1,223 @@
+@@ -0,0 +1,215 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
+
+
+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
+
-+#define DEFAULTSECARGS(task, cred, pcred) 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
-+
+#define GR_CHROOT_CAPS {{ \
+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
+#endif
diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
new file mode 100644
-index 0000000..54f4e85
+index 0000000..2bd4c8d
--- /dev/null
+++ b/include/linux/grmsg.h
-@@ -0,0 +1,110 @@
+@@ -0,0 +1,111 @@
+#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"
+#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"
+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
++#define GR_BRUTE_DAEMON_MSG "bruteforce prevention initiated for the next 30 minutes or until service restarted, stalling each fork 30 seconds. Please investigate the crash report for "
diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
new file mode 100644
-index 0000000..f9b9a21
+index 0000000..c5e5913
--- /dev/null
+++ b/include/linux/grsecurity.h
-@@ -0,0 +1,238 @@
+@@ -0,0 +1,257 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#include <linux/fs.h>
+ union {
+ const char __user *const __user *native;
+#ifdef CONFIG_COMPAT
-+ compat_uptr_t __user *compat;
++ const compat_uptr_t __user *compat;
+#endif
+ } ptr;
+};
+
-+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
++void gr_handle_brute_attach(unsigned long mm_flags);
+void gr_handle_brute_check(void);
+void gr_handle_kernel_exploit(void);
+int gr_process_user_ban(void);
+int gr_handle_hardlink(const struct dentry *dentry,
+ const struct vfsmount *mnt,
+ struct inode *inode,
-+ const int mode, const char *to);
++ const int mode, const struct filename *to);
+
+int gr_is_capable(const int cap);
+int gr_is_capable_nolog(const int cap);
+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
+
-+void gr_learn_resource(const struct task_struct *task, const int limit,
-+ const unsigned long wanted, const int gt);
+void gr_copy_label(struct task_struct *tsk);
+void gr_handle_crash(struct task_struct *task, const int sig);
+int gr_handle_signal(const struct task_struct *p, const int sig);
+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
+ const struct dentry *parent_dentry,
+ const struct vfsmount *parent_mnt,
-+ const char *from);
++ const struct filename *from);
+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
+ const struct dentry *parent_dentry,
+ const struct vfsmount *parent_mnt,
+ const struct dentry *old_dentry,
-+ const struct vfsmount *old_mnt, const char *to);
++ const struct vfsmount *old_mnt, const struct filename *to);
+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
+int gr_acl_handle_rename(struct dentry *new_dentry,
+ struct dentry *parent_dentry,
+ const struct vfsmount *parent_mnt,
+ struct dentry *old_dentry,
+ struct inode *old_parent_inode,
-+ struct vfsmount *old_mnt, const char *newname);
++ struct vfsmount *old_mnt, const struct filename *newname);
+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
+ struct dentry *old_dentry,
+ struct dentry *new_dentry,
+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
+void gr_audit_ptrace(struct task_struct *task);
+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
++void gr_put_exec_file(struct task_struct *task);
+
+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
+
++#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
++extern void gr_learn_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt);
++#else
++static inline void gr_learn_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt)
++{
++}
++#endif
++
++#ifdef CONFIG_GRKERNSEC_RESLOG
++extern void gr_log_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt);
++#else
++static inline void gr_log_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt)
++{
++}
++#endif
++
+#ifdef CONFIG_GRKERNSEC
+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
+void gr_handle_vm86(void);
+ const int protocol);
+
+#endif
-diff --git a/include/linux/hid.h b/include/linux/hid.h
-index 42970de..5db3c92 100644
---- a/include/linux/hid.h
-+++ b/include/linux/hid.h
-@@ -705,7 +705,7 @@ struct hid_ll_driver {
- unsigned int code, int value);
-
- int (*parse)(struct hid_device *hdev);
--};
-+} __no_const;
-
- #define PM_HINT_FULLON 1<<5
- #define PM_HINT_NORMAL 1<<1
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index ef788b5..ac41b7b 100644
--- a/include/linux/highmem.h
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
-index 5970266..1c48c3b 100644
+index 800de22..7a2fa46 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
-@@ -369,6 +369,7 @@ struct i2c_algorithm {
+@@ -367,6 +367,7 @@ struct i2c_algorithm {
/* To determine what the adapter supports */
u32 (*functionality) (struct i2c_adapter *);
};
struct list_head context_list; /* list of context id's
and pointers */
#endif
-diff --git a/include/linux/if_team.h b/include/linux/if_team.h
-index aa2e167..84024ce 100644
---- a/include/linux/if_team.h
-+++ b/include/linux/if_team.h
-@@ -109,6 +109,7 @@ struct team_mode_ops {
- void (*port_enabled)(struct team *team, struct team_port *port);
- void (*port_disabled)(struct team *team, struct team_port *port);
- };
-+typedef struct team_mode_ops __no_const team_mode_ops_no_const;
-
- enum team_option_type {
- TEAM_OPTION_TYPE_U32,
-@@ -181,7 +182,7 @@ struct team {
- struct list_head option_inst_list; /* list of option instances */
-
- const struct team_mode *mode;
-- struct team_mode_ops ops;
-+ team_mode_ops_no_const ops;
- long mode_priv[TEAM_MODE_PRIV_LONGS];
- };
+diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
+index aff7ad8..3942bbd 100644
+--- a/include/linux/if_pppox.h
++++ b/include/linux/if_pppox.h
+@@ -76,7 +76,7 @@ struct pppox_proto {
+ int (*ioctl)(struct socket *sock, unsigned int cmd,
+ unsigned long arg);
+ struct module *owner;
+-};
++} __do_const;
+ extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
+ extern void unregister_pppox_proto(int proto_num);
diff --git a/include/linux/init.h b/include/linux/init.h
-index 5e664f6..0a1225c 100644
+index e59041e..df0a975 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
-@@ -39,9 +39,15 @@
+@@ -39,9 +39,36 @@
* Also note, that this data cannot be "const".
*/
+#ifdef MODULE
-+#define add_latent_entropy
++#define add_init_latent_entropy
++#define add_devinit_latent_entropy
++#define add_cpuinit_latent_entropy
++#define add_meminit_latent_entropy
++#else
++#define add_init_latent_entropy __latent_entropy
++
++#ifdef CONFIG_HOTPLUG
++#define add_devinit_latent_entropy
++#else
++#define add_devinit_latent_entropy __latent_entropy
++#endif
++
++#ifdef CONFIG_HOTPLUG_CPU
++#define add_cpuinit_latent_entropy
+#else
-+#define add_latent_entropy __latent_entropy
++#define add_cpuinit_latent_entropy __latent_entropy
++#endif
++
++#ifdef CONFIG_MEMORY_HOTPLUG
++#define add_meminit_latent_entropy
++#else
++#define add_meminit_latent_entropy __latent_entropy
++#endif
+#endif
+
/* These are for everybody (although not all archs will actually
discard it in modules) */
-#define __init __section(.init.text) __cold notrace
-+#define __init __section(.init.text) __cold notrace add_latent_entropy
++#define __init __section(.init.text) __cold notrace add_init_latent_entropy
#define __initdata __section(.init.data)
- #define __initconst __section(.init.rodata)
+ #define __initconst __constsection(.init.rodata)
#define __exitdata __section(.exit.data)
-@@ -83,7 +89,7 @@
+@@ -94,7 +121,7 @@
#define __exit __section(.exit.text) __exitused __cold notrace
/* Used for HOTPLUG */
-#define __devinit __section(.devinit.text) __cold notrace
-+#define __devinit __section(.devinit.text) __cold notrace add_latent_entropy
++#define __devinit __section(.devinit.text) __cold notrace add_devinit_latent_entropy
#define __devinitdata __section(.devinit.data)
- #define __devinitconst __section(.devinit.rodata)
+ #define __devinitconst __constsection(.devinit.rodata)
#define __devexit __section(.devexit.text) __exitused __cold notrace
-@@ -91,7 +97,7 @@
- #define __devexitconst __section(.devexit.rodata)
+@@ -102,7 +129,7 @@
+ #define __devexitconst __constsection(.devexit.rodata)
/* Used for HOTPLUG_CPU */
-#define __cpuinit __section(.cpuinit.text) __cold notrace
-+#define __cpuinit __section(.cpuinit.text) __cold notrace add_latent_entropy
++#define __cpuinit __section(.cpuinit.text) __cold notrace add_cpuinit_latent_entropy
#define __cpuinitdata __section(.cpuinit.data)
- #define __cpuinitconst __section(.cpuinit.rodata)
+ #define __cpuinitconst __constsection(.cpuinit.rodata)
#define __cpuexit __section(.cpuexit.text) __exitused __cold notrace
-@@ -99,7 +105,7 @@
- #define __cpuexitconst __section(.cpuexit.rodata)
+@@ -110,7 +137,7 @@
+ #define __cpuexitconst __constsection(.cpuexit.rodata)
/* Used for MEMORY_HOTPLUG */
-#define __meminit __section(.meminit.text) __cold notrace
-+#define __meminit __section(.meminit.text) __cold notrace add_latent_entropy
++#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
#define __meminitdata __section(.meminit.data)
- #define __meminitconst __section(.meminit.rodata)
+ #define __meminitconst __constsection(.meminit.rodata)
#define __memexit __section(.memexit.text) __exitused __cold notrace
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index 89f1cb1..7986c0f 100644
+index 6d087c5..401cab8 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -143,6 +143,12 @@ extern struct task_group root_task_group;
.fs = &init_fs, \
.files = &init_files, \
.signal = &init_signals, \
-diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
-index 78e2ada..745564d 100644
---- a/include/linux/intel-iommu.h
-+++ b/include/linux/intel-iommu.h
-@@ -296,7 +296,7 @@ struct iommu_flush {
- u8 fm, u64 type);
- void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
- unsigned int size_order, u64 type);
--};
-+} __no_const;
-
- enum {
- SR_DMAR_FECTL_REG,
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index c5f856a..d29c117 100644
+index 5e4e617..eee383d 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
-@@ -433,7 +433,7 @@ enum
+@@ -435,7 +435,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
*/
/* softirq mask and active fields moved to irq_cpustat_t in
* asm/hardirq.h to get better cache usage. KAO
-@@ -441,12 +441,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
+@@ -443,12 +443,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
struct softirq_action
{
/* This macro allows us to keep printk typechecking */
static __printf(1, 2)
diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
-index c4d2fc1..5df9c19 100644
+index 4dff0c6..1ca9b72 100644
--- a/include/linux/kgdb.h
+++ b/include/linux/kgdb.h
@@ -53,7 +53,7 @@ extern int kgdb_connected;
extern struct task_struct *kgdb_usethread;
extern struct task_struct *kgdb_contthread;
-@@ -252,7 +252,7 @@ struct kgdb_arch {
- void (*disable_hw_break)(struct pt_regs *regs);
- void (*remove_all_hw_break)(void);
+@@ -255,7 +255,7 @@ struct kgdb_arch {
void (*correct_hw_break)(void);
+
+ void (*enable_nmi)(bool on);
-};
+} __do_const;
/**
* struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
-@@ -277,7 +277,7 @@ struct kgdb_io {
+@@ -280,7 +280,7 @@ struct kgdb_io {
void (*pre_exception) (void);
void (*post_exception) (void);
int is_console;
#define request_module(mod...) __request_module(true, mod)
#define request_module_nowait(mod...) __request_module(false, mod)
#define try_then_request_module(x, mod...) \
+diff --git a/include/linux/kobject.h b/include/linux/kobject.h
+index 1e57449..4fede7b 100644
+--- a/include/linux/kobject.h
++++ b/include/linux/kobject.h
+@@ -111,7 +111,7 @@ struct kobj_type {
+ struct attribute **default_attrs;
+ const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
+ const void *(*namespace)(struct kobject *kobj);
+-};
++} __do_const;
+
+ struct kobj_uevent_env {
+ char *envp[UEVENT_NUM_ENVP];
diff --git a/include/linux/kref.h b/include/linux/kref.h
index 65af688..0592677 100644
--- a/include/linux/kref.h
if (atomic_sub_and_test((int) count, &kref->refcount)) {
release(kref);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
-index b70b48b..0d7153b 100644
+index ecc5543..0e96bcc 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
-@@ -351,7 +351,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
- void vcpu_load(struct kvm_vcpu *vcpu);
+@@ -403,7 +403,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
+ int __must_check vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
struct module *module);
void kvm_exit(void);
-@@ -517,7 +517,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
+@@ -558,7 +558,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
struct kvm_guest_debug *dbg);
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
diff --git a/include/linux/libata.h b/include/linux/libata.h
-index 64f90e1..32b945b 100644
+index 1e36c63..0c5046e 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
-@@ -909,7 +909,7 @@ struct ata_port_operations {
+@@ -915,7 +915,7 @@ struct ata_port_operations {
* fields must be pointers.
*/
const struct ata_port_operations *inherits;
struct ata_port_info {
unsigned long flags;
-diff --git a/include/linux/memory.h b/include/linux/memory.h
-index ff9a9f8..c715deb 100644
---- a/include/linux/memory.h
-+++ b/include/linux/memory.h
-@@ -143,7 +143,7 @@ struct memory_accessor {
- size_t count);
- ssize_t (*write)(struct memory_accessor *, const char *buf,
- off_t offset, size_t count);
--};
-+} __no_const;
-
- /*
- * Kernel text modification mutex, used for code patching. Users of this lock
-diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
-index 1318ca6..7521340 100644
---- a/include/linux/mfd/abx500.h
-+++ b/include/linux/mfd/abx500.h
-@@ -452,6 +452,7 @@ struct abx500_ops {
- int (*event_registers_startup_state_get) (struct device *, u8 *);
- int (*startup_irq_enabled) (struct device *, unsigned int);
- };
-+typedef struct abx500_ops __no_const abx500_ops_no_const;
-
- int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
- void abx500_remove_ops(struct device *dev);
-diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
-index 9b07725..3d55001 100644
---- a/include/linux/mfd/abx500/ux500_chargalg.h
-+++ b/include/linux/mfd/abx500/ux500_chargalg.h
-@@ -19,7 +19,7 @@ struct ux500_charger_ops {
- int (*enable) (struct ux500_charger *, int, int, int);
- int (*kick_wd) (struct ux500_charger *);
- int (*update_curr) (struct ux500_charger *, int);
--};
-+} __no_const;
+diff --git a/include/linux/list.h b/include/linux/list.h
+index cc6d2aa..71febca 100644
+--- a/include/linux/list.h
++++ b/include/linux/list.h
+@@ -112,6 +112,9 @@ extern void __list_del_entry(struct list_head *entry);
+ extern void list_del(struct list_head *entry);
+ #endif
++extern void pax_list_add_tail(struct list_head *new, struct list_head *head);
++extern void pax_list_del(struct list_head *entry);
++
/**
- * struct ux500_charger - power supply ux500 charger sub class
+ * list_replace - replace old entry by new one
+ * @old : the element to be replaced
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 311be90..5f1638c 100644
+index 280dae5..39046ec 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -116,7 +116,14 @@ extern unsigned int kobjsize(const void *objp);
-
- #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
- #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
+@@ -101,6 +101,11 @@ extern unsigned int kobjsize(const void *objp);
+ #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
+ #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
+ #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
+
+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
-+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
-+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
-+#else
- #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
++#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
+#endif
+
- #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
- #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
+ #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
-@@ -1038,34 +1045,6 @@ int set_page_dirty(struct page *page);
+ #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
+@@ -1039,34 +1044,6 @@ int set_page_dirty(struct page *page);
int set_page_dirty_lock(struct page *page);
int clear_page_dirty_for_io(struct page *page);
extern pid_t
vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
-@@ -1164,6 +1143,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
+@@ -1166,6 +1143,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
}
#endif
int vma_wants_writenotify(struct vm_area_struct *vma);
extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1182,8 +1170,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
+@@ -1184,8 +1170,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
{
return 0;
}
#endif
#ifdef __PAGETABLE_PMD_FOLDED
-@@ -1192,8 +1187,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
+@@ -1194,8 +1187,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
{
return 0;
}
#endif
int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
-@@ -1211,11 +1213,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
+@@ -1213,11 +1213,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
NULL: pud_offset(pgd, address);
}
#endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
#if USE_SPLIT_PTLOCKS
-@@ -1426,6 +1440,7 @@ extern unsigned long do_mmap_pgoff(struct file *, unsigned long,
+@@ -1447,6 +1459,7 @@ extern unsigned long do_mmap_pgoff(struct file *, unsigned long,
unsigned long, unsigned long,
unsigned long, unsigned long);
extern int do_munmap(struct mm_struct *, unsigned long, size_t);
/* These take the mm semaphore themselves */
extern unsigned long vm_brk(unsigned long, unsigned long);
-@@ -1489,6 +1504,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
+@@ -1510,6 +1523,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
struct vm_area_struct **pprev);
/* Look up the first VMA which intersects the interval start_addr..end_addr-1,
NULL if none. Assume start_addr < end_addr. */
static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1517,15 +1536,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
+@@ -1538,15 +1555,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
return vma;
}
struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
unsigned long pfn, unsigned long size, pgprot_t);
-@@ -1631,7 +1641,7 @@ extern int unpoison_memory(unsigned long pfn);
+@@ -1652,7 +1660,7 @@ extern int unpoison_memory(unsigned long pfn);
extern int sysctl_memory_failure_early_kill;
extern int sysctl_memory_failure_recovery;
extern void shake_page(struct page *p, int access);
extern int soft_offline_page(struct page *page, int flags);
extern void dump_page(struct page *page);
-@@ -1662,5 +1672,11 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
+@@ -1683,5 +1691,11 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
static inline bool page_is_guard(struct page *page) { return false; }
#endif /* CONFIG_DEBUG_PAGEALLOC */
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index bf78672..debc693 100644
+index 31f8a3a..499f1db 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -279,6 +279,8 @@ struct vm_area_struct {
+@@ -275,6 +275,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
#endif
};
struct core_thread {
-@@ -353,7 +355,7 @@ struct mm_struct {
+@@ -348,7 +350,7 @@ struct mm_struct {
unsigned long def_flags;
unsigned long nr_ptes; /* Page table pages */
unsigned long start_code, end_code, start_data, end_data;
unsigned long arg_start, arg_end, env_start, env_end;
unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
-@@ -405,6 +407,24 @@ struct mm_struct {
+@@ -399,6 +401,24 @@ struct mm_struct {
struct cpumask cpumask_allocation;
#endif
struct uprobes_state uprobes_state;
};
static inline void mm_init_cpumask(struct mm_struct *mm)
-diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
-index 1d1b1e1..2a13c78 100644
---- a/include/linux/mmu_notifier.h
-+++ b/include/linux/mmu_notifier.h
-@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
- */
- #define ptep_clear_flush_notify(__vma, __address, __ptep) \
- ({ \
-- pte_t __pte; \
-+ pte_t ___pte; \
- struct vm_area_struct *___vma = __vma; \
- unsigned long ___address = __address; \
-- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
-+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
- mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
-- __pte; \
-+ ___pte; \
- })
+diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
+index c5d5278..f0b68c8 100644
+--- a/include/linux/mmiotrace.h
++++ b/include/linux/mmiotrace.h
+@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
+ /* Called from ioremap.c */
+ extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
+ void __iomem *addr);
+-extern void mmiotrace_iounmap(volatile void __iomem *addr);
++extern void mmiotrace_iounmap(const volatile void __iomem *addr);
+
+ /* For anyone to insert markers. Remember trailing newline. */
+ extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
+@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
+ {
+ }
+
+-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
++static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
+ {
+ }
- #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index 2daa54f..bfdf2f5 100644
+index a23923b..073fee4 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
-@@ -414,7 +414,7 @@ struct zone {
+@@ -421,7 +421,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
/* Zone statistics */
/*
* The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
-index 6955045..ebdb7cd 100644
+index fed3def..7cc3f93 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -12,7 +12,7 @@
#define HID_GROUP_ANY 0x0000
diff --git a/include/linux/module.h b/include/linux/module.h
-index fbcafe2..e5d9587 100644
+index 1375ee3..d631af0 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
-@@ -17,6 +17,7 @@
+@@ -17,9 +17,11 @@
#include <linux/moduleparam.h>
#include <linux/tracepoint.h>
#include <linux/export.h>
#include <linux/percpu.h>
#include <asm/module.h>
-@@ -273,19 +274,16 @@ struct module
++#include <asm/pgtable.h>
+
+ /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
+ #define MODULE_SIG_STRING "~Module signature appended~\n"
+@@ -281,19 +283,16 @@ struct module
int (*init)(void);
/* If this is non-NULL, vfree after init() returns */
/* Arch-specific module values */
struct mod_arch_specific arch;
-@@ -341,6 +339,10 @@ struct module
+@@ -349,6 +348,10 @@ struct module
#ifdef CONFIG_EVENT_TRACING
struct ftrace_event_call **trace_events;
unsigned int num_trace_events;
#endif
#ifdef CONFIG_FTRACE_MCOUNT_RECORD
unsigned int num_ftrace_callsites;
-@@ -388,16 +390,46 @@ bool is_module_address(unsigned long addr);
+@@ -396,16 +399,46 @@ bool is_module_address(unsigned long addr);
bool is_module_percpu_address(unsigned long addr);
bool is_module_text_address(unsigned long addr);
/* Search for module by name: must hold module_mutex. */
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
-index b2be02e..72d2f78 100644
+index 560ca53..5ee8d73 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -23,11 +23,23 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
+#define module_free_exec(x, y) module_free((x), (y))
+#endif
+
- /* Apply the given relocation to the (simplified) ELF. Return -error
- or 0. */
- int apply_relocate(Elf_Shdr *sechdrs,
+ /*
+ * Apply the given relocation to the (simplified) ELF. Return -error
+ * or 0.
+@@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
+ unsigned int relsec,
+ struct module *me)
+ {
++#ifdef CONFIG_MODULES
+ printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
++#endif
+ return -ENOEXEC;
+ }
+ #endif
+@@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
+ unsigned int relsec,
+ struct module *me)
+ {
++#ifdef CONFIG_MODULES
+ printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
++#endif
+ return -ENOEXEC;
+ }
+ #endif
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index d6a5806..7c13347 100644
--- a/include/linux/moduleparam.h
return nd->saved_names[nd->depth];
}
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 59dc05f3..c905a34 100644
+index a848ffc..3bbbaee 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1027,6 +1027,7 @@ struct net_device_ops {
+@@ -999,6 +999,7 @@ struct net_device_ops {
struct net_device *dev,
int idx);
};
/*
* The DEVICE structure.
-@@ -1087,7 +1088,7 @@ struct net_device {
+@@ -1059,7 +1060,7 @@ struct net_device {
int iflink;
struct net_device_stats stats;
* Do not use this in drivers.
*/
+diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
+index 7958e84..ed74d7a 100644
+--- a/include/linux/netfilter/ipset/ip_set.h
++++ b/include/linux/netfilter/ipset/ip_set.h
+@@ -98,7 +98,7 @@ struct ip_set_type_variant {
+ /* Return true if "b" set is the same as "a"
+ * according to the create set parameters */
+ bool (*same_set)(const struct ip_set *a, const struct ip_set *b);
+-};
++} __do_const;
+
+ /* The core set type structure */
+ struct ip_set_type {
+diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
+index 4966dde..7d8ce06 100644
+--- a/include/linux/netfilter/nfnetlink.h
++++ b/include/linux/netfilter/nfnetlink.h
+@@ -16,7 +16,7 @@ struct nfnl_callback {
+ const struct nlattr * const cda[]);
+ const struct nla_policy *policy; /* netlink attribute policy */
+ const u_int16_t attr_count; /* number of nlattr's */
+-};
++} __do_const;
+
+ struct nfnetlink_subsystem {
+ const char *name;
diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
new file mode 100644
index 0000000..33f4af8
+};
+
+#endif
-diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
-index c65a18a..0c05f3a 100644
---- a/include/linux/of_pdt.h
-+++ b/include/linux/of_pdt.h
-@@ -32,7 +32,7 @@ struct of_pdt_ops {
-
- /* return 0 on success; fill in 'len' with number of bytes in path */
- int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
+diff --git a/include/linux/notifier.h b/include/linux/notifier.h
+index d65746e..62e72c2 100644
+--- a/include/linux/notifier.h
++++ b/include/linux/notifier.h
+@@ -51,7 +51,8 @@ struct notifier_block {
+ int (*notifier_call)(struct notifier_block *, unsigned long, void *);
+ struct notifier_block __rcu *next;
+ int priority;
-};
-+} __no_const;
-
- extern void *prom_early_alloc(unsigned long size);
++} __do_const;
++typedef struct notifier_block __no_const notifier_block_no_const;
+ struct atomic_notifier_head {
+ spinlock_t lock;
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index a4c5624..79d6d88 100644
--- a/include/linux/oprofile.h
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index bdb4161..f373d41 100644
+index 6bfb2faa..1204767 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
-@@ -882,8 +882,8 @@ struct perf_event {
+@@ -328,8 +328,8 @@ struct perf_event {
enum perf_event_active_state state;
unsigned int attach_state;
/*
* These are the total time in nanoseconds that the event
-@@ -934,8 +934,8 @@ struct perf_event {
+@@ -380,8 +380,8 @@ struct perf_event {
* These accumulate total time (in nanoseconds) that children
* events have been enabled and running, respectively.
*/
/*
* Protect attach/detach and child_list:
-diff --git a/include/linux/personality.h b/include/linux/personality.h
-index 8fc7dd1a..c19d89e 100644
---- a/include/linux/personality.h
-+++ b/include/linux/personality.h
-@@ -44,6 +44,7 @@ enum {
- #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
- ADDR_NO_RANDOMIZE | \
- ADDR_COMPAT_LAYOUT | \
-+ ADDR_LIMIT_3GB | \
- MMAP_PAGE_ZERO)
-
- /*
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index ad1a427..6419649 100644
--- a/include/linux/pipe_fs_i.h
unsigned int r_counter;
unsigned int w_counter;
struct page *tmp_page;
+diff --git a/include/linux/platform_data/usb-ehci-s5p.h b/include/linux/platform_data/usb-ehci-s5p.h
+index 5f28cae..3d23723 100644
+--- a/include/linux/platform_data/usb-ehci-s5p.h
++++ b/include/linux/platform_data/usb-ehci-s5p.h
+@@ -14,7 +14,7 @@
+ struct s5p_ehci_platdata {
+ int (*phy_init)(struct platform_device *pdev, int type);
+ int (*phy_exit)(struct platform_device *pdev, int type);
+-};
++} __no_const;
+
+ extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
+
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index f271860..6b3bec5 100644
--- a/include/linux/pm_runtime.h
/********** include/linux/timer.h **********/
/*
-diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index 5a710b9..0b0dab9 100644
---- a/include/linux/preempt.h
-+++ b/include/linux/preempt.h
-@@ -126,7 +126,7 @@ struct preempt_ops {
- void (*sched_in)(struct preempt_notifier *notifier, int cpu);
- void (*sched_out)(struct preempt_notifier *notifier,
- struct task_struct *next);
+diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
+index 4a496eb..d9c5659 100644
+--- a/include/linux/power/smartreflex.h
++++ b/include/linux/power/smartreflex.h
+@@ -238,7 +238,7 @@ struct omap_sr_class_data {
+ int (*notify)(struct omap_sr *sr, u32 status);
+ u8 notify_flags;
+ u8 class_type;
-};
-+} __no_const;
++} __do_const;
/**
- * preempt_notifier - key for installing preemption notifiers
+ * struct omap_sr_nvalue_table - Smartreflex n-target value info
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 9afc01e..92c32e8 100644
--- a/include/linux/printk.h
void log_buf_kexec_setup(void);
void __init setup_log_buf(int early);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
-index 3fd2e87..d93a721 100644
+index 3fd2e87..75db910 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -155,6 +155,18 @@ static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode,
static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
umode_t mode, struct proc_dir_entry *base,
read_proc_t *read_proc, void * data)
-@@ -258,7 +270,7 @@ union proc_op {
- int (*proc_show)(struct seq_file *m,
- struct pid_namespace *ns, struct pid *pid,
- struct task_struct *task);
--};
-+} __no_const;
-
- struct ctl_table_header;
- struct ctl_table;
diff --git a/include/linux/random.h b/include/linux/random.h
-index ac621ce..c1215f3 100644
+index 6330ed4..419c6c3 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
-@@ -53,6 +53,10 @@ extern void add_input_randomness(unsigned int type, unsigned int code,
- unsigned int value);
- extern void add_interrupt_randomness(int irq, int irq_flags);
-
-+#ifdef CONFIG_PAX_LATENT_ENTROPY
-+extern void transfer_latent_entropy(void);
-+#endif
-+
- extern void get_random_bytes(void *buf, int nbytes);
- extern void get_random_bytes_arch(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
-@@ -69,12 +73,17 @@ void srandom32(u32 seed);
+@@ -30,12 +30,17 @@ void srandom32(u32 seed);
u32 prandom32(struct rnd_state *);
/**
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
-index e0879a7..a12f962 100644
+index 23b3630..e1bc12b 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
-@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
+@@ -18,9 +18,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
* Architecture-specific implementations of sys_reboot commands.
*/
extern void machine_shutdown(void);
struct pt_regs;
-@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
+@@ -31,9 +31,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
*/
extern void kernel_restart_prepare(char *cmd);
extern int C_A_D; /* for sysctl */
void ctrl_alt_del(void);
-@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
+@@ -47,7 +47,7 @@ extern int orderly_poweroff(bool force);
* Emergency restart, callable from an interrupt handler.
*/
+extern void emergency_restart(void) __noreturn;
#include <asm/emergency-restart.h>
- #endif
+ #endif /* _LINUX_REBOOT_H */
+diff --git a/include/linux/regset.h b/include/linux/regset.h
+index 8e0c9fe..fdb64bc 100644
+--- a/include/linux/regset.h
++++ b/include/linux/regset.h
+@@ -161,7 +161,7 @@ struct user_regset {
+ unsigned int align;
+ unsigned int bias;
+ unsigned int core_note_type;
+-};
++} __do_const;
+
+ /**
+ * struct user_regset_view - available regsets
diff --git a/include/linux/relay.h b/include/linux/relay.h
index 91cacc3..b55ff74 100644
--- a/include/linux/relay.h
/*
* CONFIG_RELAY kernel API, kernel/relay.c
-diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
-index 6fdf027..ff72610 100644
---- a/include/linux/rfkill.h
-+++ b/include/linux/rfkill.h
-@@ -147,6 +147,7 @@ struct rfkill_ops {
- void (*query)(struct rfkill *rfkill, void *data);
- int (*set_block)(void *data, bool blocked);
- };
-+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
-
- #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
- /**
diff --git a/include/linux/rio.h b/include/linux/rio.h
-index a90ebad..fd87b5d 100644
+index a3e7842..d973ca6 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
-@@ -321,7 +321,7 @@ struct rio_ops {
- int mbox, void *buffer, size_t len);
- int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
- void *(*get_inb_message)(struct rio_mport *mport, int mbox);
+@@ -339,7 +339,7 @@ struct rio_ops {
+ int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
+ u64 rstart, u32 size, u32 flags);
+ void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
-};
+} __no_const;
#define RIO_RESOURCE_MEM 0x00000100
#define RIO_RESOURCE_DOORBELL 0x00000200
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
-index 3fce545..b4fed6e 100644
+index bfe1f47..6a33ee3 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
-@@ -119,9 +119,9 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
+@@ -134,8 +134,8 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
void anon_vma_init(void); /* create anon_vma_cachep */
int anon_vma_prepare(struct vm_area_struct *);
void unlink_anon_vmas(struct vm_area_struct *);
-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
-+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
- void anon_vma_moveto_tail(struct vm_area_struct *);
-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
++int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
static inline void anon_vma_merge(struct vm_area_struct *vma,
struct vm_area_struct *next)
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 23bddac..5976055 100644
+index 3e63925..6c93b17 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -101,6 +101,7 @@ struct bio_list;
+@@ -61,6 +61,7 @@ struct bio_list;
struct fs_struct;
struct perf_event_context;
struct blk_plug;
/*
* List of flags we want to share for kernel threads,
-@@ -384,10 +385,13 @@ struct user_namespace;
+@@ -344,10 +345,23 @@ struct user_namespace;
#define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
extern int sysctl_max_map_count;
#include <linux/aio.h>
#ifdef CONFIG_MMU
-+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
-+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
++
++#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
++extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
++#else
++static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
++{
++ return 0;
++}
++#endif
++
++extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
++extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
extern void arch_pick_mmap_layout(struct mm_struct *mm);
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-@@ -651,6 +655,17 @@ struct signal_struct {
+@@ -614,6 +628,17 @@ struct signal_struct {
#ifdef CONFIG_TASKSTATS
struct taskstats *stats;
#endif
#ifdef CONFIG_AUDIT
unsigned audit_tty;
struct tty_audit_buf *tty_audit_buf;
-@@ -734,6 +749,11 @@ struct user_struct {
+@@ -691,6 +716,11 @@ struct user_struct {
struct key *session_keyring; /* UID's default session keyring */
#endif
/* Hash table maintenance information */
struct hlist_node uidhash_node;
kuid_t uid;
-@@ -1356,8 +1376,8 @@ struct task_struct {
+@@ -1312,8 +1342,8 @@ struct task_struct {
struct list_head thread_group;
struct completion *vfork_done; /* for vfork() */
cputime_t utime, stime, utimescaled, stimescaled;
cputime_t gtime;
-@@ -1373,11 +1393,6 @@ struct task_struct {
+@@ -1329,11 +1359,6 @@ struct task_struct {
struct task_cputime cputime_expires;
struct list_head cpu_timers[3];
char comm[TASK_COMM_LEN]; /* executable name excluding path
- access with [gs]et_task_comm (which lock
it with task_lock())
-@@ -1394,6 +1409,10 @@ struct task_struct {
+@@ -1350,6 +1375,10 @@ struct task_struct {
#endif
/* CPU-specific state of this task */
struct thread_struct thread;
/* filesystem information */
struct fs_struct *fs;
/* open file information */
-@@ -1467,6 +1486,10 @@ struct task_struct {
+@@ -1423,6 +1452,10 @@ struct task_struct {
gfp_t lockdep_reclaim_gfp;
#endif
/* journalling filesystem info */
void *journal_info;
-@@ -1505,6 +1528,10 @@ struct task_struct {
+@@ -1461,6 +1494,10 @@ struct task_struct {
/* cg_list protected by css_set_lock and tsk->alloc_lock */
struct list_head cg_list;
#endif
#ifdef CONFIG_FUTEX
struct robust_list_head __user *robust_list;
#ifdef CONFIG_COMPAT
-@@ -1589,8 +1616,74 @@ struct task_struct {
+@@ -1548,8 +1585,74 @@ struct task_struct {
#ifdef CONFIG_UPROBES
struct uprobe_task *utask;
#endif
+ struct acl_subject_label *acl;
+ struct acl_role_label *role;
+ struct file *exec_file;
++ unsigned long brute_expires;
+ u16 acl_role_id;
+ /* is this the task that authenticated to the special role */
+ u8 acl_sp_role;
+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
+extern void pax_report_refcount_overflow(struct pt_regs *regs);
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
+
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-@@ -2125,7 +2218,9 @@ void yield(void);
+@@ -2092,7 +2195,9 @@ void yield(void);
extern struct exec_domain default_exec_domain;
union thread_union {
unsigned long stack[THREAD_SIZE/sizeof(long)];
};
-@@ -2158,6 +2253,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -2125,6 +2230,7 @@ extern struct pid_namespace init_pid_ns;
*/
extern struct task_struct *find_task_by_vpid(pid_t nr);
extern struct task_struct *find_task_by_pid_ns(pid_t nr,
struct pid_namespace *ns);
-@@ -2314,7 +2410,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
+@@ -2281,7 +2387,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
extern void exit_itimers(struct signal_struct *);
extern void flush_itimer_signals(void);
extern void daemonize(const char *, ...);
extern int allow_signal(int);
-@@ -2515,9 +2611,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
+@@ -2485,9 +2591,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
#endif
return (obj >= stack) && (obj < (stack + THREAD_SIZE));
}
-diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
-index 899fbb4..1cb4138 100644
---- a/include/linux/screen_info.h
-+++ b/include/linux/screen_info.h
-@@ -43,7 +43,8 @@ struct screen_info {
- __u16 pages; /* 0x32 */
- __u16 vesa_attributes; /* 0x34 */
- __u32 capabilities; /* 0x36 */
-- __u8 _reserved[6]; /* 0x3a */
-+ __u16 vesapm_size; /* 0x3a */
-+ __u8 _reserved[4]; /* 0x3c */
- } __attribute__((packed));
-
- #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
diff --git a/include/linux/security.h b/include/linux/security.h
-index d143b8e..9f27b95 100644
+index 05e88bd..5cda002 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -26,6 +26,7 @@
struct linux_binprm;
struct cred;
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
-index 83c44ee..e8a9eba 100644
+index 68a04a3..866e6a1 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
-@@ -25,6 +25,9 @@ struct seq_file {
+@@ -26,6 +26,9 @@ struct seq_file {
struct mutex lock;
const struct seq_operations *op;
int poll_event;
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ u64 exec_id;
+#endif
- void *private;
- };
-
-@@ -34,6 +37,7 @@ struct seq_operations {
+ #ifdef CONFIG_USER_NS
+ struct user_namespace *user_ns;
+ #endif
+@@ -38,6 +41,7 @@ struct seq_operations {
void * (*next) (struct seq_file *m, void *v, loff_t *pos);
int (*show) (struct seq_file *m, void *v);
};
#define SEQ_SKIP 1
diff --git a/include/linux/shm.h b/include/linux/shm.h
-index edd0868..f98feee 100644
+index bcf8a6a..4d0af77 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
-@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
+@@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
/* The task created the shm object. NULL if the task is dead. */
struct task_struct *shm_creator;
/* shm_mode upper byte flags */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index f3165d2..2cb3cb7 100644
+index 6a2c34e..a1f320f 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -577,7 +577,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
}
/**
-@@ -1623,7 +1623,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
+@@ -1626,7 +1626,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD
#endif
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-@@ -2201,7 +2201,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
+@@ -2204,7 +2204,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
int noblock, int *err);
extern unsigned int datagram_poll(struct file *file, struct socket *sock,
struct poll_table_struct *wait);
int size);
extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
diff --git a/include/linux/slab.h b/include/linux/slab.h
-index 0dd2dfa..2b8677c 100644
+index 83d1a14..e23d723 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -11,12 +11,20 @@
/*
* Common fields provided in kmem_cache by all slab allocators
+@@ -110,7 +121,7 @@ struct kmem_cache {
+ unsigned int align; /* Alignment as calculated */
+ unsigned long flags; /* Active flags on the slab */
+ const char *name; /* Slab name for sysfs */
+- int refcount; /* Use counter */
++ atomic_t refcount; /* Use counter */
+ void (*ctor)(void *); /* Called on object slot creation */
+ struct list_head list; /* List of all slab caches on the system */
+ };
@@ -185,6 +196,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
void kfree(const void *);
void kzfree(const void *);
size_t ksize(const void *);
-+const char *check_heap_object(const void *ptr, unsigned long n, bool to);
++const char *check_heap_object(const void *ptr, unsigned long n);
+bool is_usercopy_object(const void *ptr);
/*
* Allocator specific definitions. These are mainly used to establish optimized
-@@ -322,7 +335,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
+@@ -264,8 +277,18 @@ size_t ksize(const void *);
+ * for general use, and so are not documented here. For a full list of
+ * potential flags, always refer to linux/gfp.h.
*/
++
++extern void kmalloc_array_error(void)
++#if defined(CONFIG_GCOV_KERNEL) && defined(CONFIG_PAX_SIZE_OVERFLOW)
++__compiletime_warning("kmalloc_array called with swapped arguments?");
++#else
++__compiletime_error("kmalloc_array called with swapped arguments?");
++#endif
++
+ static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
+ {
++ if (__builtin_constant_p(n) && !__builtin_constant_p(size))
++ kmalloc_array_error();
+ if (size != 0 && n > SIZE_MAX / size)
+ return NULL;
+ return __kmalloc(n * size, flags);
+@@ -323,7 +346,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
- (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
+ (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
+ (defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
-extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
#define kmalloc_track_caller(size, flags) \
__kmalloc_track_caller(size, flags, _RET_IP_)
#else
-@@ -341,7 +354,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
- */
+@@ -343,7 +366,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
- (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
+ (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
+ (defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
-extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
#define kmalloc_node_track_caller(size, flags, node) \
__kmalloc_node_track_caller(size, flags, node, \
_RET_IP_)
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
-index 0c634fa..8616300 100644
+index cc290f0..0ba60931 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
-@@ -69,10 +69,10 @@ struct kmem_cache {
+@@ -52,7 +52,7 @@ struct kmem_cache {
+ /* 4) cache creation/removal */
+ const char *name;
+ struct list_head list;
+- int refcount;
++ atomic_t refcount;
+ int object_size;
+ int align;
+
+@@ -68,10 +68,10 @@ struct kmem_cache {
unsigned long node_allocs;
unsigned long node_frees;
unsigned long node_overflow;
/*
* If debugging is enabled, then the allocator can add additional
-@@ -105,11 +105,16 @@ struct cache_sizes {
+@@ -104,11 +104,16 @@ struct cache_sizes {
#ifdef CONFIG_ZONE_DMA
struct kmem_cache *cs_dmacachep;
#endif
+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
#ifdef CONFIG_TRACING
- extern void *kmem_cache_alloc_trace(size_t size,
-@@ -152,6 +157,13 @@ found:
+ extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t);
+@@ -145,6 +150,13 @@ found:
cachep = malloc_sizes[i].cs_dmacachep;
else
#endif
+
cachep = malloc_sizes[i].cs_cachep;
- ret = kmem_cache_alloc_trace(size, cachep, flags);
-@@ -162,7 +174,7 @@ found:
+ ret = kmem_cache_alloc_trace(cachep, flags, size);
+@@ -155,7 +167,7 @@ found:
}
#ifdef CONFIG_NUMA
extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
#ifdef CONFIG_TRACING
-@@ -205,6 +217,13 @@ found:
+@@ -198,6 +210,13 @@ found:
cachep = malloc_sizes[i].cs_dmacachep;
else
#endif
+
cachep = malloc_sizes[i].cs_cachep;
- return kmem_cache_alloc_node_trace(size, cachep, flags, node);
+ return kmem_cache_alloc_node_trace(cachep, flags, node, size);
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
-index 0ec00b3..22b4715 100644
+index f28e14a..7831211 100644
--- a/include/linux/slob_def.h
+++ b/include/linux/slob_def.h
-@@ -9,7 +9,7 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
- return kmem_cache_alloc_node(cachep, flags, -1);
+@@ -11,7 +11,7 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
+ return kmem_cache_alloc_node(cachep, flags, NUMA_NO_NODE);
}
-void *__kmalloc_node(size_t size, gfp_t flags, int node);
static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
{
-@@ -29,7 +29,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
- return __kmalloc_node(size, flags, -1);
+@@ -31,7 +31,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
+ return __kmalloc_node(size, flags, NUMA_NO_NODE);
}
-static __always_inline void *__kmalloc(size_t size, gfp_t flags)
#ifdef CONFIG_TRACING
diff --git a/include/linux/sonet.h b/include/linux/sonet.h
-index de8832d..0147b46 100644
+index 680f9a3..f13aeb0 100644
--- a/include/linux/sonet.h
+++ b/include/linux/sonet.h
-@@ -61,7 +61,7 @@ struct sonet_stats {
- #include <linux/atomic.h>
+@@ -7,7 +7,7 @@
+ #include <uapi/linux/sonet.h>
struct k_sonet_stats {
-#define __HANDLE_ITEM(i) atomic_t i
#undef __HANDLE_ITEM
};
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
-index 523547e..2cb7140 100644
+index 34206b8..f019e06 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
-@@ -174,9 +174,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
+@@ -176,9 +176,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
{
switch (sap->sa_family) {
case AF_INET:
}
return 0;
}
-@@ -209,7 +209,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
+@@ -211,7 +211,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
static inline bool __rpc_copy_addr4(struct sockaddr *dst,
const struct sockaddr *src)
{
struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
dsin->sin_family = ssin->sin_family;
-@@ -312,7 +312,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
+@@ -314,7 +314,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
if (sa->sa_family != AF_INET6)
return 0;
}
#endif /* __KERNEL__ */
-diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
-index dc0c3cc..8503fb6 100644
---- a/include/linux/sunrpc/sched.h
-+++ b/include/linux/sunrpc/sched.h
-@@ -106,6 +106,7 @@ struct rpc_call_ops {
- void (*rpc_count_stats)(struct rpc_task *, void *);
- void (*rpc_release)(void *);
- };
-+typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
-
- struct rpc_task_setup {
- struct rpc_task *task;
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
index 0b8e3e6..33e0a01 100644
--- a/include/linux/sunrpc/svc_rdma.h
#define RPCRDMA_VERSION 1
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
-index c34b4c8..a65b67d 100644
+index cd844a6..3ca3592 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
-@@ -155,7 +155,11 @@ enum
- KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
- };
-
--
-+#ifdef CONFIG_PAX_SOFTMODE
-+enum {
-+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
-+};
-+#endif
-
- /* CTL_VM names: */
- enum
-@@ -948,6 +952,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
+@@ -41,6 +41,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
extern int proc_dostring(struct ctl_table *, int,
void __user *, size_t *, loff_t *);
extern int proc_dointvec(struct ctl_table *, int,
void __user *, size_t *, loff_t *);
extern int proc_dointvec_minmax(struct ctl_table *, int,
+diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
+index 7faf933..eb6f5e3 100644
+--- a/include/linux/sysrq.h
++++ b/include/linux/sysrq.h
+@@ -36,7 +36,7 @@ struct sysrq_key_op {
+ char *help_msg;
+ char *action_msg;
+ int enable_mask;
+-};
++} __do_const;
+
+ #ifdef CONFIG_MAGIC_SYSRQ
+
+diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
+index ccc1899..b1aaceb 100644
+--- a/include/linux/thread_info.h
++++ b/include/linux/thread_info.h
+@@ -146,6 +146,15 @@ static inline bool test_and_clear_restore_sigmask(void)
+ #error "no set_restore_sigmask() provided and default one won't work"
+ #endif
+
++extern void __check_object_size(const void *ptr, unsigned long n, bool to);
++static inline void check_object_size(const void *ptr, unsigned long n, bool to)
++{
++#ifndef CONFIG_PAX_USERCOPY_DEBUG
++ if (!__builtin_constant_p(n))
++#endif
++ __check_object_size(ptr, n, to);
++}
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _LINUX_THREAD_INFO_H */
diff --git a/include/linux/tty.h b/include/linux/tty.h
-index 9f47ab5..73da944 100644
+index f0b4eb4..1c4854e 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
-@@ -225,7 +225,7 @@ struct tty_port {
+@@ -192,7 +192,7 @@ struct tty_port {
const struct tty_port_operations *ops; /* Port operations */
spinlock_t lock; /* Lock protecting tty field */
int blocked_open; /* Waiting to open */
wait_queue_head_t open_wait; /* Open waiters */
wait_queue_head_t close_wait; /* Close waiters */
wait_queue_head_t delta_msr_wait; /* Modem status change */
-@@ -525,7 +525,7 @@ extern int tty_port_open(struct tty_port *port,
+@@ -513,7 +513,7 @@ extern int tty_port_open(struct tty_port *port,
struct tty_struct *tty, struct file *filp);
static inline int tty_port_users(struct tty_port *port)
{
}
extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
+diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
+index dd976cf..e272742 100644
+--- a/include/linux/tty_driver.h
++++ b/include/linux/tty_driver.h
+@@ -284,7 +284,7 @@ struct tty_operations {
+ void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
+ #endif
+ const struct file_operations *proc_fops;
+-};
++} __do_const;
+
+ struct tty_driver {
+ int magic; /* magic number for this structure */
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index fb79dd8d..07d4773 100644
--- a/include/linux/tty_ldisc.h
struct tty_ldisc {
diff --git a/include/linux/types.h b/include/linux/types.h
-index bf0dd75..a1f23aaa 100644
+index 1cc0e4b..0d50edf 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
-@@ -220,10 +220,26 @@ typedef struct {
+@@ -175,10 +175,26 @@ typedef struct {
int counter;
} atomic_t;
}
static inline void put_unaligned_le16(u16 val, void *p)
+diff --git a/include/linux/usb.h b/include/linux/usb.h
+index 10278d1..e21ec3c 100644
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -551,7 +551,7 @@ struct usb_device {
+ int maxchild;
+
+ u32 quirks;
+- atomic_t urbnum;
++ atomic_unchecked_t urbnum;
+
+ unsigned long active_duration;
+
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
-index c5d36c6..8478c90 100644
+index c5d36c6..108f4f9 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -39,7 +39,7 @@ enum {
/*
* callback functions for platform
-@@ -97,7 +97,7 @@ struct renesas_usbhs_platform_callback {
- * VBUS control is needed for Host
- */
- int (*set_vbus)(struct platform_device *pdev, int enable);
--};
-+} __no_const;
+diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
+index ddbbb7d..9134611 100644
+--- a/include/linux/usb/usbnet.h
++++ b/include/linux/usb/usbnet.h
+@@ -33,6 +33,7 @@ struct usbnet {
+ wait_queue_head_t *wait;
+ struct mutex phy_mutex;
+ unsigned char suspend_count;
++ unsigned char pkt_cnt, pkt_err;
+
+ /* i/o info: pipes etc */
+ unsigned in, out;
+@@ -69,6 +70,8 @@ struct usbnet {
+ # define EVENT_DEV_ASLEEP 6
+ # define EVENT_DEV_OPEN 7
+ # define EVENT_DEVICE_REPORT_IDLE 8
++# define EVENT_NO_RUNTIME_PM 9
++# define EVENT_RX_KILL 10
+ };
- /*
- * parameters for renesas usbhs
+ static inline struct usb_driver *driver_of(struct usb_interface *intf)
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
index 6f8fbcf..8259001 100644
--- a/include/linux/vermagic.h
/*
* Internals. Dont't use..
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
-index ad2cfd5..74c94ad 100644
+index 92a86b2..1d9eb3c 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
#ifdef CONFIG_SMP
int cpu;
-@@ -216,8 +216,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
+@@ -218,8 +218,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
{
}
static inline void __inc_zone_page_state(struct page *page,
-@@ -228,8 +228,8 @@ static inline void __inc_zone_page_state(struct page *page,
+@@ -230,8 +230,8 @@ static inline void __inc_zone_page_state(struct page *page,
static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
{
}
static inline void __dec_zone_page_state(struct page *page,
-diff --git a/include/linux/xattr.h b/include/linux/xattr.h
-index e5d1220..ef6e406 100644
---- a/include/linux/xattr.h
-+++ b/include/linux/xattr.h
-@@ -57,6 +57,11 @@
- #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
- #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
-
-+/* User namespace */
-+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
-+#define XATTR_PAX_FLAGS_SUFFIX "flags"
-+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
-+
- #ifdef __KERNEL__
-
- #include <linux/types.h>
-diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
-index 944ecdf..a3994fc 100644
---- a/include/media/saa7146_vv.h
-+++ b/include/media/saa7146_vv.h
-@@ -161,8 +161,8 @@ struct saa7146_ext_vv
- int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
-
- /* the extension can override this */
-- struct v4l2_ioctl_ops vid_ops;
-- struct v4l2_ioctl_ops vbi_ops;
-+ v4l2_ioctl_ops_no_const vid_ops;
-+ v4l2_ioctl_ops_no_const vbi_ops;
- /* pointer to the saa7146 core ops */
- const struct v4l2_ioctl_ops *core_ops;
-
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
-index 5c416cd..20021aa 100644
+index 95d1c91..6798cca 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
-@@ -73,7 +73,8 @@ struct v4l2_file_operations {
+@@ -76,7 +76,7 @@ struct v4l2_file_operations {
int (*mmap) (struct file *, struct vm_area_struct *);
int (*open) (struct file *);
int (*release) (struct file *);
-};
+} __do_const;
-+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
/*
* Newer version of video_device, handled by videodev2.c
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
-index e614c9c..20602b7 100644
+index e48b571..7e40de4 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
-@@ -289,7 +289,7 @@ struct v4l2_ioctl_ops {
- long (*vidioc_default) (struct file *file, void *fh,
+@@ -282,7 +282,6 @@ struct v4l2_ioctl_ops {
bool valid_prio, int cmd, void *arg);
};
--
-+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
+-
/* v4l debugging and diagnostics */
-diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
-index bcb9cc3..f4ec722e 100644
---- a/include/net/caif/caif_hsi.h
-+++ b/include/net/caif/caif_hsi.h
-@@ -98,7 +98,7 @@ struct cfhsi_cb_ops {
- void (*rx_done_cb) (struct cfhsi_cb_ops *drv);
- void (*wake_up_cb) (struct cfhsi_cb_ops *drv);
- void (*wake_down_cb) (struct cfhsi_cb_ops *drv);
--};
-+} __no_const;
-
- /* Structure implemented by HSI device. */
- struct cfhsi_ops {
+ /* Debug bitmask flags to be used on V4L2 */
diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
index 9e5425b..8136ffc 100644
--- a/include/net/caif/cfctrl.h
struct list_head list;
/* Protects from simultaneous access to first_req list */
spinlock_t info_list_lock;
-diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
-index f10553c..fb5204b 100644
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -2633,6 +2633,15 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
- unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc);
-
- /**
-+ * ieee80211_get_mesh_hdrlen - get mesh extension header length
-+ * @meshhdr: the mesh extension header, only the flags field
-+ * (first byte) will be accessed
-+ * Returns the length of the extension header, which is always at
-+ * least 6 bytes and at most 18 if address 5 and 6 are present.
-+ */
-+unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr);
-+
-+/**
- * DOC: Data path helpers
- *
- * In addition to generic utilities, cfg80211 also offers
diff --git a/include/net/flow.h b/include/net/flow.h
index 628e11b..4c475df 100644
--- a/include/net/flow.h
+extern atomic_unchecked_t flow_cache_genid;
#endif
+diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
+index e5062c9..48a9a4b 100644
+--- a/include/net/gro_cells.h
++++ b/include/net/gro_cells.h
+@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
+ cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
+
+ if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
+- atomic_long_inc(&dev->rx_dropped);
++ atomic_long_inc_unchecked(&dev->rx_dropped);
+ kfree_skb(skb);
+ return;
+ }
+@@ -73,8 +73,8 @@ static inline int gro_cells_init(struct gro_cells *gcells, struct net_device *de
+ int i;
+
+ gcells->gro_cells_mask = roundup_pow_of_two(netif_get_num_default_rss_queues()) - 1;
+- gcells->cells = kcalloc(sizeof(struct gro_cell),
+- gcells->gro_cells_mask + 1,
++ gcells->cells = kcalloc(gcells->gro_cells_mask + 1,
++ sizeof(struct gro_cell),
+ GFP_KERNEL);
+ if (!gcells->cells)
+ return -ENOMEM;
+diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
+index 1832927..ce39aea 100644
+--- a/include/net/inet_connection_sock.h
++++ b/include/net/inet_connection_sock.h
+@@ -62,7 +62,7 @@ struct inet_connection_sock_af_ops {
+ void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
+ int (*bind_conflict)(const struct sock *sk,
+ const struct inet_bind_bucket *tb, bool relax);
+-};
++} __do_const;
+
+ /** inet_connection_sock - INET connection oriented sock
+ *
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 53f464d..ba76aaa 100644
--- a/include/net/inetpeer.h
fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
#define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
-index 95374d1..2300e36 100644
+index ee75ccd..2cc2b95 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -510,7 +510,7 @@ struct ip_vs_conn {
atomic_t weight; /* server weight */
atomic_t refcnt; /* reference counter */
-diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
-index 69b610a..fe3962c 100644
---- a/include/net/irda/ircomm_core.h
-+++ b/include/net/irda/ircomm_core.h
-@@ -51,7 +51,7 @@ typedef struct {
- int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
- int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
- struct ircomm_info *);
--} call_t;
-+} __no_const call_t;
-
- struct ircomm_cb {
- irda_queue_t queue;
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
-index 59ba38bc..d515662 100644
+index 80ffde3..968b0f4 100644
--- a/include/net/irda/ircomm_tty.h
+++ b/include/net/irda/ircomm_tty.h
@@ -35,6 +35,7 @@
#include <net/irda/irias_object.h>
#include <net/irda/ircomm_core.h>
-@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
- unsigned short close_delay;
- unsigned short closing_wait; /* time to wait before closing */
-
-- int open_count;
-- int blocked_open; /* # of blocked opens */
-+ local_t open_count;
-+ local_t blocked_open; /* # of blocked opens */
-
- /* Protect concurent access to :
- * o self->open_count
diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index cc7c197..9f2da2a 100644
--- a/include/net/iucv/af_iucv.h
unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
-index 344d898..2ae1302 100644
+index 0dab173..1b76af0 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -123,7 +123,7 @@ struct neigh_ops {
struct pneigh_entry {
struct pneigh_entry *next;
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
-index fd87963..312a11f 100644
+index 95e6466..251016d 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
-@@ -102,7 +102,7 @@ struct net {
+@@ -110,7 +110,7 @@ struct net {
#endif
struct netns_ipvs *ipvs;
struct sock *diag_nlsk;
+ atomic_unchecked_t rt_genid;
};
-
-@@ -303,12 +303,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
+ /*
+@@ -320,12 +320,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
static inline int rt_genid(struct net *net)
{
struct sk_buff *skb, int offset, struct iovec *to,
size_t len, struct dma_pinned_list *pinned_list);
+diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
+index 252fd10..aa1421f 100644
+--- a/include/net/netfilter/nf_queue.h
++++ b/include/net/netfilter/nf_queue.h
+@@ -22,7 +22,7 @@ struct nf_queue_handler {
+ int (*outfn)(struct nf_queue_entry *entry,
+ unsigned int queuenum);
+ char *name;
+-};
++} __do_const;
+
+ extern int nf_register_queue_handler(u_int8_t pf,
+ const struct nf_queue_handler *qh);
diff --git a/include/net/netlink.h b/include/net/netlink.h
-index 785f37a..c81dc0c 100644
+index 9690b0f..87aded7 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
-@@ -520,7 +520,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
+@@ -534,7 +534,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
{
if (mark)
/**
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index eb24dbc..567d6ed 100644
+index 2ae2b83..dbdc85e 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
-@@ -65,7 +65,7 @@ struct netns_ipv4 {
- unsigned int sysctl_ping_group_range[2];
+@@ -64,7 +64,7 @@ struct netns_ipv4 {
+ kgid_t sysctl_ping_group_range[2];
long sysctl_tcp_mem[3];
- atomic_t dev_addr_genid;
#ifdef CONFIG_IP_MROUTE
#ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
+diff --git a/include/net/protocol.h b/include/net/protocol.h
+index 929528c..c84d4f6 100644
+--- a/include/net/protocol.h
++++ b/include/net/protocol.h
+@@ -48,7 +48,7 @@ struct net_protocol {
+ int (*gro_complete)(struct sk_buff *skb);
+ unsigned int no_policy:1,
+ netns_ok:1;
+-};
++} __do_const;
+
+ #if IS_ENABLED(CONFIG_IPV6)
+ struct inet6_protocol {
+@@ -69,7 +69,7 @@ struct inet6_protocol {
+ int (*gro_complete)(struct sk_buff *skb);
+
+ unsigned int flags; /* INET6_PROTO_xxx */
+-};
++} __do_const;
+
+ #define INET6_PROTO_NOPOLICY 0x1
+ #define INET6_PROTO_FINAL 0x2
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
-index ff49964..1411fee 100644
+index 9c6414f..fbd0524 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
-@@ -320,9 +320,9 @@ do { \
+@@ -318,9 +318,9 @@ do { \
#else /* SCTP_DEBUG */
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
+diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
+index 64158aa..b65533c 100644
+--- a/include/net/sctp/structs.h
++++ b/include/net/sctp/structs.h
+@@ -496,7 +496,7 @@ struct sctp_af {
+ int sockaddr_len;
+ sa_family_t sa_family;
+ struct list_head list;
+-};
++} __do_const;
+
+ struct sctp_af *sctp_get_af_specific(sa_family_t);
+ int sctp_register_af(struct sctp_af *);
+@@ -516,7 +516,7 @@ struct sctp_pf {
+ struct sctp_association *asoc);
+ void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
+ struct sctp_af *af;
+-};
++} __do_const;
+
+
+ /* Structure to track chunk fragments that have been acked, but peer
diff --git a/include/net/sock.h b/include/net/sock.h
-index adb7da2..1100002 100644
+index c945fba..e162e56 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
-@@ -305,7 +305,7 @@ struct sock {
+@@ -304,7 +304,7 @@ struct sock {
#ifdef CONFIG_RPS
__u32 sk_rxhash;
#endif
int sk_rcvbuf;
struct sk_filter __rcu *sk_filter;
-@@ -1764,7 +1764,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
+@@ -1763,7 +1763,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
}
static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
int copy, int offset)
{
if (skb->ip_summed == CHECKSUM_NONE) {
-@@ -2023,7 +2023,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
+@@ -2022,7 +2022,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
}
}
-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
- static inline struct page *sk_stream_alloc_page(struct sock *sk)
- {
+ /**
+ * sk_page_frag - return an appropriate page_frag
diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 1f000ff..e5a8dfb 100644
+index 4af45e3..af97861 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
-@@ -508,7 +508,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
+@@ -531,7 +531,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
extern void tcp_xmit_retransmit_queue(struct sock *);
extern void tcp_simple_retransmit(struct sock *);
extern int tcp_trim_head(struct sock *, struct sk_buff *, u32);
extern void tcp_send_probe0(struct sock *);
extern void tcp_send_partial(struct sock *);
-@@ -677,8 +677,8 @@ struct tcp_skb_cb {
+@@ -702,8 +702,8 @@ struct tcp_skb_cb {
struct inet6_skb_parm h6;
#endif
} header; /* For incoming frames */
__u32 when; /* used to compute rtt's */
__u8 tcp_flags; /* TCP header flags. (tcp[13]) */
-@@ -692,7 +692,7 @@ struct tcp_skb_cb {
+@@ -717,7 +717,7 @@ struct tcp_skb_cb {
__u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
/* 1 byte hole */
};
#define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
-@@ -1502,7 +1502,7 @@ struct tcp_seq_afinfo {
- char *name;
- sa_family_t family;
- const struct file_operations *seq_fops;
-- struct seq_operations seq_ops;
-+ seq_operations_no_const seq_ops;
- };
-
- struct tcp_iter_state {
-diff --git a/include/net/udp.h b/include/net/udp.h
-index 065f379..b661b40 100644
---- a/include/net/udp.h
-+++ b/include/net/udp.h
-@@ -244,7 +244,7 @@ struct udp_seq_afinfo {
- sa_family_t family;
- struct udp_table *udp_table;
- const struct file_operations *seq_fops;
-- struct seq_operations seq_ops;
-+ seq_operations_no_const seq_ops;
- };
-
- struct udp_iter_state {
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index 639dd13..15b206c 100644
+index 63445ed..74ef61d 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
+@@ -423,7 +423,7 @@ struct xfrm_mode {
+ struct module *owner;
+ unsigned int encap;
+ int flags;
+-};
++} __do_const;
+
+ /* Flags for xfrm_mode. */
+ enum {
@@ -514,7 +514,7 @@ struct xfrm_policy {
struct timer_list timer;
u8 qfull;
enum fc_lport_state state;
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
-index 9895f69..f1418f0 100644
+index 55367b0..d97bd2a 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
-@@ -166,9 +166,9 @@ struct scsi_device {
+@@ -169,9 +169,9 @@ struct scsi_device {
unsigned int max_device_blocked; /* what device_blocked counts down from */
#define SCSI_DEFAULT_DEVICE_BLOCKED 3
/**
-diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
-index 030b87c..98a6954 100644
---- a/include/sound/ak4xxx-adda.h
-+++ b/include/sound/ak4xxx-adda.h
-@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
- void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
- unsigned char val);
- void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
--};
-+} __no_const;
-
- #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
-
-diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
-index 8c05e47..2b5df97 100644
---- a/include/sound/hwdep.h
-+++ b/include/sound/hwdep.h
-@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
- struct snd_hwdep_dsp_status *status);
- int (*dsp_load)(struct snd_hwdep *hw,
- struct snd_hwdep_dsp_image *image);
--};
-+} __no_const;
-
- struct snd_hwdep {
- struct snd_card *card;
-diff --git a/include/sound/info.h b/include/sound/info.h
-index 9ca1a49..aba1728 100644
---- a/include/sound/info.h
-+++ b/include/sound/info.h
-@@ -44,7 +44,7 @@ struct snd_info_entry_text {
- struct snd_info_buffer *buffer);
- void (*write)(struct snd_info_entry *entry,
- struct snd_info_buffer *buffer);
--};
-+} __no_const;
-
- struct snd_info_entry_ops {
- int (*open)(struct snd_info_entry *entry,
-diff --git a/include/sound/pcm.h b/include/sound/pcm.h
-index cdca2ab..10bbe05 100644
---- a/include/sound/pcm.h
-+++ b/include/sound/pcm.h
-@@ -81,6 +81,7 @@ struct snd_pcm_ops {
- int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
- int (*ack)(struct snd_pcm_substream *substream);
- };
-+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
-
- /*
- *
-diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
-index af1b49e..a5d55a5 100644
---- a/include/sound/sb16_csp.h
-+++ b/include/sound/sb16_csp.h
-@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
- int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
- int (*csp_stop) (struct snd_sb_csp * p);
- int (*csp_qsound_transfer) (struct snd_sb_csp * p);
--};
-+} __no_const;
-
- /*
- * CSP private data
diff --git a/include/sound/soc.h b/include/sound/soc.h
-index e063380..e8077d5 100644
+index 91244a0..89ca1a7 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
-@@ -801,7 +801,7 @@ struct snd_soc_platform_driver {
+@@ -769,7 +769,7 @@ struct snd_soc_codec_driver {
+ /* probe ordering - for components with runtime dependencies */
+ int probe_order;
+ int remove_order;
+-};
++} __do_const;
+
+ /* SoC platform interface */
+ struct snd_soc_platform_driver {
+@@ -815,7 +815,7 @@ struct snd_soc_platform_driver {
unsigned int (*read)(struct snd_soc_platform *, unsigned int);
int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
int (*bespoke_trigger)(struct snd_pcm_substream *, int);
struct snd_soc_platform {
const char *name;
-@@ -1016,7 +1016,7 @@ struct snd_soc_pcm_runtime {
- struct snd_soc_dai_link *dai_link;
- struct mutex pcm_mutex;
- enum snd_soc_pcm_subclass pcm_subclass;
-- struct snd_pcm_ops ops;
-+ snd_pcm_ops_no_const ops;
-
- unsigned int dev_registered:1;
-
-diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
-index fe8590c..aaed363 100644
---- a/include/sound/tea575x-tuner.h
-+++ b/include/sound/tea575x-tuner.h
-@@ -48,7 +48,7 @@ struct snd_tea575x_ops {
-
- struct snd_tea575x {
- struct v4l2_device *v4l2_dev;
-- struct v4l2_file_operations fops;
-+ v4l2_file_operations_no_const fops;
- struct video_device vd; /* video device */
- int radio_nr; /* radio_nr */
- bool tea5759; /* 5759 chip is present */
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
-index 5be8937..a8e46e9 100644
+index fca8bbe..c0242ea 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
-@@ -434,7 +434,7 @@ struct t10_reservation_ops {
- int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
- int (*t10_pr_register)(struct se_cmd *);
- int (*t10_pr_clear)(struct se_cmd *);
--};
-+} __no_const;
-
- struct t10_reservation {
- /* Reservation effects all target ports */
-@@ -758,7 +758,7 @@ struct se_device {
+@@ -760,7 +760,7 @@ struct se_device {
spinlock_t stats_lock;
/* Active commands on this virtual SE device */
atomic_t simple_cmds;
struct se_obj dev_obj;
diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
new file mode 100644
-index 0000000..2efe49d
+index 0000000..fb634b7
--- /dev/null
+++ b/include/trace/events/fs.h
@@ -0,0 +1,53 @@
+
+TRACE_EVENT(do_sys_open,
+
-+ TP_PROTO(char *filename, int flags, int mode),
++ TP_PROTO(const char *filename, int flags, int mode),
+
+ TP_ARGS(filename, flags, mode),
+
TP_ARGS(irq, action, ret),
+diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
+index 7caf44c..23c6f27 100644
+--- a/include/uapi/linux/a.out.h
++++ b/include/uapi/linux/a.out.h
+@@ -39,6 +39,14 @@ enum machine_type {
+ M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
+ };
+
++/* Constants for the N_FLAGS field */
++#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
++#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
++#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
++#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
++/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
++#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
++
+ #if !defined (N_MAGIC)
+ #define N_MAGIC(exec) ((exec).a_info & 0xffff)
+ #endif
+diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
+index d876736..b36014e 100644
+--- a/include/uapi/linux/byteorder/little_endian.h
++++ b/include/uapi/linux/byteorder/little_endian.h
+@@ -42,51 +42,51 @@
+
+ static inline __le64 __cpu_to_le64p(const __u64 *p)
+ {
+- return (__force __le64)*p;
++ return (__force const __le64)*p;
+ }
+ static inline __u64 __le64_to_cpup(const __le64 *p)
+ {
+- return (__force __u64)*p;
++ return (__force const __u64)*p;
+ }
+ static inline __le32 __cpu_to_le32p(const __u32 *p)
+ {
+- return (__force __le32)*p;
++ return (__force const __le32)*p;
+ }
+ static inline __u32 __le32_to_cpup(const __le32 *p)
+ {
+- return (__force __u32)*p;
++ return (__force const __u32)*p;
+ }
+ static inline __le16 __cpu_to_le16p(const __u16 *p)
+ {
+- return (__force __le16)*p;
++ return (__force const __le16)*p;
+ }
+ static inline __u16 __le16_to_cpup(const __le16 *p)
+ {
+- return (__force __u16)*p;
++ return (__force const __u16)*p;
+ }
+ static inline __be64 __cpu_to_be64p(const __u64 *p)
+ {
+- return (__force __be64)__swab64p(p);
++ return (__force const __be64)__swab64p(p);
+ }
+ static inline __u64 __be64_to_cpup(const __be64 *p)
+ {
+- return __swab64p((__u64 *)p);
++ return __swab64p((const __u64 *)p);
+ }
+ static inline __be32 __cpu_to_be32p(const __u32 *p)
+ {
+- return (__force __be32)__swab32p(p);
++ return (__force const __be32)__swab32p(p);
+ }
+ static inline __u32 __be32_to_cpup(const __be32 *p)
+ {
+- return __swab32p((__u32 *)p);
++ return __swab32p((const __u32 *)p);
+ }
+ static inline __be16 __cpu_to_be16p(const __u16 *p)
+ {
+- return (__force __be16)__swab16p(p);
++ return (__force const __be16)__swab16p(p);
+ }
+ static inline __u16 __be16_to_cpup(const __be16 *p)
+ {
+- return __swab16p((__u16 *)p);
++ return __swab16p((const __u16 *)p);
+ }
+ #define __cpu_to_le64s(x) do { (void)(x); } while (0)
+ #define __le64_to_cpus(x) do { (void)(x); } while (0)
+diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
+index 126a817..d522bd1 100644
+--- a/include/uapi/linux/elf.h
++++ b/include/uapi/linux/elf.h
+@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
+ #define PT_GNU_EH_FRAME 0x6474e550
+
+ #define PT_GNU_STACK (PT_LOOS + 0x474e551)
++#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
++
++#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
++
++/* Constants for the e_flags field */
++#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
++#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
++#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
++#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
++/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
++#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
+
+ /*
+ * Extended Numbering
+@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
+ #define DT_DEBUG 21
+ #define DT_TEXTREL 22
+ #define DT_JMPREL 23
++#define DT_FLAGS 30
++ #define DF_TEXTREL 0x00000004
+ #define DT_ENCODING 32
+ #define OLD_DT_LOOS 0x60000000
+ #define DT_LOOS 0x6000000d
+@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
+ #define PF_W 0x2
+ #define PF_X 0x1
+
++#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
++#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
++#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
++#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
++#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
++#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
++/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
++/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
++#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
++#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
++#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
++#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
++
+ typedef struct elf32_phdr{
+ Elf32_Word p_type;
+ Elf32_Off p_offset;
+@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
+ #define EI_OSABI 7
+ #define EI_PAD 8
+
++#define EI_PAX 14
++
+ #define ELFMAG0 0x7f /* EI_MAG */
+ #define ELFMAG1 'E'
+ #define ELFMAG2 'L'
+diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
+index aa169c4..6a2771d 100644
+--- a/include/uapi/linux/personality.h
++++ b/include/uapi/linux/personality.h
+@@ -30,6 +30,7 @@ enum {
+ #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
+ ADDR_NO_RANDOMIZE | \
+ ADDR_COMPAT_LAYOUT | \
++ ADDR_LIMIT_3GB | \
+ MMAP_PAGE_ZERO)
+
+ /*
+diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
+index 7530e74..e714828 100644
+--- a/include/uapi/linux/screen_info.h
++++ b/include/uapi/linux/screen_info.h
+@@ -43,7 +43,8 @@ struct screen_info {
+ __u16 pages; /* 0x32 */
+ __u16 vesa_attributes; /* 0x34 */
+ __u32 capabilities; /* 0x36 */
+- __u8 _reserved[6]; /* 0x3a */
++ __u16 vesapm_size; /* 0x3a */
++ __u8 _reserved[4]; /* 0x3c */
+ } __attribute__((packed));
+
+ #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
+diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
+index 6d67213..8dab561 100644
+--- a/include/uapi/linux/sysctl.h
++++ b/include/uapi/linux/sysctl.h
+@@ -155,7 +155,11 @@ enum
+ KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
+ };
+
+-
++#ifdef CONFIG_PAX_SOFTMODE
++enum {
++ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
++};
++#endif
+
+ /* CTL_VM names: */
+ enum
+diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
+index 26607bd..588b65f 100644
+--- a/include/uapi/linux/xattr.h
++++ b/include/uapi/linux/xattr.h
+@@ -60,5 +60,9 @@
+ #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
+ #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
+
++/* User namespace */
++#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
++#define XATTR_PAX_FLAGS_SUFFIX "flags"
++#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
+
+ #endif /* _UAPI_LINUX_XATTR_H */
diff --git a/include/video/udlfb.h b/include/video/udlfb.h
index f9466fa..f4e2b81 100644
--- a/include/video/udlfb.h
void *pmi_pal;
u8 *vbe_state_orig; /*
diff --git a/init/Kconfig b/init/Kconfig
-index af6c7f8..5c188f8 100644
+index 6fdd6e3..5b01610 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -850,6 +850,7 @@ endif # CGROUPS
+@@ -925,6 +925,7 @@ endif # CGROUPS
config CHECKPOINT_RESTORE
bool "Checkpoint/restore support" if EXPERT
default n
help
Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1029,6 +1030,7 @@ config UIDGID_CONVERTED
- # Security modules
- depends on SECURITY_TOMOYO = n
- depends on SECURITY_APPARMOR = n
-+ depends on GRKERNSEC = n
+@@ -1016,6 +1017,8 @@ config UIDGID_CONVERTED
+ depends on OCFS2_FS = n
+ depends on XFS_FS = n
++ depends on GRKERNSEC = n
++
config UIDGID_STRICT_TYPE_CHECKS
bool "Require conversions between uid/gids and their internal representation"
-@@ -1416,7 +1418,7 @@ config SLUB_DEBUG
+ depends on UIDGID_CONVERTED
+@@ -1405,7 +1408,7 @@ config SLUB_DEBUG
config COMPAT_BRK
bool "Disable heap randomization"
help
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
-@@ -1599,7 +1601,7 @@ config INIT_ALL_POSSIBLE
+@@ -1648,7 +1651,7 @@ config INIT_ALL_POSSIBLE
config STOP_MACHINE
bool
default y
ifneq ($(CONFIG_BLK_DEV_INITRD),y)
obj-y += noinitramfs.o
diff --git a/init/do_mounts.c b/init/do_mounts.c
-index d3f0aee..c9322f5 100644
+index f8a6642..4e5ee1b 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -336,11 +336,11 @@ static void __init get_fs_names(char *page)
s = current->fs->pwd.dentry->d_sb;
ROOT_DEV = s->s_dev;
printk(KERN_INFO
-@@ -460,18 +460,18 @@ void __init change_floppy(char *fmt, ...)
+@@ -461,18 +461,18 @@ void __init change_floppy(char *fmt, ...)
va_start(args, fmt);
vsprintf(buf, fmt, args);
va_end(args);
termios.c_lflag |= ICANON;
sys_ioctl(fd, TCSETSF, (long)&termios);
sys_close(fd);
-@@ -565,6 +565,6 @@ void __init prepare_namespace(void)
+@@ -566,6 +566,6 @@ void __init prepare_namespace(void)
mount_root();
out:
devtmpfs_mount("dev");
if (!S_ISBLK(stat.st_mode))
return 0;
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
-index 135959a2..28a3f43 100644
+index f9acf71..1e19144 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
-@@ -53,13 +53,13 @@ static void __init handle_initrd(void)
+@@ -58,8 +58,8 @@ static void __init handle_initrd(void)
create_dev("/dev/root.old", Root_RAM0);
/* mount initrd on rootfs' /root */
mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
- sys_mkdir("/old", 0700);
-- root_fd = sys_open("/", 0, 0);
-- old_fd = sys_open("/old", 0, 0);
+- sys_chdir("/old");
+ sys_mkdir((const char __force_user *)"/old", 0700);
-+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
-+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
- /* move initrd over / and chdir/chroot in initrd root */
-- sys_chdir("/root");
-- sys_mount(".", "/", NULL, MS_MOVE, NULL);
-- sys_chroot(".");
-+ sys_chdir((const char __force_user *)"/root");
-+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
-+ sys_chroot((const char __force_user *)".");
++ sys_chdir((const char __force_user *)"/old");
/*
* In case that a resume from disk is carried out by linuxrc or one of
-@@ -76,15 +76,15 @@ static void __init handle_initrd(void)
+@@ -73,31 +73,31 @@ static void __init handle_initrd(void)
+ current->flags &= ~PF_FREEZER_SKIP;
/* move initrd to rootfs' /old */
- sys_fchdir(old_fd);
-- sys_mount("/", ".", NULL, MS_MOVE, NULL);
-+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
+- sys_mount("..", ".", NULL, MS_MOVE, NULL);
++ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
/* switch root and cwd back to / of rootfs */
- sys_fchdir(root_fd);
-- sys_chroot(".");
-+ sys_chroot((const char __force_user *)".");
- sys_close(old_fd);
- sys_close(root_fd);
+- sys_chroot("..");
++ sys_chroot((const char __force_user *)"..");
if (new_decode_dev(real_root_dev) == Root_RAM0) {
- sys_chdir("/old");
return;
}
-@@ -92,17 +92,17 @@ static void __init handle_initrd(void)
+- sys_chdir("/");
++ sys_chdir((const char __force_user *)"/");
+ ROOT_DEV = new_decode_dev(real_root_dev);
mount_root();
printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
if (fd < 0) {
error = fd;
-@@ -125,11 +125,11 @@ int __init initrd_load(void)
+@@ -120,11 +120,11 @@ int __init initrd_load(void)
* mounted in the normal path.
*/
if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
next_state = Reset;
return 0;
diff --git a/init/main.c b/init/main.c
-index d61ec54..bd3144f 100644
+index 857166f..9df1d8e 100644
--- a/init/main.c
+++ b/init/main.c
@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
static const char *panic_later, *panic_param;
-@@ -678,6 +735,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -681,6 +738,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
{
int count = preempt_count();
int ret;
if (initcall_debug)
ret = do_one_initcall_debug(fn);
-@@ -690,15 +748,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -693,15 +751,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
sprintf(msgbuf, "error code %d ", ret);
if (preempt_count() != count) {
}
return ret;
-@@ -752,8 +810,14 @@ static void __init do_initcall_level(int level)
+@@ -743,6 +801,10 @@ static char *initcall_level_names[] __initdata = {
+ "late",
+ };
+
++#ifdef CONFIG_PAX_LATENT_ENTROPY
++u64 latent_entropy;
++#endif
++
+ static void __init do_initcall_level(int level)
+ {
+ extern const struct kernel_param __start___param[], __stop___param[];
+@@ -755,8 +817,14 @@ static void __init do_initcall_level(int level)
level, level,
&repair_env_string);
do_one_initcall(*fn);
+
+#ifdef CONFIG_PAX_LATENT_ENTROPY
-+ transfer_latent_entropy();
++ add_device_randomness(&latent_entropy, sizeof(latent_entropy));
+#endif
+
+ }
}
static void __init do_initcalls(void)
-@@ -787,8 +851,14 @@ static void __init do_pre_smp_initcalls(void)
+@@ -790,8 +858,14 @@ static void __init do_pre_smp_initcalls(void)
{
initcall_t *fn;
do_one_initcall(*fn);
+
+#ifdef CONFIG_PAX_LATENT_ENTROPY
-+ transfer_latent_entropy();
++ add_device_randomness(&latent_entropy, sizeof(latent_entropy));
+#endif
+
+ }
}
- static void run_init_process(const char *init_filename)
-@@ -870,7 +940,7 @@ static int __init kernel_init(void * unused)
+ static int run_init_process(const char *init_filename)
+@@ -876,7 +950,7 @@ static noinline void __init kernel_init_freeable(void)
do_basic_setup();
/* Open the /dev/console on the rootfs, this should never fail */
printk(KERN_WARNING "Warning: unable to open an initial console.\n");
(void) sys_dup(0);
-@@ -883,11 +953,13 @@ static int __init kernel_init(void * unused)
+@@ -889,11 +963,13 @@ static noinline void __init kernel_init_freeable(void)
if (!ramdisk_execute_command)
ramdisk_execute_command = "/init";
* Ok, we have completed the initial bootup, and
* we're essentially up and running. Get rid of the
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
-index 9a08acc..e65ebe7 100644
+index 71a3ca1..cc330ee 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
-@@ -279,6 +279,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
+@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
info->attr.mq_msgsize);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
diff --git a/ipc/msg.c b/ipc/msg.c
-index 7385de2..a8180e08 100644
+index a71af5a..a90a110 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
msg_params.flg = msgflg;
diff --git a/ipc/sem.c b/ipc/sem.c
-index 5215a81..cfc0cac 100644
+index 58d31f1..cce7a55 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
sem_params.flg = semflg;
sem_params.u.nsems = nsems;
diff --git a/ipc/shm.c b/ipc/shm.c
-index 00faa05..7040960 100644
+index dff40c9..9450e27 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
shm_params.key = key;
shm_params.flg = shmflg;
shm_params.u.size = size;
-@@ -1001,6 +1018,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
+@@ -1003,6 +1020,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
f_mode = FMODE_READ | FMODE_WRITE;
}
if (shmflg & SHM_EXEC) {
prot |= PROT_EXEC;
acc_mode |= S_IXUGO;
}
-@@ -1024,9 +1047,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
+@@ -1026,9 +1049,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
if (err)
goto out_unlock;
shm_unlock(shp);
diff --git a/kernel/acct.c b/kernel/acct.c
-index 02e6167..54824f7 100644
+index 051e071..15e0920 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -550,7 +550,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
set_fs(fs);
diff --git a/kernel/audit.c b/kernel/audit.c
-index a8c84be..8bd034c 100644
+index 40414e9..c920b72 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
-@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
+@@ -116,7 +116,7 @@ u32 audit_sig_sid = 0;
3) suppressed due to audit_rate_limit
4) suppressed due to audit_backlog_limit
*/
/* The netlink socket. */
static struct sock *audit_sock;
-@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
+@@ -238,7 +238,7 @@ void audit_log_lost(const char *message)
unsigned long now;
int print;
print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
-@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
+@@ -257,7 +257,7 @@ void audit_log_lost(const char *message)
printk(KERN_WARNING
"audit: audit_lost=%d audit_rate_limit=%d "
"audit_backlog_limit=%d\n",
audit_rate_limit,
audit_backlog_limit);
audit_panic(message);
-@@ -690,7 +690,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -677,7 +677,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
status_set.pid = audit_pid;
status_set.rate_limit = audit_rate_limit;
status_set.backlog_limit = audit_backlog_limit;
- status_set.lost = atomic_read(&audit_lost);
+ status_set.lost = atomic_read_unchecked(&audit_lost);
status_set.backlog = skb_queue_len(&audit_skb_queue);
- audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
+ audit_send_reply(NETLINK_CB(skb).portid, seq, AUDIT_GET, 0, 0,
&status_set, sizeof(status_set));
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index 4b96415..d8c16ee 100644
+index 157e989..b28b365 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
-@@ -2289,7 +2289,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
+@@ -2352,7 +2352,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
}
/* global counter which is incremented every time something logs in */
/**
* audit_set_loginuid - set current task's audit_context loginuid
-@@ -2313,7 +2313,7 @@ int audit_set_loginuid(uid_t loginuid)
+@@ -2376,7 +2376,7 @@ int audit_set_loginuid(kuid_t loginuid)
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
+}
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index ff2bce5..a41e8f9 100644
+index ad99830..992d8a7 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5390,7 +5390,7 @@ static int cgroup_css_links_read(struct cgroup *cont,
+@@ -5514,7 +5514,7 @@ static int cgroup_css_links_read(struct cgroup *cont,
struct css_set *cg = link->cg;
struct task_struct *task;
int count = 0;
return -ENOMEM;
diff --git a/kernel/cred.c b/kernel/cred.c
-index de728ac..e3c267c 100644
+index 48cea3d..3476734 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -207,6 +207,16 @@ void exit_creds(struct task_struct *tsk)
/**
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
-index 0557f24..1a00d9a 100644
+index 9a61738..c5c8f3a 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -122,7 +122,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
if (kgdb_info[sstep_cpu].task)
kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
else
-@@ -861,18 +861,18 @@ static void kgdb_unregister_callbacks(void)
+@@ -887,18 +887,18 @@ static void kgdb_unregister_callbacks(void)
static void kgdb_tasklet_bpt(unsigned long ing)
{
kgdb_breakpoint();
}
EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index 31df170..bc98840 100644
+index 8875254..7cf4928 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
-@@ -1971,7 +1971,7 @@ static int kdb_lsmod(int argc, const char **argv)
- list_for_each_entry(mod, kdb_modules, list) {
+@@ -1974,7 +1974,7 @@ static int kdb_lsmod(int argc, const char **argv)
+ continue;
kdb_printf("%-20s%8u 0x%p ", mod->name,
- mod->core_size, (void *)mod);
#ifdef CONFIG_MODULE_UNLOAD
kdb_printf("%4ld ", module_refcount(mod));
#endif
-@@ -1981,7 +1981,7 @@ static int kdb_lsmod(int argc, const char **argv)
+@@ -1984,7 +1984,7 @@ static int kdb_lsmod(int argc, const char **argv)
kdb_printf(" (Loading)");
else
kdb_printf(" (Live)");
#ifdef CONFIG_MODULE_UNLOAD
{
diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 7fee567..8affa2c 100644
+index dbccf83..8c66482 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
-@@ -181,7 +181,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
+@@ -182,7 +182,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
return 0;
}
static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
enum event_type_t event_type);
-@@ -2665,7 +2665,7 @@ static void __perf_event_read(void *info)
+@@ -2668,7 +2668,7 @@ static void __perf_event_read(void *info)
static inline u64 perf_event_count(struct perf_event *event)
{
}
static u64 perf_event_read(struct perf_event *event)
-@@ -2995,9 +2995,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
+@@ -2998,9 +2998,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
mutex_lock(&event->child_mutex);
total += perf_event_read(event);
*enabled += event->total_time_enabled +
list_for_each_entry(child, &event->child_list, child_list) {
total += perf_event_read(child);
-@@ -3406,10 +3406,10 @@ void perf_event_update_userpage(struct perf_event *event)
+@@ -3403,10 +3403,10 @@ void perf_event_update_userpage(struct perf_event *event)
userpg->offset -= local64_read(&event->hw.prev_count);
userpg->time_enabled = enabled +
arch_perf_update_userpage(userpg, now);
-@@ -3842,11 +3842,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
+@@ -3965,11 +3965,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
values[n++] = perf_event_count(event);
if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
values[n++] = enabled +
}
if (read_format & PERF_FORMAT_ID)
values[n++] = primary_event_id(event);
-@@ -4524,12 +4524,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
+@@ -4712,12 +4712,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
* need to add enough zero bytes after the string to handle
* the 64bit alignment we do later.
*/
if (IS_ERR(name)) {
name = strncpy(tmp, "//toolong", sizeof(tmp));
goto got_name;
-@@ -5968,7 +5968,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
+@@ -6156,7 +6156,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
event->parent = parent_event;
event->ns = get_pid_ns(current->nsproxy->pid_ns);
event->state = PERF_EVENT_STATE_INACTIVE;
-@@ -6567,10 +6567,10 @@ static void sync_child_event(struct perf_event *child_event,
+@@ -6774,10 +6774,10 @@ static void sync_child_event(struct perf_event *child_event,
/*
* Add back the child's count to the parent's count:
*/
/*
diff --git a/kernel/exit.c b/kernel/exit.c
-index f65345f9..9c28dab 100644
+index 346616c..f103b28 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -59,6 +59,10 @@
- #include <asm/pgtable.h>
- #include <asm/mmu_context.h>
-
-+#ifdef CONFIG_GRKERNSEC
-+extern rwlock_t grsec_exec_file_lock;
-+#endif
-+
- static void exit_mm(struct task_struct * tsk);
-
- static void __unhash_process(struct task_struct *p, bool group_dead)
-@@ -182,6 +186,10 @@ void release_task(struct task_struct * p)
+@@ -182,6 +182,10 @@ void release_task(struct task_struct * p)
struct task_struct *leader;
int zap_leader;
repeat:
/* don't need to get the RCU readlock here - the process is dead and
* can't be modifying its own credentials. But shut RCU-lockdep up */
rcu_read_lock();
-@@ -394,7 +402,7 @@ int allow_signal(int sig)
+@@ -394,7 +398,7 @@ int allow_signal(int sig)
* know it'll be handled, so that they don't get converted to
* SIGKILL or just silently dropped.
*/
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
return 0;
-@@ -430,6 +438,17 @@ void daemonize(const char *name, ...)
+@@ -430,6 +434,9 @@ void daemonize(const char *name, ...)
vsnprintf(current->comm, sizeof(current->comm), name, args);
va_end(args);
-+#ifdef CONFIG_GRKERNSEC
-+ write_lock(&grsec_exec_file_lock);
-+ if (current->exec_file) {
-+ fput(current->exec_file);
-+ current->exec_file = NULL;
-+ }
-+ write_unlock(&grsec_exec_file_lock);
-+#endif
-+
++ gr_put_exec_file(current);
+ gr_set_kernel_label(current);
+
/*
* If we were started as result of loading a module, close all of the
* user space pages. We don't need them, and if we didn't close them
-@@ -907,6 +926,8 @@ void do_exit(long code)
+@@ -812,6 +819,8 @@ void do_exit(long code)
struct task_struct *tsk = current;
int group_dead;
profile_task_exit(tsk);
WARN_ON(blk_needs_flush_plug(tsk));
-@@ -923,7 +944,6 @@ void do_exit(long code)
+@@ -828,7 +837,6 @@ void do_exit(long code)
* mm_release()->clear_child_tid() from writing to a user-controlled
* kernel address.
*/
ptrace_event(PTRACE_EVENT_EXIT, code);
-@@ -982,6 +1002,9 @@ void do_exit(long code)
+@@ -887,6 +895,9 @@ void do_exit(long code)
tsk->exit_code = code;
taskstats_exit(tsk, group_dead);
exit_mm(tsk);
if (group_dead)
-@@ -1099,7 +1122,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
+@@ -1007,7 +1018,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
* Take down every thread in the group. This is called by fatal signals
* as well as by sys_exit_group (below).
*/
{
struct signal_struct *sig = current->signal;
diff --git a/kernel/fork.c b/kernel/fork.c
-index 2c8857e..288c9c7 100644
+index acc4cb6..b524cb5 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -318,7 +318,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
#endif
/*
-@@ -343,13 +343,78 @@ free_tsk:
+@@ -344,13 +344,81 @@ free_tsk:
}
#ifdef CONFIG_MMU
+ mapping->i_mmap_writable++;
+ flush_dcache_mmap_lock(mapping);
+ /* insert tmp into the share list, just after mpnt */
-+ vma_prio_tree_add(tmp, mpnt);
++ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
++ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
++ else
++ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
+ flush_dcache_mmap_unlock(mapping);
+ mutex_unlock(&mapping->i_mmap_mutex);
+ }
down_write(&oldmm->mmap_sem);
flush_cache_dup_mm(oldmm);
-@@ -361,8 +426,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -363,8 +431,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
mm->locked_vm = 0;
mm->mmap = NULL;
mm->mmap_cache = NULL;
mm->map_count = 0;
cpumask_clear(mm_cpumask(mm));
mm->mm_rb = RB_ROOT;
-@@ -378,52 +443,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -380,57 +448,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
prev = NULL;
for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
- mapping->i_mmap_writable++;
- flush_dcache_mmap_lock(mapping);
- /* insert tmp into the share list, just after mpnt */
-- vma_prio_tree_add(tmp, mpnt);
+- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
+- vma_nonlinear_insert(tmp,
+- &mapping->i_mmap_nonlinear);
+- else
+- vma_interval_tree_insert_after(tmp, mpnt,
+- &mapping->i_mmap);
- flush_dcache_mmap_unlock(mapping);
- mutex_unlock(&mapping->i_mmap_mutex);
+ tmp = dup_vma(mm, oldmm, mpnt);
}
/*
-@@ -455,9 +483,34 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -462,6 +488,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
if (retval)
goto out;
-
-- if (file)
-+ if (tmp->vm_file)
- uprobe_mmap(tmp);
}
+
+#ifdef CONFIG_PAX_SEGMEXEC
/* a new mm has just been created */
arch_dup_mmap(oldmm, mm);
retval = 0;
-@@ -466,14 +519,6 @@ out:
+@@ -470,14 +521,6 @@ out:
flush_tlb_mm(oldmm);
up_write(&oldmm->mmap_sem);
return retval;
}
static inline int mm_alloc_pgd(struct mm_struct *mm)
-@@ -710,8 +755,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
+@@ -692,8 +735,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
return ERR_PTR(err);
mm = get_task_mm(task);
mmput(mm);
mm = ERR_PTR(-EACCES);
}
-@@ -932,13 +977,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
+@@ -912,13 +955,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
spin_unlock(&fs->lock);
return -EAGAIN;
}
return 0;
}
-@@ -1205,6 +1257,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1183,6 +1233,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
retval = -EAGAIN;
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-@@ -1427,6 +1482,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
- /* Need tasklist lock for parent etc handling! */
- write_lock_irq(&tasklist_lock);
+@@ -1422,6 +1475,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+ goto bad_fork_free_pid;
+ }
-+ /* synchronizes with gr_set_acls() */
++ /* synchronizes with gr_set_acls()
++ we need to call this past the point of no return for fork()
++ */
+ gr_copy_label(p);
+
- /* CLONE_PARENT re-uses the old parent */
- if (clone_flags & (CLONE_PARENT|CLONE_THREAD)) {
- p->real_parent = current->real_parent;
-@@ -1537,6 +1595,8 @@ bad_fork_cleanup_count:
+ if (clone_flags & CLONE_THREAD) {
+ current->signal->nr_threads++;
+ atomic_inc(¤t->signal->live);
+@@ -1505,6 +1563,8 @@ bad_fork_cleanup_count:
bad_fork_free:
free_task(p);
fork_out:
return ERR_PTR(retval);
}
-@@ -1637,6 +1697,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1605,6 +1665,8 @@ long do_fork(unsigned long clone_flags,
if (clone_flags & CLONE_PARENT_SETTID)
put_user(nr, parent_tidptr);
if (clone_flags & CLONE_VFORK) {
p->vfork_done = &vfork;
init_completion(&vfork);
-@@ -1735,7 +1797,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
+@@ -1714,7 +1776,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
return 0;
/* don't need lock here; in the worst case we'll do useless copy */
return 0;
*new_fsp = copy_fs_struct(fs);
-@@ -1824,7 +1886,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+@@ -1803,7 +1865,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
fs = current->fs;
spin_lock(&fs->lock);
current->fs = new_fs;
else
new_fs = fs;
diff --git a/kernel/futex.c b/kernel/futex.c
-index 3717e7b..473c750 100644
+index 19eb089..b8c65ea 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -54,6 +54,7 @@
/*
* The futex address must be "naturally" aligned.
*/
-@@ -2714,6 +2720,7 @@ static int __init futex_init(void)
+@@ -2733,6 +2739,7 @@ static int __init futex_init(void)
{
u32 curval;
int i;
/*
* This will fail and we want it. Some arch implementations do
-@@ -2725,8 +2732,11 @@ static int __init futex_init(void)
+@@ -2744,8 +2751,11 @@ static int __init futex_init(void)
* implementation, the non-functional ones will return
* -ENOSYS.
*/
struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases);
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
-index 4304919..408c4c0 100644
+index 60f48fa..7f3a770 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -13,6 +13,7 @@
}
static void jump_label_update(struct static_key *key, int enable);
-@@ -356,10 +359,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
+@@ -357,10 +360,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
struct jump_entry *iter;
/*
diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 0668d58..591b6fc 100644
+index 5e4bd78..00c5b91 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
-@@ -1046,7 +1046,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
+@@ -1045,7 +1045,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
unsigned long flags)
{
struct compat_kexec_segment in;
/* Don't allow clients that don't understand the native
diff --git a/kernel/kmod.c b/kernel/kmod.c
-index 6f99aea..eb6e3a0 100644
+index 1c317e3..4a92a55 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
-@@ -73,7 +73,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
+@@ -74,7 +74,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
kfree(info->argv);
}
{
static char *envp[] = {
"HOME=/",
-@@ -82,7 +82,7 @@ static int call_modprobe(char *module_name, int wait)
+@@ -83,7 +83,7 @@ static int call_modprobe(char *module_name, int wait)
NULL
};
if (!argv)
goto out;
-@@ -94,7 +94,8 @@ static int call_modprobe(char *module_name, int wait)
+@@ -95,7 +95,8 @@ static int call_modprobe(char *module_name, int wait)
argv[1] = "-q";
argv[2] = "--";
argv[3] = module_name; /* check free_modprobe_argv() */
return call_usermodehelper_fns(modprobe_path, argv, envp,
wait | UMH_KILLABLE, NULL, free_modprobe_argv, NULL);
-@@ -119,9 +120,8 @@ out:
+@@ -120,9 +121,8 @@ out:
* If module auto-loading support is disabled then this function
* becomes a no-operation.
*/
char module_name[MODULE_NAME_LEN];
unsigned int max_modprobes;
int ret;
-@@ -129,9 +129,7 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -130,9 +130,7 @@ int __request_module(bool wait, const char *fmt, ...)
#define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
static int kmod_loop_msg;
if (ret >= MODULE_NAME_LEN)
return -ENAMETOOLONG;
-@@ -139,6 +137,20 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -140,6 +138,20 @@ int __request_module(bool wait, const char *fmt, ...)
if (ret)
return ret;
/* If modprobe needs a service that is in a module, we get a recursive
* loop. Limit the number of running kmod threads to max_threads/2 or
* MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
-@@ -167,11 +179,52 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -168,11 +180,52 @@ int __request_module(bool wait, const char *fmt, ...)
trace_module_request(module_name, wait, _RET_IP_);
EXPORT_SYMBOL(__request_module);
#endif /* CONFIG_MODULES */
-@@ -280,7 +333,7 @@ static int wait_for_helper(void *data)
+@@ -283,7 +336,7 @@ static int wait_for_helper(void *data)
*
* Thus the __user pointer cast is valid here.
*/
/*
* If ret is 0, either ____call_usermodehelper failed and the
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
-index c62b854..6fc810d 100644
+index 098f396..fe85ff1 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
kfree(kip);
}
return 1;
-@@ -1955,7 +1955,7 @@ static int __init init_kprobes(void)
+@@ -2063,7 +2063,7 @@ static int __init init_kprobes(void)
{
int i, err = 0;
unsigned long offset = 0, size = 0;
const char *symbol_name;
void *addr;
struct kprobe_blackpoint *kb;
-@@ -2040,11 +2040,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
+@@ -2148,11 +2148,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
kprobe_type = "k";
if (sym)
p->addr, kprobe_type, p->addr);
if (!pp)
-@@ -2081,7 +2081,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
+@@ -2190,7 +2190,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
const char *sym = NULL;
unsigned int i = *(loff_t *) v;
unsigned long offset = 0;
uevent_helper[count] = '\0';
if (count && uevent_helper[count-1] == '\n')
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
-index ea9ee45..67ebc8f 100644
+index 7981e5b..7f2105c 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -590,6 +590,10 @@ static int static_obj(void *obj)
printk("the code is fine but needs lockdep annotation.\n");
printk("turning off the locking correctness validator.\n");
dump_stack();
-@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
+@@ -3078,7 +3083,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
if (!class)
return 0;
}
seq_printf(m, "%40s %14lu %29s %pS\n",
name, stats->contending_point[i],
diff --git a/kernel/module.c b/kernel/module.c
-index 9ad9ee9..de7a157 100644
+index 3e544f4..34c3008 100644
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -58,6 +58,7 @@
- #include <linux/jump_label.h>
+@@ -59,6 +59,7 @@
#include <linux/pfn.h>
#include <linux/bsearch.h>
+ #include <linux/fips.h>
+#include <linux/grsecurity.h>
+ #include "module-internal.h"
#define CREATE_TRACE_POINTS
- #include <trace/events/module.h>
-@@ -114,7 +115,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
+@@ -153,7 +154,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
/* Bounds of module allocation, for speeding __module_address.
* Protected by module_mutex. */
int register_module_notifier(struct notifier_block * nb)
{
-@@ -278,7 +280,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
+@@ -319,7 +321,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
return true;
list_for_each_entry_rcu(mod, &modules, list) {
{ mod->syms, mod->syms + mod->num_syms, mod->crcs,
NOT_GPL_ONLY, false },
{ mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
-@@ -300,7 +302,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
- #endif
- };
+@@ -344,7 +346,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
+ if (mod->state == MODULE_STATE_UNFORMED)
+ continue;
- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
return true;
}
return false;
-@@ -432,7 +434,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
+@@ -484,7 +486,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
static int percpu_modalloc(struct module *mod,
unsigned long size, unsigned long align)
{
printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
mod->name, align, PAGE_SIZE);
align = PAGE_SIZE;
-@@ -1032,7 +1034,7 @@ struct module_attribute module_uevent =
+@@ -1088,7 +1090,7 @@ struct module_attribute module_uevent =
static ssize_t show_coresize(struct module_attribute *mattr,
struct module_kobject *mk, char *buffer)
{
}
static struct module_attribute modinfo_coresize =
-@@ -1041,7 +1043,7 @@ static struct module_attribute modinfo_coresize =
+@@ -1097,7 +1099,7 @@ static struct module_attribute modinfo_coresize =
static ssize_t show_initsize(struct module_attribute *mattr,
struct module_kobject *mk, char *buffer)
{
}
static struct module_attribute modinfo_initsize =
-@@ -1255,7 +1257,7 @@ resolve_symbol_wait(struct module *mod,
+@@ -1311,7 +1313,7 @@ resolve_symbol_wait(struct module *mod,
*/
#ifdef CONFIG_SYSFS
static inline bool sect_empty(const Elf_Shdr *sect)
{
return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-@@ -1721,21 +1723,21 @@ static void set_section_ro_nx(void *base,
+@@ -1777,21 +1779,21 @@ static void set_section_ro_nx(void *base,
static void unset_module_core_ro_nx(struct module *mod)
{
set_memory_rw);
}
-@@ -1746,14 +1748,14 @@ void set_all_modules_text_rw(void)
-
- mutex_lock(&module_mutex);
+@@ -1804,14 +1806,14 @@ void set_all_modules_text_rw(void)
list_for_each_entry_rcu(mod, &modules, list) {
+ if (mod->state == MODULE_STATE_UNFORMED)
+ continue;
- if ((mod->module_core) && (mod->core_text_size)) {
- set_page_attributes(mod->module_core,
- mod->module_core + mod->core_text_size,
set_memory_rw);
}
}
-@@ -1767,14 +1769,14 @@ void set_all_modules_text_ro(void)
-
- mutex_lock(&module_mutex);
+@@ -1827,14 +1829,14 @@ void set_all_modules_text_ro(void)
list_for_each_entry_rcu(mod, &modules, list) {
+ if (mod->state == MODULE_STATE_UNFORMED)
+ continue;
- if ((mod->module_core) && (mod->core_text_size)) {
- set_page_attributes(mod->module_core,
- mod->module_core + mod->core_text_size,
set_memory_ro);
}
}
-@@ -1820,16 +1822,19 @@ static void free_module(struct module *mod)
+@@ -1880,16 +1882,19 @@ static void free_module(struct module *mod)
/* This may be NULL, but that's OK */
unset_module_init_ro_nx(mod);
#ifdef CONFIG_MPU
update_protections(current->mm);
-@@ -1899,9 +1904,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1959,9 +1964,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
int ret = 0;
const struct kernel_symbol *ksym;
+
+ p = strstr(mod->args, "grsec_modharden_fs");
+ if (p) {
-+ char *endptr = p + strlen("grsec_modharden_fs");
++ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
+ /* copy \0 as well */
+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
+ is_fs_load = 1;
switch (sym[i].st_shndx) {
case SHN_COMMON:
/* We compiled with -fno-common. These are not
-@@ -1922,7 +1949,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1982,7 +2009,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
ksym = resolve_symbol_wait(mod, info, name);
/* Ok if resolved. */
if (ksym && !IS_ERR(ksym)) {
break;
}
-@@ -1941,11 +1970,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -2001,11 +2030,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
secbase = (unsigned long)mod_percpu(mod);
else
secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
return ret;
}
-@@ -2049,22 +2087,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -2089,22 +2127,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
|| s->sh_entsize != ~0UL
|| strstarts(sname, ".init"))
continue;
}
pr_debug("Init section allocation order:\n");
-@@ -2078,23 +2106,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -2118,23 +2146,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
|| s->sh_entsize != ~0UL
|| !strstarts(sname, ".init"))
continue;
}
}
-@@ -2266,7 +2284,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2306,7 +2324,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
/* Put symbol section at end of init part of module. */
symsect->sh_flags |= SHF_ALLOC;
info->index.sym) | INIT_OFFSET_MASK;
pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
-@@ -2281,13 +2299,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
- }
+@@ -2326,13 +2344,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+ }
/* Append room for core symbols at end of core part. */
- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
info->index.str) | INIT_OFFSET_MASK;
pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
}
-@@ -2305,12 +2323,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2350,12 +2368,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
/* Make sure we get permanent strtab: don't use info->strtab. */
mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
src = mod->symtab;
- *dst = *src;
*s++ = 0;
-@@ -2323,6 +2343,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
- s += strlcpy(s, &mod->strtab[src->st_name], KSYM_NAME_LEN) + 1;
+ for (ndst = i = 0; i < mod->num_symtab; i++) {
+@@ -2368,6 +2388,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+ }
}
mod->core_num_syms = ndst;
+
}
#else
static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2356,17 +2378,33 @@ void * __weak module_alloc(unsigned long size)
+@@ -2401,17 +2423,33 @@ void * __weak module_alloc(unsigned long size)
return size == 0 ? NULL : vmalloc_exec(size);
}
mutex_unlock(&module_mutex);
}
return ret;
-@@ -2544,8 +2582,14 @@ static struct module *setup_load_info(struct load_info *info)
+@@ -2630,8 +2668,14 @@ static struct module *setup_load_info(struct load_info *info)
static int check_modinfo(struct module *mod, struct load_info *info)
{
const char *modmagic = get_modinfo(info, "vermagic");
/* This is allowed: modprobe --force will invalidate it. */
if (!modmagic) {
err = try_to_force_load(mod, "bad vermagic");
-@@ -2568,7 +2612,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
+@@ -2654,7 +2698,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
}
/* Set up license info based on the info section */
return 0;
}
-@@ -2662,7 +2706,7 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2748,7 +2792,7 @@ static int move_module(struct module *mod, struct load_info *info)
void *ptr;
/* Do the allocs. */
/*
* The pointer to this block is stored in the module structure
* which is inside the block. Just mark it as not being a
-@@ -2672,23 +2716,50 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2758,10 +2802,10 @@ static int move_module(struct module *mod, struct load_info *info)
if (!ptr)
return -ENOMEM;
/*
* The pointer to this block is stored in the module structure
* which is inside the block. This block doesn't need to be
- * scanned as it contains data and code that will be freed
+@@ -2769,12 +2813,39 @@ static int move_module(struct module *mod, struct load_info *info)
* after the module is initialized.
*/
-- kmemleak_ignore(ptr);
+ kmemleak_ignore(ptr);
- if (!ptr && mod->init_size) {
- module_free(mod, mod->module_core);
-+ kmemleak_not_leak(ptr);
+ if (!ptr && mod->init_size_rw) {
+ module_free(mod, mod->module_core_rw);
return -ENOMEM;
+ mod->module_core_rx = ptr;
+
+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
-+ kmemleak_not_leak(ptr);
++ kmemleak_ignore(ptr);
+ if (!ptr && mod->init_size_rx) {
+ module_free_exec(mod, mod->module_core_rx);
+ module_free(mod, mod->module_init_rw);
/* Transfer each section which specifies SHF_ALLOC */
pr_debug("final section addresses:\n");
-@@ -2699,16 +2770,45 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2785,16 +2856,45 @@ static int move_module(struct module *mod, struct load_info *info)
if (!(shdr->sh_flags & SHF_ALLOC))
continue;
pr_debug("\t0x%lx %s\n",
(long)shdr->sh_addr, info->secstrings + shdr->sh_name);
}
-@@ -2763,12 +2863,12 @@ static void flush_module_icache(const struct module *mod)
+@@ -2849,12 +2949,12 @@ static void flush_module_icache(const struct module *mod)
* Do it before processing of module parameters, so the module
* can provide parameter accessor functions of its own.
*/
set_fs(old_fs);
}
-@@ -2838,8 +2938,10 @@ out:
+@@ -2924,8 +3024,10 @@ out:
static void module_deallocate(struct module *mod, struct load_info *info)
{
percpu_modfree(mod);
}
int __weak module_finalize(const Elf_Ehdr *hdr,
-@@ -2852,7 +2954,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
+@@ -2938,7 +3040,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
static int post_relocation(struct module *mod, const struct load_info *info)
{
/* Sort exception table now relocations are done. */
/* Copy relocated percpu area over. */
percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
-@@ -2903,9 +3007,38 @@ static struct module *load_module(void __user *umod,
+@@ -3036,9 +3140,38 @@ again:
if (err)
goto free_unload;
+ err = -EPERM;
+ goto free_modinfo;
+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
-+ p += strlen("grsec_modharden_normal");
++ p += sizeof("grsec_modharden_normal") - 1;
+ p2 = strstr(p, "_");
+ if (p2) {
+ *p2 = '\0';
/* Fix up syms, so that st_value is a pointer to location. */
err = simplify_symbols(mod, &info);
if (err < 0)
-@@ -2921,13 +3054,6 @@ static struct module *load_module(void __user *umod,
-
- flush_module_icache(mod);
-
-- /* Now copy in args */
-- mod->args = strndup_user(uargs, ~0UL >> 1);
-- if (IS_ERR(mod->args)) {
-- err = PTR_ERR(mod->args);
-- goto free_arch_cleanup;
-- }
--
- /* Mark state as coming so strong_try_module_get() ignores us. */
- mod->state = MODULE_STATE_COMING;
-
-@@ -2985,11 +3111,10 @@ static struct module *load_module(void __user *umod,
- unlock:
+@@ -3104,11 +3237,11 @@ again:
mutex_unlock(&module_mutex);
+ dynamic_debug_remove(info.debug);
synchronize_sched();
- kfree(mod->args);
-- free_arch_cleanup:
+ free_arch_cleanup:
module_arch_cleanup(mod);
free_modinfo:
free_modinfo(mod);
+ kfree(mod->args);
free_unload:
module_unload_free(mod);
- free_module:
-@@ -3030,16 +3155,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ unlink_mod:
+@@ -3155,16 +3288,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
MODULE_STATE_COMING, mod);
/* Set RO and NX regions for core */
do_mod_ctors(mod);
/* Start the module */
-@@ -3085,11 +3210,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+@@ -3209,11 +3342,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
mod->strtab = mod->core_strtab;
#endif
unset_module_init_ro_nx(mod);
+ mod->init_size_rw = 0;
+ mod->init_size_rx = 0;
mutex_unlock(&module_mutex);
+ wake_up_all(&module_wq);
- return 0;
-@@ -3120,10 +3246,16 @@ static const char *get_ksymbol(struct module *mod,
+@@ -3245,10 +3379,16 @@ static const char *get_ksymbol(struct module *mod,
unsigned long nextval;
/* At worse, next value is at end of module */
/* Scan for closest preceding symbol, and next symbol. (ELF
starts real symbols at 1). */
-@@ -3358,7 +3490,7 @@ static int m_show(struct seq_file *m, void *p)
- char buf[8];
+@@ -3501,7 +3641,7 @@ static int m_show(struct seq_file *m, void *p)
+ return 0;
seq_printf(m, "%s %u",
- mod->name, mod->init_size + mod->core_size);
print_unload_info(m, mod);
/* Informative for users. */
-@@ -3367,7 +3499,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3510,7 +3650,7 @@ static int m_show(struct seq_file *m, void *p)
mod->state == MODULE_STATE_COMING ? "Loading":
"Live");
/* Used by oprofile and other similar tools. */
/* Taints info */
if (mod->taints)
-@@ -3403,7 +3535,17 @@ static const struct file_operations proc_modules_operations = {
+@@ -3546,7 +3686,17 @@ static const struct file_operations proc_modules_operations = {
static int __init proc_modules_init(void)
{
return 0;
}
module_init(proc_modules_init);
-@@ -3462,12 +3604,12 @@ struct module *__module_address(unsigned long addr)
+@@ -3607,14 +3757,14 @@ struct module *__module_address(unsigned long addr)
{
struct module *mod;
+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
return NULL;
- list_for_each_entry_rcu(mod, &modules, list)
+ list_for_each_entry_rcu(mod, &modules, list) {
+ if (mod->state == MODULE_STATE_UNFORMED)
+ continue;
- if (within_module_core(addr, mod)
- || within_module_init(addr, mod))
+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
return mod;
+ }
return NULL;
- }
-@@ -3501,11 +3643,20 @@ bool is_module_text_address(unsigned long addr)
+@@ -3649,11 +3799,20 @@ bool is_module_text_address(unsigned long addr)
*/
struct module *__module_text_address(unsigned long addr)
{
mutex_set_owner(lock);
/* set it to 0 if there are no waiters left: */
+diff --git a/kernel/notifier.c b/kernel/notifier.c
+index 2d5cc4c..d9ea600 100644
+--- a/kernel/notifier.c
++++ b/kernel/notifier.c
+@@ -5,6 +5,7 @@
+ #include <linux/rcupdate.h>
+ #include <linux/vmalloc.h>
+ #include <linux/reboot.h>
++#include <linux/mm.h>
+
+ /*
+ * Notifier list for kernel code which wants to be called
+@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
+ while ((*nl) != NULL) {
+ if (n->priority > (*nl)->priority)
+ break;
+- nl = &((*nl)->next);
++ nl = (struct notifier_block **)&((*nl)->next);
+ }
+- n->next = *nl;
++ pax_open_kernel();
++ *(const void **)&n->next = *nl;
+ rcu_assign_pointer(*nl, n);
++ pax_close_kernel();
+ return 0;
+ }
+
+@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
+ return 0;
+ if (n->priority > (*nl)->priority)
+ break;
+- nl = &((*nl)->next);
++ nl = (struct notifier_block **)&((*nl)->next);
+ }
+- n->next = *nl;
++ pax_open_kernel();
++ *(const void **)&n->next = *nl;
+ rcu_assign_pointer(*nl, n);
++ pax_close_kernel();
+ return 0;
+ }
+
+@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
+ {
+ while ((*nl) != NULL) {
+ if ((*nl) == n) {
++ pax_open_kernel();
+ rcu_assign_pointer(*nl, n->next);
++ pax_close_kernel();
+ return 0;
+ }
+- nl = &((*nl)->next);
++ nl = (struct notifier_block **)&((*nl)->next);
+ }
+ return -ENOENT;
+ }
diff --git a/kernel/panic.c b/kernel/panic.c
index e1b2822..5edc1d9 100644
--- a/kernel/panic.c
}
EXPORT_SYMBOL(__stack_chk_fail);
diff --git a/kernel/pid.c b/kernel/pid.c
-index e86b291a..e8b0fb5 100644
+index aebd4f5..1693c13 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -33,6 +33,7 @@
{
struct pid *pid;
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
-index 125cb67..a4d1c30 100644
+index 125cb67..2e5c8ad 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
-@@ -6,6 +6,7 @@
+@@ -6,9 +6,11 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
#include <linux/math64.h>
#include <asm/uaccess.h>
#include <linux/kernel_stat.h>
#include <trace/events/timer.h>
-@@ -1578,14 +1579,14 @@ struct k_clock clock_posix_cpu = {
++#include <linux/random.h>
+
+ /*
+ * Called after updating RLIMIT_CPU to run cpu timer and update
+@@ -494,6 +496,8 @@ static void cleanup_timers(struct list_head *head,
+ */
+ void posix_cpu_timers_exit(struct task_struct *tsk)
+ {
++ add_device_randomness((const void*) &tsk->se.sum_exec_runtime,
++ sizeof(unsigned long long));
+ cleanup_timers(tsk->cpu_timers,
+ tsk->utime, tsk->stime, tsk->se.sum_exec_runtime);
+
+@@ -1578,14 +1582,14 @@ struct k_clock clock_posix_cpu = {
static __init int init_posix_cpu_timers(void)
{
return kc->clock_set(which_clock, &new_tp);
}
-diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
-index d523593..68197a4 100644
---- a/kernel/power/poweroff.c
-+++ b/kernel/power/poweroff.c
-@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
- .enable_mask = SYSRQ_ENABLE_BOOT,
- };
-
--static int pm_sysrq_init(void)
-+static int __init pm_sysrq_init(void)
- {
- register_sysrq_key('o', &sysrq_poweroff_op);
- return 0;
diff --git a/kernel/power/process.c b/kernel/power/process.c
-index 19db29f..33b52b6 100644
+index 87da817..30ddd13 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -33,6 +33,7 @@ static int try_to_freeze_tasks(bool user_only)
if (pm_wakeup_pending()) {
diff --git a/kernel/printk.c b/kernel/printk.c
-index 66a2ea3..10f3a01 100644
+index f8e0b5a..dda2a5c 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -817,6 +817,11 @@ static int check_syslog_permissions(int type, bool from_file)
}
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index a232bb5..2a65ef9 100644
+index fbea91d..9bf15e8 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
-@@ -279,7 +279,7 @@ static int ptrace_attach(struct task_struct *task, long request,
+@@ -319,7 +319,7 @@ static int ptrace_attach(struct task_struct *task, long request,
if (seize)
flags |= PT_SEIZED;
flags |= PT_PTRACE_CAP;
task->ptrace = flags;
-@@ -486,7 +486,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
+@@ -526,7 +526,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
break;
return -EIO;
}
return -EFAULT;
copied += retval;
src += retval;
-@@ -671,7 +671,7 @@ int ptrace_request(struct task_struct *child, long request,
+@@ -711,7 +711,7 @@ int ptrace_request(struct task_struct *child, long request,
bool seized = child->ptrace & PT_SEIZED;
int ret = -EIO;
siginfo_t siginfo, *si;
unsigned long __user *datalp = datavp;
unsigned long flags;
-@@ -873,14 +873,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
+@@ -913,14 +913,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
goto out;
}
goto out_put_task_struct;
}
-@@ -906,7 +913,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
+@@ -948,7 +955,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
return -EIO;
}
int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -1016,14 +1023,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
+@@ -1058,14 +1065,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
goto out;
}
}
diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
-index 547b1fe..65e874e 100644
+index e4c6a59..c86621a 100644
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
@@ -46,7 +46,7 @@
static void __call_rcu(struct rcu_head *head,
void (*func)(struct rcu_head *rcu),
struct rcu_ctrlblk *rcp);
-@@ -307,7 +307,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
+@@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
rcu_is_callbacks_kthread()));
}
__rcu_process_callbacks(&rcu_sched_ctrlblk);
__rcu_process_callbacks(&rcu_bh_ctrlblk);
diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
-index 918fd1e..85089bb 100644
+index 3d01902..afbf46e 100644
--- a/kernel/rcutiny_plugin.h
+++ b/kernel/rcutiny_plugin.h
@@ -893,7 +893,7 @@ static int rcu_kthread(void *arg)
}
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
-index 25b1503..1988a74 100644
+index aaa7b9f..055ff1e 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
-@@ -162,12 +162,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
+@@ -163,12 +163,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
{ 0 };
static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
{ 0 };
static long n_rcu_torture_barrier_error;
static long n_rcu_torture_boost_ktrerror;
static long n_rcu_torture_boost_rterror;
-@@ -265,11 +265,11 @@ rcu_torture_alloc(void)
+@@ -272,11 +272,11 @@ rcu_torture_alloc(void)
spin_lock_bh(&rcu_torture_lock);
if (list_empty(&rcu_torture_freelist)) {
p = rcu_torture_freelist.next;
list_del_init(p);
spin_unlock_bh(&rcu_torture_lock);
-@@ -282,7 +282,7 @@ rcu_torture_alloc(void)
+@@ -289,7 +289,7 @@ rcu_torture_alloc(void)
static void
rcu_torture_free(struct rcu_torture *p)
{
spin_lock_bh(&rcu_torture_lock);
list_add_tail(&p->rtort_free, &rcu_torture_freelist);
spin_unlock_bh(&rcu_torture_lock);
-@@ -403,7 +403,7 @@ rcu_torture_cb(struct rcu_head *p)
+@@ -410,7 +410,7 @@ rcu_torture_cb(struct rcu_head *p)
i = rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
rp->rtort_mbtest = 0;
rcu_torture_free(rp);
-@@ -452,7 +452,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
+@@ -459,7 +459,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
i = rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
rp->rtort_mbtest = 0;
list_del(&rp->rtort_free);
-@@ -995,7 +995,7 @@ rcu_torture_writer(void *arg)
+@@ -1002,7 +1002,7 @@ rcu_torture_writer(void *arg)
i = old_rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
old_rp->rtort_pipe_count++;
cur_ops->deferred_free(old_rp);
}
-@@ -1080,7 +1080,7 @@ static void rcu_torture_timer(unsigned long unused)
+@@ -1087,7 +1087,7 @@ static void rcu_torture_timer(unsigned long unused)
}
do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu);
if (p->rtort_mbtest == 0)
spin_lock(&rand_lock);
cur_ops->read_delay(&rand);
n_rcu_torture_timers++;
-@@ -1144,7 +1144,7 @@ rcu_torture_reader(void *arg)
+@@ -1151,7 +1151,7 @@ rcu_torture_reader(void *arg)
}
do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu);
if (p->rtort_mbtest == 0)
cur_ops->read_delay(&rand);
preempt_disable();
pipe_count = p->rtort_pipe_count;
-@@ -1203,11 +1203,11 @@ rcu_torture_printk(char *page)
+@@ -1210,11 +1210,11 @@ rcu_torture_printk(char *page)
rcu_torture_current,
rcu_torture_current_version,
list_empty(&rcu_torture_freelist),
n_rcu_torture_boost_ktrerror,
n_rcu_torture_boost_rterror);
cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ",
-@@ -1224,14 +1224,14 @@ rcu_torture_printk(char *page)
+@@ -1233,14 +1233,14 @@ rcu_torture_printk(char *page)
n_barrier_attempts,
n_rcu_torture_barrier_error);
cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
WARN_ON_ONCE(1);
}
cnt += sprintf(&page[cnt], "Reader Pipe: ");
-@@ -1245,7 +1245,7 @@ rcu_torture_printk(char *page)
+@@ -1254,7 +1254,7 @@ rcu_torture_printk(char *page)
cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
cnt += sprintf(&page[cnt], " %d",
}
cnt += sprintf(&page[cnt], "\n");
if (cur_ops->stats)
-@@ -1905,7 +1905,7 @@ rcu_torture_cleanup(void)
+@@ -1938,7 +1938,7 @@ rcu_torture_cleanup(void)
if (cur_ops->cleanup)
cur_ops->cleanup();
rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
else if (n_online_successes != n_online_attempts ||
n_offline_successes != n_offline_attempts)
-@@ -1974,18 +1974,18 @@ rcu_torture_init(void)
+@@ -2007,18 +2007,18 @@ rcu_torture_init(void)
rcu_torture_current = NULL;
rcu_torture_current_version = 0;
for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
per_cpu(rcu_torture_count, cpu)[i] = 0;
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
-index f7bcd9e..8973e14 100644
+index 2682295..0f2297e 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
-@@ -369,9 +369,9 @@ static void rcu_idle_enter_common(struct rcu_dynticks *rdtp, long long oldval)
+@@ -348,9 +348,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
rcu_prepare_for_idle(smp_processor_id());
/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
smp_mb__before_atomic_inc(); /* See above. */
+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
/*
- * The idle task is not permitted to enter the idle loop while
-@@ -460,10 +460,10 @@ void rcu_irq_exit(void)
- static void rcu_idle_exit_common(struct rcu_dynticks *rdtp, long long oldval)
+ * It is illegal to enter an extended quiescent state while
+@@ -508,10 +508,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
+ int user)
{
smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
- atomic_inc(&rdtp->dynticks);
+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
rcu_cleanup_after_idle(smp_processor_id());
trace_rcu_dyntick("End", oldval, rdtp->dynticks_nesting);
- if (!is_idle_task(current)) {
-@@ -557,14 +557,14 @@ void rcu_nmi_enter(void)
+ if (!user && !is_idle_task(current)) {
+@@ -670,14 +670,14 @@ void rcu_nmi_enter(void)
struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
if (rdtp->dynticks_nmi_nesting == 0 &&
}
/**
-@@ -583,9 +583,9 @@ void rcu_nmi_exit(void)
+@@ -696,9 +696,9 @@ void rcu_nmi_exit(void)
return;
/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
smp_mb__before_atomic_inc(); /* See above. */
}
/**
-@@ -599,7 +599,7 @@ int rcu_is_cpu_idle(void)
+@@ -712,7 +712,7 @@ int rcu_is_cpu_idle(void)
int ret;
preempt_disable();
preempt_enable();
return ret;
}
-@@ -667,7 +667,7 @@ int rcu_is_cpu_rrupt_from_idle(void)
+@@ -795,7 +795,7 @@ int rcu_is_cpu_rrupt_from_idle(void)
*/
static int dyntick_save_progress_counter(struct rcu_data *rdp)
{
return (rdp->dynticks_snap & 0x1) == 0;
}
-@@ -682,7 +682,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
+@@ -810,7 +810,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
unsigned int curr;
unsigned int snap;
snap = (unsigned int)rdp->dynticks_snap;
/*
-@@ -712,10 +712,10 @@ static int jiffies_till_stall_check(void)
+@@ -858,10 +858,10 @@ static int jiffies_till_stall_check(void)
* for CONFIG_RCU_CPU_STALL_TIMEOUT.
*/
if (till_stall_check < 3) {
till_stall_check = 300;
}
return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
-@@ -1351,7 +1351,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
+@@ -1589,7 +1589,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
rsp->qlen += rdp->qlen;
rdp->n_cbs_orphaned += rdp->qlen;
rdp->qlen_lazy = 0;
}
/*
-@@ -1604,7 +1604,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
+@@ -1831,7 +1831,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
}
smp_mb(); /* List handling before counting for rcu_barrier(). */
rdp->qlen_lazy -= count_lazy;
rdp->n_cbs_invoked += count;
/* Reinstate batch limit if we have worked down the excess. */
-@@ -1836,7 +1836,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+@@ -2024,7 +2024,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
/*
* Do RCU core processing for the current CPU.
*/
{
struct rcu_state *rsp;
-@@ -1943,7 +1943,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
- rdp = this_cpu_ptr(rsp->rda);
-
- /* Add the callback to our list. */
+@@ -2136,7 +2136,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
+ local_irq_restore(flags);
+ return;
+ }
- ACCESS_ONCE(rdp->qlen)++;
+ ACCESS_ONCE_RW(rdp->qlen)++;
if (lazy)
rdp->qlen_lazy++;
else
-@@ -2057,8 +2057,8 @@ void synchronize_rcu_bh(void)
+@@ -2250,8 +2250,8 @@ void synchronize_rcu_bh(void)
}
EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
static int synchronize_sched_expedited_cpu_stop(void *data)
{
-@@ -2119,7 +2119,7 @@ void synchronize_sched_expedited(void)
+@@ -2312,7 +2312,7 @@ void synchronize_sched_expedited(void)
int firstsnap, s, snap, trycount = 0;
/* Note that atomic_inc_return() implies full memory barrier. */
get_online_cpus();
WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
-@@ -2141,7 +2141,7 @@ void synchronize_sched_expedited(void)
+@@ -2334,7 +2334,7 @@ void synchronize_sched_expedited(void)
}
/* Check to see if someone else did our work for us. */
if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
smp_mb(); /* ensure test happens before caller kfree */
return;
-@@ -2156,7 +2156,7 @@ void synchronize_sched_expedited(void)
+@@ -2349,7 +2349,7 @@ void synchronize_sched_expedited(void)
* grace period works for us.
*/
get_online_cpus();
smp_mb(); /* ensure read is before try_stop_cpus(). */
}
-@@ -2167,12 +2167,12 @@ void synchronize_sched_expedited(void)
+@@ -2360,12 +2360,12 @@ void synchronize_sched_expedited(void)
* than we did beat us to the punch.
*/
do {
put_online_cpus();
}
-@@ -2366,7 +2366,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -2539,7 +2539,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
* ACCESS_ONCE() to prevent the compiler from speculating
* the increment to precede the early-exit check.
*/
WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
_rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
-@@ -2448,7 +2448,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -2581,7 +2581,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
/* Increment ->n_barrier_done to prevent duplicate work. */
smp_mb(); /* Keep increment after above mechanism. */
WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
_rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
smp_mb(); /* Keep increment before caller's subsequent code. */
-@@ -2495,10 +2495,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
+@@ -2626,10 +2626,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
init_callback_list(rdp);
rdp->qlen_lazy = 0;
WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
- rdp->cpu = cpu;
- rdp->rsp = rsp;
- raw_spin_unlock_irqrestore(&rnp->lock, flags);
-@@ -2526,8 +2526,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
- rdp->n_force_qs_snap = rsp->n_force_qs;
+ #ifdef CONFIG_RCU_USER_QS
+ WARN_ON_ONCE(rdp->dynticks->in_user);
+ #endif
+@@ -2664,8 +2664,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
rdp->blimit = blimit;
+ init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
- atomic_set(&rdp->dynticks->dynticks,
- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
diff --git a/kernel/rcutree.h b/kernel/rcutree.h
-index 4d29169..d104a3c 100644
+index a240f03..d469618 100644
--- a/kernel/rcutree.h
+++ b/kernel/rcutree.h
@@ -86,7 +86,7 @@ struct rcu_dynticks {
int dyntick_drain; /* Prepare-for-idle state variable. */
unsigned long dyntick_holdoff;
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
-index 7f3244c..417d606 100644
+index f921154..34c4873 100644
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
-@@ -843,7 +843,7 @@ void synchronize_rcu_expedited(void)
+@@ -865,7 +865,7 @@ void synchronize_rcu_expedited(void)
/* Clean up and exit. */
smp_mb(); /* ensure expedited GP seen before counter increment. */
unlock_mb_ret:
mutex_unlock(&sync_rcu_preempt_exp_mutex);
mb_ret:
+@@ -2040,7 +2040,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
+ print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
+ printk(KERN_ERR "\t%d: (%lu %s) idle=%03x/%llx/%d %s\n",
+ cpu, ticks_value, ticks_title,
+- atomic_read(&rdtp->dynticks) & 0xfff,
++ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
+ rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
+ fast_no_hz);
+ }
diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
-index abffb48..cbfa6d3 100644
+index 693513b..b9f1d63 100644
--- a/kernel/rcutree_trace.c
+++ b/kernel/rcutree_trace.c
-@@ -93,7 +93,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
- rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
- rdp->qs_pending);
+@@ -92,7 +92,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
+ rdp->completed, rdp->gpnum,
+ rdp->passed_quiesce, rdp->qs_pending);
seq_printf(m, " dt=%d/%llx/%d df=%lu",
- atomic_read(&rdp->dynticks->dynticks),
+ atomic_read_unchecked(&rdp->dynticks->dynticks),
rdp->dynticks->dynticks_nesting,
rdp->dynticks->dynticks_nmi_nesting,
rdp->dynticks_fqs);
-@@ -157,7 +157,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
- rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
- rdp->qs_pending);
+@@ -154,7 +154,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
+ rdp->completed, rdp->gpnum,
+ rdp->passed_quiesce, rdp->qs_pending);
seq_printf(m, ",%d,%llx,%d,%lu",
- atomic_read(&rdp->dynticks->dynticks),
+ atomic_read_unchecked(&rdp->dynticks->dynticks),
rdp->dynticks->dynticks_nmi_nesting,
rdp->dynticks_fqs);
diff --git a/kernel/resource.c b/kernel/resource.c
-index 34d4588..10baa6a 100644
+index 73f35d4..4684fc4 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -143,8 +143,18 @@ static const struct file_operations proc_iomem_operations = {
default:
diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
-index 0984a21..939f183 100644
+index 15f60d0..7e50319 100644
--- a/kernel/sched/auto_group.c
+++ b/kernel/sched/auto_group.c
@@ -11,7 +11,7 @@
#ifdef CONFIG_RT_GROUP_SCHED
/*
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 1a48cdb..d3949ff 100644
+index c529d00..d00b4f3 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -4103,6 +4103,8 @@ int can_nice(const struct task_struct *p, const int nice)
+@@ -3563,6 +3563,8 @@ int can_nice(const struct task_struct *p, const int nice)
/* convert nice value [19,-20] to rlimit style value [1,40] */
int nice_rlim = 20 - nice;
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
-@@ -4136,7 +4138,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -3596,7 +3598,8 @@ SYSCALL_DEFINE1(nice, int, increment)
if (nice > 19)
nice = 19;
return -EPERM;
retval = security_task_setnice(current, nice);
-@@ -4290,6 +4293,7 @@ recheck:
+@@ -3750,6 +3753,7 @@ recheck:
unsigned long rlim_rtprio =
task_rlimit(p, RLIMIT_RTPRIO);
if (policy != p->policy && !rlim_rtprio)
return -EPERM;
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 96e2b18..bb31eec 100644
+index 6b800a1..0c36227 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
-@@ -4923,7 +4923,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
+@@ -4890,7 +4890,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
* run_rebalance_domains is triggered when needed from the scheduler tick.
* Also triggered for nohz idle balancing (with nohz_balancing_kick set).
*/
int this_cpu = smp_processor_id();
struct rq *this_rq = cpu_rq(this_cpu);
diff --git a/kernel/signal.c b/kernel/signal.c
-index be4f856..453401c 100644
+index 57dde52..2c561f0 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -48,12 +48,12 @@ static struct kmem_cache *sigqueue_cachep;
+@@ -49,12 +49,12 @@ static struct kmem_cache *sigqueue_cachep;
int print_fatal_signals __read_mostly;
{
/* Is it explicitly or implicitly ignored? */
return handler == SIG_IGN ||
-@@ -62,7 +62,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
+@@ -63,7 +63,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
static int sig_task_ignored(struct task_struct *t, int sig, bool force)
{
handler = sig_handler(t, sig);
-@@ -366,6 +366,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
+@@ -367,6 +367,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
atomic_inc(&user->sigpending);
rcu_read_unlock();
if (override_rlimit ||
atomic_read(&user->sigpending) <=
task_rlimit(t, RLIMIT_SIGPENDING)) {
-@@ -490,7 +493,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
+@@ -491,7 +494,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
int unhandled_signal(struct task_struct *tsk, int sig)
{
if (is_global_init(tsk))
return 1;
if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
+@@ -811,6 +814,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
}
}
return security_task_kill(t, info, sig, 0);
}
-@@ -1197,7 +1207,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1192,7 +1202,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
return send_signal(sig, info, p, 1);
}
specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
{
return send_signal(sig, info, t, 0);
-@@ -1234,6 +1244,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1229,6 +1239,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
unsigned long int flags;
int ret, blocked, ignored;
struct k_sigaction *action;
spin_lock_irqsave(&t->sighand->siglock, flags);
action = &t->sighand->action[sig-1];
-@@ -1248,9 +1259,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1243,9 +1254,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
}
if (action->sa.sa_handler == SIG_DFL)
t->signal->flags &= ~SIGNAL_UNKILLABLE;
return ret;
}
-@@ -1317,8 +1337,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1312,8 +1332,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
ret = check_kill_permission(sig, info, p);
rcu_read_unlock();
return ret;
}
-@@ -2873,7 +2896,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
+@@ -2863,7 +2886,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
int error = -ESRCH;
rcu_read_lock();
error = check_kill_permission(sig, info, p);
/*
diff --git a/kernel/softirq.c b/kernel/softirq.c
-index b73e681..645ab62 100644
+index cc96bdc..8bb9750 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
-@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
+@@ -57,7 +57,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
"HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
"TASKLET", "SCHED", "HRTIMER", "RCU"
};
-@@ -243,7 +243,7 @@ restart:
+@@ -244,7 +244,7 @@ restart:
kstat_incr_softirqs_this_cpu(vec_nr);
trace_softirq_entry(vec_nr);
trace_softirq_exit(vec_nr);
if (unlikely(prev_count != preempt_count())) {
printk(KERN_ERR "huh, entered softirq %u %s %p"
-@@ -390,9 +390,11 @@ void __raise_softirq_irqoff(unsigned int nr)
+@@ -391,9 +391,11 @@ void __raise_softirq_irqoff(unsigned int nr)
or_softirq_pending(1UL << nr);
}
}
/*
-@@ -446,7 +448,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
+@@ -447,7 +449,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
EXPORT_SYMBOL(__tasklet_hi_schedule_first);
{
struct tasklet_struct *list;
-@@ -481,7 +483,7 @@ static void tasklet_action(struct softirq_action *a)
+@@ -482,7 +484,7 @@ static void tasklet_action(struct softirq_action *a)
}
}
struct tasklet_struct *list;
diff --git a/kernel/srcu.c b/kernel/srcu.c
-index 2095be3..9a5b89d 100644
+index 97c465e..d83f3bb 100644
--- a/kernel/srcu.c
+++ b/kernel/srcu.c
@@ -302,9 +302,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
}
EXPORT_SYMBOL_GPL(__srcu_read_unlock);
diff --git a/kernel/sys.c b/kernel/sys.c
-index 909148a..cd51acf 100644
+index e6e0ece..1f2e413 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -157,6 +157,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
break;
}
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 87174ef..68cbb82 100644
+index 26f65ea..df8e5ad 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -92,7 +92,6 @@
/* External variables not in a header file. */
extern int sysctl_overcommit_memory;
extern int sysctl_overcommit_ratio;
-@@ -170,10 +169,8 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -172,10 +171,8 @@ static int proc_taint(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos);
#endif
static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos);
-@@ -202,6 +199,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
+@@ -206,6 +203,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
#endif
static struct ctl_table kern_table[];
static struct ctl_table vm_table[];
static struct ctl_table fs_table[];
-@@ -216,6 +215,20 @@ extern struct ctl_table epoll_table[];
+@@ -220,6 +219,20 @@ extern struct ctl_table epoll_table[];
int sysctl_legacy_va_layout;
#endif
/* The default sysctl tables: */
static struct ctl_table sysctl_base_table[] = {
-@@ -262,6 +275,22 @@ static int max_extfrag_threshold = 1000;
+@@ -266,6 +279,22 @@ static int max_extfrag_threshold = 1000;
#endif
static struct ctl_table kern_table[] = {
{
.procname = "sched_child_runs_first",
.data = &sysctl_sched_child_runs_first,
-@@ -546,7 +575,7 @@ static struct ctl_table kern_table[] = {
+@@ -552,7 +581,7 @@ static struct ctl_table kern_table[] = {
.data = &modprobe_path,
.maxlen = KMOD_PATH_LEN,
.mode = 0644,
},
{
.procname = "modules_disabled",
-@@ -713,16 +742,20 @@ static struct ctl_table kern_table[] = {
+@@ -719,16 +748,20 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
{
.procname = "ngroups_max",
.data = &ngroups_max,
-@@ -1219,6 +1252,13 @@ static struct ctl_table vm_table[] = {
+@@ -1225,6 +1258,13 @@ static struct ctl_table vm_table[] = {
.proc_handler = proc_dointvec_minmax,
.extra1 = &zero,
},
#else
{
.procname = "nr_trim_pages",
-@@ -1670,6 +1710,16 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -1675,6 +1715,16 @@ int proc_dostring(struct ctl_table *table, int write,
buffer, lenp, ppos);
}
static size_t proc_skip_spaces(char **buf)
{
size_t ret;
-@@ -1775,6 +1825,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
+@@ -1780,6 +1830,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
len = strlen(tmp);
if (len > *size)
len = *size;
if (copy_to_user(*buf, tmp, len))
return -EFAULT;
*size -= len;
-@@ -1967,7 +2019,6 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -1972,7 +2024,6 @@ static int proc_taint(struct ctl_table *table, int write,
return err;
}
static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-@@ -1976,7 +2027,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
+@@ -1981,7 +2032,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
}
struct do_proc_dointvec_minmax_conv_param {
int *min;
-@@ -2119,8 +2169,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
+@@ -2128,8 +2178,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
*i = val;
} else {
val = convdiv * (*i) / convmul;
err = proc_put_long(&buffer, &left, val, false);
if (err)
break;
-@@ -2512,6 +2565,12 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -2521,6 +2574,12 @@ int proc_dostring(struct ctl_table *table, int write,
return -ENOSYS;
}
int proc_dointvec(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-@@ -2568,5 +2627,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2577,5 +2636,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
EXPORT_SYMBOL(proc_dostring);
if (result < 0)
goto out;
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
-index d0a3279..db0ad99 100644
+index 145bb4d..b2aa969 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
-@@ -27,9 +27,12 @@
- #include <linux/cgroup.h>
+@@ -28,9 +28,12 @@
#include <linux/fs.h>
#include <linux/file.h>
+ #include <linux/pid_namespace.h>
+#include <linux/grsecurity.h>
#include <net/genetlink.h>
#include <linux/atomic.h>
/*
* Maximum length of a cpumask that can be specified in
* the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -561,6 +564,9 @@ err:
+@@ -570,6 +573,9 @@ err:
static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
{
return cmd_attr_register_cpumask(info);
else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
diff --git a/kernel/time.c b/kernel/time.c
-index ba744cf..267b7c5 100644
+index d226c6a..c7c0960 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
update_vsyscall_tz();
if (firsttime) {
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
-index aa27d39..34d221c 100644
+index f11d83b..d016d91 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
-@@ -779,7 +779,7 @@ static int __init alarmtimer_init(void)
+@@ -750,7 +750,7 @@ static int __init alarmtimer_init(void)
struct platform_device *pdev;
int error = 0;
int i;
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index f791637..00051de 100644
+index e424970..4c7962b 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/syscore_ops.h>
#include <linux/clocksource.h>
#include <linux/jiffies.h>
-@@ -434,6 +435,8 @@ int do_settimeofday(const struct timespec *tv)
+@@ -368,6 +369,8 @@ int do_settimeofday(const struct timespec *tv)
if (!timespec_valid_strict(tv))
return -EINVAL;
return -ENOMEM;
return 0;
diff --git a/kernel/timer.c b/kernel/timer.c
-index 46ef2b1..ad081f144 100644
+index 367d008..46857a0 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
-@@ -1377,7 +1377,7 @@ void update_process_times(int user_tick)
+@@ -1363,7 +1363,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
*/
{
struct tvec_base *base = __this_cpu_read(tvec_bases);
+@@ -1772,7 +1772,7 @@ static int __cpuinit timer_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata timers_nb = {
++static struct notifier_block __cpuinitconst timers_nb = {
+ .notifier_call = timer_cpu_notify,
+ };
+
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index c0bd030..62a1927 100644
--- a/kernel/trace/blktrace.c
ret = -EIO;
bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index b4f20fb..483c5fa 100644
+index 356bc2f..7c94fc0 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
-@@ -1785,12 +1785,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
+@@ -1874,12 +1874,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
if (unlikely(ftrace_disabled))
return 0;
}
/*
-@@ -2885,7 +2890,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
+@@ -2965,7 +2970,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
int
register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
{
struct ftrace_func_probe *entry;
struct ftrace_page *pg;
-@@ -3697,8 +3702,10 @@ static int ftrace_process_locs(struct module *mod,
+@@ -3832,8 +3837,10 @@ static int ftrace_process_locs(struct module *mod,
if (!count)
return 0;
start_pg = ftrace_allocate_pages(count);
if (!start_pg)
+@@ -4541,8 +4548,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+
+ static int ftrace_graph_active;
+-static struct notifier_block ftrace_suspend_notifier;
+-
+ int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
+ {
+ return 0;
+@@ -4686,6 +4691,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
+ return NOTIFY_DONE;
+ }
+
++static struct notifier_block ftrace_suspend_notifier = {
++ .notifier_call = ftrace_suspend_notifier_call
++};
++
+ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+ trace_func_graph_ent_t entryfunc)
+ {
+@@ -4699,7 +4708,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+ goto out;
+ }
+
+- ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
+ register_pm_notifier(&ftrace_suspend_notifier);
+
+ ftrace_graph_active++;
+diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
+index 4cb5e51..e7e05d9 100644
+--- a/kernel/trace/ring_buffer.c
++++ b/kernel/trace/ring_buffer.c
+@@ -346,9 +346,9 @@ struct buffer_data_page {
+ */
+ struct buffer_page {
+ struct list_head list; /* list of buffer pages */
+- local_t write; /* index for next write */
++ local_unchecked_t write; /* index for next write */
+ unsigned read; /* index for next read */
+- local_t entries; /* entries on this page */
++ local_unchecked_t entries; /* entries on this page */
+ unsigned long real_end; /* real end of data */
+ struct buffer_data_page *page; /* Actual data page */
+ };
+@@ -460,8 +460,8 @@ struct ring_buffer_per_cpu {
+ unsigned long lost_events;
+ unsigned long last_overrun;
+ local_t entries_bytes;
+- local_t commit_overrun;
+- local_t overrun;
++ local_unchecked_t commit_overrun;
++ local_unchecked_t overrun;
+ local_t entries;
+ local_t committing;
+ local_t commits;
+@@ -860,8 +860,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
+ *
+ * We add a counter to the write field to denote this.
+ */
+- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
+- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
++ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
++ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
+
+ /*
+ * Just make sure we have seen our old_write and synchronize
+@@ -889,8 +889,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
+ * cmpxchg to only update if an interrupt did not already
+ * do it for us. If the cmpxchg fails, we don't care.
+ */
+- (void)local_cmpxchg(&next_page->write, old_write, val);
+- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
++ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
++ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
+
+ /*
+ * No need to worry about races with clearing out the commit.
+@@ -1249,12 +1249,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
+
+ static inline unsigned long rb_page_entries(struct buffer_page *bpage)
+ {
+- return local_read(&bpage->entries) & RB_WRITE_MASK;
++ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
+ }
+
+ static inline unsigned long rb_page_write(struct buffer_page *bpage)
+ {
+- return local_read(&bpage->write) & RB_WRITE_MASK;
++ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
+ }
+
+ static int
+@@ -1349,7 +1349,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
+ * bytes consumed in ring buffer from here.
+ * Increment overrun to account for the lost events.
+ */
+- local_add(page_entries, &cpu_buffer->overrun);
++ local_add_unchecked(page_entries, &cpu_buffer->overrun);
+ local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
+ }
+
+@@ -1905,7 +1905,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
+ * it is our responsibility to update
+ * the counters.
+ */
+- local_add(entries, &cpu_buffer->overrun);
++ local_add_unchecked(entries, &cpu_buffer->overrun);
+ local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
+
+ /*
+@@ -2055,7 +2055,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+ if (tail == BUF_PAGE_SIZE)
+ tail_page->real_end = 0;
+
+- local_sub(length, &tail_page->write);
++ local_sub_unchecked(length, &tail_page->write);
+ return;
+ }
+
+@@ -2090,7 +2090,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+ rb_event_set_padding(event);
+
+ /* Set the write back to the previous setting */
+- local_sub(length, &tail_page->write);
++ local_sub_unchecked(length, &tail_page->write);
+ return;
+ }
+
+@@ -2102,7 +2102,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+
+ /* Set write to end of buffer */
+ length = (tail + length) - BUF_PAGE_SIZE;
+- local_sub(length, &tail_page->write);
++ local_sub_unchecked(length, &tail_page->write);
+ }
+
+ /*
+@@ -2128,7 +2128,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+ * about it.
+ */
+ if (unlikely(next_page == commit_page)) {
+- local_inc(&cpu_buffer->commit_overrun);
++ local_inc_unchecked(&cpu_buffer->commit_overrun);
+ goto out_reset;
+ }
+
+@@ -2182,7 +2182,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+ cpu_buffer->tail_page) &&
+ (cpu_buffer->commit_page ==
+ cpu_buffer->reader_page))) {
+- local_inc(&cpu_buffer->commit_overrun);
++ local_inc_unchecked(&cpu_buffer->commit_overrun);
+ goto out_reset;
+ }
+ }
+@@ -2230,7 +2230,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+ length += RB_LEN_TIME_EXTEND;
+
+ tail_page = cpu_buffer->tail_page;
+- write = local_add_return(length, &tail_page->write);
++ write = local_add_return_unchecked(length, &tail_page->write);
+
+ /* set write to only the index of the write */
+ write &= RB_WRITE_MASK;
+@@ -2247,7 +2247,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+ kmemcheck_annotate_bitfield(event, bitfield);
+ rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
+
+- local_inc(&tail_page->entries);
++ local_inc_unchecked(&tail_page->entries);
+
+ /*
+ * If this is the first commit on the page, then update
+@@ -2280,7 +2280,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+
+ if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
+ unsigned long write_mask =
+- local_read(&bpage->write) & ~RB_WRITE_MASK;
++ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
+ unsigned long event_length = rb_event_length(event);
+ /*
+ * This is on the tail page. It is possible that
+@@ -2290,7 +2290,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+ */
+ old_index += write_mask;
+ new_index += write_mask;
+- index = local_cmpxchg(&bpage->write, old_index, new_index);
++ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
+ if (index == old_index) {
+ /* update counters */
+ local_sub(event_length, &cpu_buffer->entries_bytes);
+@@ -2629,7 +2629,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+
+ /* Do the likely case first */
+ if (likely(bpage->page == (void *)addr)) {
+- local_dec(&bpage->entries);
++ local_dec_unchecked(&bpage->entries);
+ return;
+ }
+
+@@ -2641,7 +2641,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+ start = bpage;
+ do {
+ if (bpage->page == (void *)addr) {
+- local_dec(&bpage->entries);
++ local_dec_unchecked(&bpage->entries);
+ return;
+ }
+ rb_inc_page(cpu_buffer, &bpage);
+@@ -2923,7 +2923,7 @@ static inline unsigned long
+ rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
+ {
+ return local_read(&cpu_buffer->entries) -
+- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
++ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
+ }
+
+ /**
+@@ -3011,7 +3011,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
+ return 0;
+
+ cpu_buffer = buffer->buffers[cpu];
+- ret = local_read(&cpu_buffer->overrun);
++ ret = local_read_unchecked(&cpu_buffer->overrun);
+
+ return ret;
+ }
+@@ -3032,7 +3032,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
+ return 0;
+
+ cpu_buffer = buffer->buffers[cpu];
+- ret = local_read(&cpu_buffer->commit_overrun);
++ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
+
+ return ret;
+ }
+@@ -3077,7 +3077,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
+ /* if you care about this being correct, lock the buffer */
+ for_each_buffer_cpu(buffer, cpu) {
+ cpu_buffer = buffer->buffers[cpu];
+- overruns += local_read(&cpu_buffer->overrun);
++ overruns += local_read_unchecked(&cpu_buffer->overrun);
+ }
+
+ return overruns;
+@@ -3253,8 +3253,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+ /*
+ * Reset the reader page to size zero.
+ */
+- local_set(&cpu_buffer->reader_page->write, 0);
+- local_set(&cpu_buffer->reader_page->entries, 0);
++ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
++ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
+ local_set(&cpu_buffer->reader_page->page->commit, 0);
+ cpu_buffer->reader_page->real_end = 0;
+
+@@ -3288,7 +3288,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+ * want to compare with the last_overrun.
+ */
+ smp_mb();
+- overwrite = local_read(&(cpu_buffer->overrun));
++ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
+
+ /*
+ * Here's the tricky part.
+@@ -3858,8 +3858,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+
+ cpu_buffer->head_page
+ = list_entry(cpu_buffer->pages, struct buffer_page, list);
+- local_set(&cpu_buffer->head_page->write, 0);
+- local_set(&cpu_buffer->head_page->entries, 0);
++ local_set_unchecked(&cpu_buffer->head_page->write, 0);
++ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
+ local_set(&cpu_buffer->head_page->page->commit, 0);
+
+ cpu_buffer->head_page->read = 0;
+@@ -3869,14 +3869,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+
+ INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
+ INIT_LIST_HEAD(&cpu_buffer->new_pages);
+- local_set(&cpu_buffer->reader_page->write, 0);
+- local_set(&cpu_buffer->reader_page->entries, 0);
++ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
++ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
+ local_set(&cpu_buffer->reader_page->page->commit, 0);
+ cpu_buffer->reader_page->read = 0;
+
+- local_set(&cpu_buffer->commit_overrun, 0);
++ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
+ local_set(&cpu_buffer->entries_bytes, 0);
+- local_set(&cpu_buffer->overrun, 0);
++ local_set_unchecked(&cpu_buffer->overrun, 0);
+ local_set(&cpu_buffer->entries, 0);
+ local_set(&cpu_buffer->committing, 0);
+ local_set(&cpu_buffer->commits, 0);
+@@ -4279,8 +4279,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
+ rb_init_page(bpage);
+ bpage = reader->page;
+ reader->page = *data_page;
+- local_set(&reader->write, 0);
+- local_set(&reader->entries, 0);
++ local_set_unchecked(&reader->write, 0);
++ local_set_unchecked(&reader->entries, 0);
+ reader->read = 0;
+ *data_page = bpage;
+
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 5c38c81..88012af 100644
+index 31e4f55..62da00f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
-@@ -4437,10 +4437,9 @@ static const struct file_operations tracing_dyn_info_fops = {
+@@ -4436,10 +4436,9 @@ static const struct file_operations tracing_dyn_info_fops = {
};
#endif
static int once;
if (d_tracer)
-@@ -4460,10 +4459,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -4459,10 +4458,9 @@ struct dentry *tracing_init_dentry(void)
return d_tracer;
}
struct dentry *d_tracer;
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 29111da..d190fe2 100644
+index d608d09..7eddcb1 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
-@@ -1308,10 +1308,6 @@ static LIST_HEAD(ftrace_module_file_list);
+@@ -1320,10 +1320,6 @@ static LIST_HEAD(ftrace_module_file_list);
struct ftrace_module_file_ops {
struct list_head list;
struct module *mod;
};
static struct ftrace_module_file_ops *
-@@ -1332,17 +1328,12 @@ trace_create_file_ops(struct module *mod)
+@@ -1344,17 +1340,12 @@ trace_create_file_ops(struct module *mod)
file_ops->mod = mod;
list_add(&file_ops->list, &ftrace_module_file_list);
-@@ -1366,8 +1357,8 @@ static void trace_module_add_events(struct module *mod)
+@@ -1378,8 +1369,8 @@ static void trace_module_add_events(struct module *mod)
for_each_event(call, start, end) {
__trace_add_event_call(*call, mod,
}
entry = ring_buffer_event_data(event);
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index 123b189..97b81f5 100644
+index 123b189..1e9e2a6 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
if (p) {
s->len = p - s->buffer;
return 1;
+@@ -824,14 +824,16 @@ int register_ftrace_event(struct trace_event *event)
+ goto out;
+ }
+
++ pax_open_kernel();
+ if (event->funcs->trace == NULL)
+- event->funcs->trace = trace_nop_print;
++ *(void **)&event->funcs->trace = trace_nop_print;
+ if (event->funcs->raw == NULL)
+- event->funcs->raw = trace_nop_print;
++ *(void **)&event->funcs->raw = trace_nop_print;
+ if (event->funcs->hex == NULL)
+- event->funcs->hex = trace_nop_print;
++ *(void **)&event->funcs->hex = trace_nop_print;
+ if (event->funcs->binary == NULL)
+- event->funcs->binary = trace_nop_print;
++ *(void **)&event->funcs->binary = trace_nop_print;
++ pax_close_kernel();
+
+ key = event->type & (EVENT_HASHSIZE - 1);
+
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
-index d4545f4..a9010a1 100644
+index 0c1b1657..95337e9 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -53,7 +53,7 @@ static inline void check_stack(void)
return;
local_irq_save(flags);
-diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 872bd6d..31601a2 100644
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
-@@ -1422,7 +1422,7 @@ retry:
- /* morph UNBOUND to REBIND atomically */
- worker_flags &= ~WORKER_UNBOUND;
- worker_flags |= WORKER_REBIND;
-- ACCESS_ONCE(worker->flags) = worker_flags;
-+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
-
- idle_rebind.cnt++;
- worker->idle_rebind = &idle_rebind;
-@@ -1448,7 +1448,7 @@ retry:
- /* morph UNBOUND to REBIND atomically */
- worker_flags &= ~WORKER_UNBOUND;
- worker_flags |= WORKER_REBIND;
-- ACCESS_ONCE(worker->flags) = worker_flags;
-+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
-
- if (test_and_set_bit(WORK_STRUCT_PENDING_BIT,
- work_data_bits(rebind_work)))
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 2403a63..5c4be4c 100644
+index 28e9d6c9..50381bd 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
-@@ -1252,6 +1252,7 @@ config LATENCYTOP
+@@ -1278,6 +1278,7 @@ config LATENCYTOP
depends on DEBUG_KERNEL
depends on STACKTRACE_SUPPORT
depends on PROC_FS
select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
select KALLSYMS
select KALLSYMS_ALL
-@@ -1267,7 +1268,7 @@ source kernel/trace/Kconfig
+@@ -1306,7 +1307,7 @@ config INTERVAL_TREE_TEST
config PROVIDE_OHCI1394_DMA_INIT
bool "Remote debugging over FireWire early on boot"
help
If you want to debug problems which hang or crash the kernel early
on boot and the crashing machine has a FireWire port, you can use
-@@ -1296,7 +1297,7 @@ config PROVIDE_OHCI1394_DMA_INIT
+@@ -1335,7 +1336,7 @@ config PROVIDE_OHCI1394_DMA_INIT
config FIREWIRE_OHCI_REMOTE_DMA
bool "Remote debugging over FireWire with firewire-ohci"
help
This option lets you use the FireWire bus for remote debugging
with help of the firewire-ohci driver. It enables unfiltered
+diff --git a/lib/Makefile b/lib/Makefile
+index a08b791..a3ff1eb 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -46,7 +46,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
+
+ obj-$(CONFIG_BTREE) += btree.o
+ obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
+-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
++obj-y += list_debug.o
+ obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
+
+ ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 06fdfa1..97c5c7d 100644
--- a/lib/bitmap.c
}
EXPORT_SYMBOL(bitmap_parselist_user);
diff --git a/lib/bug.c b/lib/bug.c
-index a28c141..2bd3d95 100644
+index d0cdf14..4d07bd2 100644
--- a/lib/bug.c
+++ b/lib/bug.c
-@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
+@@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
return BUG_TRAP_TYPE_NONE;
bug = find_bug(bugaddr);
EXPORT_SYMBOL(devm_ioport_unmap);
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
-index 66ce414..6f0a0dd 100644
+index d84beb9..da44791 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
-@@ -924,7 +924,7 @@ out:
+@@ -754,7 +754,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
+
+ void dma_debug_add_bus(struct bus_type *bus)
+ {
+- struct notifier_block *nb;
++ notifier_block_no_const *nb;
+
+ if (global_disable)
+ return;
+@@ -919,7 +919,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
{
if (atomic_read(&task->signal->live) != 1)
return false;
+diff --git a/lib/list_debug.c b/lib/list_debug.c
+index c24c2f7..3fc5da0 100644
+--- a/lib/list_debug.c
++++ b/lib/list_debug.c
+@@ -11,7 +11,9 @@
+ #include <linux/bug.h>
+ #include <linux/kernel.h>
+ #include <linux/rculist.h>
++#include <linux/mm.h>
+
++#ifdef CONFIG_DEBUG_LIST
+ /*
+ * Insert a new entry between two known consecutive entries.
+ *
+@@ -19,21 +21,32 @@
+ * the prev/next entries already!
+ */
+
+-void __list_add(struct list_head *new,
+- struct list_head *prev,
+- struct list_head *next)
++static bool __list_add_debug(struct list_head *new,
++ struct list_head *prev,
++ struct list_head *next)
+ {
+- WARN(next->prev != prev,
++ if (WARN(next->prev != prev,
+ "list_add corruption. next->prev should be "
+ "prev (%p), but was %p. (next=%p).\n",
+- prev, next->prev, next);
+- WARN(prev->next != next,
++ prev, next->prev, next) ||
++ WARN(prev->next != next,
+ "list_add corruption. prev->next should be "
+ "next (%p), but was %p. (prev=%p).\n",
+- next, prev->next, prev);
+- WARN(new == prev || new == next,
++ next, prev->next, prev) ||
++ WARN(new == prev || new == next,
+ "list_add double add: new=%p, prev=%p, next=%p.\n",
+- new, prev, next);
++ new, prev, next))
++ return false;
++ return true;
++}
++
++void __list_add(struct list_head *new,
++ struct list_head *prev,
++ struct list_head *next)
++{
++ if (!__list_add_debug(new, prev, next))
++ return;
++
+ next->prev = new;
+ new->next = next;
+ new->prev = prev;
+@@ -41,7 +54,7 @@ void __list_add(struct list_head *new,
+ }
+ EXPORT_SYMBOL(__list_add);
+
+-void __list_del_entry(struct list_head *entry)
++static bool __list_del_entry_debug(struct list_head *entry)
+ {
+ struct list_head *prev, *next;
+
+@@ -60,9 +73,16 @@ void __list_del_entry(struct list_head *entry)
+ WARN(next->prev != entry,
+ "list_del corruption. next->prev should be %p, "
+ "but was %p\n", entry, next->prev))
++ return false;
++ return true;
++}
++
++void __list_del_entry(struct list_head *entry)
++{
++ if (!__list_del_entry_debug(entry))
+ return;
+
+- __list_del(prev, next);
++ __list_del(entry->prev, entry->next);
+ }
+ EXPORT_SYMBOL(__list_del_entry);
+
+@@ -86,15 +106,54 @@ EXPORT_SYMBOL(list_del);
+ void __list_add_rcu(struct list_head *new,
+ struct list_head *prev, struct list_head *next)
+ {
+- WARN(next->prev != prev,
++ if (WARN(next->prev != prev,
+ "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
+- prev, next->prev, next);
+- WARN(prev->next != next,
++ prev, next->prev, next) ||
++ WARN(prev->next != next,
+ "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
+- next, prev->next, prev);
++ next, prev->next, prev))
++ return;
++
+ new->next = next;
+ new->prev = prev;
+ rcu_assign_pointer(list_next_rcu(prev), new);
+ next->prev = new;
+ }
+ EXPORT_SYMBOL(__list_add_rcu);
++#endif
++
++void pax_list_add_tail(struct list_head *new, struct list_head *head)
++{
++ struct list_head *prev, *next;
++
++ prev = head->prev;
++ next = head;
++
++#ifdef CONFIG_DEBUG_LIST
++ if (!__list_add_debug(new, prev, next))
++ return;
++#endif
++
++ pax_open_kernel();
++ next->prev = new;
++ new->next = next;
++ new->prev = prev;
++ prev->next = new;
++ pax_close_kernel();
++}
++EXPORT_SYMBOL(pax_list_add_tail);
++
++void pax_list_del(struct list_head *entry)
++{
++#ifdef CONFIG_DEBUG_LIST
++ if (!__list_del_entry_debug(entry))
++ return;
++#endif
++
++ pax_open_kernel();
++ __list_del(entry->prev, entry->next);
++ entry->next = LIST_POISON1;
++ entry->prev = LIST_POISON2;
++ pax_close_kernel();
++}
++EXPORT_SYMBOL(pax_list_del);
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index e796429..6e38f9f 100644
--- a/lib/radix-tree.c
unsigned long c;
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index 0e33754..50a0e63 100644
+index 39c99fe..18f060b 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -16,6 +16,9 @@
#include <stdarg.h>
#include <linux/module.h> /* for KSYM_SYMBOL_LEN */
#include <linux/types.h>
-@@ -536,7 +539,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
+@@ -533,7 +536,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
char sym[KSYM_SYMBOL_LEN];
if (ext == 'B')
sprint_backtrace(sym, value);
sprint_symbol(sym, value);
else
sprint_symbol_no_offset(sym, value);
-@@ -969,7 +972,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
+@@ -966,7 +969,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
return number(buf, end, *(const netdev_features_t *)addr, spec);
}
/*
* Show a '%p' thing. A kernel extension is that the '%p' is followed
-@@ -983,6 +990,8 @@ int kptr_restrict __read_mostly;
+@@ -980,6 +987,8 @@ int kptr_restrict __read_mostly;
* - 'S' For symbolic direct pointers with offset
* - 's' For symbolic direct pointers without offset
* - 'B' For backtraced symbolic direct pointers with offset
* - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
* - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
* - 'M' For a 6-byte MAC address, it prints the address in the
-@@ -1038,12 +1047,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1035,12 +1044,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
if (!ptr && *fmt != 'K') {
/*
}
switch (*fmt) {
-@@ -1053,6 +1062,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1050,6 +1059,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
/* Fallthrough */
case 'S':
case 's':
case 'B':
return symbol_string(buf, end, ptr, spec, *fmt);
case 'R':
-@@ -1093,6 +1109,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1090,6 +1106,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
va_end(va);
return buf;
}
case 'K':
/*
* %pK cannot be used in IRQ context because its test
-@@ -1116,6 +1134,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1113,6 +1131,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
}
break;
}
+ Also ignore 'K' pointers, since we force their NULLing for non-root users
+ above
+ */
-+ if (ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
++ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
+ dump_stack();
+ ptr = NULL;
@@ -0,0 +1 @@
+-grsec
diff --git a/mm/Kconfig b/mm/Kconfig
-index d5c8019..f513038 100644
+index a3f8ddd..f31e92e 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
-@@ -251,10 +251,10 @@ config KSM
+@@ -252,10 +252,10 @@ config KSM
root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
config DEFAULT_MMAP_MIN_ADDR
This is the portion of low virtual memory which should be protected
from userspace allocation. Keeping a user from writing to low pages
can help reduce the impact of kernel NULL pointer bugs.
-@@ -285,7 +285,7 @@ config MEMORY_FAILURE
+@@ -286,7 +286,7 @@ config MEMORY_FAILURE
config HWPOISON_INJECT
tristate "HWPoison pages injector"
config NOMMU_INITIAL_TRIM_EXCESS
diff --git a/mm/filemap.c b/mm/filemap.c
-index 3843445..4fe6833 100644
+index 83efee7..3f99381 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -1746,7 +1746,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+@@ -1747,7 +1747,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
struct address_space *mapping = file->f_mapping;
if (!mapping->a_ops->readpage)
+ return -ENODEV;
file_accessed(file);
vma->vm_ops = &generic_file_vm_ops;
- vma->vm_flags |= VM_CAN_NONLINEAR;
+ return 0;
@@ -2087,6 +2087,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
*pos = i_size_read(inode);
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
diff --git a/mm/fremap.c b/mm/fremap.c
-index 9ed4fd4..c42648d 100644
+index a0aaf0e..20325c3 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
-@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -157,6 +157,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
retry:
vma = find_vma(mm, start);
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
diff --git a/mm/highmem.c b/mm/highmem.c
-index d517cd1..006a1c5 100644
+index 09fc744..3936897 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
-@@ -137,9 +137,10 @@ static void flush_all_zero_pkmaps(void)
+@@ -138,9 +138,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
page = pte_page(pkmap_page_table[i]);
set_page_address(page, NULL);
need_flush = 1;
}
-@@ -198,9 +199,11 @@ start:
+@@ -199,9 +200,11 @@ start:
}
}
vaddr = PKMAP_ADDR(last_pkmap_nr);
set_page_address(page, (void *)vaddr);
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
-index 141dbb6..ebff057 100644
+index 40f17c3..c1cc011 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
-@@ -735,7 +735,7 @@ out:
+@@ -710,7 +710,7 @@ out:
* run pte_offset_map on the pmd, if an huge pmd could
* materialize from under us from a different thread.
*/
/* if an huge pmd materialized from under us just retry later */
if (unlikely(pmd_trans_huge(*pmd)))
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index 3adceaf..dccfea3 100644
+index b969ed4..10e3e37 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
-@@ -2512,6 +2512,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2509,6 +2509,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
return 1;
}
/*
* Hugetlb_cow() should be called with page lock of the original hugepage held.
* Called with hugetlb_instantiation_mutex held and pte_page locked so we
-@@ -2628,6 +2649,11 @@ retry_avoidcopy:
+@@ -2627,6 +2648,11 @@ retry_avoidcopy:
make_huge_pte(vma, new_page, 1));
page_remove_rmap(old_page);
hugepage_add_new_anon_rmap(new_page, vma, address);
+
/* Make the old page be freed below */
new_page = old_page;
- mmu_notifier_invalidate_range_end(mm,
+ }
@@ -2786,6 +2812,10 @@ retry:
&& (vma->vm_flags & VM_SHARED)));
set_huge_pte_at(mm, address, ptep, new_pte);
if (!ptep)
return VM_FAULT_OOM;
diff --git a/mm/internal.h b/mm/internal.h
-index b8c91b3..93e95a3 100644
+index 3c5197d..08d0065 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
#ifdef CONFIG_MEMORY_FAILURE
extern bool is_free_buddy_page(struct page *page);
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
-index 45eb621..6ccd8ea 100644
+index a217cc5..44b2b35 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
for (i = 0; i < object->trace_len; i++) {
void *ptr = (void *)object->trace[i];
- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
-+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
++ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
}
}
+@@ -1852,7 +1852,7 @@ static int __init kmemleak_late_init(void)
+ return -ENOMEM;
+ }
+
+- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
++ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
+ &kmemleak_fops);
+ if (!dentry)
+ pr_warning("Failed to create the debugfs kmemleak file\n");
diff --git a/mm/maccess.c b/mm/maccess.c
index d53adf9..03a24bf 100644
--- a/mm/maccess.c
set_fs(old_fs);
diff --git a/mm/madvise.c b/mm/madvise.c
-index 14d260f..b2a80fd 100644
+index 03dfa5c..b032917 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -48,6 +48,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
switch (behavior) {
case MADV_NORMAL:
new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
-@@ -119,6 +123,13 @@ success:
+@@ -123,6 +127,13 @@ success:
/*
* vm_flags is protected by the mmap_sem held in write mode.
*/
vma->vm_flags = new_flags;
out:
-@@ -177,6 +188,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
+@@ -181,6 +192,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
struct vm_area_struct ** prev,
unsigned long start, unsigned long end)
{
*prev = vma;
if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
return -EINVAL;
-@@ -189,6 +205,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
+@@ -193,6 +209,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
zap_page_range(vma, start, end - start, &details);
} else
zap_page_range(vma, start, end - start, NULL);
return 0;
}
-@@ -393,6 +424,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
+@@ -397,6 +428,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
if (end < start)
goto out;
if (end == start)
goto out;
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
-index a6e2141..eaf5aad 100644
+index 8b20278..05dac18 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
#ifdef __ARCH_SI_TRAPNO
si.si_trapno = trapno;
#endif
-@@ -1038,7 +1038,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1040,7 +1040,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
}
nr_pages = 1 << compound_trans_order(hpage);
/*
* We need/can do nothing about count=0 pages.
-@@ -1068,7 +1068,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1070,7 +1070,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
if (!PageHWPoison(hpage)
|| (hwpoison_filter(p) && TestClearPageHWPoison(p))
|| (p != hpage && TestSetPageHWPoison(hpage))) {
return 0;
}
set_page_hwpoison_huge_page(hpage);
-@@ -1126,7 +1126,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
}
if (hwpoison_filter(p)) {
if (TestClearPageHWPoison(p))
unlock_page(hpage);
put_page(hpage);
return 0;
-@@ -1321,7 +1321,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1323,7 +1323,7 @@ int unpoison_memory(unsigned long pfn)
return 0;
}
if (TestClearPageHWPoison(p))
pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
return 0;
}
-@@ -1335,7 +1335,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1337,7 +1337,7 @@ int unpoison_memory(unsigned long pfn)
*/
if (TestClearPageHWPoison(page)) {
pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
freeit = 1;
if (PageHuge(page))
clear_page_hwpoison_huge_page(page);
-@@ -1440,7 +1440,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
+@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
}
done:
if (!PageHWPoison(hpage))
&mce_bad_pages);
set_page_hwpoison_huge_page(hpage);
dequeue_hwpoisoned_huge_page(hpage);
-@@ -1572,7 +1572,7 @@ int soft_offline_page(struct page *page, int flags)
+@@ -1582,7 +1582,7 @@ int soft_offline_page(struct page *page, int flags)
return ret;
done:
/* keep elevated page count for bad page */
return ret;
diff --git a/mm/memory.c b/mm/memory.c
-index 5736170..8e04800 100644
+index f2973b2..fd020a7 100644
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -426,6 +426,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+@@ -431,6 +431,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
free_pte_range(tlb, pmd, addr);
} while (pmd++, addr = next, addr != end);
start &= PUD_MASK;
if (start < floor)
return;
-@@ -440,6 +441,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+@@ -445,6 +446,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
pmd = pmd_offset(pud, start);
pud_clear(pud);
pmd_free_tlb(tlb, pmd, start);
}
static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
-@@ -459,6 +462,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -464,6 +467,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
free_pmd_range(tlb, pud, addr, next, floor, ceiling);
} while (pud++, addr = next, addr != end);
start &= PGDIR_MASK;
if (start < floor)
return;
-@@ -473,6 +477,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -478,6 +482,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
pud = pud_offset(pgd, start);
pgd_clear(pgd);
pud_free_tlb(tlb, pud, start);
}
/*
-@@ -1614,12 +1620,6 @@ no_page_table:
+@@ -1626,12 +1632,6 @@ no_page_table:
return page;
}
/**
* __get_user_pages() - pin user pages in memory
* @tsk: task_struct of target task
-@@ -1692,10 +1692,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1704,10 +1704,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
i = 0;
if (!vma && in_gate_area(mm, start)) {
unsigned long pg = start & PAGE_MASK;
pgd_t *pgd;
-@@ -1743,7 +1743,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1755,7 +1755,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
goto next_page;
}
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
return i ? : -EFAULT;
-@@ -1770,11 +1770,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1782,11 +1782,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
int ret;
unsigned int fault_flags = 0;
if (foll_flags & FOLL_WRITE)
fault_flags |= FAULT_FLAG_WRITE;
if (nonblocking)
-@@ -1848,7 +1843,7 @@ next_page:
+@@ -1860,7 +1855,7 @@ next_page:
start += PAGE_SIZE;
nr_pages--;
} while (nr_pages && start < vma->vm_end);
return i;
}
EXPORT_SYMBOL(__get_user_pages);
-@@ -2055,6 +2050,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
+@@ -2067,6 +2062,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
page_add_file_rmap(page);
set_pte_at(mm, addr, pte, mk_pte(page, prot));
retval = 0;
pte_unmap_unlock(pte, ptl);
return retval;
-@@ -2089,10 +2088,22 @@ out:
- int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
- struct page *page)
- {
+@@ -2111,9 +2110,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
+ if (!page_count(page))
+ return -EINVAL;
+ if (!(vma->vm_flags & VM_MIXEDMAP)) {
+
+#ifdef CONFIG_PAX_SEGMEXEC
-+ struct vm_area_struct *vma_m;
++ struct vm_area_struct *vma_m;
+#endif
+
- if (addr < vma->vm_start || addr >= vma->vm_end)
- return -EFAULT;
- if (!page_count(page))
- return -EINVAL;
+ BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
+ BUG_ON(vma->vm_flags & VM_PFNMAP);
+ vma->vm_flags |= VM_MIXEDMAP;
+
+#ifdef CONFIG_PAX_SEGMEXEC
-+ vma_m = pax_find_mirror_vma(vma);
-+ if (vma_m)
-+ vma_m->vm_flags |= VM_INSERTPAGE;
++ vma_m = pax_find_mirror_vma(vma);
++ if (vma_m)
++ vma_m->vm_flags |= VM_MIXEDMAP;
+#endif
+
- vma->vm_flags |= VM_INSERTPAGE;
+ }
return insert_page(vma, addr, page, vma->vm_page_prot);
}
-@@ -2178,6 +2189,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
+@@ -2196,6 +2207,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
unsigned long pfn)
{
BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
if (addr < vma->vm_start || addr >= vma->vm_end)
return -EFAULT;
-@@ -2385,7 +2397,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
+@@ -2396,7 +2408,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
BUG_ON(pud_huge(*pud));
if (!pmd)
return -ENOMEM;
do {
-@@ -2405,7 +2419,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
+@@ -2416,7 +2430,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
unsigned long next;
int err;
if (!pud)
return -ENOMEM;
do {
-@@ -2493,6 +2509,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
+@@ -2504,6 +2520,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
copy_user_highpage(dst, src, va, vma);
}
/*
* This routine handles present pages, when users try to write
* to a shared page. It is done by copying the page to a new address
-@@ -2703,6 +2899,12 @@ gotten:
+@@ -2720,6 +2916,12 @@ gotten:
*/
page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
if (likely(pte_same(*page_table, orig_pte))) {
if (old_page) {
if (!PageAnon(old_page)) {
dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2754,6 +2956,10 @@ gotten:
+@@ -2771,6 +2973,10 @@ gotten:
page_remove_rmap(old_page);
}
/* Free the old page.. */
new_page = old_page;
ret |= VM_FAULT_WRITE;
-@@ -3033,6 +3239,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3051,6 +3257,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
swap_free(entry);
if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
try_to_free_swap(page);
unlock_page(page);
if (swapcache) {
/*
-@@ -3056,6 +3267,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3074,6 +3285,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
/* No need to invalidate - it was non-present before */
update_mmu_cache(vma, address, page_table);
unlock:
pte_unmap_unlock(page_table, ptl);
out:
-@@ -3075,40 +3291,6 @@ out_release:
+@@ -3093,40 +3309,6 @@ out_release:
}
/*
* We enter with non-exclusive mmap_sem (to exclude vma changes,
* but allow concurrent faults), and pte mapped but not yet locked.
* We return with mmap_sem still held, but pte unmapped and unlocked.
-@@ -3117,27 +3299,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3135,27 +3317,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long address, pte_t *page_table, pmd_t *pmd,
unsigned int flags)
{
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -3156,6 +3334,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3174,6 +3352,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
if (!pte_none(*page_table))
goto release;
inc_mm_counter_fast(mm, MM_ANONPAGES);
page_add_new_anon_rmap(page, vma, address);
setpte:
-@@ -3163,6 +3346,12 @@ setpte:
+@@ -3181,6 +3364,12 @@ setpte:
/* No need to invalidate - it was non-present before */
update_mmu_cache(vma, address, page_table);
unlock:
pte_unmap_unlock(page_table, ptl);
return 0;
-@@ -3306,6 +3495,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3324,6 +3513,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
*/
/* Only go through if we didn't race with anybody else... */
if (likely(pte_same(*page_table, orig_pte))) {
flush_icache_page(vma, page);
entry = mk_pte(page, vma->vm_page_prot);
if (flags & FAULT_FLAG_WRITE)
-@@ -3325,6 +3520,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3343,6 +3538,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
/* no need to invalidate: a not-present page won't be cached */
update_mmu_cache(vma, address, page_table);
} else {
if (cow_page)
mem_cgroup_uncharge_page(cow_page);
-@@ -3479,6 +3682,12 @@ int handle_pte_fault(struct mm_struct *mm,
+@@ -3497,6 +3700,12 @@ int handle_pte_fault(struct mm_struct *mm,
if (flags & FAULT_FLAG_WRITE)
flush_tlb_fix_spurious_fault(vma, address);
}
unlock:
pte_unmap_unlock(pte, ptl);
return 0;
-@@ -3495,6 +3704,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3513,6 +3722,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
pmd_t *pmd;
pte_t *pte;
__set_current_state(TASK_RUNNING);
count_vm_event(PGFAULT);
-@@ -3506,6 +3719,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3524,6 +3737,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
if (unlikely(is_vm_hugetlb_page(vma)))
return hugetlb_fault(mm, vma, address, flags);
retry:
pgd = pgd_offset(mm, address);
pud = pud_alloc(mm, pgd, address);
-@@ -3547,7 +3788,7 @@ retry:
+@@ -3565,7 +3806,7 @@ retry:
* run pte_offset_map on the pmd, if an huge pmd could
* materialize from under us from a different thread.
*/
return VM_FAULT_OOM;
/* if an huge pmd materialized from under us just retry later */
if (unlikely(pmd_trans_huge(*pmd)))
-@@ -3584,6 +3825,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
+@@ -3602,6 +3843,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
spin_unlock(&mm->page_table_lock);
return 0;
}
#endif /* __PAGETABLE_PUD_FOLDED */
#ifndef __PAGETABLE_PMD_FOLDED
-@@ -3614,6 +3872,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
+@@ -3632,6 +3890,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
spin_unlock(&mm->page_table_lock);
return 0;
}
#endif /* __PAGETABLE_PMD_FOLDED */
int make_pages_present(unsigned long addr, unsigned long end)
-@@ -3651,7 +3933,7 @@ static int __init gate_vma_init(void)
+@@ -3669,7 +3951,7 @@ static int __init gate_vma_init(void)
gate_vma.vm_start = FIXADDR_USER_START;
gate_vma.vm_end = FIXADDR_USER_END;
gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
return 0;
}
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
-index 3d64b36..c6ab69c 100644
+index 002c281..9429765 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -655,6 +655,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
}
out:
-@@ -1147,6 +1162,17 @@ static long do_mbind(unsigned long start, unsigned long len,
+@@ -1150,6 +1165,17 @@ static long do_mbind(unsigned long start, unsigned long len,
if (end < start)
return -EINVAL;
if (end == start)
return 0;
-@@ -1370,8 +1396,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1373,8 +1399,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
*/
tcred = __task_cred(task);
if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
rcu_read_unlock();
err = -EPERM;
goto out_put;
-@@ -1402,6 +1427,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1405,6 +1430,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
goto out;
}
capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
diff --git a/mm/migrate.c b/mm/migrate.c
-index 77ed2d7..317d528 100644
+index 346d32d..d7adff2 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
-@@ -1350,8 +1350,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
+@@ -1352,8 +1352,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
*/
tcred = __task_cred(task);
if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
err = -EPERM;
goto out;
diff --git a/mm/mlock.c b/mm/mlock.c
-index ef726e8..cd7f1ec 100644
+index f0b9ce5..da8d069 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -13,6 +13,7 @@
#include <linux/sched.h>
#include <linux/export.h>
#include <linux/rmap.h>
-@@ -376,7 +377,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -369,7 +370,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
{
unsigned long nstart, end, tmp;
struct vm_area_struct * vma, * prev;
VM_BUG_ON(start & ~PAGE_MASK);
VM_BUG_ON(len != PAGE_ALIGN(len));
-@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -378,6 +379,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
return -EINVAL;
if (end == start)
return 0;
vma = find_vma(current->mm, start);
if (!vma || vma->vm_start > start)
return -ENOMEM;
-@@ -396,6 +400,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -389,6 +393,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
for (nstart = start ; ; ) {
vm_flags_t newflags;
/* Here we know that vma->vm_start <= nstart < vma->vm_end. */
newflags = vma->vm_flags | VM_LOCKED;
-@@ -501,6 +510,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
+@@ -494,6 +503,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
lock_limit >>= PAGE_SHIFT;
/* check against resource limits */
if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
error = do_mlock(start, len, 1);
up_write(¤t->mm->mmap_sem);
-@@ -524,17 +534,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
+@@ -517,17 +527,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
static int do_mlockall(int flags)
{
struct vm_area_struct * vma, * prev = NULL;
newflags = vma->vm_flags | VM_LOCKED;
if (!(flags & MCL_CURRENT))
newflags &= ~VM_LOCKED;
-@@ -567,6 +583,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -560,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
lock_limit >>= PAGE_SHIFT;
ret = -ENOMEM;
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
diff --git a/mm/mmap.c b/mm/mmap.c
-index ae18a48..86cf99e 100644
+index 9a796c4..e2c9724 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -47,6 +47,16 @@
+@@ -31,6 +31,7 @@
+ #include <linux/audit.h>
+ #include <linux/khugepaged.h>
+ #include <linux/uprobes.h>
++#include <linux/random.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/cacheflush.h>
+@@ -47,6 +48,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
static void unmap_region(struct mm_struct *mm,
struct vm_area_struct *vma, struct vm_area_struct *prev,
unsigned long start, unsigned long end);
-@@ -72,22 +82,32 @@ static void unmap_region(struct mm_struct *mm,
+@@ -66,22 +77,32 @@ static void unmap_region(struct mm_struct *mm,
* x: (no) no x: (no) yes x: (no) yes x: (yes) yes
*
*/
/*
* Make sure vm_committed_as in one cacheline and not cacheline shared with
* other variables. It can be updated by several CPUs frequently.
-@@ -229,6 +249,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -223,6 +244,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
struct vm_area_struct *next = vma->vm_next;
might_sleep();
+ BUG_ON(vma->vm_mirror);
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
- if (vma->vm_file) {
-@@ -275,6 +296,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+ if (vma->vm_file)
+@@ -266,6 +288,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
* not page aligned -Ram Gupta
*/
rlim = rlimit(RLIMIT_DATA);
if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
(mm->end_data - mm->start_data) > rlim)
goto out;
-@@ -708,6 +730,12 @@ static int
+@@ -736,6 +759,12 @@ static int
can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
{
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
if (vma->vm_pgoff == vm_pgoff)
-@@ -727,6 +755,12 @@ static int
+@@ -755,6 +784,12 @@ static int
can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
{
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
pgoff_t vm_pglen;
-@@ -769,13 +803,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
+@@ -797,13 +832,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
struct vm_area_struct *vma_merge(struct mm_struct *mm,
struct vm_area_struct *prev, unsigned long addr,
unsigned long end, unsigned long vm_flags,
/*
* We later require that vma->vm_flags == vm_flags,
* so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -791,6 +832,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -819,6 +861,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
if (next && next->vm_end == end) /* cases 6, 7, 8 */
next = next->vm_next;
/*
* Can it merge with the predecessor?
*/
-@@ -810,9 +860,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -838,9 +889,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
/* cases 1, 6 */
err = vma_adjust(prev, prev->vm_start,
next->vm_end, prev->vm_pgoff, NULL);
if (err)
return NULL;
khugepaged_enter_vma_merge(prev);
-@@ -826,12 +891,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -854,12 +920,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
mpol_equal(policy, vma_policy(next)) &&
can_vma_merge_before(next, vm_flags,
anon_vma, file, pgoff+pglen)) {
if (err)
return NULL;
khugepaged_enter_vma_merge(area);
-@@ -940,16 +1020,13 @@ none:
+@@ -968,16 +1049,13 @@ none:
void vm_stat_account(struct mm_struct *mm, unsigned long flags,
struct file *file, long pages)
{
- } else if (flags & stack_flags)
+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
mm->stack_vm += pages;
- if (flags & (VM_RESERVED|VM_IO))
- mm->reserved_vm += pages;
-@@ -987,7 +1064,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+ }
+ #endif /* CONFIG_PROC_FS */
+@@ -1013,7 +1091,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
* (the exception is when the underlying filesystem is noexec
* mounted, in which case we dont add PROT_EXEC.)
*/
if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
prot |= PROT_EXEC;
-@@ -1013,7 +1090,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1039,7 +1117,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
/* Obtain the address to map to. we verify (or select) it and ensure
* that it represents a valid section of the address space.
*/
if (addr & ~PAGE_MASK)
return addr;
-@@ -1024,6 +1101,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1050,6 +1128,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
if (flags & MAP_LOCKED)
if (!can_do_mlock())
return -EPERM;
-@@ -1035,6 +1142,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1061,6 +1169,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
locked += mm->locked_vm;
lock_limit = rlimit(RLIMIT_MEMLOCK);
lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
}
-@@ -1101,6 +1209,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1127,6 +1236,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
}
}
return mmap_region(file, addr, len, flags, vm_flags, pgoff);
}
-@@ -1177,7 +1288,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
+@@ -1203,7 +1315,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
vm_flags_t vm_flags = vma->vm_flags;
/* If it was private or non-writable, the write bit is already clear */
return 0;
/* The backer wishes to know when pages are first written to? */
-@@ -1226,14 +1337,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1252,13 +1364,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
unsigned long charged = 0;
struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
/* Clear old maps */
error = -ENOMEM;
-munmap_back:
- vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
- if (vma && vma->vm_start < addr + len) {
+ if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
if (do_munmap(mm, addr, len))
return -ENOMEM;
- goto munmap_back;
-+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
-+ BUG_ON(vma && vma->vm_start < addr + len);
++ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
}
/* Check against address space limit. */
-@@ -1282,6 +1403,16 @@ munmap_back:
+@@ -1307,6 +1428,16 @@ munmap_back:
goto unacct_error;
}
vma->vm_mm = mm;
vma->vm_start = addr;
vma->vm_end = addr + len;
-@@ -1306,6 +1437,19 @@ munmap_back:
- error = file->f_op->mmap(file, vma);
+@@ -1331,6 +1462,13 @@ munmap_back:
if (error)
goto unmap_and_free_vma;
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+ if (vma_m && (vm_flags & VM_EXECUTABLE))
-+ added_exe_file_vma(mm);
-+#endif
-+
+
+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
+ vma->vm_flags |= VM_PAGEEXEC;
+ }
+#endif
+
- if (vm_flags & VM_EXECUTABLE)
- added_exe_file_vma(mm);
-
-@@ -1343,6 +1487,11 @@ munmap_back:
+ /* Can addr have changed??
+ *
+ * Answer: Yes, several device drivers can do it in their
+@@ -1365,6 +1503,11 @@ munmap_back:
vma_link(mm, vma, prev, rb_link, rb_parent);
file = vma->vm_file;
/* Once vma denies write, undo our temporary denial count */
if (correct_wcount)
atomic_inc(&inode->i_writecount);
-@@ -1350,6 +1499,7 @@ out:
+@@ -1372,6 +1515,7 @@ out:
perf_event_mmap(vma);
vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
if (vm_flags & VM_LOCKED) {
if (!mlock_vma_pages_range(vma, addr, addr + len))
mm->locked_vm += (len >> PAGE_SHIFT);
-@@ -1371,6 +1521,12 @@ unmap_and_free_vma:
+@@ -1393,6 +1537,12 @@ unmap_and_free_vma:
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
charged = 0;
free_vma:
kmem_cache_free(vm_area_cachep, vma);
unacct_error:
if (charged)
-@@ -1378,6 +1534,44 @@ unacct_error:
+@@ -1400,6 +1550,62 @@ unacct_error:
return error;
}
-+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
++#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
++unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
++{
++ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
++ return (random32() & 0xFF) << PAGE_SHIFT;
++
++ return 0;
++}
++#endif
++
++bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
+{
+ if (!vma) {
+#ifdef CONFIG_STACK_GROWSUP
+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
+#endif
++ else if (offset)
++ return offset <= vma->vm_start - addr - len;
+
+ return true;
+}
+
-+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
++unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
+{
+ if (vma->vm_start < len)
+ return -ENOMEM;
-+ if (!(vma->vm_flags & VM_GROWSDOWN))
-+ return vma->vm_start - len;
++
++ if (!(vma->vm_flags & VM_GROWSDOWN)) {
++ if (offset <= vma->vm_start - len)
++ return vma->vm_start - len - offset;
++ else
++ return -ENOMEM;
++ }
++
+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
+ return vma->vm_start - len - sysctl_heap_stack_gap;
+ return -ENOMEM;
/* Get an address range which is currently unmapped.
* For shmat() with addr=0.
*
-@@ -1404,18 +1598,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1419,6 +1625,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ struct mm_struct *mm = current->mm;
+ struct vm_area_struct *vma;
+ unsigned long start_addr;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+ if (len > TASK_SIZE)
+ return -ENOMEM;
+@@ -1426,18 +1633,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
if (flags & MAP_FIXED)
return addr;
- return addr;
+ if (TASK_SIZE - len >= addr) {
+ vma = find_vma(mm, addr);
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ return addr;
+ }
}
}
full_search:
-@@ -1426,34 +1625,40 @@ full_search:
+@@ -1448,34 +1660,40 @@ full_search:
* Start a new search - just in case we missed
* some holes.
*/
- mm->free_area_cache = addr + len;
- return addr;
- }
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ break;
if (addr + mm->cached_hole_size < vma->vm_start)
mm->cached_hole_size = vma->vm_start - addr;
mm->free_area_cache = addr;
}
-@@ -1469,7 +1674,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1491,7 +1709,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
{
struct vm_area_struct *vma;
struct mm_struct *mm = current->mm;
- unsigned long addr = addr0, start_addr;
+ unsigned long base = mm->mmap_base, addr = addr0, start_addr;
++ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
/* requested length too big for entire address space */
if (len > TASK_SIZE)
-@@ -1478,13 +1683,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1500,13 +1719,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
if (flags & MAP_FIXED)
return addr;
- return addr;
+ if (TASK_SIZE - len >= addr) {
+ vma = find_vma(mm, addr);
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
+ return addr;
+ }
}
/* check if free_area_cache is useful for us */
-@@ -1508,7 +1718,7 @@ try_again:
+@@ -1530,7 +1754,7 @@ try_again:
* return with success:
*/
vma = find_vma(mm, addr);
- if (!vma || addr+len <= vma->vm_start)
-+ if (check_heap_stack_gap(vma, addr, len))
++ if (check_heap_stack_gap(vma, addr, len, offset))
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr);
-@@ -1517,8 +1727,8 @@ try_again:
+@@ -1539,8 +1763,8 @@ try_again:
mm->cached_hole_size = vma->vm_start - addr;
/* try just below the current vma->vm_start */
- addr = vma->vm_start-len;
- } while (len < vma->vm_start);
-+ addr = skip_heap_stack_gap(vma, len);
++ addr = skip_heap_stack_gap(vma, len, offset);
+ } while (!IS_ERR_VALUE(addr));
fail:
/*
-@@ -1541,13 +1751,21 @@ fail:
+@@ -1563,13 +1787,21 @@ fail:
* can happen with large stack limits and large mmap()
* allocations.
*/
mm->cached_hole_size = ~0UL;
return addr;
-@@ -1556,6 +1774,12 @@ fail:
+@@ -1578,6 +1810,12 @@ fail:
void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
{
/*
* Is this a new hole at the highest possible address?
*/
-@@ -1563,8 +1787,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1585,8 +1823,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
mm->free_area_cache = addr;
/* dont allow allocations above current base */
}
unsigned long
-@@ -1663,6 +1889,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
+@@ -1685,6 +1925,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
return vma;
}
+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
-+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
++ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
+ return vma_m;
+}
+#endif
/*
* Verify that the stack growth is acceptable and
* update accounting. This is shared with both the
-@@ -1679,6 +1927,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1701,6 +1963,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
return -ENOMEM;
/* Stack limit test */
if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
return -ENOMEM;
-@@ -1689,6 +1938,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1711,6 +1974,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
locked = mm->locked_vm + grow;
limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
limit >>= PAGE_SHIFT;
if (locked > limit && !capable(CAP_IPC_LOCK))
return -ENOMEM;
}
-@@ -1718,37 +1968,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1740,37 +2004,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
* PA-RISC uses this for its stack; IA64 for its Register Backing Store.
* vma is the last one with address > vma->vm_end. Have to extend vma.
*/
unsigned long size, grow;
size = address - vma->vm_start;
-@@ -1763,6 +2024,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
+@@ -1787,6 +2062,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
}
}
}
+ vma_unlock_anon_vma(vma->vm_next);
vma_unlock_anon_vma(vma);
khugepaged_enter_vma_merge(vma);
- return error;
-@@ -1776,6 +2039,8 @@ int expand_downwards(struct vm_area_struct *vma,
+ validate_mm(vma->vm_mm);
+@@ -1801,6 +2078,8 @@ int expand_downwards(struct vm_area_struct *vma,
unsigned long address)
{
int error;
/*
* We must make sure the anon_vma is allocated
-@@ -1789,6 +2054,15 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -1814,6 +2093,15 @@ int expand_downwards(struct vm_area_struct *vma,
if (error)
return error;
vma_lock_anon_vma(vma);
/*
-@@ -1798,9 +2072,17 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -1823,9 +2111,17 @@ int expand_downwards(struct vm_area_struct *vma,
*/
/* Somebody else might have raced and expanded it already */
size = vma->vm_end - address;
grow = (vma->vm_start - address) >> PAGE_SHIFT;
-@@ -1810,11 +2092,22 @@ int expand_downwards(struct vm_area_struct *vma,
- if (!error) {
+@@ -1837,6 +2133,17 @@ int expand_downwards(struct vm_area_struct *vma,
vma->vm_start = address;
vma->vm_pgoff -= grow;
+ anon_vma_interval_tree_post_update_vma(vma);
+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (vma_m) {
++ anon_vma_interval_tree_pre_update_vma(vma_m);
+ vma_m->vm_start -= grow << PAGE_SHIFT;
+ vma_m->vm_pgoff -= grow;
++ anon_vma_interval_tree_post_update_vma(vma_m);
+ }
+#endif
+
perf_event_mmap(vma);
}
}
- }
- vma_unlock_anon_vma(vma);
-+ if (lockprev)
-+ vma_unlock_anon_vma(prev);
- khugepaged_enter_vma_merge(vma);
- return error;
- }
-@@ -1886,6 +2179,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -1914,6 +2221,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
do {
long nrpages = vma_pages(vma);
if (vma->vm_flags & VM_ACCOUNT)
nr_accounted += nrpages;
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
-@@ -1931,6 +2231,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -1959,6 +2273,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
insertion_point = (prev ? &prev->vm_next : &mm->mmap);
vma->vm_prev = NULL;
do {
rb_erase(&vma->vm_rb, &mm->mm_rb);
mm->map_count--;
tail_vma = vma;
-@@ -1959,14 +2269,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1987,14 +2311,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
struct vm_area_struct *new;
int err = -ENOMEM;
/* most fields are the same, copy all, and then fixup */
*new = *vma;
-@@ -1979,6 +2308,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2007,6 +2350,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
}
pol = mpol_dup(vma_policy(vma));
if (IS_ERR(pol)) {
err = PTR_ERR(pol);
-@@ -2004,6 +2349,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2029,6 +2388,36 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
else
err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
+ mpol_get(pol);
+ vma_set_policy(new_m, pol);
+
-+ if (new_m->vm_file) {
++ if (new_m->vm_file)
+ get_file(new_m->vm_file);
-+ if (vma_m->vm_flags & VM_EXECUTABLE)
-+ added_exe_file_vma(mm);
-+ }
+
+ if (new_m->vm_ops && new_m->vm_ops->open)
+ new_m->vm_ops->open(new_m);
+ if (err) {
+ if (new_m->vm_ops && new_m->vm_ops->close)
+ new_m->vm_ops->close(new_m);
-+ if (new_m->vm_file) {
-+ if (vma_m->vm_flags & VM_EXECUTABLE)
-+ removed_exe_file_vma(mm);
++ if (new_m->vm_file)
+ fput(new_m->vm_file);
-+ }
+ mpol_put(pol);
+ }
+ }
/* Success. */
if (!err)
return 0;
-@@ -2016,10 +2397,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
- removed_exe_file_vma(mm);
+@@ -2038,10 +2427,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+ new->vm_ops->close(new);
+ if (new->vm_file)
fput(new->vm_file);
- }
- unlink_anon_vmas(new);
out_free_mpol:
mpol_put(pol);
kmem_cache_free(vm_area_cachep, new);
out_err:
return err;
-@@ -2032,6 +2421,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2054,6 +2451,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long addr, int new_below)
{
if (mm->map_count >= sysctl_max_map_count)
return -ENOMEM;
-@@ -2043,11 +2441,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2065,11 +2471,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
* work. This now handles partial unmappings.
* Jeremy Fitzhardinge <jeremy@goop.org>
*/
if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
return -EINVAL;
-@@ -2122,6 +2539,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
+@@ -2144,6 +2569,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
/* Fix up all other VM information */
remove_vma_list(mm, vma);
return 0;
}
-@@ -2130,6 +2549,13 @@ int vm_munmap(unsigned long start, size_t len)
+@@ -2152,6 +2579,13 @@ int vm_munmap(unsigned long start, size_t len)
int ret;
struct mm_struct *mm = current->mm;
down_write(&mm->mmap_sem);
ret = do_munmap(mm, start, len);
up_write(&mm->mmap_sem);
-@@ -2143,16 +2569,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
+@@ -2165,16 +2599,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
return vm_munmap(addr, len);
}
/*
* this is really a simplified "do_mmap". it only handles
* anonymous maps. eventually we may be able to do some
-@@ -2166,6 +2582,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2188,6 +2612,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
struct rb_node ** rb_link, * rb_parent;
pgoff_t pgoff = addr >> PAGE_SHIFT;
int error;
len = PAGE_ALIGN(len);
if (!len)
-@@ -2173,16 +2590,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2195,16 +2620,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
locked += mm->locked_vm;
lock_limit = rlimit(RLIMIT_MEMLOCK);
lock_limit >>= PAGE_SHIFT;
-@@ -2199,22 +2630,22 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2221,21 +2660,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
/*
* Clear old maps. this also does some error checking for us
*/
- munmap_back:
- vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
- if (vma && vma->vm_start < addr + len) {
+ if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
if (do_munmap(mm, addr, len))
return -ENOMEM;
- goto munmap_back;
-- }
-+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
-+ BUG_ON(vma && vma->vm_start < addr + len);
-+ }
++ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
+ }
/* Check against address space limits *after* clearing old maps... */
- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
return -ENOMEM;
/* Can we just expand an old private anonymous mapping? */
-@@ -2228,7 +2659,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2249,7 +2687,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
*/
vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
if (!vma) {
return -ENOMEM;
}
-@@ -2242,11 +2673,12 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2263,11 +2701,12 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
perf_event_mmap(vma);
return addr;
}
-@@ -2304,6 +2736,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2325,6 +2764,7 @@ void exit_mmap(struct mm_struct *mm)
while (vma) {
if (vma->vm_flags & VM_ACCOUNT)
nr_accounted += vma_pages(vma);
vma = remove_vma(vma);
}
vm_unacct_memory(nr_accounted);
-@@ -2320,6 +2753,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
- struct vm_area_struct * __vma, * prev;
- struct rb_node ** rb_link, * rb_parent;
+@@ -2341,6 +2781,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
+ struct vm_area_struct *prev;
+ struct rb_node **rb_link, *rb_parent;
+#ifdef CONFIG_PAX_SEGMEXEC
+ struct vm_area_struct *vma_m = NULL;
/*
* The vm_pgoff of a purely anonymous vma should be irrelevant
* until its first write fault, when page's anon_vma and index
-@@ -2343,7 +2783,21 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
+@@ -2364,7 +2811,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
security_vm_enough_memory_mm(mm, vma_pages(vma)))
return -ENOMEM;
return 0;
}
-@@ -2362,6 +2816,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2384,6 +2845,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
struct mempolicy *pol;
bool faulted_in_anon_vma = true;
/*
* If anonymous vma has not yet been faulted, update new pgoff
* to match new location, to increase its chance of merging.
-@@ -2430,6 +2886,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2450,6 +2913,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
return NULL;
}
+ get_file(vma_m->vm_file);
+ if (vma_m->vm_ops && vma_m->vm_ops->open)
+ vma_m->vm_ops->open(vma_m);
-+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
++ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
+ vma_m->vm_mirror = vma;
+ vma->vm_mirror = vma_m;
/*
* Return true if the calling process may expand its vm space by the passed
* number of pages
-@@ -2441,6 +2930,12 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
+@@ -2461,6 +2957,12 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
if (cur + npages > lim)
return 0;
return 1;
-@@ -2511,6 +3006,22 @@ int install_special_mapping(struct mm_struct *mm,
+@@ -2531,6 +3033,22 @@ int install_special_mapping(struct mm_struct *mm,
vma->vm_start = addr;
vma->vm_end = addr + len;
if (nstart < prev->vm_end)
diff --git a/mm/mremap.c b/mm/mremap.c
-index cc06d0e..40b5d18 100644
+index 1b61c2d..1cc0e3c 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
-@@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
+@@ -125,6 +125,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
continue;
pte = ptep_get_and_clear(mm, old_addr, old_pte);
pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
set_pte_at(mm, new_addr, new_pte, pte);
}
-@@ -298,6 +304,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
+@@ -319,6 +325,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
if (is_vm_hugetlb_page(vma))
goto Einval;
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
goto Efault;
-@@ -354,20 +365,25 @@ static unsigned long mremap_to(unsigned long addr,
+@@ -375,20 +386,25 @@ static unsigned long mremap_to(unsigned long addr,
unsigned long ret = -EINVAL;
unsigned long charged = 0;
unsigned long map_flags;
goto out;
ret = do_munmap(mm, new_addr, new_len);
-@@ -435,6 +451,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -456,6 +472,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
struct vm_area_struct *vma;
unsigned long ret = -EINVAL;
unsigned long charged = 0;
down_write(¤t->mm->mmap_sem);
-@@ -455,6 +472,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -476,6 +493,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
if (!new_len)
goto out;
if (flags & MREMAP_FIXED) {
if (flags & MREMAP_MAYMOVE)
ret = mremap_to(addr, old_len, new_addr, new_len);
-@@ -503,6 +531,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -524,6 +552,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
addr + new_len);
}
ret = addr;
goto out;
}
}
-@@ -526,7 +555,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -547,7 +576,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
goto out;
}
out:
if (ret & ~PAGE_MASK)
diff --git a/mm/nommu.c b/mm/nommu.c
-index d4b0c10..ed421b5 100644
+index 45131b4..c521665 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
atomic_long_t mmap_pages_allocated;
-@@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -824,15 +823,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
EXPORT_SYMBOL(find_vma);
/*
* expand a stack to a given address
* - not supported under NOMMU conditions
*/
-@@ -1551,6 +1541,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -1540,6 +1530,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
/* most fields are the same, copy all, and then fixup */
*new = *vma;
new->vm_region = region;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index c13ea75..081ab2c 100644
+index ceb4168..d7774f2 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -340,7 +340,7 @@ out:
{
__free_pages_ok(page, compound_order(page));
}
-@@ -697,6 +697,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -693,6 +693,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
int i;
int bad = 0;
trace_mm_page_free(page, order);
kmemcheck_free_shadow(page, order);
-@@ -712,6 +716,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -708,6 +712,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
debug_check_no_obj_freed(page_address(page),
PAGE_SIZE << order);
}
arch_free_page(page, order);
kernel_map_pages(page, 1 << order, 0);
-@@ -853,8 +863,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
+@@ -849,8 +859,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
arch_alloc_page(page, order);
kernel_map_pages(page, 1 << order, 1);
if (order && (gfp_flags & __GFP_COMP))
prep_compound_page(page, order);
-@@ -3648,7 +3660,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
+@@ -3684,7 +3696,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
unsigned long pfn;
for (pfn = start_pfn; pfn < end_pfn; pfn++) {
}
return 0;
diff --git a/mm/percpu.c b/mm/percpu.c
-index bb4be74..a43ea85 100644
+index ddc5efb..f632d2c 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
if (!mm || IS_ERR(mm)) {
rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
diff --git a/mm/rmap.c b/mm/rmap.c
-index aa95e59..b681a63 100644
+index 2ee1ef0..2e175ba 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
-@@ -168,6 +168,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
struct anon_vma *anon_vma = vma->anon_vma;
struct anon_vma_chain *avc;
might_sleep();
if (unlikely(!anon_vma)) {
struct mm_struct *mm = vma->vm_mm;
-@@ -177,6 +181,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -172,6 +176,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
if (!avc)
goto out_enomem;
anon_vma = find_mergeable_anon_vma(vma);
allocated = NULL;
if (!anon_vma) {
-@@ -190,6 +200,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -185,6 +195,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
/* page_table_lock to protect against threads */
spin_lock(&mm->page_table_lock);
if (likely(!vma->anon_vma)) {
vma->anon_vma = anon_vma;
anon_vma_chain_link(vma, avc, anon_vma);
allocated = NULL;
-@@ -200,12 +222,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -195,12 +217,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
if (unlikely(allocated))
put_anon_vma(allocated);
anon_vma_chain_free(avc);
out_enomem:
return -ENOMEM;
-@@ -241,7 +275,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
+@@ -236,7 +270,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
* Attach the anon_vmas from src to dst.
* Returns 0 on success, -ENOMEM on failure.
*/
{
struct anon_vma_chain *avc, *pavc;
struct anon_vma *root = NULL;
-@@ -319,7 +353,7 @@ void anon_vma_moveto_tail(struct vm_area_struct *dst)
+@@ -269,7 +303,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
* the corresponding VMA in the parent process is attached to.
* Returns 0 on success, non-zero on failure.
*/
struct anon_vma_chain *avc;
struct anon_vma *anon_vma;
diff --git a/mm/shmem.c b/mm/shmem.c
-index d2eeca1..3f160be 100644
+index 50c5b8f..0bc87f7 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -31,7 +31,7 @@
-#define SHORT_SYMLINK_LEN 128
+#define SHORT_SYMLINK_LEN 64
- struct shmem_xattr {
- struct list_head list; /* anchored by shmem_inode_info->xattr_list */
-@@ -2594,8 +2594,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
+ /*
+ * shmem_fallocate and shmem_writepage communicate via inode->i_private
+@@ -2112,6 +2112,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
+ static int shmem_xattr_validate(const char *name)
+ {
+ struct { const char *prefix; size_t len; } arr[] = {
++
++#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
++ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
++#endif
++
+ { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
+ { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
+ };
+@@ -2167,6 +2172,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
+ if (err)
+ return err;
+
++#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
++ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
++ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
++ return -EOPNOTSUPP;
++ if (size > 8)
++ return -EINVAL;
++ }
++#endif
++
+ return simple_xattr_set(&info->xattrs, name, value, size, flags);
+ }
+
+@@ -2466,8 +2480,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
int err = -ENOMEM;
/* Round up to L1_CACHE_BYTES to resist false sharing */
return -ENOMEM;
diff --git a/mm/slab.c b/mm/slab.c
-index d066037..5bb78d9 100644
+index 33d3363..3851c61 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -164,7 +164,7 @@ static bool pfmemalloc_active __read_mostly;
#else
#define STATS_INC_ACTIVE(x) do { } while (0)
#define STATS_DEC_ACTIVE(x) do { } while (0)
-@@ -549,7 +549,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
+@@ -534,7 +534,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
* reciprocal_divide(offset, cache->reciprocal_buffer_size)
*/
static inline unsigned int obj_to_index(const struct kmem_cache *cache,
{
u32 offset = (obj - slab->s_mem);
return reciprocal_divide(offset, cache->reciprocal_buffer_size);
-@@ -570,12 +570,13 @@ EXPORT_SYMBOL(malloc_sizes);
+@@ -555,12 +555,13 @@ EXPORT_SYMBOL(malloc_sizes);
struct cache_names {
char *name;
char *name_dma;
#undef CACHE
};
-@@ -736,6 +737,12 @@ static inline struct kmem_cache *__find_general_cachep(size_t size,
+@@ -721,6 +722,12 @@ static inline struct kmem_cache *__find_general_cachep(size_t size,
if (unlikely(gfpflags & GFP_DMA))
return csizep->cs_dmacachep;
#endif
return csizep->cs_cachep;
}
-@@ -1684,7 +1691,7 @@ void __init kmem_cache_init(void)
- sizes[INDEX_AC].cs_cachep = __kmem_cache_create(names[INDEX_AC].name,
- sizes[INDEX_AC].cs_size,
- ARCH_KMALLOC_MINALIGN,
-- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
-+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
- NULL);
+@@ -1676,7 +1683,7 @@ void __init kmem_cache_init(void)
+ sizes[INDEX_AC].cs_cachep->size = sizes[INDEX_AC].cs_size;
+ sizes[INDEX_AC].cs_cachep->object_size = sizes[INDEX_AC].cs_size;
+ sizes[INDEX_AC].cs_cachep->align = ARCH_KMALLOC_MINALIGN;
+- __kmem_cache_create(sizes[INDEX_AC].cs_cachep, ARCH_KMALLOC_FLAGS|SLAB_PANIC);
++ __kmem_cache_create(sizes[INDEX_AC].cs_cachep, ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY);
+ list_add(&sizes[INDEX_AC].cs_cachep->list, &slab_caches);
if (INDEX_AC != INDEX_L3) {
-@@ -1692,7 +1699,7 @@ void __init kmem_cache_init(void)
- __kmem_cache_create(names[INDEX_L3].name,
- sizes[INDEX_L3].cs_size,
- ARCH_KMALLOC_MINALIGN,
-- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
-+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
- NULL);
- }
-
-@@ -1710,7 +1717,7 @@ void __init kmem_cache_init(void)
- sizes->cs_cachep = __kmem_cache_create(names->name,
- sizes->cs_size,
- ARCH_KMALLOC_MINALIGN,
-- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
-+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
- NULL);
+@@ -1685,7 +1692,7 @@ void __init kmem_cache_init(void)
+ sizes[INDEX_L3].cs_cachep->size = sizes[INDEX_L3].cs_size;
+ sizes[INDEX_L3].cs_cachep->object_size = sizes[INDEX_L3].cs_size;
+ sizes[INDEX_L3].cs_cachep->align = ARCH_KMALLOC_MINALIGN;
+- __kmem_cache_create(sizes[INDEX_L3].cs_cachep, ARCH_KMALLOC_FLAGS|SLAB_PANIC);
++ __kmem_cache_create(sizes[INDEX_L3].cs_cachep, ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY);
+ list_add(&sizes[INDEX_L3].cs_cachep->list, &slab_caches);
+ }
+
+@@ -1705,7 +1712,7 @@ void __init kmem_cache_init(void)
+ sizes->cs_cachep->size = sizes->cs_size;
+ sizes->cs_cachep->object_size = sizes->cs_size;
+ sizes->cs_cachep->align = ARCH_KMALLOC_MINALIGN;
+- __kmem_cache_create(sizes->cs_cachep, ARCH_KMALLOC_FLAGS|SLAB_PANIC);
++ __kmem_cache_create(sizes->cs_cachep, ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY);
+ list_add(&sizes->cs_cachep->list, &slab_caches);
}
#ifdef CONFIG_ZONE_DMA
-@@ -1722,6 +1729,16 @@ void __init kmem_cache_init(void)
- SLAB_PANIC,
- NULL);
+@@ -1718,6 +1725,17 @@ void __init kmem_cache_init(void)
+ ARCH_KMALLOC_FLAGS|SLAB_CACHE_DMA| SLAB_PANIC);
+ list_add(&sizes->cs_dmacachep->list, &slab_caches);
#endif
+
+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+ sizes->cs_usercopycachep = kmem_cache_create(
-+ names->name_usercopy,
-+ sizes->cs_size,
-+ ARCH_KMALLOC_MINALIGN,
-+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
-+ NULL);
++ sizes->cs_usercopycachep = kmem_cache_zalloc(kmem_cache, GFP_NOWAIT);
++ sizes->cs_usercopycachep->name = names->name_usercopy;
++ sizes->cs_usercopycachep->size = sizes->cs_size;
++ sizes->cs_usercopycachep->object_size = sizes->cs_size;
++ sizes->cs_usercopycachep->align = ARCH_KMALLOC_MINALIGN;
++ __kmem_cache_create(sizes->cs_usercopycachep, ARCH_KMALLOC_FLAGS| SLAB_PANIC|SLAB_USERCOPY);
++ list_add(&sizes->cs_usercopycachep->list, &slab_caches);
+#endif
+
sizes++;
names++;
}
-@@ -4467,10 +4484,10 @@ static int s_show(struct seq_file *m, void *p)
+@@ -4405,10 +4423,10 @@ static int s_show(struct seq_file *m, void *p)
}
/* cpu stats */
{
seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
allochit, allocmiss, freehit, freemiss);
-@@ -4729,13 +4746,71 @@ static int __init slab_proc_init(void)
+@@ -4667,13 +4685,71 @@ static int __init slab_proc_init(void)
{
proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
#ifdef CONFIG_DEBUG_SLAB_LEAK
+ if (!PageSlab(page))
+ return false;
+
-+ cachep = page_get_cache(page);
++ cachep = page->slab_cache;
+ return cachep->flags & SLAB_USERCOPY;
+}
+
+#ifdef CONFIG_PAX_USERCOPY
-+const char *check_heap_object(const void *ptr, unsigned long n, bool to)
++const char *check_heap_object(const void *ptr, unsigned long n)
+{
+ struct page *page;
+ struct kmem_cache *cachep;
+ if (!PageSlab(page))
+ return NULL;
+
-+ cachep = page_get_cache(page);
++ cachep = page->slab_cache;
+ if (!(cachep->flags & SLAB_USERCOPY))
+ return cachep->name;
+
/**
* ksize - get the actual amount of memory allocated for a given object
* @objp: Pointer to the object
+diff --git a/mm/slab_common.c b/mm/slab_common.c
+index 069a24e6..226a310 100644
+--- a/mm/slab_common.c
++++ b/mm/slab_common.c
+@@ -127,7 +127,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
+ err = __kmem_cache_create(s, flags);
+ if (!err) {
+
+- s->refcount = 1;
++ atomic_set(&s->refcount, 1);
+ list_add(&s->list, &slab_caches);
+
+ } else {
+@@ -163,8 +163,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
+ {
+ get_online_cpus();
+ mutex_lock(&slab_mutex);
+- s->refcount--;
+- if (!s->refcount) {
++ if (atomic_dec_and_test(&s->refcount)) {
+ list_del(&s->list);
+
+ if (!__kmem_cache_shutdown(s)) {
diff --git a/mm/slob.c b/mm/slob.c
-index 45d4ca7..88943c1 100644
+index 1e921c5..1ce12c2 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -159,7 +159,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
+ struct page *page;
#ifdef CONFIG_NUMA
- if (node != -1)
+ if (node != NUMA_NO_NODE)
@@ -203,14 +203,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
if (!page)
return NULL;
return;
}
-@@ -425,11 +427,10 @@ out:
- * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
+@@ -426,11 +428,10 @@ out:
*/
--void *__kmalloc_node(size_t size, gfp_t gfp, int node)
-+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
+ static __always_inline void *
+-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
++__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
{
- unsigned int *m;
-- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
- void *ret;
+ slob_t *m;
+ void *ret = NULL;
gfp &= gfp_allowed_mask;
-@@ -443,20 +444,23 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
+@@ -444,20 +445,23 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
if (!m)
return NULL;
+ m[1].units = align;
ret = (void *)m + align;
- trace_kmalloc_node(_RET_IP_, ret,
+ trace_kmalloc_node(caller, ret,
size, size + align, gfp, node);
} else {
unsigned int order = get_order(size);
page->private = size;
}
-@@ -464,7 +468,16 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
+@@ -465,7 +469,17 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
size, PAGE_SIZE << order, gfp, node);
}
+ return ret;
+}
+
-+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
++static __always_inline void *
++__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
+{
+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
-+ void *ret = __kmalloc_node_align(size, gfp, node, align);
++ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
+
+ if (!ZERO_OR_NULL_PTR(ret))
+ kmemleak_alloc(ret, size, 1, gfp);
return ret;
}
- EXPORT_SYMBOL(__kmalloc_node);
-@@ -480,15 +493,91 @@ void kfree(const void *block)
+
+@@ -501,15 +515,91 @@ void kfree(const void *block)
kmemleak_free(block);
sp = virt_to_page(block);
- if (PageSlab(sp)) {
+ VM_BUG_ON(!PageSlab(sp));
+ if (!sp->private) {
- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
- unsigned int *m = (unsigned int *)(block - align);
- slob_free(m, *m + align);
- } else
+}
+
+#ifdef CONFIG_PAX_USERCOPY
-+const char *check_heap_object(const void *ptr, unsigned long n, bool to)
++const char *check_heap_object(const void *ptr, unsigned long n)
+{
+ struct page *page;
+ const slob_t *free;
/* can't use ksize for kmem_cache_alloc memory, only kmalloc */
size_t ksize(const void *block)
{
-@@ -499,10 +588,11 @@ size_t ksize(const void *block)
+@@ -520,10 +610,11 @@ size_t ksize(const void *block)
return 0;
sp = virt_to_page(block);
- if (PageSlab(sp)) {
+ VM_BUG_ON(!PageSlab(sp));
+ if (!sp->private) {
- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
- unsigned int *m = (unsigned int *)(block - align);
- return SLOB_UNITS(*m) * SLOB_UNIT;
+ slob_t *m = (slob_t *)(block - align);
} else
return sp->private;
}
-@@ -513,8 +603,13 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
- {
- struct kmem_cache *c;
-
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
-+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
-+#else
- c = slob_alloc(sizeof(struct kmem_cache),
- GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
-+#endif
-
- if (c) {
- c->name = name;
-@@ -549,23 +644,33 @@ EXPORT_SYMBOL(kmem_cache_destroy);
+@@ -550,23 +641,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
{
lockdep_trace_alloc(flags);
+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+ b = __kmalloc_node_align(c->size, flags, node, c->align);
++ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
+#else
if (c->size < PAGE_SIZE) {
b = slob_alloc(c->size, flags, c->align, node);
if (c->ctor)
c->ctor(b);
-@@ -577,10 +682,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -578,10 +679,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
static void __kmem_cache_free(void *b, int size)
{
}
static void kmem_rcu_free(struct rcu_head *head)
-@@ -593,17 +702,31 @@ static void kmem_rcu_free(struct rcu_head *head)
+@@ -594,17 +699,31 @@ static void kmem_rcu_free(struct rcu_head *head)
void kmem_cache_free(struct kmem_cache *c, void *b)
{
EXPORT_SYMBOL(kmem_cache_free);
diff --git a/mm/slub.c b/mm/slub.c
-index 2fdd96f..1e2f893 100644
+index 321afab..9595170 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -201,7 +201,7 @@ struct track {
static int sysfs_slab_add(struct kmem_cache *);
static int sysfs_slab_alias(struct kmem_cache *, const char *);
static void sysfs_slab_remove(struct kmem_cache *);
-@@ -525,7 +525,7 @@ static void print_track(const char *s, struct track *t)
+@@ -521,7 +521,7 @@ static void print_track(const char *s, struct track *t)
if (!t->addr)
return;
s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
#ifdef CONFIG_STACKTRACE
{
-@@ -2612,6 +2612,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
+@@ -2623,6 +2623,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
page = virt_to_head_page(x);
+ BUG_ON(!PageSlab(page));
+
- slab_free(s, page, x, _RET_IP_);
-
- trace_kmem_cache_free(_RET_IP_, x);
-@@ -2645,7 +2647,7 @@ static int slub_min_objects;
+ if (kmem_cache_debug(s) && page->slab != s) {
+ pr_err("kmem_cache_free: Wrong slab cache. %s but object"
+ " is from %s\n", page->slab->name, s->name);
+@@ -2663,7 +2665,7 @@ static int slub_min_objects;
* Merge control. If this is set then no merging of slab caches will occur.
* (Could be removed. This was introduced to pacify the merge skeptics.)
*/
/*
* Calculate the order of allocation given an slab object size.
-@@ -3098,7 +3100,7 @@ static int kmem_cache_open(struct kmem_cache *s,
- else
- s->cpu_partial = 30;
-
-- s->refcount = 1;
-+ atomic_set(&s->refcount, 1);
- #ifdef CONFIG_NUMA
- s->remote_node_defrag_ratio = 1000;
- #endif
-@@ -3202,8 +3204,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
- void kmem_cache_destroy(struct kmem_cache *s)
- {
- mutex_lock(&slab_mutex);
-- s->refcount--;
-- if (!s->refcount) {
-+ if (atomic_dec_and_test(&s->refcount)) {
- list_del(&s->list);
- mutex_unlock(&slab_mutex);
- if (kmem_cache_close(s)) {
-@@ -3232,6 +3233,10 @@ static struct kmem_cache *kmem_cache;
+@@ -3225,6 +3227,10 @@ EXPORT_SYMBOL(kmalloc_caches);
static struct kmem_cache *kmalloc_dma_caches[SLUB_PAGE_SHIFT];
#endif
static int __init setup_slub_min_order(char *str)
{
get_option(&str, &slub_min_order);
-@@ -3346,6 +3351,13 @@ static struct kmem_cache *get_slab(size_t size, gfp_t flags)
+@@ -3279,7 +3285,7 @@ static struct kmem_cache *__init create_kmalloc_cache(const char *name,
+ if (kmem_cache_open(s, flags))
+ goto panic;
+
+- s->refcount = 1;
++ atomic_set(&s->refcount, 1);
+ list_add(&s->list, &slab_caches);
+ return s;
+
+@@ -3343,6 +3349,13 @@ static struct kmem_cache *get_slab(size_t size, gfp_t flags)
return kmalloc_dma_caches[index];
#endif
return kmalloc_caches[index];
}
-@@ -3414,6 +3426,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
+@@ -3411,6 +3424,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
EXPORT_SYMBOL(__kmalloc_node);
#endif
+}
+
+#ifdef CONFIG_PAX_USERCOPY
-+const char *check_heap_object(const void *ptr, unsigned long n, bool to)
++const char *check_heap_object(const void *ptr, unsigned long n)
+{
+ struct page *page;
+ struct kmem_cache *s;
size_t ksize(const void *object)
{
struct page *page;
-@@ -3688,7 +3753,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
+@@ -3685,7 +3751,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
int node;
list_add(&s->list, &slab_caches);
for_each_node_state(node, N_NORMAL_MEMORY) {
struct kmem_cache_node *n = get_node(s, node);
-@@ -3808,17 +3873,17 @@ void __init kmem_cache_init(void)
+@@ -3808,17 +3874,17 @@ void __init kmem_cache_init(void)
/* Caches that are not of the two-to-the-power-of size */
if (KMALLOC_MIN_SIZE <= 32) {
caches++;
}
-@@ -3860,6 +3925,22 @@ void __init kmem_cache_init(void)
+@@ -3860,6 +3926,22 @@ void __init kmem_cache_init(void)
}
}
#endif
printk(KERN_INFO
"SLUB: Genslabs=%d, HWalign=%d, Order=%d-%d, MinObjects=%d,"
" CPUs=%d, Nodes=%d\n",
-@@ -3886,7 +3967,7 @@ static int slab_unmergeable(struct kmem_cache *s)
+@@ -3886,7 +3968,7 @@ static int slab_unmergeable(struct kmem_cache *s)
/*
* We may have set a slab to be unmergeable during bootstrap.
*/
return 1;
return 0;
-@@ -3941,7 +4022,7 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
+@@ -3940,7 +4022,7 @@ struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
s = find_mergeable(size, align, flags, name, ctor);
if (s) {
/*
* Adjust the object sizes so that we clear
* the complete object on kzalloc.
-@@ -3950,7 +4031,7 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
+@@ -3949,7 +4031,7 @@ struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
if (sysfs_slab_alias(s, name)) {
- s->refcount--;
+ atomic_dec(&s->refcount);
- return NULL;
+ s = NULL;
}
- return s;
-@@ -4072,7 +4153,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
+ }
+@@ -4064,7 +4146,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
}
#endif
static int count_inuse(struct page *page)
{
return page->inuse;
-@@ -4459,12 +4540,12 @@ static void resiliency_test(void)
+@@ -4451,12 +4533,12 @@ static void resiliency_test(void)
validate_slab_cache(kmalloc_caches[9]);
}
#else
enum slab_stat_type {
SL_ALL, /* All slabs */
SL_PARTIAL, /* Only partially allocated slabs */
-@@ -4708,7 +4789,7 @@ SLAB_ATTR_RO(ctor);
+@@ -4700,7 +4782,7 @@ SLAB_ATTR_RO(ctor);
static ssize_t aliases_show(struct kmem_cache *s, char *buf)
{
}
SLAB_ATTR_RO(aliases);
-@@ -5279,6 +5360,7 @@ static char *create_unique_id(struct kmem_cache *s)
+@@ -5262,6 +5344,7 @@ static char *create_unique_id(struct kmem_cache *s)
return name;
}
static int sysfs_slab_add(struct kmem_cache *s)
{
int err;
-@@ -5341,6 +5423,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
+@@ -5324,6 +5407,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
kobject_del(&s->kobj);
kobject_put(&s->kobj);
}
/*
* Need to buffer aliases during bootup until sysfs becomes
-@@ -5354,6 +5437,7 @@ struct saved_alias {
+@@ -5337,6 +5421,7 @@ struct saved_alias {
static struct saved_alias *alias_list;
static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
{
struct saved_alias *al;
-@@ -5376,6 +5460,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
+@@ -5359,6 +5444,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
alias_list = al;
return 0;
}
return pgd;
}
diff --git a/mm/swap.c b/mm/swap.c
-index 7782588..228c784 100644
+index 6310dc2..3662b3f 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -30,6 +30,7 @@
}
diff --git a/mm/swapfile.c b/mm/swapfile.c
-index 14e254c..a6af32c 100644
+index f91a255..9dcac21 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -64,7 +64,7 @@ static DEFINE_MUTEX(swapon_mutex);
static inline unsigned char swap_count(unsigned char ent)
{
-@@ -1603,7 +1603,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
+@@ -1601,7 +1601,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
}
filp_close(swap_file, NULL);
err = 0;
wake_up_interruptible(&proc_poll_wait);
out_dput:
-@@ -1619,8 +1619,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
+@@ -1618,8 +1618,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
poll_wait(file, &proc_poll_wait, wait);
return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
}
-@@ -1718,7 +1718,7 @@ static int swaps_open(struct inode *inode, struct file *file)
+@@ -1717,7 +1717,7 @@ static int swaps_open(struct inode *inode, struct file *file)
return ret;
seq = file->private_data;
return 0;
}
-@@ -2060,7 +2060,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
+@@ -2059,7 +2059,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
(frontswap_map) ? "FS" : "");
mutex_unlock(&swapon_mutex);
if (S_ISREG(inode->i_mode))
diff --git a/mm/util.c b/mm/util.c
-index 8c7265a..c96d884 100644
+index dc3036c..b6c7c9d 100644
--- a/mm/util.c
+++ b/mm/util.c
-@@ -285,6 +285,12 @@ done:
+@@ -292,6 +292,12 @@ done:
void arch_pick_mmap_layout(struct mm_struct *mm)
{
mm->mmap_base = TASK_UNMAPPED_BASE;
mm->unmap_area = arch_unmap_area;
}
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 2bb90b1..ed47e53 100644
+index 78e0830..bc6bbd8 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
} while (pte++, addr += PAGE_SIZE, addr != end);
}
-@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
- unsigned long end, pgprot_t prot, struct page **pages, int *nr)
- {
- pte_t *pte;
-+ int ret = -ENOMEM;
-
- /*
- * nr is a running index into the array which helps higher level
-@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
+@@ -100,16 +111,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
pte = pte_alloc_kernel(pmd, addr);
if (!pte)
return -ENOMEM;
struct page *page = pages[*nr];
- if (WARN_ON(!pte_none(*pte)))
-- return -EBUSY;
-- if (WARN_ON(!page))
-- return -ENOMEM;
+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
+ if (pgprot_val(prot) & _PAGE_NX)
+#endif
+
-+ if (WARN_ON(!pte_none(*pte))) {
-+ ret = -EBUSY;
-+ goto out;
++ if (!pte_none(*pte)) {
++ pax_close_kernel();
++ WARN_ON(1);
+ return -EBUSY;
+- if (WARN_ON(!page))
+ }
-+ if (WARN_ON(!page)) {
-+ ret = -ENOMEM;
-+ goto out;
++ if (!page) {
++ pax_close_kernel();
++ WARN_ON(1);
+ return -ENOMEM;
+ }
set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
(*nr)++;
} while (pte++, addr += PAGE_SIZE, addr != end);
-- return 0;
-+ ret = 0;
-+out:
+ pax_close_kernel();
-+ return ret;
+ return 0;
}
- static int vmap_pmd_range(pud_t *pud, unsigned long addr,
-@@ -119,7 +144,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
+@@ -119,7 +143,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
pmd_t *pmd;
unsigned long next;
if (!pmd)
return -ENOMEM;
do {
-@@ -136,7 +161,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
+@@ -136,7 +160,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
pud_t *pud;
unsigned long next;
if (!pud)
return -ENOMEM;
do {
-@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
+@@ -191,11 +215,20 @@ int is_vmalloc_or_module_addr(const void *x)
* and fall back on vmalloc() if that fails. Others
* just put it in the vmalloc space.
*/
return is_vmalloc_addr(x);
}
-@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
+@@ -216,8 +249,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
if (!pgd_none(*pgd)) {
pud_t *pud = pud_offset(pgd, addr);
if (!pmd_none(*pmd)) {
pte_t *ptep, pte;
-@@ -329,7 +369,7 @@ static void purge_vmap_area_lazy(void);
+@@ -329,7 +368,7 @@ static void purge_vmap_area_lazy(void);
* Allocate a region of KVA of the specified size and alignment, within the
* vstart and vend.
*/
unsigned long align,
unsigned long vstart, unsigned long vend,
int node, gfp_t gfp_mask)
-@@ -1328,6 +1368,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
+@@ -1328,6 +1367,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
struct vm_struct *area;
BUG_ON(in_interrupt());
if (flags & VM_IOREMAP) {
int bit = fls(size);
-@@ -1568,6 +1618,11 @@ void *vmap(struct page **pages, unsigned int count,
+@@ -1568,6 +1617,11 @@ void *vmap(struct page **pages, unsigned int count,
if (count > totalram_pages)
return NULL;
area = get_vm_area_caller((count << PAGE_SHIFT), flags,
__builtin_return_address(0));
if (!area)
-@@ -1669,6 +1724,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
+@@ -1669,6 +1723,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
if (!size || (size >> PAGE_SHIFT) > totalram_pages)
goto fail;
area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
start, end, node, gfp_mask, caller);
if (!area)
-@@ -1842,10 +1904,9 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1842,10 +1903,9 @@ EXPORT_SYMBOL(vzalloc_node);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
-1, __builtin_return_address(0));
}
-@@ -2136,6 +2197,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
+@@ -2136,6 +2196,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
unsigned long uaddr = vma->vm_start;
unsigned long usize = vma->vm_end - vma->vm_start;
if ((PAGE_SIZE-1) & (unsigned long)addr)
return -EINVAL;
-@@ -2572,7 +2635,7 @@ static int s_show(struct seq_file *m, void *p)
- {
- struct vm_struct *v = p;
-
-- seq_printf(m, "0x%p-0x%p %7ld",
-+ seq_printf(m, "0x%pK-0x%pK %7ld",
+@@ -2575,7 +2637,11 @@ static int s_show(struct seq_file *m, void *p)
v->addr, v->addr + v->size, v->size);
if (v->caller)
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ seq_printf(m, " %pK", v->caller);
++#else
+ seq_printf(m, " %pS", v->caller);
++#endif
+
+ if (v->nr_pages)
+ seq_printf(m, " pages=%d", v->nr_pages);
diff --git a/mm/vmstat.c b/mm/vmstat.c
-index df7a674..8b4a4f3 100644
+index c737057..a49753a 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
}
+ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
+@@ -503,8 +503,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
+ if (pset->vm_stat_diff[i]) {
+ int v = pset->vm_stat_diff[i];
+ pset->vm_stat_diff[i] = 0;
+- atomic_long_add(v, &zone->vm_stat[i]);
+- atomic_long_add(v, &vm_stat[i]);
++ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
++ atomic_long_add_unchecked(v, &vm_stat[i]);
+ }
+ }
#endif
-@@ -1212,10 +1212,20 @@ static int __init setup_vmstat(void)
+@@ -1224,10 +1224,20 @@ static int __init setup_vmstat(void)
start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
return 0;
}
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
-index 9096bcb..43ed7bb 100644
+index ee07072..593e3fd 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
-@@ -557,8 +557,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
+@@ -484,7 +484,7 @@ out:
+ return NOTIFY_DONE;
+ }
+
+-static struct notifier_block vlan_notifier_block __read_mostly = {
++static struct notifier_block vlan_notifier_block = {
+ .notifier_call = vlan_device_event,
+ };
+
+@@ -559,8 +559,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
break;
vn = net_generic(net, vlan_net_id);
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
-index 6449bae..8c1f454 100644
+index 02efb25..41541a9 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -425,7 +425,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
/*
* ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
-diff --git a/net/atm/mpc.h b/net/atm/mpc.h
-index 0919a88..a23d54e 100644
---- a/net/atm/mpc.h
-+++ b/net/atm/mpc.h
-@@ -33,7 +33,7 @@ struct mpoa_client {
- struct mpc_parameters parameters; /* parameters for this client */
-
- const struct net_device_ops *old_ops;
-- struct net_device_ops new_ops;
-+ net_device_ops_no_const new_ops;
- };
-
-
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 0d020de..011c7bb 100644
--- a/net/atm/proc.c
static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
diff --git a/net/atm/resources.c b/net/atm/resources.c
-index 23f45ce..c748f1a 100644
+index 0447d5d..3cf4728 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
#undef __HANDLE_ITEM
}
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
-index 469daab..262851c 100644
+index c6fcc76..1270d14 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -62,7 +62,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
hard_iface->packet_len = BATADV_OGM_HLEN;
hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC);
-@@ -600,8 +600,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
+@@ -608,9 +608,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
+ batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;
/* change sequence number to network order */
- batadv_ogm_packet->seqno =
-- htonl((uint32_t)atomic_read(&hard_iface->seqno));
+- seqno = (uint32_t)atomic_read(&hard_iface->seqno);
++ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->seqno);
+ batadv_ogm_packet->seqno = htonl(seqno);
- atomic_inc(&hard_iface->seqno);
-+ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
+ atomic_inc_unchecked(&hard_iface->seqno);
- batadv_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
- batadv_ogm_packet->tt_crc = htons(bat_priv->tt_crc);
-@@ -1001,7 +1001,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
+ batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn);
+ batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc);
+@@ -1015,7 +1015,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
return;
/* could be changed by schedule_own_packet() */
if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)
has_directlink_flag = 1;
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index 282bf6e..4b2603d 100644
+index d112fd6..686a447 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
-@@ -320,7 +320,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
+@@ -327,7 +327,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
dev_add_pack(&hard_iface->batman_adv_ptype);
batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
hard_iface->net_dev->name);
-@@ -443,7 +443,7 @@ batadv_hardif_add_interface(struct net_device *net_dev)
+@@ -450,7 +450,7 @@ batadv_hardif_add_interface(struct net_device *net_dev)
/* This can't be called via a bat_priv callback because
* we have no bat_priv yet.
*/
return hard_iface;
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 21c5357..768be1a 100644
+index ce0684a..4a0cbf1 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
-@@ -227,7 +227,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
+@@ -234,7 +234,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
+ primary_if->net_dev->dev_addr, ETH_ALEN);
/* set broadcast sequence number */
- bcast_packet->seqno =
-- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
-+ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
+- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
++ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
+ bcast_packet->seqno = htonl(seqno);
batadv_add_bcast_packet_to_list(bat_priv, skb, 1);
-
-@@ -407,7 +407,7 @@ struct net_device *batadv_softif_create(const char *name)
+@@ -427,7 +427,7 @@ struct net_device *batadv_softif_create(const char *name)
atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
- atomic_set(&bat_priv->bcast_seqno, 1);
+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
- atomic_set(&bat_priv->ttvn, 0);
- atomic_set(&bat_priv->tt_local_changes, 0);
- atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
+ atomic_set(&bat_priv->tt.vn, 0);
+ atomic_set(&bat_priv->tt.local_changes, 0);
+ atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index 12635fd..d99d837 100644
+index ac1e07a..4c846e2 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -33,8 +33,8 @@ struct batadv_hard_iface {
unsigned char *packet_buff;
int packet_len;
struct kobject *hardif_obj;
-@@ -176,7 +176,7 @@ struct batadv_priv {
+@@ -244,7 +244,7 @@ struct batadv_priv {
atomic_t orig_interval; /* uint */
atomic_t hop_penalty; /* uint */
atomic_t log_level; /* uint */
+ atomic_unchecked_t bcast_seqno;
atomic_t bcast_queue_left;
atomic_t batman_queue_left;
- atomic_t ttvn; /* translation table version number */
+ char num_ifaces;
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
-index 0016464..0ef3e53 100644
+index f397232..3206a33 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
-@@ -269,7 +269,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
+@@ -272,7 +272,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail;
frag2->flags = large_tail;
frag2->seqno = htons(seqno);
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
-index d5ace1e..231c4bf 100644
+index 07f0739..3c42e34 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -934,7 +934,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
err = -EFAULT;
break;
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
-index 38c00f1..e9d566e 100644
+index a91239d..d7ed533 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
-@@ -3165,8 +3165,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
+@@ -3183,8 +3183,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
break;
case L2CAP_CONF_RFC:
if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
rfc.mode != chan->mode)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
-index 34bbe1c..451c19b 100644
+index 083f2bf..799f9448 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
-@@ -467,7 +467,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
+@@ -471,7 +471,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
struct sock *sk = sock->sk;
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
struct l2cap_options opts;
u32 opt;
BT_DBG("sk %p", sk);
-@@ -489,7 +490,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
+@@ -493,7 +494,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
opts.max_tx = chan->max_tx;
opts.txwin_size = chan->tx_win;
if (copy_from_user((char *) &opts, optval, len)) {
err = -EFAULT;
break;
-@@ -567,7 +568,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
+@@ -571,7 +572,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
struct bt_security sec;
struct bt_power pwr;
struct l2cap_conn *conn;
u32 opt;
BT_DBG("sk %p", sk);
-@@ -590,7 +592,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
+@@ -594,7 +596,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
sec.level = BT_SECURITY_LOW;
if (copy_from_user((char *) &sec, optval, len)) {
err = -EFAULT;
break;
-@@ -687,7 +689,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
+@@ -691,7 +693,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
err = -EFAULT;
break;
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index 1a17850..65a3129 100644
+index 868a909..d044bc3 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -667,7 +667,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
err = -EFAULT;
break;
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
-index 56f1823..da44330 100644
+index ccc2487..921073d 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -309,7 +309,7 @@ static void rfcomm_dev_del(struct rfcomm_dev *dev)
p->sequence_no);
list_del(&p->list);
goto out;
+diff --git a/net/can/af_can.c b/net/can/af_can.c
+index ddac1ee..3ee0a78 100644
+--- a/net/can/af_can.c
++++ b/net/can/af_can.c
+@@ -872,7 +872,7 @@ static const struct net_proto_family can_family_ops = {
+ };
+
+ /* notifier block for netdevice event */
+-static struct notifier_block can_netdev_notifier __read_mostly = {
++static struct notifier_block can_netdev_notifier = {
+ .notifier_call = can_notifier,
+ };
+
diff --git a/net/can/gw.c b/net/can/gw.c
-index b54d5e6..91c3b25 100644
+index 1f5c978..ef714c7 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
-@@ -96,7 +96,7 @@ struct cf_mod {
- struct {
- void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
- void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
-- } csumfunc;
-+ } __no_const csumfunc;
- };
+@@ -67,7 +67,6 @@ MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
+ MODULE_ALIAS("can-gw");
+
+ static HLIST_HEAD(cgw_list);
+-static struct notifier_block notifier;
+ static struct kmem_cache *cgw_cache __read_mostly;
+@@ -887,6 +886,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
+ return err;
+ }
+
++static struct notifier_block notifier = {
++ .notifier_call = cgw_notifier
++};
++
+ static __init int cgw_module_init(void)
+ {
+ printk(banner);
+@@ -898,7 +901,6 @@ static __init int cgw_module_init(void)
+ return -ENOMEM;
+
+ /* set notifier */
+- notifier.notifier_call = cgw_notifier;
+ register_netdevice_notifier(¬ifier);
+
+ if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
diff --git a/net/compat.c b/net/compat.c
-index 74ed1d7..3695bd9 100644
+index 79ae884..17c5c09 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
int fdnum = scm->fp->count;
struct file **fp = scm->fp->fp;
-@@ -364,7 +364,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
+@@ -363,7 +363,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
return -EFAULT;
old_fs = get_fs();
set_fs(KERNEL_DS);
set_fs(old_fs);
return err;
-@@ -425,7 +425,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
+@@ -424,7 +424,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
len = sizeof(ktime);
old_fs = get_fs();
set_fs(KERNEL_DS);
set_fs(old_fs);
if (!err) {
-@@ -568,7 +568,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
+@@ -567,7 +567,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
case MCAST_JOIN_GROUP:
case MCAST_LEAVE_GROUP:
{
struct group_req __user *kgr =
compat_alloc_user_space(sizeof(struct group_req));
u32 interface;
-@@ -589,7 +589,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
+@@ -588,7 +588,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
case MCAST_BLOCK_SOURCE:
case MCAST_UNBLOCK_SOURCE:
{
struct group_source_req __user *kgsr = compat_alloc_user_space(
sizeof(struct group_source_req));
u32 interface;
-@@ -610,7 +610,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
+@@ -609,7 +609,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
}
case MCAST_MSFILTER:
{
struct group_filter __user *kgf;
u32 interface, fmode, numsrc;
-@@ -648,7 +648,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
+@@ -647,7 +647,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
char __user *optval, int __user *optlen,
int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
{
struct group_filter __user *kgf;
int __user *koptlen;
u32 interface, fmode, numsrc;
-@@ -797,7 +797,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
+@@ -796,7 +796,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
if (call < SYS_SOCKET || call > SYS_SENDMMSG)
return -EINVAL;
return err;
diff --git a/net/core/dev.c b/net/core/dev.c
-index 2fb9f59..d9a07df 100644
+index e5942bf..25998c3 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -1138,9 +1138,13 @@ void dev_load(struct net *net, const char *name)
+@@ -1162,9 +1162,13 @@ void dev_load(struct net *net, const char *name)
if (no_module && capable(CAP_NET_ADMIN))
no_module = request_module("netdev-%s", name);
if (no_module && capable(CAP_SYS_MODULE)) {
}
}
EXPORT_SYMBOL(dev_load);
-@@ -1605,7 +1609,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
+@@ -1627,7 +1631,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
{
if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -1615,7 +1619,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
+@@ -1637,7 +1641,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
nf_reset(skb);
if (unlikely(!is_skb_forwardable(dev, skb))) {
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -2071,7 +2075,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
+@@ -2093,7 +2097,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
struct dev_gso_cb {
void (*destructor)(struct sk_buff *skb);
#define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
-@@ -2928,7 +2932,7 @@ enqueue:
+@@ -2955,7 +2959,7 @@ enqueue:
local_irq_restore(flags);
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -3000,7 +3004,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -3027,7 +3031,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
-@@ -3331,7 +3335,7 @@ ncls:
+@@ -3358,7 +3362,7 @@ ncls:
ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
} else {
drop:
kfree_skb(skb);
/* Jamal, now you will not able to escape explaining
* me how you were going to use this. :-)
-@@ -3898,7 +3902,7 @@ void netif_napi_del(struct napi_struct *napi)
+@@ -3944,7 +3948,7 @@ void netif_napi_del(struct napi_struct *napi)
}
EXPORT_SYMBOL(netif_napi_del);
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
unsigned long time_limit = jiffies + 2;
-@@ -4368,8 +4372,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
+@@ -4423,8 +4427,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
else
seq_printf(seq, "%04x", ntohs(pt->type));
}
return 0;
-@@ -5922,7 +5931,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
+@@ -5987,7 +5996,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
} else {
netdev_stats_to_stats64(storage, &dev->stats);
}
m->msg_iov = iov;
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
-index 2c5a0a0..a45f90c 100644
+index fad649a..f2fdac4 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
-@@ -58,7 +58,7 @@ struct rtnl_link {
- rtnl_doit_func doit;
- rtnl_dumpit_func dumpit;
- rtnl_calcit_func calcit;
--};
-+} __no_const;
+@@ -198,14 +198,16 @@ int __rtnl_register(int protocol, int msgtype,
+ rtnl_msg_handlers[protocol] = tab;
+ }
+
++ pax_open_kernel();
+ if (doit)
+- tab[msgindex].doit = doit;
++ *(void **)&tab[msgindex].doit = doit;
- static DEFINE_MUTEX(rtnl_mutex);
+ if (dumpit)
+- tab[msgindex].dumpit = dumpit;
++ *(void **)&tab[msgindex].dumpit = dumpit;
+ if (calcit)
+- tab[msgindex].calcit = calcit;
++ *(void **)&tab[msgindex].calcit = calcit;
++ pax_close_kernel();
+
+ return 0;
+ }
+@@ -248,8 +250,10 @@ int rtnl_unregister(int protocol, int msgtype)
+ if (rtnl_msg_handlers[protocol] == NULL)
+ return -ENOENT;
+
+- rtnl_msg_handlers[protocol][msgindex].doit = NULL;
+- rtnl_msg_handlers[protocol][msgindex].dumpit = NULL;
++ pax_open_kernel();
++ *(void **)&rtnl_msg_handlers[protocol][msgindex].doit = NULL;
++ *(void **)&rtnl_msg_handlers[protocol][msgindex].dumpit = NULL;
++ pax_close_kernel();
+
+ return 0;
+ }
diff --git a/net/core/scm.c b/net/core/scm.c
-index 040cebe..5b1e312 100644
+index ab57084..0190c8f 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
-@@ -203,7 +203,7 @@ EXPORT_SYMBOL(__scm_send);
+@@ -223,7 +223,7 @@ EXPORT_SYMBOL(__scm_send);
int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
{
struct cmsghdr __user *cm
struct cmsghdr cmhdr;
int cmlen = CMSG_LEN(len);
int err;
-@@ -226,7 +226,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
+@@ -246,7 +246,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
err = -EFAULT;
if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
goto out;
goto out;
cmlen = CMSG_SPACE(len);
if (msg->msg_controllen < cmlen)
-@@ -242,7 +242,7 @@ EXPORT_SYMBOL(put_cmsg);
+@@ -262,7 +262,7 @@ EXPORT_SYMBOL(put_cmsg);
void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
{
struct cmsghdr __user *cm
int fdmax = 0;
int fdnum = scm->fp->count;
-@@ -262,7 +262,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
+@@ -282,7 +282,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
if (fdnum < fdmax)
fdmax = fdnum;
{
struct socket *sock;
diff --git a/net/core/sock.c b/net/core/sock.c
-index a6000fb..d4aee72 100644
+index 8a146cf..ee08914d 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -399,7 +399,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -388,7 +388,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
struct sk_buff_head *list = &sk->sk_receive_queue;
if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
trace_sock_rcvqueue_full(sk, skb);
return -ENOMEM;
}
-@@ -409,7 +409,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -398,7 +398,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
return err;
if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
return -ENOBUFS;
}
-@@ -429,7 +429,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -418,7 +418,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
skb_dst_force(skb);
spin_lock_irqsave(&list->lock, flags);
__skb_queue_tail(list, skb);
spin_unlock_irqrestore(&list->lock, flags);
-@@ -449,7 +449,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -438,7 +438,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
skb->dev = NULL;
if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
goto discard_and_relse;
}
if (nested)
-@@ -467,7 +467,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -456,7 +456,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
} else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
bh_unlock_sock(sk);
goto discard_and_relse;
}
-@@ -886,12 +886,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -875,12 +875,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
struct timeval tm;
} v;
return -EINVAL;
memset(&v, 0, sizeof(v));
-@@ -1039,11 +1039,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1028,11 +1028,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
case SO_PEERNAME:
{
return -EINVAL;
if (copy_to_user(optval, address, len))
return -EFAULT;
-@@ -1091,7 +1091,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1080,7 +1080,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
if (len > lv)
len = lv;
return -EFAULT;
lenout:
if (put_user(len, optlen))
-@@ -2193,7 +2193,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
+@@ -2212,7 +2212,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
*/
smp_wmb();
atomic_set(&sk->sk_refcnt, 1);
EXPORT_SYMBOL(sock_init_data);
diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
-index 9d8755e..26de8bc 100644
+index 602cd63..05c6c60 100644
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -15,20 +15,27 @@ static DEFINE_MUTEX(sock_diag_table_mutex);
return -EFAULT;
*lenp = len;
+diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
+index 2a6abc1..c379ba7 100644
+--- a/net/ipv4/devinet.c
++++ b/net/ipv4/devinet.c
+@@ -822,9 +822,9 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg)
+ if (!ifa) {
+ ret = -ENOBUFS;
+ ifa = inet_alloc_ifa();
++ if (!ifa)
++ break;
+ INIT_HLIST_NODE(&ifa->hash);
+- if (!ifa)
+- break;
+ if (colon)
+ memcpy(ifa->ifa_label, ifr.ifr_name, IFNAMSIZ);
+ else
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
-index f444ac7..b7bdda9 100644
+index 825c608..750ff29 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
if (ifa->ifa_dev->ifa_list == NULL) {
/* Last address was deleted from this interface.
* Disable IP.
-@@ -1062,7 +1062,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
+@@ -1061,7 +1061,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
#ifdef CONFIG_IP_ROUTE_MULTIPATH
fib_sync_up(dev);
#endif
- atomic_inc(&net->ipv4.dev_addr_genid);
+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
- rt_cache_flush(dev_net(dev));
+ rt_cache_flush(net);
break;
case NETDEV_DOWN:
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index 9633661..4e0bc08 100644
+index 71b125c..f4c70b0 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -767,7 +767,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
inet_twsk_deschedule(tw, death_row);
while (twrefcnt) {
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
-index c7527f6..d8bba61 100644
+index 000e3d2..5472da3 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
@@ -503,8 +503,8 @@ relookup:
secure_ip_id(daddr->addr.a4) :
secure_ipv6_id(daddr->addr.a6));
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
-index 8d07c97..d0812ef 100644
+index 8d5cc75..821fd11 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -322,7 +322,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
rc = qp->q.fragments && (end - start) > max;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
-index 5eea4a8..49819c2 100644
+index 14bbfcf..644f472 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
-@@ -1142,7 +1142,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+@@ -1151,7 +1151,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
len = min_t(unsigned int, len, opt->optlen);
if (put_user(len, optlen))
return -EFAULT;
return -EFAULT;
return 0;
}
-@@ -1273,7 +1274,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+@@ -1282,7 +1283,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
if (sk->sk_type != SOCK_STREAM)
return -ENOPROTOOPT;
msg.msg_flags = flags;
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
-index 67e8a6b..386764d 100644
+index 798358b..73570b7 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -321,7 +321,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
case IPT_SO_GET_ENTRIES:
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
-index 6232d47..6b88607 100644
+index 8f3d054..c58d05d 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
-@@ -847,7 +847,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
- sk_rmem_alloc_get(sp),
- 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
+@@ -843,7 +843,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
+ from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
+ 0, sock_i_ino(sp),
atomic_read(&sp->sk_refcnt), sp,
- atomic_read(&sp->sk_drops), len);
+ atomic_read_unchecked(&sp->sk_drops), len);
static int ping_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
-index d23c657..cb69cc2 100644
+index 73d1e4d..3af0e8f 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
goto out;
ret = 0;
out: return ret;
-@@ -995,7 +999,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
- sk_wmem_alloc_get(sp),
- sk_rmem_alloc_get(sp),
- 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
+@@ -997,7 +1001,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+ 0, 0L, 0,
+ from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
+ 0, sock_i_ino(sp),
- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
-+ atomic_read(&sp->sk_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
-+ sp,
-+#endif
-+ atomic_read_unchecked(&sp->sk_drops));
++ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
}
static int raw_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 2a1383c..ff99572 100644
+index df25142..e92a82a 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
-@@ -2523,7 +2523,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
+@@ -2529,7 +2529,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
static __net_init int rt_genid_init(struct net *net)
{
get_random_bytes(&net->ipv4.dev_addr_genid,
sizeof(net->ipv4.dev_addr_genid));
return 0;
-diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
-index 813b43a..834857f 100644
---- a/net/ipv4/tcp_illinois.c
-+++ b/net/ipv4/tcp_illinois.c
-@@ -313,11 +313,13 @@ static void tcp_illinois_info(struct sock *sk, u32 ext,
- .tcpv_rttcnt = ca->cnt_rtt,
- .tcpv_minrtt = ca->base_rtt,
- };
-- u64 t = ca->sum_rtt;
+diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
+index 1432cdb..fc582a7 100644
+--- a/net/ipv4/tcp_cong.c
++++ b/net/ipv4/tcp_cong.c
+@@ -309,6 +309,12 @@ void tcp_slow_start(struct tcp_sock *tp)
+ {
+ int cnt; /* increase in packets */
+ unsigned int delta = 0;
++ u32 snd_cwnd = tp->snd_cwnd;
++
++ if (unlikely(!snd_cwnd)) {
++ pr_err_once("snd_cwnd is nul, please report this bug.\n");
++ snd_cwnd = 1U;
++ }
-- do_div(t, ca->cnt_rtt);
-- info.tcpv_rtt = t;
-+ if (info.tcpv_rttcnt > 0) {
-+ u64 t = ca->sum_rtt;
+ /* RFC3465: ABC Slow start
+ * Increase only after a full MSS of bytes is acked
+@@ -323,7 +329,7 @@ void tcp_slow_start(struct tcp_sock *tp)
+ if (sysctl_tcp_max_ssthresh > 0 && tp->snd_cwnd > sysctl_tcp_max_ssthresh)
+ cnt = sysctl_tcp_max_ssthresh >> 1; /* limited slow start */
+ else
+- cnt = tp->snd_cwnd; /* exponential increase */
++ cnt = snd_cwnd; /* exponential increase */
-+ do_div(t, info.tcpv_rttcnt);
-+ info.tcpv_rtt = t;
-+ }
- nla_put(skb, INET_DIAG_VEGASINFO, sizeof(info), &info);
+ /* RFC3465: ABC
+ * We MAY increase by 2 if discovered delayed ack
+@@ -333,11 +339,11 @@ void tcp_slow_start(struct tcp_sock *tp)
+ tp->bytes_acked = 0;
+
+ tp->snd_cwnd_cnt += cnt;
+- while (tp->snd_cwnd_cnt >= tp->snd_cwnd) {
+- tp->snd_cwnd_cnt -= tp->snd_cwnd;
++ while (tp->snd_cwnd_cnt >= snd_cwnd) {
++ tp->snd_cwnd_cnt -= snd_cwnd;
+ delta++;
}
+- tp->snd_cwnd = min(tp->snd_cwnd + delta, tp->snd_cwnd_clamp);
++ tp->snd_cwnd = min(snd_cwnd + delta, tp->snd_cwnd_clamp);
}
+ EXPORT_SYMBOL_GPL(tcp_slow_start);
+
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index d377f48..f19e3ec 100644
+index 181fc82..cc95f8c 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -4556,6 +4556,9 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size)
- struct tcphdr *th;
- bool fragstolen;
-
-+ if (size == 0)
-+ return 0;
-+
- skb = alloc_skb(size + sizeof(*th), sk->sk_allocation);
- if (!skb)
- goto err;
-@@ -4728,7 +4731,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
+@@ -4704,7 +4704,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
* simplifies code)
*/
static void
struct sk_buff *head, struct sk_buff *tail,
u32 start, u32 end)
{
+@@ -5536,6 +5536,9 @@ slow_path:
+ if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb))
+ goto csum_error;
+
++ if (!th->ack)
++ goto discard;
++
+ /*
+ * Standard slow path.
+ */
+@@ -5544,7 +5547,7 @@ slow_path:
+ return 0;
+
+ step5:
+- if (th->ack && tcp_ack(sk, skb, FLAG_SLOWPATH) < 0)
++ if (tcp_ack(sk, skb, FLAG_SLOWPATH) < 0)
+ goto discard;
+
+ /* ts_recent update must be made after we are sure that the packet
+@@ -5836,6 +5839,7 @@ discard:
+ tcp_paws_reject(&tp->rx_opt, 0))
+ goto discard_and_undo;
+
++#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
+ if (th->syn) {
+ /* We see SYN without ACK. It is attempt of
+ * simultaneous connect with crossed SYNs.
+@@ -5886,6 +5890,7 @@ discard:
+ goto discard;
+ #endif
+ }
++#endif
+ /* "fifth, if neither of the SYN or RST bits is set then
+ * drop the segment and return."
+ */
+@@ -5930,7 +5935,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+ goto discard;
+
+ if (th->syn) {
+- if (th->fin)
++ if (th->fin || th->urg || th->psh)
+ goto discard;
+ if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
+ return 1;
+@@ -5977,11 +5982,15 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+ if (tcp_check_req(sk, skb, req, NULL, true) == NULL)
+ goto discard;
+ }
++
++ if (!th->ack)
++ goto discard;
++
+ if (!tcp_validate_incoming(sk, skb, th, 0))
+ return 0;
+
+ /* step 5: check the ACK field */
+- if (th->ack) {
++ if (true) {
+ int acceptable = tcp_ack(sk, skb, FLAG_SLOWPATH) > 0;
+
+ switch (sk->sk_state) {
+@@ -6131,8 +6140,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+ }
+ break;
+ }
+- } else
+- goto discard;
++ }
+
+ /* ts_recent update must be made after we are sure that the packet
+ * is in window.
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index db7bfad..bfea796 100644
+index bc3cb46..815ccd6 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -90,6 +90,10 @@ int sysctl_tcp_low_latency __read_mostly;
#ifdef CONFIG_TCP_MD5SIG
static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
__be32 daddr, __be32 saddr, const struct tcphdr *th);
-@@ -1664,6 +1668,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1899,6 +1903,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
return 0;
reset:
tcp_v4_send_reset(rsk, skb);
discard:
kfree_skb(skb);
-@@ -1764,12 +1771,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1999,12 +2006,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
TCP_SKB_CB(skb)->sacked = 0;
sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1820,6 +1834,10 @@ no_tcp_socket:
+@@ -2055,6 +2069,10 @@ no_tcp_socket:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
tcp_v4_send_reset(NULL, skb);
}
-@@ -2415,7 +2433,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
- 0, /* non standard timer */
- 0, /* open_requests have no inode */
- atomic_read(&sk->sk_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
- req,
-+#endif
- len);
- }
-
-@@ -2465,7 +2487,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
- sock_i_uid(sk),
- icsk->icsk_probes_out,
- sock_i_ino(sk),
-- atomic_read(&sk->sk_refcnt), sk,
-+ atomic_read(&sk->sk_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
-+ sk,
-+#endif
- jiffies_to_clock_t(icsk->icsk_rto),
- jiffies_to_clock_t(icsk->icsk_ack.ato),
- (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
-@@ -2493,7 +2520,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
- " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
- i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
- 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
-- atomic_read(&tw->tw_refcnt), tw, len);
-+ atomic_read(&tw->tw_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
-+ tw,
-+#endif
-+ len);
- }
-
- #define TMPSZ 150
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
-index 6ff7f10..38de56e 100644
+index a7302d9..e3ec754 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -27,6 +27,10 @@
int sysctl_tcp_syncookies __read_mostly = 1;
EXPORT_SYMBOL(sysctl_tcp_syncookies);
-@@ -707,6 +711,10 @@ listen_overflow:
-
- embryonic_reset:
- NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
-+
+@@ -742,7 +746,10 @@ embryonic_reset:
+ * avoid becoming vulnerable to outside attack aiming at
+ * resetting legit local connections.
+ */
+- req->rsk_ops->send_reset(sk, skb);
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+ if (!grsec_enable_blackhole)
++ if (!grsec_enable_blackhole)
+#endif
- if (!(flg & TCP_FLAG_RST))
- req->rsk_ops->send_reset(sk, skb);
-
++ req->rsk_ops->send_reset(sk, skb);
+ } else if (fastopen) { /* received a valid RST pkt */
+ reqsk_fastopen_remove(sk, req, true);
+ tcp_reset(sk);
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index 4526fe6..1a34e43 100644
--- a/net/ipv4/tcp_probe.c
cnt += width;
}
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
-index b774a03..3873efe 100644
+index d47c1b4..b0584de 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -22,6 +22,10 @@
syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
/* Has it gone just too far? */
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
-index 2814f66..fa2b223 100644
+index 79c8dbe..aceb1b6 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -87,6 +87,7 @@
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
/*
-@@ -2116,8 +2140,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
- sk_wmem_alloc_get(sp),
- sk_rmem_alloc_get(sp),
- 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-- atomic_read(&sp->sk_refcnt), sp,
+@@ -2119,7 +2143,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
+ from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
+ 0, sock_i_ino(sp),
+ atomic_read(&sp->sk_refcnt), sp,
- atomic_read(&sp->sk_drops), len);
-+ atomic_read(&sp->sk_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
-+ sp,
-+#endif
+ atomic_read_unchecked(&sp->sk_drops), len);
}
int udp4_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index b10374d..0baa1f9 100644
+index 0424e4e..308dd43 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -2144,7 +2144,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
+@@ -2121,7 +2121,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
p.iph.ihl = 5;
p.iph.protocol = IPPROTO_IPV6;
p.iph.ttl = 64;
if (ops->ndo_do_ioctl) {
mm_segment_t oldfs = get_fs();
+diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
+index d5cb3c4..b3e38d0 100644
+--- a/net/ipv6/ip6_gre.c
++++ b/net/ipv6/ip6_gre.c
+@@ -1353,7 +1353,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
+ }
+
+
+-static struct inet6_protocol ip6gre_protocol __read_mostly = {
++static struct inet6_protocol ip6gre_protocol = {
+ .handler = ip6gre_rcv,
+ .err_handler = ip6gre_err,
+ .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
-index ba6d13d..6899122 100644
+index e02faed..9780f28 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
-@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
+@@ -990,7 +990,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
if (sk->sk_type != SOCK_STREAM)
return -ENOPROTOOPT;
case IP6T_SO_GET_ENTRIES:
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
-index 4a5f78b..3f22ebe 100644
+index d8e95c7..81422bc 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -379,7 +379,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
return -EFAULT;
return 0;
default:
-@@ -1252,7 +1257,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
- 0, 0L, 0,
- sock_i_uid(sp), 0,
+@@ -1253,7 +1258,7 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+ from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
+ 0,
sock_i_ino(sp),
- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
-+ atomic_read(&sp->sk_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
-+ sp,
-+#endif
-+ atomic_read_unchecked(&sp->sk_drops));
++ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
}
static int raw6_seq_show(struct seq_file *seq, void *v)
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index b1e6cf0..b140ef2 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -872,7 +872,7 @@ restart:
+ dst_hold(&rt->dst);
+ read_unlock_bh(&table->tb6_lock);
+
+- if (!rt->n && !(rt->rt6i_flags & RTF_NONEXTHOP))
++ if (!rt->n && !(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_LOCAL)))
+ nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr);
+ else if (!(rt->dst.flags & DST_HOST))
+ nrt = rt6_alloc_clone(rt, &fl6->daddr);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 7e32d42..5d975ba 100644
+index 73f2a6b..f8049a1 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -106,6 +106,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
static void tcp_v6_hash(struct sock *sk)
{
if (sk->sk_state != TCP_CLOSE) {
-@@ -1511,6 +1515,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1525,6 +1529,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
return 0;
reset:
tcp_v6_send_reset(sk, skb);
discard:
if (opt_skb)
-@@ -1592,12 +1599,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
+@@ -1606,12 +1613,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
TCP_SKB_CB(skb)->sacked = 0;
sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1646,6 +1661,10 @@ no_tcp_socket:
+@@ -1660,6 +1675,10 @@ no_tcp_socket:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
tcp_v6_send_reset(NULL, skb);
}
-@@ -1857,7 +1876,13 @@ static void get_openreq6(struct seq_file *seq,
- uid,
- 0, /* non standard timer */
- 0, /* open_requests have no inode */
-- 0, req);
-+ 0,
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL
-+#else
-+ req
-+#endif
-+ );
- }
-
- static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
-@@ -1907,7 +1932,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
- sock_i_uid(sp),
- icsk->icsk_probes_out,
- sock_i_ino(sp),
-- atomic_read(&sp->sk_refcnt), sp,
-+ atomic_read(&sp->sk_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
-+ sp,
-+#endif
- jiffies_to_clock_t(icsk->icsk_rto),
- jiffies_to_clock_t(icsk->icsk_ack.ato),
- (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
-@@ -1942,7 +1972,13 @@ static void get_timewait6_sock(struct seq_file *seq,
- dest->s6_addr32[2], dest->s6_addr32[3], destp,
- tw->tw_substate, 0, 0,
- 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
-- atomic_read(&tw->tw_refcnt), tw);
-+ atomic_read(&tw->tw_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL
-+#else
-+ tw
-+#endif
-+ );
- }
-
- static int tcp6_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index 07e2bfe..328dae8 100644
+index fc99972..69397e8 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -51,6 +51,10 @@
icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
kfree_skb(skb);
-@@ -1471,8 +1478,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
- 0, 0L, 0,
- sock_i_uid(sp), 0,
+@@ -1473,7 +1480,7 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
+ 0,
sock_i_ino(sp),
-- atomic_read(&sp->sk_refcnt), sp,
+ atomic_read(&sp->sk_refcnt), sp,
- atomic_read(&sp->sk_drops));
-+ atomic_read(&sp->sk_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
-+ sp,
-+#endif
+ atomic_read_unchecked(&sp->sk_drops));
}
int udp6_seq_show(struct seq_file *seq, void *v)
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
-index 6b9d5a0..4dffaf1 100644
+index 496ce2c..f79fac8 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
-@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
- add_wait_queue(&self->open_wait, &wait);
+@@ -311,12 +311,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+ add_wait_queue(&port->open_wait, &wait);
IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
-- __FILE__,__LINE__, tty->driver->name, self->open_count );
-+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
+- __FILE__, __LINE__, tty->driver->name, port->count);
++ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
- /* As far as I can see, we protect open_count - Jean II */
- spin_lock_irqsave(&self->spinlock, flags);
+ spin_lock_irqsave(&port->lock, flags);
if (!tty_hung_up_p(filp)) {
extra_count = 1;
-- self->open_count--;
-+ local_dec(&self->open_count);
+- port->count--;
++ atomic_dec(&port->count);
}
- spin_unlock_irqrestore(&self->spinlock, flags);
-- self->blocked_open++;
-+ local_inc(&self->blocked_open);
-
- while (1) {
- if (tty->termios->c_cflag & CBAUD) {
-@@ -330,7 +330,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+ spin_unlock_irqrestore(&port->lock, flags);
+ port->blocked_open++;
+@@ -352,7 +352,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
}
IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
-- __FILE__,__LINE__, tty->driver->name, self->open_count );
-+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
+- __FILE__, __LINE__, tty->driver->name, port->count);
++ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
schedule();
}
-@@ -341,13 +341,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+@@ -363,13 +363,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
if (extra_count) {
/* ++ is not atomic, so this should be protected - Jean II */
- spin_lock_irqsave(&self->spinlock, flags);
-- self->open_count++;
-+ local_inc(&self->open_count);
- spin_unlock_irqrestore(&self->spinlock, flags);
+ spin_lock_irqsave(&port->lock, flags);
+- port->count++;
++ atomic_inc(&port->count);
+ spin_unlock_irqrestore(&port->lock, flags);
}
-- self->blocked_open--;
-+ local_dec(&self->blocked_open);
+ port->blocked_open--;
IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
-- __FILE__,__LINE__, tty->driver->name, self->open_count);
-+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
+- __FILE__, __LINE__, tty->driver->name, port->count);
++ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
if (!retval)
- self->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -412,14 +412,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
- }
- /* ++ is not atomic, so this should be protected - Jean II */
- spin_lock_irqsave(&self->spinlock, flags);
-- self->open_count++;
-+ local_inc(&self->open_count);
+ port->flags |= ASYNC_NORMAL_ACTIVE;
+@@ -443,12 +443,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
- tty->driver_data = self;
- self->tty = tty;
- spin_unlock_irqrestore(&self->spinlock, flags);
+ /* ++ is not atomic, so this should be protected - Jean II */
+ spin_lock_irqsave(&self->port.lock, flags);
+- self->port.count++;
++ atomic_inc(&self->port.count);
+ spin_unlock_irqrestore(&self->port.lock, flags);
+ tty_port_tty_set(&self->port, tty);
IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
-- self->line, self->open_count);
-+ self->line, local_read(&self->open_count));
+- self->line, self->port.count);
++ self->line, atomic_read(&self->port.count));
/* Not really used by us, but lets do it anyway */
- self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-@@ -505,7 +505,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
- return;
+ tty->low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+@@ -985,7 +985,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
+ tty_kref_put(port->tty);
}
+ port->tty = NULL;
+- port->count = 0;
++ atomic_set(&port->count, 0);
+ spin_unlock_irqrestore(&port->lock, flags);
-- if ((tty->count == 1) && (self->open_count != 1)) {
-+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
- /*
- * Uh, oh. tty->count is 1, which means that the tty
- * structure will be freed. state->count should always
-@@ -515,16 +515,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
- */
- IRDA_DEBUG(0, "%s(), bad serial port count; "
- "tty->count is 1, state->count is %d\n", __func__ ,
-- self->open_count);
-- self->open_count = 1;
-+ local_read(&self->open_count));
-+ local_set(&self->open_count, 1);
- }
-
-- if (--self->open_count < 0) {
-+ if (local_dec_return(&self->open_count) < 0) {
- IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
-- __func__, self->line, self->open_count);
-- self->open_count = 0;
-+ __func__, self->line, local_read(&self->open_count));
-+ local_set(&self->open_count, 0);
- }
-- if (self->open_count) {
-+ if (local_read(&self->open_count)) {
- spin_unlock_irqrestore(&self->spinlock, flags);
-
- IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
-@@ -556,7 +556,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
- tty->closing = 0;
- self->tty = NULL;
-
-- if (self->blocked_open) {
-+ if (local_read(&self->blocked_open)) {
- if (self->close_delay)
- schedule_timeout_interruptible(self->close_delay);
- wake_up_interruptible(&self->open_wait);
-@@ -1008,7 +1008,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
- spin_lock_irqsave(&self->spinlock, flags);
- self->flags &= ~ASYNC_NORMAL_ACTIVE;
- self->tty = NULL;
-- self->open_count = 0;
-+ local_set(&self->open_count, 0);
- spin_unlock_irqrestore(&self->spinlock, flags);
-
- wake_up_interruptible(&self->open_wait);
-@@ -1355,7 +1355,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
+ wake_up_interruptible(&port->open_wait);
+@@ -1342,7 +1342,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
seq_putc(m, '\n');
seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
-- seq_printf(m, "Open count: %d\n", self->open_count);
-+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
+- seq_printf(m, "Open count: %d\n", self->port.count);
++ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
seq_printf(m, "Max data size: %d\n", self->max_data_size);
seq_printf(m, "Max header size: %d\n", self->max_header_size);
write_unlock_bh(&iucv_sk_list.lock);
diff --git a/net/key/af_key.c b/net/key/af_key.c
-index 34e4185..8823368 100644
+index 08897a3..0b812ab 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
-@@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
+@@ -3019,10 +3019,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
static u32 get_acqseq(void)
{
u32 res;
} while (!res);
return res;
}
-diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
-index 3bfb34a..69bf48d 100644
---- a/net/l2tp/l2tp_eth.c
-+++ b/net/l2tp/l2tp_eth.c
-@@ -290,6 +290,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p
-
- out_del_dev:
- free_netdev(dev);
-+ spriv->dev = NULL;
- out_del_session:
- l2tp_session_delete(session);
- out:
-diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
-index 5746d62..327aa07 100644
---- a/net/mac80211/ibss.c
-+++ b/net/mac80211/ibss.c
-@@ -1074,7 +1074,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
- sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH;
- sdata->u.ibss.ibss_join_req = jiffies;
-
-- memcpy(sdata->u.ibss.ssid, params->ssid, IEEE80211_MAX_SSID_LEN);
-+ memcpy(sdata->u.ibss.ssid, params->ssid, params->ssid_len);
- sdata->u.ibss.ssid_len = params->ssid_len;
-
- mutex_unlock(&sdata->u.ibss.mtx);
+diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
+index 494da7f..6ce2ffd 100644
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -2604,7 +2604,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
+ else
+ local->probe_req_reg--;
+
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ break;
+
+ ieee80211_queue_work(&local->hw, &local->reconfig_filter);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
-index bb61f77..3788d63 100644
+index 493e2e8..be76574 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -28,6 +28,7 @@
#include "key.h"
#include "sta_info.h"
#include "debug.h"
-@@ -840,7 +841,7 @@ struct ieee80211_local {
+@@ -852,7 +853,7 @@ struct ieee80211_local {
/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
spinlock_t queue_stop_reason_lock;
/* number of interfaces with corresponding FIF_ flags */
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index c93d395..a305570 100644
+index 0f5af91..4dba9e7 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -454,7 +454,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+@@ -465,7 +465,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
break;
}
res = drv_start(local);
if (res)
goto err_del_bss;
-@@ -497,7 +497,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+@@ -508,7 +508,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
break;
}
res = ieee80211_add_virtual_monitor(local);
if (res)
goto err_stop;
-@@ -594,7 +594,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+@@ -616,7 +616,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
mutex_unlock(&local->mtx);
if (coming_up)
if (hw_reconf_flags)
ieee80211_hw_config(local, hw_reconf_flags);
-@@ -607,7 +607,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+@@ -630,7 +630,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
err_del_interface:
drv_remove_interface(local, sdata);
err_stop:
drv_stop(local);
err_del_bss:
sdata->bss = NULL;
-@@ -736,7 +736,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -762,7 +762,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
}
if (going_down)
switch (sdata->vif.type) {
case NL80211_IFTYPE_AP_VLAN:
-@@ -796,7 +796,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -818,7 +818,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
ieee80211_recalc_ps(local, -1);
if (local->ops->napi_poll)
napi_disable(&local->napi);
ieee80211_clear_tx_pending(local);
-@@ -828,7 +828,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -850,7 +850,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
}
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
}
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index c26e231..8916637 100644
+index f57f597..e0a7c03 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -166,7 +166,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
+@@ -164,7 +164,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
local->hw.conf.power_level = power;
}
return -EFAULT;
return p;
-diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index 0cb4ede..884155d 100644
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -491,6 +491,11 @@ ieee80211_rx_mesh_check(struct ieee80211_rx_data *rx)
-
- if (ieee80211_is_action(hdr->frame_control)) {
- u8 category;
-+
-+ /* make sure category field is present */
-+ if (rx->skb->len < IEEE80211_MIN_ACTION_SIZE)
-+ return RX_DROP_MONITOR;
-+
- mgmt = (struct ieee80211_mgmt *)hdr;
- category = mgmt->u.action.category;
- if (category != WLAN_CATEGORY_MESH_ACTION &&
-@@ -1426,7 +1431,6 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
- frag = sc & IEEE80211_SCTL_FRAG;
-
- if (likely((!ieee80211_has_morefrags(fc) && frag == 0) ||
-- (rx->skb)->len < 24 ||
- is_multicast_ether_addr(hdr->addr1))) {
- /* not fragmented */
- goto out;
-@@ -1849,6 +1853,20 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
-
- hdr = (struct ieee80211_hdr *) skb->data;
- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-+
-+ /* make sure fixed part of mesh header is there, also checks skb len */
-+ if (!pskb_may_pull(rx->skb, hdrlen + 6))
-+ return RX_DROP_MONITOR;
-+
-+ mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);
-+
-+ /* make sure full mesh header is there, also checks skb len */
-+ if (!pskb_may_pull(rx->skb,
-+ hdrlen + ieee80211_get_mesh_hdrlen(mesh_hdr)))
-+ return RX_DROP_MONITOR;
-+
-+ /* reload pointers */
-+ hdr = (struct ieee80211_hdr *) skb->data;
- mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);
-
- /* frame is in RMC, don't forward */
-@@ -1871,9 +1889,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
- if (is_multicast_ether_addr(hdr->addr1)) {
- mpp_addr = hdr->addr3;
- proxied_addr = mesh_hdr->eaddr1;
-- } else {
-+ } else if (mesh_hdr->flags & MESH_FLAGS_AE_A5_A6) {
-+ /* has_a4 already checked in ieee80211_rx_mesh_check */
- mpp_addr = hdr->addr4;
- proxied_addr = mesh_hdr->eaddr2;
-+ } else {
-+ return RX_DROP_MONITOR;
- }
-
- rcu_read_lock();
-@@ -2313,6 +2334,10 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
- }
- break;
- case WLAN_CATEGORY_SELF_PROTECTED:
-+ if (len < (IEEE80211_MIN_ACTION_SIZE +
-+ sizeof(mgmt->u.action.u.self_prot.action_code)))
-+ break;
-+
- switch (mgmt->u.action.u.self_prot.action_code) {
- case WLAN_SP_MESH_PEERING_OPEN:
- case WLAN_SP_MESH_PEERING_CLOSE:
-@@ -2331,6 +2356,10 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
- }
- break;
- case WLAN_CATEGORY_MESH_ACTION:
-+ if (len < (IEEE80211_MIN_ACTION_SIZE +
-+ sizeof(mgmt->u.action.u.mesh_action.action_code)))
-+ break;
-+
- if (!ieee80211_vif_is_mesh(&sdata->vif))
- break;
- if (mesh_action_is_path_sel(mgmt) &&
-@@ -2865,10 +2894,15 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
- if (ieee80211_is_data(fc) || ieee80211_is_mgmt(fc))
- local->dot11ReceivedFragmentCount++;
-
-- if (ieee80211_is_mgmt(fc))
-- err = skb_linearize(skb);
-- else
-+ if (ieee80211_is_mgmt(fc)) {
-+ /* drop frame if too short for header */
-+ if (skb->len < ieee80211_hdrlen(fc))
-+ err = -ENOBUFS;
-+ else
-+ err = skb_linearize(skb);
-+ } else {
- err = !pskb_may_pull(skb, ieee80211_hdrlen(fc));
-+ }
-
- if (err) {
- dev_kfree_skb(skb);
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index c9b52f7..4da1014 100644
+index 0151ae3..26709d3 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
-@@ -1251,7 +1251,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+@@ -1332,7 +1332,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
}
#endif
/* everything else happens only if HW was up & running */
/*
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
-index c19b214..471fad1 100644
+index 49e96df..63a51c3 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -872,6 +872,16 @@ config NETFILTER_XT_MATCH_ESP
+@@ -936,6 +936,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
tristate '"hashlimit" match support'
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
-index 1c5160f..145ae21 100644
+index 3259697..54d5393 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -90,6 +90,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
+@@ -109,6 +109,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
if (!todrop_rate[i]) return 0;
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
-index b54ecce..fc5f6cf 100644
+index 58918e2..4d177a9 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
ip_vs_conn_put(cp);
return ret;
}
-@@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
+@@ -1681,7 +1681,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
pkts = sysctl_sync_threshold(ipvs);
else
if (ipvs->sync_state & IP_VS_STATE_MASTER)
ip_vs_sync_conn(net, cp, pkts);
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
-index f51013c..c99ee52 100644
+index c4ee437..a774a74 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
-@@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
+@@ -787,7 +787,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
ip_vs_rs_hash(ipvs, dest);
write_unlock_bh(&ipvs->rs_lock);
}
/* bind the service */
if (!dest->svc) {
-@@ -2076,7 +2076,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2081,7 +2081,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
" %-7s %-6d %-10d %-10d\n",
&dest->addr.in6,
ntohs(dest->port),
atomic_read(&dest->weight),
atomic_read(&dest->activeconns),
atomic_read(&dest->inactconns));
-@@ -2087,7 +2087,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2092,7 +2092,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
"%-7s %-6d %-10d %-10d\n",
ntohl(dest->addr.ip),
ntohs(dest->port),
atomic_read(&dest->weight),
atomic_read(&dest->activeconns),
atomic_read(&dest->inactconns));
-@@ -2557,7 +2557,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
+@@ -2562,7 +2562,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
entry.addr = dest->addr.ip;
entry.port = dest->port;
entry.weight = atomic_read(&dest->weight);
entry.u_threshold = dest->u_threshold;
entry.l_threshold = dest->l_threshold;
-@@ -3092,7 +3092,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
+@@ -3098,7 +3098,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
nla_put_u16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
cp->old_state = cp->state;
/*
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
-index c3c6291..3376d73 100644
+index cc4c809..50f8fe5 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
-@@ -1157,7 +1157,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
+@@ -1202,7 +1202,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
else
rc = NF_ACCEPT;
/* do not touch skb anymore */
goto out;
}
-@@ -1278,7 +1278,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
+@@ -1323,7 +1323,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
else
rc = NF_ACCEPT;
/* do not touch skb anymore */
}
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
-index 2ceec64..a5b8a61 100644
+index ec02168..f0caab6 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -1529,6 +1529,10 @@ err_extend:
+@@ -1533,6 +1533,10 @@ err_extend:
#define UNCONFIRMED_NULLS_VAL ((1<<30)+0)
#define DYING_NULLS_VAL ((1<<30)+1)
static int nf_conntrack_init_net(struct net *net)
{
int ret;
-@@ -1542,7 +1546,11 @@ static int nf_conntrack_init_net(struct net *net)
+@@ -1546,7 +1550,11 @@ static int nf_conntrack_init_net(struct net *net)
goto err_stat;
}
ret = -ENOMEM;
goto err_slabname;
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
-index 5cfb5be..217c6d8 100644
+index 92fd8ec..3f6ea4b 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
-@@ -70,7 +70,7 @@ struct nfulnl_instance {
+@@ -72,7 +72,7 @@ struct nfulnl_instance {
};
static DEFINE_SPINLOCK(instances_lock);
#define INSTANCE_BUCKETS 16
static struct hlist_head instance_table[INSTANCE_BUCKETS];
-@@ -523,7 +523,7 @@ __build_packet_message(struct nfulnl_instance *inst,
+@@ -537,7 +537,7 @@ __build_packet_message(struct nfulnl_instance *inst,
/* global sequence number */
if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
if (data_len) {
diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
new file mode 100644
-index 0000000..6905327
+index 0000000..c566332
--- /dev/null
+++ b/net/netfilter/xt_gradm.c
@@ -0,0 +1,51 @@
+};
+
+static int __init gradm_mt_init(void)
-+{
-+ return xt_register_match(&gradm_mt_reg);
++{
++ return xt_register_match(&gradm_mt_reg);
+}
+
+static void __exit gradm_mt_exit(void)
-+{
-+ xt_unregister_match(&gradm_mt_reg);
++{
++ xt_unregister_match(&gradm_mt_reg);
+}
+
+module_init(gradm_mt_init);
return 0;
}
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
-index 9172179..a4035c4 100644
+index 4da797f..eb1df70 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
-@@ -769,7 +769,7 @@ static void netlink_overrun(struct sock *sk)
+@@ -782,7 +782,7 @@ static void netlink_overrun(struct sock *sk)
sk->sk_error_report(sk);
}
}
+ atomic_inc_unchecked(&sk->sk_drops);
}
- static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
-@@ -2059,7 +2059,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
+ static struct sock *netlink_getsockbyportid(struct sock *ssk, u32 portid)
+@@ -2068,7 +2068,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
sk_wmem_alloc_get(s),
nlk->cb,
atomic_read(&s->sk_refcnt),
sax->fsa_ax25.sax25_call = nr->source_addr;
*uaddr_len = sizeof(struct sockaddr_ax25);
}
-diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
-index ddeb9aa..e18fffd 100644
---- a/net/nfc/llcp/sock.c
-+++ b/net/nfc/llcp/sock.c
-@@ -443,15 +443,11 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
- pr_debug("sock %p sk %p flags 0x%x\n", sock, sk, flags);
-
- if (!addr || len < sizeof(struct sockaddr_nfc) ||
-- addr->sa_family != AF_NFC) {
-- pr_err("Invalid socket\n");
-+ addr->sa_family != AF_NFC)
- return -EINVAL;
-- }
-
-- if (addr->service_name_len == 0 && addr->dsap == 0) {
-- pr_err("Missing service name or dsap\n");
-+ if (addr->service_name_len == 0 && addr->dsap == 0)
- return -EINVAL;
-- }
-
- pr_debug("addr dev_idx=%u target_idx=%u protocol=%u\n", addr->dev_idx,
- addr->target_idx, addr->nfc_protocol);
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index c5c9e2a..4814ab1 100644
+index 94060ed..c9bf90e 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
-@@ -1689,7 +1689,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -1578,7 +1578,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
spin_lock(&sk->sk_receive_queue.lock);
po->stats.tp_packets++;
__skb_queue_tail(&sk->sk_receive_queue, skb);
spin_unlock(&sk->sk_receive_queue.lock);
sk->sk_data_ready(sk, skb->len);
-@@ -1698,7 +1698,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -1587,7 +1587,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
drop_n_acct:
spin_lock(&sk->sk_receive_queue.lock);
po->stats.tp_drops++;
spin_unlock(&sk->sk_receive_queue.lock);
drop_n_restore:
-@@ -2642,6 +2642,7 @@ out:
+@@ -2335,13 +2335,15 @@ static int packet_release(struct socket *sock)
+
+ packet_flush_mclist(sk);
+
+- memset(&req_u, 0, sizeof(req_u));
+-
+- if (po->rx_ring.pg_vec)
++ if (po->rx_ring.pg_vec) {
++ memset(&req_u, 0, sizeof(req_u));
+ packet_set_ring(sk, &req_u, 1, 0);
++ }
+
+- if (po->tx_ring.pg_vec)
++ if (po->tx_ring.pg_vec) {
++ memset(&req_u, 0, sizeof(req_u));
+ packet_set_ring(sk, &req_u, 1, 1);
++ }
+
+ fanout_release(sk);
+
+@@ -2537,6 +2539,7 @@ out:
static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
{
struct sock_exterr_skb *serr;
struct sk_buff *skb, *skb2;
int copied, err;
-@@ -2663,8 +2664,9 @@ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
+@@ -2558,8 +2561,9 @@ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
sock_recv_timestamp(msg, sk, skb);
serr = SKB_EXT_ERR(skb);
msg->msg_flags |= MSG_ERRQUEUE;
err = copied;
-@@ -3276,7 +3278,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -3171,7 +3175,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
case PACKET_HDRLEN:
if (len > sizeof(int))
len = sizeof(int);
return -EFAULT;
switch (val) {
case TPACKET_V1:
-@@ -3315,7 +3317,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -3210,7 +3214,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
len = lv;
if (put_user(len, optlen))
return -EFAULT;
break;
}
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
-index 0acc943..c727611 100644
+index b7e9827..c264c85 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
-@@ -613,8 +613,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
- pn->resource, sk->sk_state,
- sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
- sock_i_uid(sk), sock_i_ino(sk),
-- atomic_read(&sk->sk_refcnt), sk,
+@@ -615,7 +615,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
+ from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
+ sock_i_ino(sk),
+ atomic_read(&sk->sk_refcnt), sk,
- atomic_read(&sk->sk_drops), &len);
-+ atomic_read(&sk->sk_refcnt),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ NULL,
-+#else
-+ sk,
-+#endif
+ atomic_read_unchecked(&sk->sk_drops), &len);
}
seq_printf(seq, "%*s\n", 127 - len, "");
set_fs(oldfs);
}
diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
-index 1b4fd68..2234175 100644
+index 81cf5a4..b5826ff 100644
--- a/net/rds/tcp_send.c
+++ b/net/rds/tcp_send.c
@@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
+diff --git a/net/sctp/auth.c b/net/sctp/auth.c
+index 159b9bc..d8420ae 100644
+--- a/net/sctp/auth.c
++++ b/net/sctp/auth.c
+@@ -71,7 +71,7 @@ void sctp_auth_key_put(struct sctp_auth_bytes *key)
+ return;
+
+ if (atomic_dec_and_test(&key->refcnt)) {
+- kfree(key);
++ kzfree(key);
+ SCTP_DBG_OBJCNT_DEC(keys);
+ }
+ }
+diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
+index 1859e2b..80a7264 100644
+--- a/net/sctp/endpointola.c
++++ b/net/sctp/endpointola.c
+@@ -249,6 +249,8 @@ void sctp_endpoint_free(struct sctp_endpoint *ep)
+ /* Final destructor for endpoint. */
+ static void sctp_endpoint_destroy(struct sctp_endpoint *ep)
+ {
++ int i;
++
+ SCTP_ASSERT(ep->base.dead, "Endpoint is not dead", return);
+
+ /* Free up the HMAC transform. */
+@@ -271,6 +273,9 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep)
+ sctp_inq_free(&ep->base.inqueue);
+ sctp_bind_addr_free(&ep->base.bind_addr);
+
++ for (i = 0; i < SCTP_HOW_MANY_SECRETS; ++i)
++ memset(&ep->secret_key[i], 0, SCTP_SECRET_SIZE);
++
+ /* Remove and free the port */
+ if (sctp_sk(ep->base.sk)->bind_hash)
+ sctp_put_port(ep->base.sk);
+diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
+index ea14cb4..834e8e4 100644
+--- a/net/sctp/ipv6.c
++++ b/net/sctp/ipv6.c
+@@ -1037,7 +1037,7 @@ void sctp_v6_pf_init(void)
+
+ void sctp_v6_pf_exit(void)
+ {
+- list_del(&sctp_af_inet6.list);
++ pax_list_del((struct list_head *)&sctp_af_inet6.list);
+ }
+
+ /* Initialize IPv6 support and register with socket layer. */
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
-index 1e2eee8..ce3967e 100644
+index 9966e7b..540c575 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
-@@ -319,7 +319,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
+@@ -328,7 +328,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
seq_printf(seq,
"%8pK %8pK %-3d %-3d %-2d %-4d "
"%4d %8d %8d %7d %5lu %-5d %5d ",
assoc->state, hash,
assoc->assoc_id,
assoc->sndbuf_used,
+diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
+index 2d51842..150ba5c 100644
+--- a/net/sctp/protocol.c
++++ b/net/sctp/protocol.c
+@@ -834,8 +834,10 @@ int sctp_register_af(struct sctp_af *af)
+ return 0;
+ }
+
+- INIT_LIST_HEAD(&af->list);
+- list_add_tail(&af->list, &sctp_address_families);
++ pax_open_kernel();
++ INIT_LIST_HEAD((struct list_head *)&af->list);
++ pax_close_kernel();
++ pax_list_add_tail((struct list_head *)&af->list, &sctp_address_families);
+ return 1;
+ }
+
+@@ -1122,7 +1124,7 @@ static void sctp_v4_pf_init(void)
+
+ static void sctp_v4_pf_exit(void)
+ {
+- list_del(&sctp_af_inet.list);
++ pax_list_del((struct list_head *)&sctp_af_inet.list);
+ }
+
+ static int sctp_v4_protosw_init(void)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 5e25981..dbda919 100644
+index 406d957..0a6ae623 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
-@@ -4630,6 +4630,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+@@ -3388,7 +3388,7 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
+
+ ret = sctp_auth_set_key(sctp_sk(sk)->ep, asoc, authkey);
+ out:
+- kfree(authkey);
++ kzfree(authkey);
+ return ret;
+ }
+
+@@ -4661,6 +4661,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
if (space_left < addrlen)
return -ENOMEM;
return -EFAULT;
to += addrlen;
diff --git a/net/socket.c b/net/socket.c
-index edc3c4a..4b4e4a8 100644
+index d92c490..b4bc863 100644
--- a/net/socket.c
+++ b/net/socket.c
-@@ -88,6 +88,7 @@
- #include <linux/nsproxy.h>
+@@ -89,6 +89,7 @@
#include <linux/magic.h>
#include <linux/slab.h>
+ #include <linux/xattr.h>
+#include <linux/in.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -105,6 +106,8 @@
+@@ -106,6 +107,8 @@
#include <linux/sockios.h>
#include <linux/atalk.h>
static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos);
-@@ -321,7 +324,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
+@@ -322,7 +325,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
&sockfs_dentry_operations, SOCKFS_MAGIC);
}
static struct file_system_type sock_fs_type = {
.name = "sockfs",
-@@ -1209,6 +1212,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1276,6 +1279,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
return -EAFNOSUPPORT;
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
/* Compatibility.
-@@ -1340,6 +1345,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
+@@ -1407,6 +1412,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
retval = sock_create(family, type, protocol, &sock);
if (retval < 0)
goto out;
-@@ -1452,6 +1467,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1534,6 +1549,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
if (sock) {
err = move_addr_to_kernel(umyaddr, addrlen, &address);
if (err >= 0) {
err = security_socket_bind(sock,
(struct sockaddr *)&address,
addrlen);
-@@ -1460,6 +1483,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1542,6 +1565,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
(struct sockaddr *)
&address, addrlen);
}
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1483,10 +1507,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
+@@ -1565,10 +1589,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
if ((unsigned int)backlog > somaxconn)
backlog = somaxconn;
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1530,6 +1564,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1612,6 +1646,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
newsock->type = sock->type;
newsock->ops = sock->ops;
/*
* We don't need try_module_get here, as the listening socket (sock)
* has the protocol module (sock->ops->owner) held.
-@@ -1568,6 +1614,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1657,6 +1703,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
fd_install(newfd, newfile);
err = newfd;
out_put:
fput_light(sock->file, fput_needed);
out:
-@@ -1600,6 +1648,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1689,6 +1737,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
int, addrlen)
{
struct socket *sock;
struct sockaddr_storage address;
int err, fput_needed;
-@@ -1610,6 +1659,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1699,6 +1748,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
if (err < 0)
goto out_put;
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-@@ -1964,7 +2024,7 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2053,7 +2113,7 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
* checking falls down on this.
*/
if (copy_from_user(ctl_buf,
ctl_len))
goto out_freectl;
msg_sys->msg_control = ctl_buf;
-@@ -2132,7 +2192,7 @@ static int __sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2221,7 +2281,7 @@ static int __sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
* kernel msghdr to use the kernel address space)
*/
uaddr_len = COMPAT_NAMELEN(msg);
if (MSG_CMSG_COMPAT & flags) {
err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
-@@ -2761,7 +2821,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
+@@ -2844,7 +2904,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
}
ifr = compat_alloc_user_space(buf_size);
if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
return -EFAULT;
-@@ -2785,12 +2845,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
+@@ -2868,12 +2928,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
offsetof(struct ethtool_rxnfc, fs.ring_cookie));
if (copy_in_user(rxnfc, compat_rxnfc,
copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
sizeof(rxnfc->rule_cnt)))
return -EFAULT;
-@@ -2802,12 +2862,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
+@@ -2885,12 +2945,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
if (convert_out) {
if (copy_in_user(compat_rxnfc, rxnfc,
copy_in_user(&compat_rxnfc->rule_cnt, &rxnfc->rule_cnt,
sizeof(rxnfc->rule_cnt)))
return -EFAULT;
-@@ -2877,7 +2937,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
+@@ -2960,7 +3020,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
old_fs = get_fs();
set_fs(KERNEL_DS);
err = dev_ioctl(net, cmd,
set_fs(old_fs);
return err;
-@@ -2986,7 +3046,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
+@@ -3069,7 +3129,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
old_fs = get_fs();
set_fs(KERNEL_DS);
set_fs(old_fs);
if (cmd == SIOCGIFMAP && !err) {
-@@ -3091,7 +3151,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
+@@ -3174,7 +3234,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
ret |= __get_user(rtdev, &(ur4->rt_dev));
if (rtdev) {
ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
devname[15] = 0;
} else
r4.rt_dev = NULL;
-@@ -3317,8 +3377,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
+@@ -3400,8 +3460,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
int __user *uoptlen;
int err;
set_fs(KERNEL_DS);
if (level == SOL_SOCKET)
-@@ -3338,7 +3398,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
+@@ -3421,7 +3481,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
char __user *uoptval;
int err;
set_fs(KERNEL_DS);
if (level == SOL_SOCKET)
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
-index 128494e..775d0e0 100644
+index 7865b44..174662e 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -240,9 +240,9 @@ static int rpc_wait_bit_killable(void *word)
goto err;
return 0;
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-index 73b428b..5f3f8f3 100644
+index 62e4f9b..dd3f2d7 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
}
static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
-@@ -1266,7 +1266,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
+@@ -1262,7 +1262,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
spin_lock_bh(&xprt->sc_lock);
if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
spin_unlock_bh(&xprt->sc_lock);
return (mode << 6) | (mode << 3) | mode;
}
diff --git a/net/tipc/link.c b/net/tipc/link.c
-index 1c1e615..113e0ae 100644
+index a79c755..eca357d 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
-@@ -1171,7 +1171,7 @@ static int link_send_sections_long(struct tipc_port *sender,
+@@ -1169,7 +1169,7 @@ static int link_send_sections_long(struct tipc_port *sender,
struct tipc_msg fragm_hdr;
struct sk_buff *buf, *buf_chain, *prev;
u32 fragm_crs, fragm_rest, hsz, sect_rest;
int curr_sect;
u32 fragm_no;
-@@ -1212,7 +1212,7 @@ again:
+@@ -1210,7 +1210,7 @@ again:
if (!sect_rest) {
sect_rest = msg_sect[++curr_sect].iov_len;
}
if (sect_rest < fragm_rest)
-@@ -1231,7 +1231,7 @@ error:
+@@ -1229,7 +1229,7 @@ error:
}
} else
skb_copy_to_linear_data_offset(buf, fragm_crs,
pos += msg_sect[cnt].iov_len;
}
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
-index 5ed5965..90abe34 100644
+index 0f7d0d0..00f89bf 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub,
sub->evt.event = htohl(event, sub->swap);
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index c5ee4ff..e905948 100644
+index 5b5c876..3127bf7 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
-@@ -789,6 +789,12 @@ static struct sock *unix_find_other(struct net *net,
+@@ -786,6 +786,12 @@ static struct sock *unix_find_other(struct net *net,
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
goto put_fail;
u = unix_find_socket_byinode(inode);
if (!u)
goto put_fail;
-@@ -809,6 +815,13 @@ static struct sock *unix_find_other(struct net *net,
+@@ -806,6 +812,13 @@ static struct sock *unix_find_other(struct net *net,
if (u) {
struct dentry *dentry;
dentry = unix_sk(u)->path.dentry;
if (dentry)
touch_atime(&unix_sk(u)->path);
} else
-@@ -842,12 +855,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
+@@ -839,12 +852,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
*/
err = security_path_mknod(&path, dentry, mode, 0);
if (!err) {
done_path_create(&path, dentry);
return err;
}
-diff --git a/net/wireless/core.h b/net/wireless/core.h
-index bc7430b..35349de 100644
---- a/net/wireless/core.h
-+++ b/net/wireless/core.h
-@@ -28,7 +28,7 @@ struct cfg80211_registered_device {
- struct mutex mtx;
-
- /* rfkill support */
-- struct rfkill_ops rfkill_ops;
-+ rfkill_ops_no_const rfkill_ops;
- struct rfkill *rfkill;
- struct work_struct rfkill_sync;
-
-diff --git a/net/wireless/util.c b/net/wireless/util.c
-index 994e2f0..f67aeb1 100644
---- a/net/wireless/util.c
-+++ b/net/wireless/util.c
-@@ -309,7 +309,7 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb)
- }
- EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb);
-
--static int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
-+unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
- {
- int ae = meshhdr->flags & MESH_FLAGS_AE;
- /* 7.1.3.5a.2 */
-@@ -326,6 +326,7 @@ static int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
- return 6;
- }
- }
-+EXPORT_SYMBOL(ieee80211_get_mesh_hdrlen);
-
- int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
- enum nl80211_iftype iftype)
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
-index b0eb7aa..7d73e82 100644
+index c8717c1..08539f5 100644
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
iwp->length += essid_compat;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 387848e..a6667a2 100644
+index 41eabc4..8d4e6d6 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
-@@ -300,7 +300,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
+@@ -317,7 +317,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
{
policy->walk.dead = 1;
if (del_timer(&policy->timer))
xfrm_pol_put(policy);
-@@ -584,7 +584,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
+@@ -601,7 +601,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
hlist_add_head(&policy->bydst, chain);
xfrm_pol_hold(policy);
net->xfrm.policy_count[dir]++;
rt_genid_bump(net);
if (delpol)
__xfrm_policy_unlink(delpol, dir);
-@@ -1533,7 +1533,7 @@ free_dst:
+@@ -1550,7 +1550,7 @@ free_dst:
goto out;
}
xfrm_dst_alloc_copy(void **target, const void *src, int size)
{
if (!*target) {
-@@ -1545,7 +1545,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
+@@ -1562,7 +1562,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
return 0;
}
xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1557,7 +1557,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
+@@ -1574,7 +1574,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
#endif
}
xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1651,7 +1651,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
+@@ -1668,7 +1668,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
xdst->num_pols = num_pols;
memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
return xdst;
}
-@@ -2352,7 +2352,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
+@@ -2369,7 +2369,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
if (xdst->xfrm_genid != dst->xfrm->genid)
return 0;
if (xdst->num_pols > 0 &&
return 0;
mtu = dst_mtu(dst->child);
-@@ -2891,7 +2891,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
+@@ -2896,7 +2896,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
sizeof(pol->xfrm_vec[i].saddr));
pol->xfrm_vec[i].encap_family = mp->new_family;
/* flush bundles */
}
}
+diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
+index 3459692..eefb515 100644
+--- a/net/xfrm/xfrm_state.c
++++ b/net/xfrm/xfrm_state.c
+@@ -278,7 +278,9 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
+ if (!try_module_get(afinfo->owner))
+ goto out;
+
+- mode->afinfo = afinfo;
++ pax_open_kernel();
++ *(void **)&mode->afinfo = afinfo;
++ pax_close_kernel();
+ modemap[mode->encap] = mode;
+ err = 0;
+
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
-index ff1720d..ed8475e 100644
+index 0e801c3..5c8ad3b 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -111,7 +111,7 @@ endif
kallsymso=""
kallsyms_vmlinux=""
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
-index 7ed6864..b6e90e6 100644
+index df4fc23..0ea719d 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -128,7 +128,7 @@ static void device_id_check(const char *modname, const char *device_id,
sprintf(alias, "dmi*");
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index 68e9f5e..ac7759b 100644
+index 0d93856..e828363 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
-@@ -930,6 +930,7 @@ enum mismatch {
+@@ -933,6 +933,7 @@ enum mismatch {
ANY_INIT_TO_ANY_EXIT,
ANY_EXIT_TO_ANY_INIT,
EXPORT_TO_INIT_EXIT,
};
struct sectioncheck {
-@@ -1044,6 +1045,12 @@ const struct sectioncheck sectioncheck[] = {
+@@ -1047,6 +1048,12 @@ const struct sectioncheck sectioncheck[] = {
.tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
.mismatch = EXPORT_TO_INIT_EXIT,
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
}
};
-@@ -1166,10 +1173,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
+@@ -1169,10 +1176,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
continue;
if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
continue;
if (d < 0)
d = addr - sym->st_value;
if (d < distance) {
-@@ -1448,6 +1455,14 @@ static void report_sec_mismatch(const char *modname,
+@@ -1451,6 +1458,14 @@ static void report_sec_mismatch(const char *modname,
tosym, prl_to, prl_to, tosym);
free(prl_to);
break;
}
fprintf(stderr, "\n");
}
-@@ -1682,7 +1697,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
+@@ -1685,7 +1700,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
static void check_sec_ref(struct module *mod, const char *modname,
struct elf_info *elf)
{
Elf_Shdr *sechdrs = elf->sechdrs;
/* Walk through all sections */
-@@ -1780,7 +1795,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
+@@ -1783,7 +1798,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
va_end(ap);
}
{
if (buf->size - buf->pos < len) {
buf->size += len + SZ;
-@@ -1998,7 +2013,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -2001,7 +2016,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
if (fstat(fileno(file), &st) < 0)
goto close_write;
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
diff --git a/security/Kconfig b/security/Kconfig
-index e9c6ac7..e7feb0d 100644
+index e9c6ac7..01c698c 100644
--- a/security/Kconfig
+++ b/security/Kconfig
-@@ -4,6 +4,896 @@
+@@ -4,6 +4,902 @@
menu "Security options"
+config PAX_KERNEXEC
+ bool "Enforce non-executable kernel pages"
+ default y if GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_NONE || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_GUEST) || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_KVM))
-+ depends on (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
++ depends on (X86 || ARM_LPAE) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
+ select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
+ select PAX_KERNEXEC_PLUGIN if X86_64
+ help
+config PAX_USERCOPY
+ bool "Harden heap object copies between kernel and userland"
+ default y if GRKERNSEC_CONFIG_AUTO
-+ depends on X86 || PPC || SPARC || ARM
++ depends on ARM || IA64 || PPC || SPARC || X86
+ depends on GRKERNSEC && (SLAB || SLUB || SLOB)
+ select PAX_USERCOPY_SLABS
+ help
+ Since this has a negligible performance impact, you should enable
+ this feature.
+
++
++config PAX_USERCOPY_DEBUG
++ bool
++ depends on X86 && PAX_USERCOPY
++ default n
++
+config PAX_SIZE_OVERFLOW
+ bool "Prevent various integer overflows in function size parameters"
+ default y if GRKERNSEC_CONFIG_AUTO
source security/keys/Kconfig
config SECURITY_DMESG_RESTRICT
-@@ -103,7 +993,7 @@ config INTEL_TXT
+@@ -103,7 +999,7 @@ config INTEL_TXT
config LSM_MMAP_MIN_ADDR
int "Low address space for LSM to protect from user allocation"
depends on SECURITY && SECURITY_SELINUX
help
This is the portion of low virtual memory which should be protected
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 8ea39aa..8569ac5 100644
+index 8c2a7f6..b133ac9 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -614,7 +614,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
if (bprm->cap_effective)
return 1;
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
-index e7c99fd..5b2fa24 100644
+index 6ee8826..6350060 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
-@@ -95,8 +95,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
+@@ -96,8 +96,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
extern spinlock_t ima_queue_lock;
struct ima_h_table {
};
extern struct ima_h_table ima_htable;
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
-index 032ff03..c428a74 100644
+index b356884..fd9676e 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
-@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
+@@ -79,7 +79,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
int result;
/* can overflow, only indicator */
if (iov != iovstack)
kfree(iov);
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
-index 3364fbf..1f10f31 100644
+index 5d34b4e..2456674 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
-@@ -966,7 +966,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
+@@ -986,7 +986,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
/*
* Copy the iovec data from userspace
*/
unsigned ioc)
{
for (; ioc > 0; ioc--) {
-@@ -988,7 +988,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
+@@ -1008,7 +1008,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
* If successful, 0 will be returned.
*/
long keyctl_instantiate_key_common(key_serial_t id,
unsigned ioc,
size_t plen,
key_serial_t ringid)
-@@ -1083,7 +1083,7 @@ long keyctl_instantiate_key(key_serial_t id,
+@@ -1103,7 +1103,7 @@ long keyctl_instantiate_key(key_serial_t id,
[0].iov_len = plen
};
}
return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
-@@ -1116,7 +1116,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
+@@ -1136,7 +1136,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
if (ret == 0)
goto no_payload_free;
if (iov != iovstack)
kfree(iov);
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
-index 81e7852..2b2ecc3 100644
+index 6e42df1..aba52bd 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -227,16 +227,16 @@ static long keyring_read(const struct key *keyring,
/*
diff --git a/security/security.c b/security/security.c
-index 860aeb3..45765c0 100644
+index 8dcd4ae..1124de7 100644
--- a/security/security.c
+++ b/security/security.c
@@ -20,6 +20,7 @@
/* Save user chosen LSM */
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 6c77f63..7496c76 100644
+index 61a5336..27215d8 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -95,8 +95,6 @@
/* SECMARK reference count */
static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
-@@ -5511,7 +5509,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+@@ -5476,7 +5474,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
#endif
}
#else
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index 8221514..5c4775f 100644
+index 38be92c..21f49ee 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
-@@ -3429,7 +3429,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
+@@ -3398,7 +3398,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
return 0;
}
.ptrace_access_check = smack_ptrace_access_check,
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
-index c2d04a5..e6a1aeb 100644
+index a2ee362..5754f34 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
-@@ -501,7 +501,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
+@@ -503,7 +503,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
* tomoyo_security_ops is a "struct security_operations" which is used for
* registering TOMOYO.
*/
.cred_alloc_blank = tomoyo_cred_alloc_blank,
.cred_prepare = tomoyo_cred_prepare,
diff --git a/security/yama/Kconfig b/security/yama/Kconfig
-index 51d6709..1f3dbe2 100644
+index 20ef514..4182bed 100644
--- a/security/yama/Kconfig
+++ b/security/yama/Kconfig
@@ -1,6 +1,6 @@
/* PCM3052 register definitions */
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
-index 08fde00..0bf641a 100644
+index 4c1cc51..16040040 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
}
} else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
-index 91cdf94..4085161 100644
+index 91cdf943..4085161 100644
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
if (err < 0)
return err;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
-index 53b5ada..2db94c8 100644
+index f9ddecf..e27404d 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
-@@ -2780,11 +2780,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
+@@ -2804,11 +2804,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
switch (substream->stream) {
case SNDRV_PCM_STREAM_PLAYBACK:
result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
default:
result = -EINVAL;
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
-index 5cf8d65..912a79c 100644
+index 60e8fc1..786abcb 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -64,7 +64,7 @@ struct ops_list {
break;
default:
return -EINVAL;
-diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
-index 7bd5e33..1fcab12 100644
---- a/sound/isa/cmi8330.c
-+++ b/sound/isa/cmi8330.c
-@@ -172,7 +172,7 @@ struct snd_cmi8330 {
-
- struct snd_pcm *pcm;
- struct snd_cmi8330_stream {
-- struct snd_pcm_ops ops;
-+ snd_pcm_ops_no_const ops;
- snd_pcm_open_callback_t open;
- void *private_data; /* sb or wss */
- } streams[2];
diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
index b2b3c01..e1c1e1f 100644
--- a/sound/oss/sb_audio.c
list_add(&s->list, &cs4297a_devs);
-diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
-index e5a7e19..4049063 100644
---- a/sound/pci/hda/hda_codec.h
-+++ b/sound/pci/hda/hda_codec.h
-@@ -614,7 +614,7 @@ struct hda_bus_ops {
- /* notify power-up/down from codec to controller */
- void (*pm_notify)(struct hda_bus *bus);
- #endif
--};
-+} __no_const;
-
- /* template to pass to the bus constructor */
- struct hda_bus_template {
-@@ -714,6 +714,7 @@ struct hda_codec_ops {
- #endif
- void (*reboot_notify)(struct hda_codec *codec);
- };
-+typedef struct hda_codec_ops __no_const hda_codec_ops_no_const;
-
- /* record for amp information cache */
- struct hda_cache_head {
-@@ -744,7 +745,7 @@ struct hda_pcm_ops {
- struct snd_pcm_substream *substream);
- int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
- struct snd_pcm_substream *substream);
--};
-+} __no_const;
-
- /* PCM information for each substream */
- struct hda_pcm_stream {
-@@ -802,7 +803,7 @@ struct hda_codec {
- const char *modelname; /* model name for preset */
-
- /* set by patch */
-- struct hda_codec_ops patch_ops;
-+ hda_codec_ops_no_const patch_ops;
-
- /* PCM to create, set by patch_ops.build_pcms callback */
- unsigned int num_pcms;
-diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
-index 0da778a..bc38b84 100644
---- a/sound/pci/ice1712/ice1712.h
-+++ b/sound/pci/ice1712/ice1712.h
-@@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
- unsigned int mask_flags; /* total mask bits */
- struct snd_akm4xxx_ops {
- void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
-- } ops;
-+ } __no_const ops;
- };
-
- struct snd_ice1712_spdif {
-@@ -285,7 +285,7 @@ struct snd_ice1712_spdif {
- int (*default_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
- void (*stream_get)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
- int (*stream_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
-- } ops;
-+ } __no_const ops;
- };
-
-
diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
-index bddc405..2c0733c 100644
+index 4631a23..001ae57 100644
--- a/sound/pci/ymfpci/ymfpci.h
+++ b/sound/pci/ymfpci/ymfpci.h
@@ -358,7 +358,7 @@ struct snd_ymfpci {
const struct firmware *dsp_microcode;
const struct firmware *controller_microcode;
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
-index 62b2363..ee77972 100644
+index 3a6f03f..bc5c86c 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -203,8 +203,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
wake_up(&chip->interrupt_sleep);
}
}
-@@ -2402,7 +2402,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
+@@ -2420,7 +2420,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
spin_lock_init(&chip->reg_lock);
spin_lock_init(&chip->voice_lock);
init_waitqueue_head(&chip->interrupt_sleep);
+}
diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
new file mode 100644
-index 0000000..846aeb0
+index 0000000..414fe5e
--- /dev/null
+++ b/tools/gcc/colorize_plugin.c
-@@ -0,0 +1,148 @@
+@@ -0,0 +1,151 @@
+/*
-+ * Copyright 2012 by PaX Team <pageexec@freemail.hu>
++ * Copyright 2012
-2013 by PaX Team <pageexec@freemail.hu>
+ * Licensed under the GPL v2
+ *
+ * Note: the choice of the license means that the compilation process is
+int plugin_is_GPL_compatible;
+
+static struct plugin_info colorize_plugin_info = {
-+ .version = "201203092200",
++ .version = "201302112000",
+ .help = NULL,
+};
+
+ .pass = {
+ .type = SIMPLE_IPA_PASS,
+ .name = "colorize_rearm",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = NULL,
+ .execute = execute_colorize_rearm,
+ .sub = NULL,
+}
diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
new file mode 100644
-index 0000000..92ed719
+index 0000000..c415c9d
--- /dev/null
+++ b/tools/gcc/constify_plugin.c
-@@ -0,0 +1,331 @@
+@@ -0,0 +1,359 @@
+/*
+ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
-+ * Copyright 2011 by PaX Team <pageexec@freemail.hu>
++ * Copyright 2011
-2013 by PaX Team <pageexec@freemail.hu>
+ * Licensed under the GPL v2, or (at your option) v3
+ *
+ * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
+int plugin_is_GPL_compatible;
+
+static struct plugin_info const_plugin_info = {
-+ .version = "201205300030",
++ .version = "201302112000",
+ .help = "no-constify\tturn off constification\n",
+};
+
++static tree get_field_type(tree field)
++{
++ return strip_array_types(TREE_TYPE(field));
++}
++
++static bool walk_struct(tree node);
+static void deconstify_tree(tree node);
+
+static void deconstify_type(tree type)
+ tree field;
+
+ for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
-+ tree type = TREE_TYPE(field);
++ tree fieldtype = get_field_type(field);
+
-+ if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
++ if (TREE_CODE(fieldtype) != RECORD_TYPE && TREE_CODE(fieldtype) != UNION_TYPE)
+ continue;
-+ if (!TYPE_READONLY(type))
++ if (!TYPE_READONLY(fieldtype))
++ continue;
++ if (!walk_struct(fieldtype))
+ continue;
+
+ deconstify_tree(field);
++ TREE_READONLY(field) = 0;
+ }
+ TYPE_READONLY(type) = 0;
+ C_TYPE_FIELDS_READONLY(type) = 0;
+{
+ tree old_type, new_type, field;
+
++// TREE_READONLY(node) = 0;
+ old_type = TREE_TYPE(node);
++ while (TREE_CODE(old_type) == ARRAY_TYPE && TREE_CODE(TREE_TYPE(old_type)) != ARRAY_TYPE) {
++ node = old_type;
++ old_type = TREE_TYPE(old_type);
++ }
+
++ gcc_assert(TREE_CODE(old_type) == RECORD_TYPE || TREE_CODE(old_type) == UNION_TYPE);
+ gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
+
+ new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
+
+ deconstify_type(new_type);
+
-+ TREE_READONLY(node) = 0;
+ TREE_TYPE(node) = new_type;
+}
+
+
+static bool is_fptr(tree field)
+{
-+ tree ptr = TREE_TYPE(field);
++ tree ptr = get_field_type(field);
+
+ if (TREE_CODE(ptr) != POINTER_TYPE)
+ return false;
+ if (TYPE_FIELDS(node) == NULL_TREE)
+ return false;
+
++ if (lookup_attribute("do_const", TYPE_ATTRIBUTES(node)))
++ return true;
++
+ if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
+ gcc_assert(!TYPE_READONLY(node));
+ deconstify_type(node);
+ }
+
+ for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
-+ tree type = TREE_TYPE(field);
++ tree type = get_field_type(field);
+ enum tree_code code = TREE_CODE(type);
+
+ if (node == type)
+
+ if (walk_struct(type))
+ constify_type(type);
++ else
++ deconstify_type(type);
+}
+
-+static unsigned int check_local_variables(void);
-+
-+struct gimple_opt_pass pass_local_variable = {
-+ {
-+ .type = GIMPLE_PASS,
-+ .name = "check_local_variables",
-+ .gate = NULL,
-+ .execute = check_local_variables,
-+ .sub = NULL,
-+ .next = NULL,
-+ .static_pass_number = 0,
-+ .tv_id = TV_NONE,
-+ .properties_required = 0,
-+ .properties_provided = 0,
-+ .properties_destroyed = 0,
-+ .todo_flags_start = 0,
-+ .todo_flags_finish = 0
-+ }
-+};
-+
+static unsigned int check_local_variables(void)
+{
++ unsigned int ret = 0;
+ tree var;
-+ referenced_var_iterator rvi;
+
+#if BUILDING_GCC_VERSION == 4005
-+ FOR_EACH_REFERENCED_VAR(var, rvi) {
++ tree vars;
++#else
++ unsigned int i;
++#endif
++
++#if BUILDING_GCC_VERSION == 4005
++ for (vars = cfun->local_decls; vars; vars = TREE_CHAIN(vars)) {
++ var = TREE_VALUE(vars);
+#else
-+ FOR_EACH_REFERENCED_VAR(cfun, var, rvi) {
++ FOR_EACH_LOCAL_DECL(cfun, i, var) {
+#endif
+ tree type = TREE_TYPE(var);
+
-+ if (!DECL_P(var) || TREE_STATIC(var) || DECL_EXTERNAL(var))
++ gcc_assert(DECL_P(var));
++ if (is_global_var(var))
+ continue;
+
+ if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
+// if (lookup_attribute("no_const", DECL_ATTRIBUTES(var)))
+// continue;
+
-+// if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
-+// continue;
++ if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
++ continue;
+
+ if (walk_struct(type)) {
+ error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
-+ return 1;
++ ret = 1;
+ }
+ }
-+ return 0;
++ return ret;
+}
+
++struct gimple_opt_pass pass_local_variable = {
++ {
++ .type = GIMPLE_PASS,
++ .name = "check_local_variables",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
++ .gate = NULL,
++ .execute = check_local_variables,
++ .sub = NULL,
++ .next = NULL,
++ .static_pass_number = 0,
++ .tv_id = TV_NONE,
++ .properties_required = 0,
++ .properties_provided = 0,
++ .properties_destroyed = 0,
++ .todo_flags_start = 0,
++ .todo_flags_finish = 0
++ }
++};
++
+int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
+{
+ const char * const plugin_name = plugin_info->base_name;
+
+ struct register_pass_info local_variable_pass_info = {
+ .pass = &pass_local_variable.pass,
-+ .reference_pass_name = "*referenced_vars",
++ .reference_pass_name = "ssa",
+ .ref_pass_instance_number = 1,
-+ .pos_op = PASS_POS_INSERT_AFTER
++ .pos_op = PASS_POS_INSERT_BEFORE
+ };
+
+ if (!plugin_default_version_check(version, &gcc_version)) {
+}
diff --git a/tools/gcc/generate_size_overflow_hash.sh b/tools/gcc/generate_size_overflow_hash.sh
new file mode 100644
-index 0000000..02c6bec
+index 0000000..e518932
--- /dev/null
+++ b/tools/gcc/generate_size_overflow_hash.sh
@@ -0,0 +1,94 @@
+done
+
+create_defines() {
-+ for i in `seq 1 32`
++ for i in `seq 0 31`
+ do
+ echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
+ done
+ echo >> "$header1"
+}
+
-+create_structs () {
++create_structs() {
+ rm -f "$header1"
+
+ create_defines
+ struct_hash_name="${data_array[0]}"
+ funcn="${data_array[1]}"
+ params="${data_array[2]}"
-+ next="${data_array[5]}"
++ next="${data_array[4]}"
+
+ echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
+
+ done
+}
+
-+create_headers () {
++create_headers() {
+ echo "const struct size_overflow_hash * const size_overflow_hash[$n] = {" >> "$header1"
+}
+
-+create_array_elements () {
++create_array_elements() {
+ index=0
+ grep -v "nohasharray" $database | sort -n -k 4 | while read data
+ do
+ data_array=($data)
+ i="${data_array[3]}"
-+ hash="${data_array[4]}"
++ hash="${data_array[0]}"
+ while [[ $index -lt $i ]]
+ do
+ echo -e "\t["$index"]\t= NULL," >> "$header1"
+exit 0
diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
new file mode 100644
-index 0000000..a86e422
+index 0000000..568b360
--- /dev/null
+++ b/tools/gcc/kallocstat_plugin.c
-@@ -0,0 +1,167 @@
+@@ -0,0 +1,170 @@
+/*
-+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
++ * Copyright 2011
-2013 by the PaX Team <pageexec@freemail.hu>
+ * Licensed under the GPL v2
+ *
+ * Note: the choice of the license means that the compilation process is
+};
+
+static struct plugin_info kallocstat_plugin_info = {
-+ .version = "201111150100",
++ .version = "201302112000",
+};
+
+static unsigned int execute_kallocstat(void);
+ .pass = {
+ .type = GIMPLE_PASS,
+ .name = "kallocstat",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = NULL,
+ .execute = execute_kallocstat,
+ .sub = NULL,
+}
diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
new file mode 100644
-index 0000000..98011fa
+index 0000000..0408e06
--- /dev/null
+++ b/tools/gcc/kernexec_plugin.c
-@@ -0,0 +1,427 @@
+@@ -0,0 +1,465 @@
+/*
-+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
++ * Copyright 2011
-2013 by the PaX Team <pageexec@freemail.hu>
+ * Licensed under the GPL v2
+ *
+ * Note: the choice of the license means that the compilation process is
+extern void print_gimple_stmt(FILE *, gimple, int, int);
+extern rtx emit_move_insn(rtx x, rtx y);
+
++#if BUILDING_GCC_VERSION <= 4006
++#define ANY_RETURN_P(rtx) (GET_CODE(rtx) == RETURN)
++#endif
++
++#if BUILDING_GCC_VERSION >= 4008
++#define TODO_dump_func 0
++#endif
++
+int plugin_is_GPL_compatible;
+
+static struct plugin_info kernexec_plugin_info = {
-+ .version = "201111291120",
++ .version = "201302112000",
+ .help = "method=[bts|or]\tinstrumentation method\n"
+};
+
+ .pass = {
+ .type = GIMPLE_PASS,
+ .name = "kernexec_reload",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = kernexec_cmodel_check,
+ .execute = execute_kernexec_reload,
+ .sub = NULL,
+ .pass = {
+ .type = GIMPLE_PASS,
+ .name = "kernexec_fptr",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = kernexec_cmodel_check,
+ .execute = execute_kernexec_fptr,
+ .sub = NULL,
+ .pass = {
+ .type = RTL_PASS,
+ .name = "kernexec_retaddr",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = kernexec_cmodel_check,
+ .execute = execute_kernexec_retaddr,
+ .sub = NULL,
+
+ // create temporary unsigned long variable used for bitops and cast fptr to it
+ intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
++#if BUILDING_GCC_VERSION <= 4007
+ add_referenced_var(intptr);
+ mark_sym_for_renaming(intptr);
++#endif
+ assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
+ gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
+ update_stmt(assign_intptr);
+
+ // cast temporary unsigned long back to a temporary fptr variable
+ new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
++#if BUILDING_GCC_VERSION <= 4007
+ add_referenced_var(new_fptr);
+ mark_sym_for_renaming(new_fptr);
++#endif
+ assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
+ gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
+ update_stmt(assign_new_fptr);
+{
+ gimple asm_or_stmt, call_stmt;
+ tree old_fptr, new_fptr, input, output;
++#if BUILDING_GCC_VERSION <= 4007
+ VEC(tree, gc) *inputs = NULL;
+ VEC(tree, gc) *outputs = NULL;
++#else
++ vec<tree, va_gc> *inputs = NULL;
++ vec<tree, va_gc> *outputs = NULL;
++#endif
+
+ call_stmt = gsi_stmt(*gsi);
+ old_fptr = gimple_call_fn(call_stmt);
+
+ // create temporary fptr variable
+ new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
++#if BUILDING_GCC_VERSION <= 4007
+ add_referenced_var(new_fptr);
+ mark_sym_for_renaming(new_fptr);
++#endif
+
+ // build asm volatile("orq %%r10, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
+ input = build_tree_list(NULL_TREE, build_string(2, "0"));
+ input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
+ output = build_tree_list(NULL_TREE, build_string(3, "=r"));
+ output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
++#if BUILDING_GCC_VERSION <= 4007
+ VEC_safe_push(tree, gc, inputs, input);
+ VEC_safe_push(tree, gc, outputs, output);
++#else
++ vec_safe_push(inputs, input);
++ vec_safe_push(outputs, output);
++#endif
+ asm_or_stmt = gimple_build_asm_vec("orq %%r10, %0\n\t", inputs, outputs, NULL, NULL);
+ gimple_asm_set_volatile(asm_or_stmt, true);
+ gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
+ gcc_unreachable();
+
+ // ... through a function pointer
-+ fn = SSA_NAME_VAR(fn);
-+ if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL)
-+ continue;
++ if (SSA_NAME_VAR(fn) != NULL_TREE) {
++ fn = SSA_NAME_VAR(fn);
++ if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL) {
++ debug_tree(fn);
++ gcc_unreachable();
++ }
++ }
+ fn = TREE_TYPE(fn);
+ if (TREE_CODE(fn) != POINTER_TYPE)
+ continue;
+ for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
+ // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
+ // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
++ // (jump_insn 97 96 98 6 (simple_return) fptr.c:50 -1 (nil) -> simple_return)
+ rtx body;
+
+ // is it a retn
+ body = PATTERN(insn);
+ if (GET_CODE(body) == PARALLEL)
+ body = XVECEXP(body, 0, 0);
-+ if (GET_CODE(body) != RETURN)
++ if (!ANY_RETURN_P(body))
+ continue;
+ kernexec_instrument_retaddr(insn);
+ }
+}
diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
new file mode 100644
-index 0000000..b8008f7
+index 0000000..1276616
--- /dev/null
+++ b/tools/gcc/latent_entropy_plugin.c
-@@ -0,0 +1,295 @@
+@@ -0,0 +1,321 @@
+/*
-+ * Copyright 2012 by the PaX Team <pageexec@freemail.hu>
++ * Copyright 2012
-2013 by the PaX Team <pageexec@freemail.hu>
+ * Licensed under the GPL v2
+ *
+ * Note: the choice of the license means that the compilation process is
+#include "emit-rtl.h"
+#include "tree-flow.h"
+
++#if BUILDING_GCC_VERSION >= 4008
++#define TODO_dump_func 0
++#endif
++
+int plugin_is_GPL_compatible;
+
+static tree latent_entropy_decl;
+
+static struct plugin_info latent_entropy_plugin_info = {
-+ .version = "201207271820",
++ .version = "201302112000",
+ .help = NULL
+};
+
+ .pass = {
+ .type = GIMPLE_PASS,
+ .name = "latent_entropy",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = gate_latent_entropy,
+ .execute = execute_latent_entropy,
+ .sub = NULL,
+ op = get_op(&rhs);
+ addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
+ assign = gimple_build_assign(local_entropy, addxorrol);
++#if BUILDING_GCC_VERSION <= 4007
+ find_referenced_vars_in(assign);
++#endif
+//debug_bb(bb);
+ gsi = gsi_after_labels(bb);
+ gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
+
+ // 1. create temporary copy of latent_entropy
+ temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
++#if BUILDING_GCC_VERSION <= 4007
+ add_referenced_var(temp);
+ mark_sym_for_renaming(temp);
++#endif
+
+ // 2. read...
+ assign = gimple_build_assign(temp, latent_entropy_decl);
++#if BUILDING_GCC_VERSION <= 4007
+ find_referenced_vars_in(assign);
++#endif
+ gsi = gsi_after_labels(bb);
+ gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
+ update_stmt(assign);
+ // 3. ...modify...
+ addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
+ assign = gimple_build_assign(temp, addxorrol);
++#if BUILDING_GCC_VERSION <= 4007
+ find_referenced_vars_in(assign);
++#endif
+ gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
+ update_stmt(assign);
+
+ // 4. ...write latent_entropy
+ assign = gimple_build_assign(latent_entropy_decl, temp);
++#if BUILDING_GCC_VERSION <= 4007
+ find_referenced_vars_in(assign);
++#endif
+ gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
+ update_stmt(assign);
+}
+ if (!latent_entropy_decl) {
+ struct varpool_node *node;
+
++#if BUILDING_GCC_VERSION <= 4007
+ for (node = varpool_nodes; node; node = node->next) {
+ tree var = node->decl;
++#else
++ FOR_EACH_VARIABLE(node) {
++ tree var = node->symbol.decl;
++#endif
+ if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
+ continue;
+ latent_entropy_decl = var;
+
+ // 1. create local entropy variable
+ local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
++#if BUILDING_GCC_VERSION <= 4007
+ add_referenced_var(local_entropy);
+ mark_sym_for_renaming(local_entropy);
++#endif
+
+ // 2. initialize local entropy variable
+ bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
+
+ assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
+// gimple_set_location(assign, loc);
++#if BUILDING_GCC_VERSION <= 4007
+ find_referenced_vars_in(assign);
++#endif
+ gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
+ update_stmt(assign);
+ bb = bb->next_bb;
+}
diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data
new file mode 100644
-index 0000000..9332f17
+index 0000000..5921fd7
--- /dev/null
+++ b/tools/gcc/size_overflow_hash.data
-@@ -0,0 +1,3597 @@
-+_000001_hash alloc_dr 2 65495 _000001_hash NULL
-+_000002_hash __copy_from_user 3 10918 _000002_hash NULL
-+_000003_hash copy_from_user 3 17559 _000003_hash NULL
-+_000004_hash __copy_from_user_inatomic 3 4365 _000004_hash NULL
-+_000005_hash __copy_from_user_nocache 3 39351 _000005_hash NULL
-+_000006_hash __copy_to_user_inatomic 3 19214 _000006_hash NULL
-+_000007_hash do_xip_mapping_read 5 60297 _000007_hash NULL
-+_000008_hash hugetlbfs_read 3 11268 _000008_hash NULL
-+_000009_hash kmalloc 1 60432 _003302_hash NULL nohasharray
-+_000010_hash kmalloc_array 1-2 9444 _000010_hash NULL
-+_000012_hash __kmalloc_reserve 1 17080 _000012_hash NULL
-+_000013_hash kmalloc_slab 1 11917 _000013_hash NULL
-+_000014_hash kmemdup 2 64015 _000014_hash NULL
-+_000015_hash __krealloc 2 14857 _000340_hash NULL nohasharray
-+_000016_hash memdup_user 2 59590 _000016_hash NULL
-+_000017_hash module_alloc 1 63630 _000017_hash NULL
-+_000018_hash read_default_ldt 2 14302 _000018_hash NULL
-+_000019_hash read_kcore 3 63488 _000019_hash NULL
-+_000020_hash read_ldt 2 47570 _000020_hash NULL
-+_000021_hash read_zero 3 19366 _000021_hash NULL
-+_000022_hash __vmalloc_node 1 39308 _000022_hash NULL
-+_000023_hash aac_convert_sgraw2 4 51598 _000023_hash NULL
-+_000024_hash aa_simple_write_to_buffer 4-3 49683 _000024_hash NULL
-+_000025_hash ablkcipher_copy_iv 3 64140 _000025_hash NULL
-+_000026_hash ablkcipher_next_slow 3-4 47274 _000026_hash NULL
-+_000028_hash acpi_battery_write_alarm 3 1240 _000028_hash NULL
-+_000029_hash acpi_os_allocate 1 14892 _000029_hash NULL
-+_000030_hash acpi_system_write_wakeup_device 3 34853 _000030_hash NULL
-+_000031_hash adu_write 3 30487 _000031_hash NULL
-+_000032_hash aer_inject_write 3 52399 _000032_hash NULL
-+_000033_hash afs_alloc_flat_call 2-3 36399 _000033_hash NULL
-+_000035_hash afs_proc_cells_write 3 61139 _000035_hash NULL
-+_000036_hash afs_proc_rootcell_write 3 15822 _000036_hash NULL
-+_000037_hash agp_3_5_isochronous_node_enable 3 49465 _000037_hash NULL
-+_000038_hash agp_alloc_page_array 1 22554 _000038_hash NULL
-+_000039_hash ah_alloc_tmp 2-3 54378 _000039_hash NULL
-+_000041_hash ahash_setkey_unaligned 3 33521 _000041_hash NULL
-+_000042_hash alg_setkey 3 31485 _000042_hash NULL
-+_000043_hash aligned_kmalloc 1 3628 _000043_hash NULL
-+_000044_hash alloc_context 1 3194 _000044_hash NULL
-+_000045_hash alloc_ep_req 2 54860 _000045_hash NULL
-+_000046_hash alloc_fdmem 1 27083 _000046_hash NULL
-+_000047_hash alloc_flex_gd 1 57259 _000047_hash NULL
-+_000048_hash alloc_sglist 1-3-2 22960 _000048_hash NULL
-+_000049_hash __alloc_skb 1 23940 _000049_hash NULL
-+_000050_hash aoedev_flush 2 44398 _000050_hash NULL
-+_000051_hash append_to_buffer 3 63550 _000051_hash NULL
-+_000052_hash asix_read_cmd 5 13245 _000052_hash NULL
-+_000053_hash asix_write_cmd 5 58192 _000053_hash NULL
-+_000054_hash at76_set_card_command 4 4471 _000054_hash NULL
-+_000055_hash ath6kl_add_bss_if_needed 6 24317 _000055_hash NULL
-+_000056_hash ath6kl_debug_roam_tbl_event 3 5224 _000056_hash NULL
-+_000057_hash ath6kl_mgmt_powersave_ap 6 13791 _000057_hash NULL
-+_000058_hash ath6kl_send_go_probe_resp 3 21113 _000058_hash NULL
-+_000059_hash ath6kl_set_ap_probe_resp_ies 3 50539 _000059_hash NULL
-+_000060_hash ath6kl_set_assoc_req_ies 3 43185 _000060_hash NULL
-+_000061_hash ath6kl_wmi_bssinfo_event_rx 3 2275 _000061_hash NULL
-+_000062_hash ath6kl_wmi_send_action_cmd 7 58860 _000062_hash NULL
-+_000063_hash __ath6kl_wmi_send_mgmt_cmd 7 38971 _000063_hash NULL
-+_000064_hash attach_hdlc_protocol 3 19986 _000064_hash NULL
-+_000065_hash audio_write 4 54261 _001782_hash NULL nohasharray
-+_000066_hash audit_unpack_string 3 13748 _000066_hash NULL
-+_000067_hash ax25_setsockopt 5 42740 _000067_hash NULL
-+_000068_hash b43_debugfs_write 3 34838 _000068_hash NULL
-+_000069_hash b43legacy_debugfs_write 3 28556 _000069_hash NULL
-+_000070_hash batadv_hash_new 1 40491 _000070_hash NULL
-+_000071_hash batadv_orig_node_add_if 2 18433 _000071_hash NULL
-+_000072_hash batadv_orig_node_del_if 2 4 _000072_hash NULL
-+_000073_hash batadv_tt_changes_fill_buff 4 40323 _000073_hash NULL
-+_000074_hash batadv_tt_realloc_packet_buff 4 49960 _000074_hash NULL
-+_000075_hash bch_alloc 1 4593 _000075_hash NULL
-+_000076_hash befs_nls2utf 3 17163 _000076_hash NULL
-+_000077_hash befs_utf2nls 3 25628 _000077_hash NULL
-+_000078_hash bfad_debugfs_write_regrd 3 15218 _000078_hash NULL
-+_000079_hash bfad_debugfs_write_regwr 3 61841 _000079_hash NULL
-+_000080_hash bio_alloc_map_data 1-2 50782 _000080_hash NULL
-+_000082_hash bio_kmalloc 2 54672 _000082_hash NULL
-+_000083_hash bitmap_storage_alloc 2 55077 _000083_hash NULL
-+_000084_hash blkcipher_copy_iv 3 24075 _000084_hash NULL
-+_000085_hash blkcipher_next_slow 3-4 52733 _000085_hash NULL
-+_000087_hash bl_pipe_downcall 3 34264 _000087_hash NULL
-+_000088_hash bnad_debugfs_write_regrd 3 6706 _000088_hash NULL
-+_000089_hash bnad_debugfs_write_regwr 3 57500 _000089_hash NULL
-+_000090_hash bnx2fc_cmd_mgr_alloc 2-3 24873 _000090_hash NULL
-+_000092_hash bnx2fc_process_unsol_compl 2 15576 _000092_hash NULL
-+_000093_hash bnx2_nvram_write 2-4 7790 _000093_hash NULL
-+_000095_hash btmrvl_gpiogap_write 3 35053 _000095_hash NULL
-+_000096_hash btmrvl_hscfgcmd_write 3 27143 _000096_hash NULL
-+_000097_hash btmrvl_hscmd_write 3 27089 _000097_hash NULL
-+_000098_hash btmrvl_hsmode_write 3 42252 _000098_hash NULL
-+_000099_hash btmrvl_pscmd_write 3 29504 _000099_hash NULL
-+_000100_hash btmrvl_psmode_write 3 3703 _000100_hash NULL
-+_000101_hash btrfs_alloc_delayed_item 1 11678 _000101_hash NULL
-+_000102_hash c4iw_id_table_alloc 3 48163 _000102_hash NULL
-+_000103_hash cache_do_downcall 3 6926 _000103_hash NULL
-+_000104_hash cachefiles_cook_key 2 33274 _000104_hash NULL
-+_000105_hash cachefiles_daemon_write 3 43535 _000105_hash NULL
-+_000106_hash capi_write 3 35104 _003607_hash NULL nohasharray
-+_000107_hash carl9170_debugfs_write 3 50857 _000107_hash NULL
-+_000108_hash cciss_allocate_sg_chain_blocks 2-3 5368 _000108_hash NULL
-+_000110_hash cciss_proc_write 3 10259 _000110_hash NULL
-+_000111_hash cdrom_read_cdda_old 4 27664 _000111_hash NULL
-+_000112_hash ceph_alloc_page_vector 1 18710 _000112_hash NULL
-+_000113_hash ceph_buffer_new 1 35974 _000113_hash NULL
-+_000114_hash ceph_copy_user_to_page_vector 3-4 656 _000114_hash NULL
-+_000116_hash ceph_get_direct_page_vector 2 41917 _000116_hash NULL
-+_000117_hash ceph_msg_new 2 5846 _000117_hash NULL
-+_000118_hash ceph_setxattr 4 18913 _000118_hash NULL
-+_000119_hash cfi_read_pri 3 24366 _000119_hash NULL
-+_000120_hash cgroup_write_string 5 10900 _000120_hash NULL
-+_000121_hash cgroup_write_X64 5 54514 _000121_hash NULL
-+_000122_hash change_xattr 5 61390 _000122_hash NULL
-+_000123_hash check_load_and_stores 2 2143 _000123_hash NULL
-+_000124_hash cifs_idmap_key_instantiate 3 54503 _000124_hash NULL
-+_000125_hash cifs_security_flags_proc_write 3 5484 _000125_hash NULL
-+_000126_hash cifs_setxattr 4 23957 _000126_hash NULL
-+_000127_hash cifs_spnego_key_instantiate 3 23588 _000127_hash NULL
-+_000128_hash cld_pipe_downcall 3 15058 _000128_hash NULL
-+_000129_hash clear_refs_write 3 61904 _000129_hash NULL
-+_000130_hash clusterip_proc_write 3 44729 _000130_hash NULL
-+_000131_hash cm4040_write 3 58079 _000131_hash NULL
-+_000132_hash cm_copy_private_data 2 3649 _000132_hash NULL
-+_000133_hash cmm_write 3 2896 _000133_hash NULL
-+_000134_hash cm_write 3 36858 _000134_hash NULL
-+_000135_hash coda_psdev_write 3 1711 _000135_hash NULL
-+_000136_hash codec_reg_read_file 3 36280 _000136_hash NULL
-+_000137_hash command_file_write 3 31318 _000137_hash NULL
-+_000138_hash command_write 3 58841 _000138_hash NULL
-+_000139_hash comm_write 3 44537 _001714_hash NULL nohasharray
-+_000140_hash concat_writev 3 21451 _000140_hash NULL
-+_000141_hash copy_and_check 3 19089 _000141_hash NULL
-+_000142_hash copy_from_user_toio 3 31966 _000142_hash NULL
-+_000143_hash copy_items 6 50140 _000143_hash NULL
-+_000144_hash copy_macs 4 45534 _000144_hash NULL
-+_000145_hash __copy_to_user 3 17551 _000145_hash NULL
-+_000146_hash copy_vm86_regs_from_user 3 45340 _000146_hash NULL
-+_000147_hash core_sys_select 1 47494 _000147_hash NULL
-+_000148_hash cosa_write 3 1774 _000148_hash NULL
-+_000149_hash cp210x_set_config 4 46447 _000149_hash NULL
-+_000150_hash create_entry 2 33479 _000150_hash NULL
-+_000151_hash create_queues 2-3 9088 _000151_hash NULL
-+_000153_hash create_xattr 5 54106 _000153_hash NULL
-+_000154_hash create_xattr_datum 5 33356 _003443_hash NULL nohasharray
-+_000155_hash csum_partial_copy_fromiovecend 3-4 9957 _000155_hash NULL
-+_000157_hash ctrl_out 3-5 8712 _000157_hash NULL
-+_000159_hash cxacru_cm_get_array 4 4412 _000159_hash NULL
-+_000160_hash cxgbi_alloc_big_mem 1 4707 _000160_hash NULL
-+_000161_hash dac960_user_command_proc_write 3 3071 _000161_hash NULL
-+_000162_hash datablob_format 2 39571 _002490_hash NULL nohasharray
-+_000163_hash dccp_feat_clone_sp_val 3 11942 _000163_hash NULL
-+_000164_hash dccp_setsockopt_ccid 4 30701 _000164_hash NULL
-+_000165_hash dccp_setsockopt_cscov 2 37766 _000165_hash NULL
-+_000166_hash dccp_setsockopt_service 4 65336 _000166_hash NULL
-+_000167_hash ddebug_proc_write 3 18055 _000167_hash NULL
-+_000168_hash dev_config 3 8506 _000168_hash NULL
-+_000169_hash device_write 3 45156 _000169_hash NULL
-+_000170_hash devm_kzalloc 2 4966 _000170_hash NULL
-+_000171_hash devres_alloc 2 551 _000171_hash NULL
-+_000172_hash dfs_file_write 3 41196 _000172_hash NULL
-+_000173_hash direct_entry 3 38836 _000173_hash NULL
-+_000174_hash dispatch_ioctl 2 32357 _000174_hash NULL
-+_000175_hash dispatch_proc_write 3 44320 _000175_hash NULL
-+_000176_hash diva_os_copy_from_user 4 7792 _000176_hash NULL
-+_000177_hash dlm_alloc_pagevec 1 54296 _000177_hash NULL
-+_000178_hash dlmfs_file_read 3 28385 _000178_hash NULL
-+_000179_hash dlmfs_file_write 3 6892 _000179_hash NULL
-+_000180_hash dm_read 3 15674 _000180_hash NULL
-+_000181_hash dm_write 3 2513 _000181_hash NULL
-+_000182_hash __dn_setsockopt 5 13060 _000182_hash NULL
-+_000183_hash dns_query 3 9676 _000183_hash NULL
-+_000184_hash dns_resolver_instantiate 3 63314 _000184_hash NULL
-+_000185_hash do_add_counters 3 3992 _000185_hash NULL
-+_000186_hash __do_config_autodelink 3 58763 _000186_hash NULL
-+_000187_hash do_ip_setsockopt 5 41852 _000187_hash NULL
-+_000188_hash do_ipv6_setsockopt 5 18215 _000188_hash NULL
-+_000189_hash do_ip_vs_set_ctl 4 48641 _000189_hash NULL
-+_000190_hash do_kimage_alloc 3 64827 _000190_hash NULL
-+_000191_hash do_register_entry 4 29478 _000191_hash NULL
-+_000192_hash do_tty_write 5 44896 _000192_hash NULL
-+_000193_hash do_update_counters 4 2259 _000193_hash NULL
-+_000194_hash dsp_write 2 46218 _000194_hash NULL
-+_000195_hash dup_to_netobj 3 26363 _000195_hash NULL
-+_000196_hash dwc3_link_state_write 3 12641 _000196_hash NULL
-+_000197_hash dwc3_mode_write 3 51997 _000197_hash NULL
-+_000198_hash dwc3_testmode_write 3 30516 _000198_hash NULL
-+_000199_hash ecryptfs_copy_filename 4 11868 _000199_hash NULL
-+_000200_hash ecryptfs_miscdev_write 3 26847 _000200_hash NULL
-+_000201_hash ecryptfs_send_miscdev 2 64816 _000201_hash NULL
-+_000202_hash efx_tsoh_heap_alloc 2 58545 _000202_hash NULL
-+_000203_hash emi26_writememory 4 57908 _000203_hash NULL
-+_000204_hash emi62_writememory 4 29731 _000204_hash NULL
-+_000205_hash encrypted_instantiate 3 3168 _000205_hash NULL
-+_000206_hash encrypted_update 3 13414 _000206_hash NULL
-+_000207_hash ep0_write 3 14536 _001422_hash NULL nohasharray
-+_000208_hash ep_read 3 58813 _000208_hash NULL
-+_000209_hash ep_write 3 59008 _000209_hash NULL
-+_000210_hash erst_dbg_write 3 46715 _000210_hash NULL
-+_000211_hash esp_alloc_tmp 2-3 40558 _000211_hash NULL
-+_000213_hash evdev_do_ioctl 2 24459 _000213_hash NULL
-+_000214_hash exofs_read_lookup_dev_table 3 17733 _000214_hash NULL
-+_000215_hash ext4_kvmalloc 1 14796 _000215_hash NULL
-+_000216_hash ezusb_writememory 4 45976 _000216_hash NULL
-+_000217_hash fanotify_write 3 64623 _000217_hash NULL
-+_000218_hash fd_copyin 3 56247 _000218_hash NULL
-+_000219_hash ffs_epfile_io 3 64886 _000219_hash NULL
-+_000220_hash ffs_prepare_buffer 2 59892 _000220_hash NULL
-+_000221_hash f_hidg_write 3 7932 _000221_hash NULL
-+_000222_hash file_read_actor 4 1401 _000222_hash NULL
-+_000223_hash fill_write_buffer 3 3142 _000223_hash NULL
-+_000224_hash __find_xattr 6 2117 _002425_hash NULL nohasharray
-+_000225_hash fl_create 5 56435 _000225_hash NULL
-+_000226_hash fs_path_ensure_buf 2 59445 _000226_hash NULL
-+_000227_hash ftdi_elan_write 3 57309 _000227_hash NULL
-+_000228_hash fw_iso_buffer_alloc 2 13704 _000228_hash NULL
-+_000229_hash garmin_write_bulk 3 58191 _000229_hash NULL
-+_000230_hash garp_attr_create 3 3883 _000230_hash NULL
-+_000231_hash get_arg 3 5694 _000231_hash NULL
-+_000232_hash getdqbuf 1 62908 _000232_hash NULL
-+_000233_hash get_fdb_entries 3 41916 _000233_hash NULL
-+_000234_hash get_fd_set 1 3866 _000234_hash NULL
-+_000235_hash get_indirect_ea 4 51869 _000235_hash NULL
-+_000236_hash get_registers 3 26187 _000236_hash NULL
-+_000237_hash get_scq 2 10897 _000237_hash NULL
-+_000238_hash get_server_iovec 2 16804 _000238_hash NULL
-+_000239_hash get_ucode_user 3 38202 _000239_hash NULL
-+_000240_hash get_user_cpu_mask 2 14861 _000240_hash NULL
-+_000241_hash gfs2_alloc_sort_buffer 1 18275 _000241_hash NULL
-+_000242_hash gfs2_glock_nq_m 1 20347 _000242_hash NULL
-+_000243_hash gigaset_initcs 2 43753 _000243_hash NULL
-+_000244_hash gigaset_initdriver 2 1060 _000244_hash NULL
-+_000245_hash groups_alloc 1 7614 _000245_hash NULL
-+_000246_hash gs_alloc_req 2 58883 _000246_hash NULL
-+_000247_hash gs_buf_alloc 2 25067 _000247_hash NULL
-+_000248_hash gsm_data_alloc 3 42437 _000248_hash NULL
-+_000249_hash gss_pipe_downcall 3 23182 _000249_hash NULL
-+_000250_hash handle_request 9 10024 _000250_hash NULL
-+_000251_hash hashtab_create 3 33769 _000251_hash NULL
-+_000252_hash hcd_buffer_alloc 2 27495 _000252_hash NULL
-+_000253_hash hci_sock_setsockopt 5 28993 _000253_hash NULL
-+_000254_hash heap_init 2 49617 _000254_hash NULL
-+_000255_hash hest_ghes_dev_register 1 46766 _000255_hash NULL
-+_000256_hash hidg_alloc_ep_req 2 10159 _000256_hash NULL
-+_000257_hash hid_parse_report 3 51737 _000257_hash NULL
-+_000258_hash hidraw_get_report 3 45609 _000258_hash NULL
-+_000259_hash hidraw_report_event 3 20503 _000259_hash NULL
-+_000260_hash hidraw_send_report 3 23449 _000260_hash NULL
-+_000261_hash hpfs_translate_name 3 41497 _000261_hash NULL
-+_000262_hash hysdn_conf_write 3 52145 _000262_hash NULL
-+_000263_hash __i2400mu_send_barker 3 23652 _000263_hash NULL
-+_000264_hash i2cdev_read 3 1206 _000264_hash NULL
-+_000265_hash i2cdev_write 3 23310 _000265_hash NULL
-+_000266_hash i2o_parm_field_get 5 34477 _000266_hash NULL
-+_000267_hash i2o_parm_table_get 6 61635 _000267_hash NULL
-+_000268_hash ib_copy_from_udata 3 59502 _000268_hash NULL
-+_000269_hash ib_ucm_alloc_data 3 36885 _000269_hash NULL
-+_000270_hash ib_umad_write 3 47993 _000270_hash NULL
-+_000271_hash ib_uverbs_unmarshall_recv 5 12251 _000271_hash NULL
-+_000272_hash icn_writecmd 2 38629 _000272_hash NULL
-+_000273_hash ide_driver_proc_write 3 32493 _000273_hash NULL
-+_000274_hash ide_settings_proc_write 3 35110 _000274_hash NULL
-+_000275_hash idetape_chrdev_write 3 53976 _000275_hash NULL
-+_000276_hash idmap_pipe_downcall 3 14591 _000276_hash NULL
-+_000277_hash ieee80211_build_probe_req 7-5 27660 _000277_hash NULL
-+_000278_hash ieee80211_if_write 3 34894 _000278_hash NULL
-+_000279_hash if_write 3 51756 _000279_hash NULL
-+_000280_hash ilo_write 3 64378 _000280_hash NULL
-+_000281_hash ima_write_policy 3 40548 _000281_hash NULL
-+_000282_hash init_data_container 1 60709 _000282_hash NULL
-+_000283_hash init_send_hfcd 1 34586 _000283_hash NULL
-+_000284_hash insert_dent 7 65034 _000284_hash NULL
-+_000285_hash interpret_user_input 2 19393 _000285_hash NULL
-+_000286_hash int_proc_write 3 39542 _000286_hash NULL
-+_000287_hash ioctl_private_iw_point 7 1273 _000287_hash NULL
-+_000288_hash iov_iter_copy_from_user 4 31942 _000288_hash NULL
-+_000289_hash iov_iter_copy_from_user_atomic 4 56368 _000289_hash NULL
-+_000290_hash iowarrior_write 3 18604 _000290_hash NULL
-+_000291_hash ipc_alloc 1 1192 _000291_hash NULL
-+_000292_hash ipc_rcu_alloc 1 21208 _000292_hash NULL
-+_000293_hash ip_options_get_from_user 4 64958 _000293_hash NULL
-+_000294_hash ipv6_renew_option 3 38813 _000294_hash NULL
-+_000295_hash ip_vs_conn_fill_param_sync 6 29771 _001898_hash NULL nohasharray
-+_000296_hash ip_vs_create_timeout_table 2 64478 _000296_hash NULL
-+_000297_hash ipw_queue_tx_init 3 49161 _000297_hash NULL
-+_000298_hash irda_setsockopt 5 19824 _000298_hash NULL
-+_000299_hash irias_new_octseq_value 2 13596 _003821_hash NULL nohasharray
-+_000300_hash irnet_ctrl_write 3 24139 _000300_hash NULL
-+_000301_hash isdn_add_channels 3 40905 _000301_hash NULL
-+_000302_hash isdn_ppp_fill_rq 2 41428 _000302_hash NULL
-+_000303_hash isdn_ppp_write 4 29109 _000303_hash NULL
-+_000304_hash isdn_read 3 50021 _000304_hash NULL
-+_000305_hash isdn_v110_open 3 2418 _000305_hash NULL
-+_000306_hash isdn_writebuf_stub 4 52383 _000306_hash NULL
-+_000307_hash islpci_mgt_transmit 5 34133 _000307_hash NULL
-+_000308_hash iso_callback 3 43208 _000308_hash NULL
-+_000309_hash iso_packets_buffer_init 3-4 29061 _000309_hash NULL
-+_000310_hash it821x_firmware_command 3 8628 _000310_hash NULL
-+_000311_hash iwch_alloc_fastreg_pbl 2 40153 _000311_hash NULL
-+_000312_hash iwl_calib_set 3 34400 _003754_hash NULL nohasharray
-+_000313_hash jbd2_journal_init_revoke_table 1 36336 _000313_hash NULL
-+_000314_hash jffs2_alloc_full_dirent 1 60179 _001158_hash NULL nohasharray
-+_000315_hash journal_init_revoke_table 1 56331 _000315_hash NULL
-+_000316_hash kcalloc 1-2 27770 _000316_hash NULL
-+_000318_hash keyctl_instantiate_key_common 4 47889 _000318_hash NULL
-+_000319_hash keyctl_update_key 3 26061 _000319_hash NULL
-+_000320_hash __kfifo_alloc 2-3 22173 _000320_hash NULL
-+_000322_hash kfifo_copy_from_user 3 5091 _000322_hash NULL
-+_000323_hash kmalloc_node 1 50163 _003818_hash NULL nohasharray
-+_000324_hash kmalloc_parameter 1 65279 _000324_hash NULL
-+_000325_hash kmem_alloc 1 31920 _000325_hash NULL
-+_000326_hash kobj_map 2-3 9566 _000326_hash NULL
-+_000328_hash kone_receive 4 4690 _000328_hash NULL
-+_000329_hash kone_send 4 63435 _000329_hash NULL
-+_000330_hash krealloc 2 14908 _000330_hash NULL
-+_000331_hash kvmalloc 1 32646 _000331_hash NULL
-+_000332_hash kvm_read_guest_atomic 4 10765 _000332_hash NULL
-+_000333_hash kvm_read_guest_cached 4 39666 _000333_hash NULL
-+_000334_hash kvm_read_guest_page 5 18074 _000334_hash NULL
-+_000335_hash kzalloc 1 54740 _000335_hash NULL
-+_000336_hash l2cap_sock_setsockopt 5 50207 _000336_hash NULL
-+_000337_hash l2cap_sock_setsockopt_old 4 29346 _000337_hash NULL
-+_000338_hash lane2_associate_req 4 45398 _000338_hash NULL
-+_000339_hash lbs_debugfs_write 3 48413 _000339_hash NULL
-+_000340_hash lcd_write 3 14857 _000340_hash &_000015_hash
-+_000341_hash ldm_frag_add 2 5611 _000341_hash NULL
-+_000342_hash __lgread 4 31668 _000342_hash NULL
-+_000343_hash libipw_alloc_txb 1-3-2 27579 _000343_hash NULL
-+_000344_hash link_send_sections_long 4 46556 _000344_hash NULL
-+_000345_hash listxattr 3 12769 _000345_hash NULL
-+_000346_hash load_msg 2 95 _000346_hash NULL
-+_000347_hash lpfc_debugfs_dif_err_write 3 17424 _000347_hash NULL
-+_000348_hash lp_write 3 9511 _000348_hash NULL
-+_000349_hash mb_cache_create 2 17307 _000349_hash NULL
-+_000350_hash mce_write 3 26201 _000350_hash NULL
-+_000351_hash mcs7830_get_reg 3 33308 _000351_hash NULL
-+_000352_hash mcs7830_set_reg 3 31413 _000352_hash NULL
-+_000353_hash memcpy_fromiovec 3 55247 _000353_hash NULL
-+_000354_hash memcpy_fromiovecend 3-4 2707 _000354_hash NULL
-+_000356_hash mempool_resize 2 47983 _002039_hash NULL nohasharray
-+_000357_hash mem_rw 3 22085 _000357_hash NULL
-+_000358_hash mgmt_control 3 7349 _000358_hash NULL
-+_000359_hash mgmt_pending_add 5 46976 _000359_hash NULL
-+_000360_hash mlx4_ib_alloc_fast_reg_page_list 2 46119 _000360_hash NULL
-+_000361_hash mmc_alloc_sg 1 21504 _000361_hash NULL
-+_000362_hash mmc_send_bus_test 4 18285 _000362_hash NULL
-+_000363_hash mmc_send_cxd_data 5 38655 _000363_hash NULL
-+_000364_hash module_alloc_update_bounds 1 47205 _000364_hash NULL
-+_000365_hash move_addr_to_kernel 2 32673 _000365_hash NULL
-+_000366_hash mpi_alloc_limb_space 1 23190 _000366_hash NULL
-+_000367_hash mpi_resize 2 44674 _000367_hash NULL
-+_000368_hash mptctl_getiocinfo 2 28545 _000368_hash NULL
-+_000369_hash mtdchar_readoob 4 31200 _000369_hash NULL
-+_000370_hash mtdchar_write 3 56831 _002122_hash NULL nohasharray
-+_000371_hash mtdchar_writeoob 4 3393 _000371_hash NULL
-+_000372_hash mtd_device_parse_register 5 5024 _000372_hash NULL
-+_000373_hash mtf_test_write 3 18844 _000373_hash NULL
-+_000374_hash mthca_alloc_icm_table 3-4 38268 _002459_hash NULL nohasharray
-+_000376_hash mthca_alloc_init 2 21754 _000376_hash NULL
-+_000377_hash mthca_array_init 2 39987 _000377_hash NULL
-+_000378_hash mthca_buf_alloc 2 35861 _000378_hash NULL
-+_000379_hash mtrr_write 3 59622 _000379_hash NULL
-+_000380_hash musb_test_mode_write 3 33518 _000380_hash NULL
-+_000381_hash mwifiex_get_common_rates 3 17131 _000381_hash NULL
-+_000382_hash __mxt_write_reg 3 57326 _000382_hash NULL
-+_000383_hash nand_bch_init 2-3 16280 _001439_hash NULL nohasharray
-+_000385_hash ncp_file_write 3 3813 _000385_hash NULL
-+_000386_hash ncp__vol2io 5 4804 _000386_hash NULL
-+_000387_hash nes_alloc_fast_reg_page_list 2 33523 _000387_hash NULL
-+_000388_hash nfc_targets_found 3 29886 _000388_hash NULL
-+_000389_hash __nf_ct_ext_add_length 3 12364 _000389_hash NULL
-+_000390_hash nfs4_acl_new 1 49806 _000390_hash NULL
-+_000391_hash nfs4_write_cached_acl 4 15070 _000391_hash NULL
-+_000392_hash nfsd_symlink 6 63442 _000392_hash NULL
-+_000393_hash nfs_idmap_get_desc 2-4 42990 _000393_hash NULL
-+_000395_hash nfs_readdir_make_qstr 3 12509 _000395_hash NULL
-+_000396_hash note_last_dentry 3 12285 _000396_hash NULL
-+_000397_hash ntfs_copy_from_user 3-5 15072 _000397_hash NULL
-+_000399_hash __ntfs_copy_from_user_iovec_inatomic 3-4 38153 _000399_hash NULL
-+_000401_hash ntfs_ucstonls 3-5 23097 _000401_hash NULL
-+_000403_hash nvme_alloc_iod 1 56027 _000403_hash NULL
-+_000404_hash nvram_write 3 3894 _000404_hash NULL
-+_000405_hash o2hb_debug_create 4 18744 _000405_hash NULL
-+_000406_hash o2net_send_message_vec 4 879 _002013_hash NULL nohasharray
-+_000407_hash ocfs2_control_cfu 2 37750 _000407_hash NULL
-+_000408_hash oom_adjust_write 3 41116 _000408_hash NULL
-+_000409_hash oom_score_adj_write 3 42594 _000409_hash NULL
-+_000410_hash oprofilefs_ulong_from_user 3 57251 _000410_hash NULL
-+_000411_hash opticon_write 4 60775 _000411_hash NULL
-+_000412_hash p9_check_zc_errors 4 15534 _000412_hash NULL
-+_000413_hash packet_buffer_init 2 1607 _000413_hash NULL
-+_000414_hash packet_setsockopt 5 17662 _000414_hash NULL
-+_000415_hash parse_command 2 37079 _000415_hash NULL
-+_000416_hash pcbit_writecmd 2 12332 _000416_hash NULL
-+_000417_hash pcmcia_replace_cis 3 57066 _000417_hash NULL
-+_000418_hash pgctrl_write 3 50453 _000418_hash NULL
-+_000419_hash pg_write 3 40766 _000419_hash NULL
-+_000420_hash pidlist_allocate 1 64404 _000420_hash NULL
-+_000421_hash pipe_iov_copy_from_user 3 23102 _000421_hash NULL
-+_000422_hash pipe_iov_copy_to_user 3 3447 _000422_hash NULL
-+_000423_hash pkt_add 3 39897 _000423_hash NULL
-+_000424_hash pktgen_if_write 3 55628 _000424_hash NULL
-+_000425_hash platform_device_add_data 3 310 _000425_hash NULL
-+_000426_hash platform_device_add_resources 3 13289 _000426_hash NULL
-+_000427_hash pmcraid_copy_sglist 3 38431 _000427_hash NULL
-+_000428_hash pm_qos_power_write 3 52513 _000428_hash NULL
-+_000429_hash pnpbios_proc_write 3 19758 _000429_hash NULL
-+_000430_hash pool_allocate 3 42012 _000430_hash NULL
-+_000431_hash posix_acl_alloc 1 48063 _000431_hash NULL
-+_000432_hash ppp_cp_parse_cr 4 5214 _000432_hash NULL
-+_000433_hash ppp_write 3 34034 _000433_hash NULL
-+_000434_hash pp_read 3 33210 _000434_hash NULL
-+_000435_hash pp_write 3 39554 _000435_hash NULL
-+_000436_hash printer_req_alloc 2 62687 _000436_hash NULL
-+_000437_hash printer_write 3 60276 _000437_hash NULL
-+_000438_hash prism2_info_scanresults 3 59729 _000438_hash NULL
-+_000439_hash prism2_set_genericelement 3 29277 _000439_hash NULL
-+_000440_hash __probe_kernel_read 3 61119 _000440_hash NULL
-+_000441_hash __probe_kernel_write 3 29842 _000441_hash NULL
-+_000442_hash proc_coredump_filter_write 3 25625 _000442_hash NULL
-+_000443_hash _proc_do_string 2 6376 _000443_hash NULL
-+_000444_hash process_vm_rw_pages 5-6 15954 _000444_hash NULL
-+_000446_hash proc_loginuid_write 3 63648 _000446_hash NULL
-+_000447_hash proc_pid_attr_write 3 63845 _000447_hash NULL
-+_000448_hash proc_scsi_devinfo_write 3 32064 _000448_hash NULL
-+_000449_hash proc_scsi_write 3 29142 _000449_hash NULL
-+_000450_hash proc_scsi_write_proc 3 267 _000450_hash NULL
-+_000451_hash pskb_expand_head 2-3 42881 _000451_hash NULL
-+_000453_hash pstore_mkfile 5 50830 _000453_hash NULL
-+_000454_hash pti_char_write 3 60960 _000454_hash NULL
-+_000455_hash ptrace_writedata 4 45021 _000455_hash NULL
-+_000456_hash pt_write 3 40159 _000456_hash NULL
-+_000457_hash qdisc_class_hash_alloc 1 18262 _000457_hash NULL
-+_000458_hash r3964_write 4 57662 _000458_hash NULL
-+_000459_hash raw_seticmpfilter 3 6888 _000459_hash NULL
-+_000460_hash raw_setsockopt 5 45800 _000460_hash NULL
-+_000461_hash rawv6_seticmpfilter 5 12137 _000461_hash NULL
-+_000462_hash ray_cs_essid_proc_write 3 17875 _000462_hash NULL
-+_000463_hash rbd_add 3 16366 _000463_hash NULL
-+_000464_hash rbd_snap_add 4 19678 _000464_hash NULL
-+_000465_hash rdma_set_ib_paths 3 45592 _000465_hash NULL
-+_000466_hash rds_page_copy_user 4 35691 _000466_hash NULL
-+_000467_hash read 3 9397 _000467_hash NULL
-+_000468_hash read_buf 2 20469 _000468_hash NULL
-+_000469_hash read_cis_cache 4 29735 _000469_hash NULL
-+_000470_hash realloc_buffer 2 25816 _000470_hash NULL
-+_000471_hash receive_DataRequest 3 9904 _000471_hash NULL
-+_000472_hash recent_mt_proc_write 3 8206 _000472_hash NULL
-+_000473_hash regmap_access_read_file 3 37223 _000473_hash NULL
-+_000474_hash regmap_bulk_write 4 59049 _000474_hash NULL
-+_000475_hash regmap_map_read_file 3 37685 _000475_hash NULL
-+_000476_hash regset_tls_set 4 18459 _000476_hash NULL
-+_000477_hash reiserfs_add_entry 4 23062 _002792_hash NULL nohasharray
-+_000478_hash remote_settings_file_write 3 22987 _000478_hash NULL
-+_000479_hash request_key_auth_new 3 38092 _000479_hash NULL
-+_000480_hash restore_i387_fxsave 2 17528 _000480_hash NULL
-+_000481_hash revalidate 2 19043 _000481_hash NULL
-+_000482_hash rfcomm_sock_setsockopt 5 18254 _000482_hash NULL
-+_000483_hash rndis_add_response 2 58544 _000483_hash NULL
-+_000484_hash rndis_set_oid 4 6547 _000484_hash NULL
-+_000485_hash rngapi_reset 3 34366 _002137_hash NULL nohasharray
-+_000486_hash roccat_common2_receive 4 50369 _000486_hash NULL
-+_000487_hash roccat_common2_send 4 2422 _000487_hash NULL
-+_000488_hash rpc_malloc 2 43573 _000488_hash NULL
-+_000489_hash rt2x00debug_write_bbp 3 8212 _000489_hash NULL
-+_000490_hash rt2x00debug_write_csr 3 64753 _000490_hash NULL
-+_000491_hash rt2x00debug_write_eeprom 3 23091 _000491_hash NULL
-+_000492_hash rt2x00debug_write_rf 3 38195 _000492_hash NULL
-+_000493_hash rt2x00debug_write_rfcsr 3 41473 _000493_hash NULL
-+_000494_hash rts51x_read_mem 4 26577 _002730_hash NULL nohasharray
-+_000495_hash rts51x_read_status 4 11830 _000495_hash NULL
-+_000496_hash rts51x_write_mem 4 17598 _000496_hash NULL
-+_000497_hash rw_copy_check_uvector 3 45748 _003716_hash NULL nohasharray
-+_000498_hash rxrpc_request_key 3 27235 _000498_hash NULL
-+_000499_hash rxrpc_server_keyring 3 16431 _000499_hash NULL
-+_000500_hash savemem 3 58129 _000500_hash NULL
-+_000501_hash sb16_copy_from_user 10-7-6 55836 _000501_hash NULL
-+_000504_hash sched_autogroup_write 3 10984 _000504_hash NULL
-+_000505_hash scsi_mode_select 6 37330 _000505_hash NULL
-+_000506_hash scsi_tgt_copy_sense 3 26933 _000506_hash NULL
-+_000507_hash sctp_auth_create_key 1 51641 _000507_hash NULL
-+_000508_hash sctp_getsockopt_delayed_ack 2 9232 _000508_hash NULL
-+_000509_hash sctp_getsockopt_local_addrs 2 25178 _000509_hash NULL
-+_000510_hash sctp_make_abort_user 3 29654 _000510_hash NULL
-+_000511_hash sctp_setsockopt_active_key 3 43755 _000511_hash NULL
-+_000512_hash sctp_setsockopt_adaptation_layer 3 26935 _003246_hash NULL nohasharray
-+_000513_hash sctp_setsockopt_associnfo 3 51684 _000513_hash NULL
-+_000514_hash sctp_setsockopt_auth_chunk 3 30843 _000514_hash NULL
-+_000515_hash sctp_setsockopt_auth_key 3 3793 _000515_hash NULL
-+_000516_hash sctp_setsockopt_autoclose 3 5775 _000516_hash NULL
-+_000517_hash sctp_setsockopt_bindx 3 49870 _000517_hash NULL
-+_000518_hash __sctp_setsockopt_connectx 3 46949 _000518_hash NULL
-+_000519_hash sctp_setsockopt_context 3 31091 _000519_hash NULL
-+_000520_hash sctp_setsockopt_default_send_param 3 49578 _000520_hash NULL
-+_000521_hash sctp_setsockopt_delayed_ack 3 40129 _000521_hash NULL
-+_000522_hash sctp_setsockopt_del_key 3 42304 _002709_hash NULL nohasharray
-+_000523_hash sctp_setsockopt_events 3 18862 _000523_hash NULL
-+_000524_hash sctp_setsockopt_hmac_ident 3 11687 _000524_hash NULL
-+_000525_hash sctp_setsockopt_initmsg 3 1383 _000525_hash NULL
-+_000526_hash sctp_setsockopt_maxburst 3 28041 _000526_hash NULL
-+_000527_hash sctp_setsockopt_maxseg 3 11829 _000527_hash NULL
-+_000528_hash sctp_setsockopt_peer_addr_params 3 734 _000528_hash NULL
-+_000529_hash sctp_setsockopt_peer_primary_addr 3 13440 _000529_hash NULL
-+_000530_hash sctp_setsockopt_rtoinfo 3 30941 _000530_hash NULL
-+_000531_hash security_context_to_sid_core 2 29248 _000531_hash NULL
-+_000532_hash sel_commit_bools_write 3 46077 _000532_hash NULL
-+_000533_hash sel_write_avc_cache_threshold 3 2256 _000533_hash NULL
-+_000534_hash sel_write_bool 3 46996 _000534_hash NULL
-+_000535_hash sel_write_checkreqprot 3 60774 _000535_hash NULL
-+_000536_hash sel_write_disable 3 10511 _000536_hash NULL
-+_000537_hash sel_write_enforce 3 48998 _000537_hash NULL
-+_000538_hash sel_write_load 3 63830 _000538_hash NULL
-+_000539_hash send_bulk_static_data 3 61932 _000539_hash NULL
-+_000540_hash set_aoe_iflist 2 42737 _000540_hash NULL
-+_000541_hash setkey_unaligned 3 39474 _000541_hash NULL
-+_000542_hash set_registers 3 53582 _000542_hash NULL
-+_000543_hash setsockopt 5 54539 _000543_hash NULL
-+_000544_hash setup_req 3 5848 _000544_hash NULL
-+_000545_hash setxattr 4 37006 _000545_hash NULL
-+_000546_hash sfq_alloc 1 2861 _000546_hash NULL
-+_000547_hash sg_kmalloc 1 50240 _000547_hash NULL
-+_000548_hash sgl_map_user_pages 2 30610 _000548_hash NULL
-+_000549_hash shash_setkey_unaligned 3 8620 _000549_hash NULL
-+_000550_hash shmem_xattr_alloc 2 61190 _000550_hash NULL
-+_000551_hash sierra_setup_urb 5 46029 _000551_hash NULL
-+_000552_hash simple_transaction_get 3 50633 _000552_hash NULL
-+_000553_hash simple_write_to_buffer 2-5 3122 _000553_hash NULL
-+_000555_hash sisusb_send_bulk_msg 3 17864 _000555_hash NULL
-+_000556_hash skb_add_data 3 48363 _000556_hash NULL
-+_000557_hash skb_do_copy_data_nocache 5 12465 _000557_hash NULL
-+_000558_hash sl_alloc_bufs 2 50380 _000558_hash NULL
-+_000559_hash sl_realloc_bufs 2 64086 _000559_hash NULL
-+_000560_hash smk_set_cipso 3 20379 _000560_hash NULL
-+_000561_hash smk_write_ambient 3 45691 _000561_hash NULL
-+_000562_hash smk_write_direct 3 46363 _000562_hash NULL
-+_000563_hash smk_write_doi 3 49621 _000563_hash NULL
-+_000564_hash smk_write_logging 3 2618 _000564_hash NULL
-+_000565_hash smk_write_mapped 3 13519 _000565_hash NULL
-+_000566_hash smk_write_netlbladdr 3 42525 _000566_hash NULL
-+_000567_hash smk_write_onlycap 3 14400 _000567_hash NULL
-+_000568_hash smk_write_rules_list 3 18565 _000568_hash NULL
-+_000569_hash snd_ctl_elem_user_tlv 3 11695 _000569_hash NULL
-+_000570_hash snd_emu10k1_fx8010_read 5 9605 _000570_hash NULL
-+_000571_hash snd_emu10k1_synth_copy_from_user 3-5 9061 _000571_hash NULL
-+_000573_hash snd_gus_dram_poke 4 18525 _000573_hash NULL
-+_000574_hash snd_hdsp_playback_copy 5 20676 _000574_hash NULL
-+_000575_hash snd_info_entry_write 3 63474 _000575_hash NULL
-+_000576_hash snd_korg1212_copy_from 6 36169 _000576_hash NULL
-+_000577_hash snd_mem_proc_write 3 9786 _000577_hash NULL
-+_000578_hash snd_midi_channel_init_set 1 30092 _000578_hash NULL
-+_000579_hash snd_midi_event_new 1 9893 _000764_hash NULL nohasharray
-+_000580_hash snd_opl4_mem_proc_write 5 9670 _000580_hash NULL
-+_000581_hash snd_pcm_aio_read 3 13900 _000581_hash NULL
-+_000582_hash snd_pcm_aio_write 3 28738 _000582_hash NULL
-+_000583_hash snd_pcm_oss_write1 3 10872 _000583_hash NULL
-+_000584_hash snd_pcm_oss_write2 3 27332 _000584_hash NULL
-+_000585_hash snd_rawmidi_kernel_write1 4 56847 _000585_hash NULL
-+_000586_hash snd_rme9652_playback_copy 5 20970 _000586_hash NULL
-+_000587_hash snd_sb_csp_load_user 3 45190 _000587_hash NULL
-+_000588_hash snd_usb_ctl_msg 8 8436 _000588_hash NULL
-+_000589_hash sock_bindtodevice 3 50942 _000589_hash NULL
-+_000590_hash sock_kmalloc 2 62205 _000590_hash NULL
-+_000591_hash spidev_ioctl 2 12846 _000591_hash NULL
-+_000592_hash spidev_write 3 44510 _000592_hash NULL
-+_000593_hash squashfs_read_table 3 16945 _000593_hash NULL
-+_000594_hash srpt_alloc_ioctx 2-3 51042 _000594_hash NULL
-+_000596_hash srpt_alloc_ioctx_ring 2-4-3 49330 _000596_hash NULL
-+_000597_hash st5481_setup_isocpipes 6-4 61340 _000597_hash NULL
-+_000598_hash sta_agg_status_write 3 45164 _000598_hash NULL
-+_000599_hash svc_setsockopt 5 36876 _000599_hash NULL
-+_000600_hash sys_add_key 4 61288 _000600_hash NULL
-+_000601_hash sys_modify_ldt 3 18824 _000601_hash NULL
-+_000602_hash sys_semtimedop 3 4486 _000602_hash NULL
-+_000603_hash sys_setdomainname 2 4373 _000603_hash NULL
-+_000604_hash sys_sethostname 2 42962 _000604_hash NULL
-+_000605_hash tomoyo_write_self 3 45161 _000605_hash NULL
-+_000606_hash tower_write 3 8580 _000606_hash NULL
-+_000607_hash tpm_write 3 50798 _000607_hash NULL
-+_000608_hash trusted_instantiate 3 4710 _000608_hash NULL
-+_000609_hash trusted_update 3 12664 _000609_hash NULL
-+_000610_hash tty_buffer_alloc 2 45437 _000610_hash NULL
-+_000611_hash __tun_chr_ioctl 4 22300 _000611_hash NULL
-+_000612_hash ubi_more_leb_change_data 4 63534 _000612_hash NULL
-+_000613_hash ubi_more_update_data 4 39189 _000613_hash NULL
-+_000614_hash ubi_resize_volume 2 50172 _000614_hash NULL
-+_000615_hash udf_alloc_i_data 2 35786 _000615_hash NULL
-+_000616_hash uea_idma_write 3 64139 _000616_hash NULL
-+_000617_hash uea_request 4 47613 _000617_hash NULL
-+_000618_hash uea_send_modem_cmd 3 3888 _000618_hash NULL
-+_000619_hash uio_write 3 43202 _000619_hash NULL
-+_000620_hash um_idi_write 3 18293 _000620_hash NULL
-+_000621_hash us122l_ctl_msg 8 13330 _000621_hash NULL
-+_000622_hash usb_alloc_urb 1 43436 _000622_hash NULL
-+_000623_hash usblp_new_writeurb 2 22894 _000623_hash NULL
-+_000624_hash usblp_write 3 23178 _000624_hash NULL
-+_000625_hash usbtest_alloc_urb 3-5 34446 _000625_hash NULL
-+_000627_hash usbtmc_write 3 64340 _000627_hash NULL
-+_000628_hash user_instantiate 3 26131 _000628_hash NULL
-+_000629_hash user_update 3 41332 _000629_hash NULL
-+_000630_hash uwb_rc_cmd_done 4 35892 _000630_hash NULL
-+_000631_hash uwb_rc_neh_grok_event 3 55799 _000631_hash NULL
-+_000632_hash v9fs_alloc_rdir_buf 2 42150 _000632_hash NULL
-+_000633_hash vc_do_resize 3-4 48842 _000633_hash NULL
-+_000635_hash vcs_write 3 3910 _000635_hash NULL
-+_000636_hash vga_arb_write 3 36112 _000636_hash NULL
-+_000637_hash vga_switcheroo_debugfs_write 3 33984 _000637_hash NULL
-+_000638_hash vhci_get_user 3 45039 _000638_hash NULL
-+_000639_hash video_proc_write 3 6724 _000639_hash NULL
-+_000640_hash vlsi_alloc_ring 3-4 57003 _000640_hash NULL
-+_000642_hash __vmalloc 1 61168 _000642_hash NULL
-+_000643_hash vmalloc_32 1 1135 _000643_hash NULL
-+_000644_hash vmalloc_32_user 1 37519 _000644_hash NULL
-+_000645_hash vmalloc_exec 1 36132 _000645_hash NULL
-+_000646_hash vmalloc_node 1 58700 _000646_hash NULL
-+_000647_hash __vmalloc_node_flags 1 30352 _000647_hash NULL
-+_000648_hash vmalloc_user 1 32308 _000648_hash NULL
-+_000649_hash vol_cdev_direct_write 3 20751 _000649_hash NULL
-+_000650_hash vp_request_msix_vectors 2 28849 _000650_hash NULL
-+_000651_hash vring_add_indirect 3-4 20737 _000651_hash NULL
-+_000653_hash vring_new_virtqueue 1 9671 _000653_hash NULL
-+_000654_hash vxge_os_dma_malloc 2 46184 _000654_hash NULL
-+_000655_hash vxge_os_dma_malloc_async 3 56348 _000655_hash NULL
-+_000656_hash wdm_write 3 53735 _000656_hash NULL
-+_000657_hash wiimote_hid_send 3 48528 _000657_hash NULL
-+_000658_hash wlc_phy_loadsampletable_nphy 3 64367 _000658_hash NULL
-+_000659_hash write 3 62671 _000659_hash NULL
-+_000660_hash write_flush 3 50803 _000660_hash NULL
-+_000661_hash write_rio 3 54837 _000661_hash NULL
-+_000662_hash x25_asy_change_mtu 2 26928 _000662_hash NULL
-+_000663_hash xdi_copy_from_user 4 8395 _000663_hash NULL
-+_000664_hash xfrm_dst_alloc_copy 3 3034 _000664_hash NULL
-+_000665_hash xfrm_user_policy 4 62573 _000665_hash NULL
-+_000666_hash xfs_attrmulti_attr_set 4 59346 _000666_hash NULL
-+_000667_hash xfs_handle_to_dentry 3 12135 _000667_hash NULL
-+_000668_hash xip_file_read 3 58592 _000668_hash NULL
-+_000669_hash __xip_file_write 3-4 2733 _000669_hash NULL
-+_000671_hash xprt_rdma_allocate 2 31372 _000671_hash NULL
-+_000672_hash zd_usb_iowrite16v_async 3 23984 _000672_hash NULL
-+_000673_hash zd_usb_read_fw 4 22049 _000673_hash NULL
-+_000674_hash zerocopy_sg_from_iovec 3 11828 _000674_hash NULL
-+_000675_hash __a2mp_build 3 60987 _000675_hash NULL
-+_000677_hash acpi_ex_allocate_name_string 2-1 7685 _001169_hash NULL nohasharray
-+_000678_hash acpi_os_allocate_zeroed 1 37422 _000678_hash NULL
-+_000679_hash acpi_ut_initialize_buffer 2 47143 _002830_hash NULL nohasharray
-+_000680_hash ad7879_spi_xfer 3 36311 _000680_hash NULL
-+_000681_hash add_new_gdb 3 27643 _000681_hash NULL
-+_000682_hash add_numbered_child 5 14273 _000682_hash NULL
-+_000683_hash add_res_range 4 21310 _000683_hash NULL
-+_000684_hash addtgt 3 54703 _000684_hash NULL
-+_000685_hash add_uuid 4 49831 _000685_hash NULL
-+_000686_hash afs_cell_alloc 2 24052 _000686_hash NULL
-+_000687_hash aggr_recv_addba_req_evt 4 38037 _000687_hash NULL
-+_000688_hash agp_create_memory 1 1075 _000688_hash NULL
-+_000689_hash agp_create_user_memory 1 62955 _000689_hash NULL
-+_000690_hash alg_setsockopt 5 20985 _000690_hash NULL
-+_000691_hash alloc_async 1 14208 _000691_hash NULL
-+_000692_hash ___alloc_bootmem_nopanic 1 53626 _000692_hash NULL
-+_000693_hash alloc_buf 1 34532 _000693_hash NULL
-+_000694_hash alloc_chunk 1 49575 _000694_hash NULL
-+_000695_hash alloc_context 1 41283 _000695_hash NULL
-+_000696_hash alloc_ctrl_packet 1 44667 _000696_hash NULL
-+_000697_hash alloc_data_packet 1 46698 _000697_hash NULL
-+_000698_hash alloc_dca_provider 2 59670 _000698_hash NULL
-+_000699_hash __alloc_dev_table 2 54343 _000699_hash NULL
-+_000700_hash alloc_ep 1 17269 _000700_hash NULL
-+_000701_hash __alloc_extent_buffer 3 15093 _000701_hash NULL
-+_000702_hash alloc_group_attrs 2 9194 _000727_hash NULL nohasharray
-+_000703_hash alloc_large_system_hash 2 22391 _000703_hash NULL
-+_000704_hash alloc_netdev_mqs 1 30030 _000704_hash NULL
-+_000705_hash __alloc_objio_seg 1 7203 _000705_hash NULL
-+_000706_hash alloc_ring 2-4 15345 _000706_hash NULL
-+_000707_hash alloc_ring 2-4 39151 _000707_hash NULL
-+_000710_hash alloc_session 1-2 64171 _000710_hash NULL
-+_000714_hash alloc_skb 1 55439 _000714_hash NULL
-+_000715_hash alloc_skb_fclone 1 3467 _000715_hash NULL
-+_000716_hash alloc_smp_req 1 51337 _000716_hash NULL
-+_000717_hash alloc_smp_resp 1 3566 _000717_hash NULL
-+_000718_hash alloc_ts_config 1 45775 _000718_hash NULL
-+_000719_hash alloc_upcall 2 62186 _000719_hash NULL
-+_000720_hash altera_drscan 2 48698 _000720_hash NULL
-+_000721_hash altera_irscan 2 62396 _000721_hash NULL
-+_000722_hash altera_set_dr_post 2 54291 _000722_hash NULL
-+_000723_hash altera_set_dr_pre 2 64862 _000723_hash NULL
-+_000724_hash altera_set_ir_post 2 20948 _000724_hash NULL
-+_000725_hash altera_set_ir_pre 2 54103 _000725_hash NULL
-+_000726_hash altera_swap_dr 2 50090 _000726_hash NULL
-+_000727_hash altera_swap_ir 2 9194 _000727_hash &_000702_hash
-+_000728_hash amd_create_gatt_pages 1 20537 _000728_hash NULL
-+_000729_hash aoechr_write 3 62883 _003674_hash NULL nohasharray
-+_000730_hash applesmc_create_nodes 2 49392 _000730_hash NULL
-+_000731_hash array_zalloc 1-2 7519 _000731_hash NULL
-+_000733_hash arvo_sysfs_read 6 31617 _000733_hash NULL
-+_000734_hash arvo_sysfs_write 6 3311 _000734_hash NULL
-+_000735_hash asd_store_update_bios 4 10165 _000735_hash NULL
-+_000736_hash ata_host_alloc 2 46094 _000736_hash NULL
-+_000737_hash atalk_sendmsg 4 21677 _000737_hash NULL
-+_000738_hash ath6kl_cfg80211_connect_event 7-9-8 13443 _000738_hash NULL
-+_000739_hash ath6kl_mgmt_tx 9 21153 _000739_hash NULL
-+_000740_hash ath6kl_wmi_proc_events_vif 5 42549 _003190_hash NULL nohasharray
-+_000741_hash ath6kl_wmi_roam_tbl_event_rx 3 43440 _000741_hash NULL
-+_000742_hash ath6kl_wmi_send_mgmt_cmd 7 17347 _000742_hash NULL
-+_000743_hash ath_descdma_setup 5 12257 _000743_hash NULL
-+_000744_hash ath_rx_edma_init 2 65483 _000744_hash NULL
-+_000745_hash ati_create_gatt_pages 1 4722 _003275_hash NULL nohasharray
-+_000746_hash audit_expand 2 2098 _000746_hash NULL
-+_000747_hash audit_init_entry 1 38644 _000747_hash NULL
-+_000748_hash ax25_sendmsg 4 62770 _000748_hash NULL
-+_000749_hash b1_alloc_card 1 36155 _000749_hash NULL
-+_000750_hash b43_nphy_load_samples 3 36481 _000750_hash NULL
-+_000751_hash batadv_orig_hash_add_if 2 10033 _000751_hash NULL
-+_000752_hash batadv_orig_hash_del_if 2 48972 _000752_hash NULL
-+_000753_hash batadv_tt_append_diff 4 20588 _000753_hash NULL
-+_000754_hash batadv_tt_commit_changes 4 2008 _000754_hash NULL
-+_000755_hash batadv_tt_prepare_packet_buff 4 1280 _000755_hash NULL
-+_000756_hash bio_copy_user_iov 4 37660 _000756_hash NULL
-+_000757_hash __bio_map_kern 3 47379 _000757_hash NULL
-+_000758_hash bitmap_resize 2 33054 _000758_hash NULL
-+_000759_hash blk_check_plugged 3 50736 _000759_hash NULL
-+_000760_hash blk_register_region 1-2 51424 _000760_hash NULL
-+_000762_hash bm_entry_write 3 28338 _000762_hash NULL
-+_000763_hash bm_realloc_pages 2 9431 _000763_hash NULL
-+_000764_hash bm_register_write 3 9893 _000764_hash &_000579_hash
-+_000765_hash bm_status_write 3 12964 _000765_hash NULL
-+_000766_hash br_mdb_rehash 2 42643 _000766_hash NULL
-+_000767_hash btmrvl_sdio_host_to_card 3 12152 _000767_hash NULL
-+_000768_hash btrfs_copy_from_user 1-3 43806 _000768_hash NULL
-+_000770_hash btrfs_insert_delayed_dir_index 4 63720 _000770_hash NULL
-+_000771_hash __btrfs_map_block 3 49839 _000771_hash NULL
-+_000772_hash c4iw_init_resource 2-3 30393 _000772_hash NULL
-+_000774_hash cache_downcall 3 13666 _000774_hash NULL
-+_000775_hash cache_slow_downcall 2 8570 _000775_hash NULL
-+_000776_hash caif_seqpkt_sendmsg 4 22961 _000776_hash NULL
-+_000777_hash caif_stream_sendmsg 4 9110 _000777_hash NULL
-+_000778_hash carl9170_cmd_buf 3 950 _000778_hash NULL
-+_000779_hash cdev_add 2-3 38176 _000779_hash NULL
-+_000781_hash cdrom_read_cdda 4 50478 _000781_hash NULL
-+_000782_hash ceph_dns_resolve_name 2 62488 _000782_hash NULL
-+_000783_hash ceph_msgpool_get 2 54258 _000783_hash NULL
-+_000784_hash cfg80211_connect_result 4-6 56515 _000784_hash NULL
-+_000786_hash cfg80211_disconnected 4 57 _000786_hash NULL
-+_000787_hash cfg80211_inform_bss 8 19332 _000787_hash NULL
-+_000788_hash cfg80211_inform_bss_frame 4 41078 _000788_hash NULL
-+_000789_hash cfg80211_mlme_register_mgmt 5 19852 _000789_hash NULL
-+_000790_hash cfg80211_roamed_bss 4-6 50198 _000790_hash NULL
-+_000792_hash cgroup_file_write 3 52417 _000792_hash NULL
-+_000793_hash cifs_readdata_alloc 1 26360 _000793_hash NULL
-+_000794_hash cifs_readv_from_socket 3 19109 _000794_hash NULL
-+_000795_hash cifs_writedata_alloc 1 32880 _003097_hash NULL nohasharray
-+_000796_hash cnic_alloc_dma 3 34641 _000796_hash NULL
-+_000797_hash cnic_init_id_tbl 2 41354 _000797_hash NULL
-+_000798_hash configfs_write_file 3 61621 _000798_hash NULL
-+_000799_hash construct_key 3 11329 _000799_hash NULL
-+_000800_hash context_alloc 3 24645 _000800_hash NULL
-+_000801_hash copy_to_user 3 57835 _000801_hash NULL
-+_000802_hash cp210x_get_config 4 56229 _000802_hash NULL
-+_000803_hash create_attr_set 1 22861 _000803_hash NULL
-+_000804_hash create_bounce_buffer 3 39155 _000804_hash NULL
-+_000805_hash create_gpadl_header 2 19064 _000805_hash NULL
-+_000806_hash _create_sg_bios 4 31244 _000806_hash NULL
-+_000807_hash cryptd_alloc_instance 2-3 18048 _000807_hash NULL
-+_000809_hash crypto_ahash_setkey 3 55134 _000809_hash NULL
-+_000810_hash crypto_alloc_instance2 3 25277 _000810_hash NULL
-+_000811_hash crypto_shash_setkey 3 60483 _000811_hash NULL
-+_000812_hash cxgb_alloc_mem 1 24007 _000812_hash NULL
-+_000813_hash cxgbi_device_portmap_create 3 25747 _000813_hash NULL
-+_000814_hash cxgbi_device_register 1-2 36746 _000814_hash NULL
-+_000816_hash __cxio_init_resource_fifo 3 23447 _000816_hash NULL
-+_000817_hash dccp_sendmsg 4 56058 _000817_hash NULL
-+_000818_hash ddp_make_gl 1 12179 _000818_hash NULL
-+_000819_hash depth_write 3 3021 _000819_hash NULL
-+_000820_hash dev_irnet_write 3 11398 _000820_hash NULL
-+_000821_hash dev_set_alias 3 50084 _000821_hash NULL
-+_000822_hash dev_write 3 7708 _000822_hash NULL
-+_000823_hash dfs_global_file_write 3 6112 _000823_hash NULL
-+_000824_hash dgram_sendmsg 4 45679 _000824_hash NULL
-+_000825_hash disconnect 4 32521 _000825_hash NULL
-+_000826_hash dma_attach 6-7 50831 _000826_hash NULL
-+_000828_hash dma_declare_coherent_memory 4-2 14244 _000828_hash NULL
-+_000829_hash dn_sendmsg 4 38390 _000829_hash NULL
-+_000830_hash dn_setsockopt 5 314 _000830_hash NULL
-+_000831_hash do_arpt_set_ctl 4 51053 _000831_hash NULL
-+_000832_hash do_dccp_setsockopt 5 54377 _003195_hash NULL nohasharray
-+_000833_hash do_ip6t_set_ctl 4 60040 _000833_hash NULL
-+_000834_hash do_ipt_set_ctl 4 56238 _000834_hash NULL
-+_000835_hash do_jffs2_setxattr 5 25910 _000835_hash NULL
-+_000836_hash do_msgsnd 4 1387 _000836_hash NULL
-+_000837_hash do_pselect 1 62061 _000837_hash NULL
-+_000838_hash do_raw_setsockopt 5 55215 _000838_hash NULL
-+_000839_hash do_readv_writev 4 51849 _000839_hash NULL
-+_000840_hash do_sync 1 9604 _000840_hash NULL
-+_000841_hash dup_array 3 33551 _000841_hash NULL
-+_000842_hash ecryptfs_decode_and_decrypt_filename 5 10379 _000842_hash NULL
-+_000843_hash ecryptfs_encrypt_and_encode_filename 6 2109 _000843_hash NULL
-+_000844_hash ecryptfs_send_message_locked 2 31801 _000844_hash NULL
-+_000845_hash edac_device_alloc_ctl_info 1 5941 _000845_hash NULL
-+_000846_hash edac_mc_alloc 4 3611 _000846_hash NULL
-+_000847_hash edac_pci_alloc_ctl_info 1 63388 _000847_hash NULL
-+_000848_hash efivar_create_sysfs_entry 2 19485 _000848_hash NULL
-+_000849_hash enable_write 3 30456 _000849_hash NULL
-+_000850_hash enclosure_register 3 57412 _000850_hash NULL
-+_000851_hash enlarge_skb 2 44248 _002839_hash NULL nohasharray
-+_000852_hash evdev_ioctl_handler 2 21705 _000852_hash NULL
-+_000853_hash ext4_kvzalloc 1 47605 _000853_hash NULL
-+_000854_hash extend_netdev_table 2 21453 _000854_hash NULL
-+_000855_hash fcoe_ctlr_device_add 3 1793 _000855_hash NULL
-+_000856_hash fd_do_readv 3 51297 _000856_hash NULL
-+_000857_hash fd_do_writev 3 29329 _000857_hash NULL
-+_000858_hash __feat_register_sp 6 64712 _000858_hash NULL
-+_000859_hash __ffs_ep0_read_events 3 48868 _000859_hash NULL
-+_000860_hash ffs_ep0_write 3 9438 _000860_hash NULL
-+_000861_hash ffs_epfile_read 3 18775 _000861_hash NULL
-+_000862_hash ffs_epfile_write 3 48014 _000862_hash NULL
-+_000863_hash fib_info_hash_alloc 1 9075 _000863_hash NULL
-+_000864_hash fillonedir 3 41746 _000864_hash NULL
-+_000865_hash fs_devrw_entry 3 11924 _000865_hash NULL
-+_000866_hash fs_path_prepare_for_add 2 61854 _000866_hash NULL
-+_000867_hash fuse_fill_write_pages 4 53682 _000867_hash NULL
-+_000868_hash fw_device_op_ioctl 2 11595 _000868_hash NULL
-+_000869_hash fw_iso_buffer_init 3 54582 _000869_hash NULL
-+_000870_hash fw_node_create 2 9559 _000870_hash NULL
-+_000871_hash garmin_read_process 3 27509 _000871_hash NULL
-+_000872_hash garp_request_join 4 7471 _000872_hash NULL
-+_000873_hash generic_perform_write 3 54832 _000873_hash NULL
-+_000874_hash gen_pool_add_virt 4 39913 _000874_hash NULL
-+_000875_hash get_derived_key 4 61100 _000875_hash NULL
-+_000876_hash get_new_cssid 2 51665 _000876_hash NULL
-+_000877_hash getxattr 4 24398 _003758_hash NULL nohasharray
-+_000878_hash gsm_control_reply 4 53333 _000878_hash NULL
-+_000879_hash hcd_alloc_coherent 5 55862 _000879_hash NULL
-+_000880_hash hci_sock_sendmsg 4 37420 _000880_hash NULL
-+_000881_hash hidraw_ioctl 2 63658 _000881_hash NULL
-+_000882_hash hidraw_write 3 31536 _000882_hash NULL
-+_000883_hash hid_register_field 2-3 4874 _000883_hash NULL
-+_000885_hash hid_report_raw_event 4 2762 _000885_hash NULL
-+_000886_hash hpi_alloc_control_cache 1 35351 _000886_hash NULL
-+_000887_hash hugetlbfs_read_actor 2-5-4 34547 _000887_hash NULL
-+_000890_hash hvc_alloc 4 12579 _000890_hash NULL
-+_000891_hash __hwahc_dev_set_key 5 46328 _000891_hash NULL
-+_000892_hash i2400m_zrealloc_2x 3 54166 _001549_hash NULL nohasharray
-+_000893_hash ib_alloc_device 1 26483 _000893_hash NULL
-+_000894_hash ib_create_send_mad 5 1196 _000894_hash NULL
-+_000895_hash ibmasm_new_command 2 25714 _000895_hash NULL
-+_000896_hash ib_send_cm_drep 3 50186 _000896_hash NULL
-+_000897_hash ib_send_cm_mra 4 60202 _003063_hash NULL nohasharray
-+_000898_hash ib_send_cm_rtu 3 63138 _000898_hash NULL
-+_000899_hash ide_core_cp_entry 3 22636 _000899_hash NULL
-+_000900_hash ieee80211_if_write_smps 3 35550 _000900_hash NULL
-+_000901_hash ieee80211_if_write_tkip_mic_test 3 58748 _000901_hash NULL
-+_000902_hash ieee80211_if_write_tsf 3 36077 _000902_hash NULL
-+_000903_hash ieee80211_if_write_uapsd_max_sp_len 3 14233 _000903_hash NULL
-+_000904_hash ieee80211_if_write_uapsd_queues 3 51526 _000904_hash NULL
-+_000905_hash ieee80211_key_alloc 3 19065 _000905_hash NULL
-+_000906_hash ieee80211_send_probe_req 6-4 6924 _000906_hash NULL
-+_000907_hash ieee80211_skb_resize 3 50211 _000907_hash NULL
-+_000908_hash if_spi_host_to_card 4 62890 _000908_hash NULL
-+_000909_hash if_writecmd 2 815 _000909_hash NULL
-+_000910_hash init_bch 1-2 64130 _000910_hash NULL
-+_000912_hash init_ipath 1 48187 _000912_hash NULL
-+_000913_hash init_list_set 2-3 39188 _000913_hash NULL
-+_000915_hash init_q 4 132 _000915_hash NULL
-+_000916_hash init_state 2 60165 _000916_hash NULL
-+_000917_hash init_tag_map 3 57515 _000917_hash NULL
-+_000918_hash input_ff_create 2 21240 _000918_hash NULL
-+_000919_hash input_mt_init_slots 2 31183 _000919_hash NULL
-+_000920_hash interfaces 2 38859 _000920_hash NULL
-+_000921_hash int_hardware_entry 3 36833 _000921_hash NULL
-+_000922_hash int_hw_irq_en 3 46776 _000922_hash NULL
-+_000923_hash int_tasklet_entry 3 52500 _000923_hash NULL
-+_000924_hash ioat2_alloc_ring 2 11172 _000924_hash NULL
-+_000925_hash ip_generic_getfrag 3-4 12187 _000925_hash NULL
-+_000927_hash ip_options_get_alloc 1 7448 _000927_hash NULL
-+_000928_hash ipr_alloc_ucode_buffer 1 40199 _000928_hash NULL
-+_000929_hash ip_set_alloc 1 57953 _000929_hash NULL
-+_000930_hash ip_setsockopt 5 33487 _000930_hash NULL
-+_000931_hash ipv6_flowlabel_opt 3 58135 _001179_hash NULL nohasharray
-+_000932_hash ipv6_renew_options 5 28867 _000932_hash NULL
-+_000933_hash ipv6_setsockopt 5 29871 _000933_hash NULL
-+_000934_hash ipxrtr_route_packet 4 54036 _000934_hash NULL
-+_000935_hash irda_sendmsg 4 4388 _000935_hash NULL
-+_000936_hash irda_sendmsg_dgram 4 38563 _000936_hash NULL
-+_000937_hash irda_sendmsg_ultra 4 42047 _000937_hash NULL
-+_000938_hash irias_add_octseq_attrib 4 29983 _000938_hash NULL
-+_000939_hash irq_alloc_generic_chip 2 26650 _000939_hash NULL
-+_000940_hash iscsi_alloc_session 3 49390 _000940_hash NULL
-+_000941_hash iscsi_create_conn 2 50425 _000941_hash NULL
-+_000942_hash iscsi_create_endpoint 1 15193 _000942_hash NULL
-+_000943_hash iscsi_create_iface 5 38510 _000943_hash NULL
-+_000944_hash iscsi_decode_text_input 4 58292 _000944_hash NULL
-+_000945_hash iscsi_pool_init 2-4 54913 _000945_hash NULL
-+_000947_hash iscsit_dump_data_payload 2 38683 _000947_hash NULL
-+_000948_hash isdn_write 3 45863 _000948_hash NULL
-+_000949_hash isku_receive 4 54130 _000949_hash NULL
-+_000950_hash islpci_mgt_transaction 5 23610 _000950_hash NULL
-+_000951_hash iso_alloc_urb 4-5 45206 _000951_hash NULL
-+_000952_hash iso_sched_alloc 1 13377 _003325_hash NULL nohasharray
-+_000953_hash iwl_trans_txq_alloc 3 36147 _000953_hash NULL
-+_000954_hash ixgbe_alloc_q_vector 4-6 24439 _000954_hash NULL
-+_000956_hash jbd2_journal_init_revoke 2 51088 _000956_hash NULL
-+_000957_hash jffs2_write_dirent 5 37311 _000957_hash NULL
-+_000958_hash journal_init_revoke 2 56933 _000958_hash NULL
-+_000959_hash keyctl_instantiate_key 3 41855 _000959_hash NULL
-+_000960_hash keyctl_instantiate_key_iov 3 16969 _000960_hash NULL
-+_000961_hash __kfifo_from_user 3 20399 _000961_hash NULL
-+_000962_hash kimage_crash_alloc 3 3233 _000962_hash NULL
-+_000963_hash kimage_normal_alloc 3 31140 _000963_hash NULL
-+_000964_hash kmem_realloc 2 37489 _000964_hash NULL
-+_000965_hash kmem_zalloc 1 11510 _000965_hash NULL
-+_000966_hash koneplus_sysfs_read 6 42792 _000966_hash NULL
-+_000967_hash kvm_kvzalloc 1 52894 _000967_hash NULL
-+_000968_hash kvm_read_guest_page_mmu 6 37611 _000968_hash NULL
-+_000969_hash kvm_set_irq_routing 3 48704 _000969_hash NULL
-+_000970_hash kvm_write_guest_cached 4 11106 _000970_hash NULL
-+_000971_hash kvm_write_guest_page 5 63555 _002812_hash NULL nohasharray
-+_000972_hash kzalloc_node 1 24352 _000972_hash NULL
-+_000973_hash l2cap_skbuff_fromiovec 3-4 35003 _000973_hash NULL
-+_000975_hash l2tp_ip_sendmsg 4 50411 _000975_hash NULL
-+_000976_hash l2tp_session_create 1 25286 _000976_hash NULL
-+_000977_hash lc_create 3 48662 _000977_hash NULL
-+_000978_hash leaf_dealloc 3 29566 _000978_hash NULL
-+_000979_hash linear_conf 2 23485 _003837_hash NULL nohasharray
-+_000980_hash llc_ui_sendmsg 4 24987 _000980_hash NULL
-+_000981_hash load_module 2 60056 _003010_hash NULL nohasharray
-+_000982_hash lpfc_sli4_queue_alloc 3 62646 _000982_hash NULL
-+_000983_hash mdiobus_alloc_size 1 52259 _000983_hash NULL
-+_000984_hash mempool_create_node 1 3191 _000984_hash NULL
-+_000985_hash mem_read 3 57631 _000985_hash NULL
-+_000986_hash memstick_alloc_host 1 142 _000986_hash NULL
-+_000987_hash mem_swapout_entry 3 32586 _000987_hash NULL
-+_000988_hash mem_write 3 22232 _000988_hash NULL
-+_000989_hash mesh_table_alloc 1 22305 _000989_hash NULL
-+_000990_hash mfd_add_devices 4 16668 _000990_hash NULL
-+_000991_hash mISDN_sock_sendmsg 4 41035 _000991_hash NULL
-+_000992_hash mlx4_init_icm_table 4-5 2151 _000992_hash NULL
-+_000994_hash mmc_alloc_host 1 48097 _000994_hash NULL
-+_000995_hash mmc_test_alloc_mem 2-3 28102 _000995_hash NULL
-+_000997_hash mon_bin_ioctl 3 2771 _000997_hash NULL
-+_000998_hash mpi_alloc 1 18094 _000998_hash NULL
-+_000999_hash mpihelp_mul_karatsuba_case 5-3 23918 _003061_hash NULL nohasharray
-+_001000_hash __mptctl_ioctl 2 15875 _001000_hash NULL
-+_001001_hash mtd_concat_create 2 14416 _001001_hash NULL
-+_001002_hash mthca_alloc_cq_buf 3 46512 _001002_hash NULL
-+_001003_hash mvumi_alloc_mem_resource 3 47750 _001003_hash NULL
-+_001004_hash mwifiex_11n_create_rx_reorder_tbl 4 63806 _001004_hash NULL
-+_001005_hash mwifiex_alloc_sdio_mpa_buffers 2-3 60961 _001005_hash NULL
-+_001007_hash mwl8k_cmd_set_beacon 4 23110 _001007_hash NULL
-+_001008_hash neigh_hash_alloc 1 17595 _001008_hash NULL
-+_001009_hash __netdev_alloc_skb 2 18595 _001009_hash NULL
-+_001010_hash __netlink_change_ngroups 2 46156 _001010_hash NULL
-+_001011_hash netlink_sendmsg 4 33708 _001236_hash NULL nohasharray
-+_001012_hash netxen_alloc_sds_rings 2 13417 _001012_hash NULL
-+_001013_hash new_bind_ctl 2 35324 _001013_hash NULL
-+_001014_hash new_dir 3 31919 _001014_hash NULL
-+_001015_hash new_tape_buffer 2 32866 _001015_hash NULL
-+_001016_hash nfc_llcp_build_tlv 3 19536 _001016_hash NULL
-+_001017_hash nfc_llcp_send_i_frame 3 59130 _001017_hash NULL
-+_001018_hash nf_ct_ext_create 3 51232 _001018_hash NULL
-+_001019_hash nfs4_alloc_pages 1 48426 _001019_hash NULL
-+_001020_hash nfs4_alloc_slots 1 2454 _003345_hash NULL nohasharray
-+_001021_hash nfsctl_transaction_write 3 64800 _001021_hash NULL
-+_001022_hash nfs_fscache_get_super_cookie 3 44355 _001850_hash NULL nohasharray
-+_001023_hash nfs_idmap_request_key 3 30208 _001023_hash NULL
-+_001024_hash nfs_pgarray_set 2 1085 _001024_hash NULL
-+_001025_hash nl_pid_hash_zalloc 1 23314 _001025_hash NULL
-+_001026_hash nr_sendmsg 4 53656 _001026_hash NULL
-+_001027_hash nsm_create_handle 4 38060 _001027_hash NULL
-+_001028_hash ntfs_copy_from_user_iovec 3-6 49829 _001028_hash NULL
-+_001030_hash ntfs_file_buffered_write 4-6 41442 _001030_hash NULL
-+_001032_hash __ntfs_malloc 1 34022 _001032_hash NULL
-+_001033_hash nvme_alloc_queue 3 46865 _001033_hash NULL
-+_001034_hash nvme_map_user_pages 3-4 41093 _001639_hash NULL nohasharray
-+_001036_hash ocfs2_acl_from_xattr 2 21604 _001036_hash NULL
-+_001037_hash ocfs2_control_message 3 19564 _001037_hash NULL
-+_001038_hash _ore_get_io_state 3-5-4 2166 _001038_hash NULL
-+_001041_hash orinoco_set_key 5-7 17878 _001041_hash NULL
-+_001043_hash osdmap_set_max_osd 2 57630 _002267_hash NULL nohasharray
-+_001044_hash _osd_realloc_seg 3 54352 _001044_hash NULL
-+_001045_hash osst_execute 7-6 17607 _001045_hash NULL
-+_001046_hash osst_write 3 31581 _001046_hash NULL
-+_001047_hash otp_read 2-5-4 10594 _001047_hash NULL
-+_001050_hash ovs_vport_alloc 1 33475 _001050_hash NULL
-+_001051_hash p54_parse_rssical 3 64493 _001051_hash NULL
-+_001052_hash p9_client_zc_rpc 7 14345 _001052_hash NULL
-+_001053_hash packet_sendmsg_spkt 4 28885 _001053_hash NULL
-+_001054_hash pair_device 4 61175 _003161_hash NULL nohasharray
-+_001055_hash pccard_store_cis 6 18176 _001055_hash NULL
-+_001056_hash pci_add_cap_save_buffer 3 3426 _001056_hash NULL
-+_001057_hash pcnet32_realloc_rx_ring 3 36598 _001057_hash NULL
-+_001058_hash pcnet32_realloc_tx_ring 3 38428 _001058_hash NULL
-+_001059_hash pcpu_mem_zalloc 1 22948 _001059_hash NULL
-+_001060_hash pep_sendmsg 4 62524 _001060_hash NULL
-+_001061_hash pfkey_sendmsg 4 47394 _001061_hash NULL
-+_001062_hash pidlist_resize 2 496 _001062_hash NULL
-+_001063_hash pin_code_reply 4 46510 _001063_hash NULL
-+_001064_hash ping_getfrag 3-4 8360 _001064_hash NULL
-+_001066_hash pipe_set_size 2 5204 _001066_hash NULL
-+_001067_hash pkt_bio_alloc 1 48284 _001067_hash NULL
-+_001068_hash platform_create_bundle 4-6 12785 _001068_hash NULL
-+_001070_hash pm8001_store_update_fw 4 55716 _001070_hash NULL
-+_001071_hash pmcraid_alloc_sglist 1 9864 _001071_hash NULL
-+_001072_hash pn533_dep_link_up 5 22154 _001072_hash NULL
-+_001073_hash pn533_init_target_frame 3 65438 _001073_hash NULL
-+_001074_hash pnp_alloc 1 24869 _001538_hash NULL nohasharray
-+_001075_hash pn_sendmsg 4 12640 _001075_hash NULL
-+_001076_hash pppoe_sendmsg 4 48039 _001076_hash NULL
-+_001077_hash pppol2tp_sendmsg 4 56420 _001077_hash NULL
-+_001078_hash prism2_info_hostscanresults 3 39657 _001078_hash NULL
-+_001079_hash process_vm_rw 3-5 47533 _001079_hash NULL
-+_001081_hash process_vm_rw_single_vec 1-2 26213 _001081_hash NULL
-+_001083_hash proc_write 3 51003 _001083_hash NULL
-+_001084_hash profile_load 3 58267 _001084_hash NULL
-+_001085_hash profile_remove 3 8556 _001085_hash NULL
-+_001086_hash profile_replace 3 14652 _001086_hash NULL
-+_001087_hash pscsi_get_bio 1 56103 _001087_hash NULL
-+_001088_hash __pskb_copy 2 9038 _001088_hash NULL
-+_001089_hash __pskb_pull_tail 2 60287 _001089_hash NULL
-+_001090_hash qla4xxx_alloc_work 2 44813 _001090_hash NULL
-+_001091_hash qlcnic_alloc_msix_entries 2 46160 _001091_hash NULL
-+_001092_hash qlcnic_alloc_sds_rings 2 26795 _001092_hash NULL
-+_001093_hash queue_received_packet 5 9657 _001093_hash NULL
-+_001094_hash raw_send_hdrinc 4 58803 _001094_hash NULL
-+_001095_hash raw_sendmsg 4 23078 _003316_hash NULL nohasharray
-+_001096_hash rawsock_sendmsg 4 60010 _001096_hash NULL
-+_001097_hash rawv6_send_hdrinc 3 35425 _001097_hash NULL
-+_001098_hash rawv6_setsockopt 5 56165 _001098_hash NULL
-+_001099_hash rb_alloc 1 3102 _001099_hash NULL
-+_001100_hash rbd_alloc_coll 1 33678 _001100_hash NULL
-+_001101_hash rbd_create_rw_ops 1 55297 _001101_hash NULL
-+_001102_hash rds_ib_inc_copy_to_user 3 55007 _001102_hash NULL
-+_001103_hash rds_iw_inc_copy_to_user 3 29214 _001103_hash NULL
-+_001104_hash rds_message_alloc 1 10517 _001104_hash NULL
-+_001105_hash rds_message_copy_from_user 3 45510 _001105_hash NULL
-+_001106_hash rds_message_inc_copy_to_user 3 26540 _001106_hash NULL
-+_001107_hash regcache_rbtree_insert_to_block 5 58009 _001107_hash NULL
-+_001108_hash _regmap_raw_write 4 42652 _001108_hash NULL
-+_001109_hash regmap_register_patch 3 21681 _001109_hash NULL
-+_001110_hash relay_alloc_page_array 1 52735 _001110_hash NULL
-+_001111_hash remove_uuid 4 64505 _001111_hash NULL
-+_001112_hash reshape_ring 2 29147 _001112_hash NULL
-+_001113_hash RESIZE_IF_NEEDED 2 56286 _001113_hash NULL
-+_001114_hash resize_info_buffer 2 62889 _001114_hash NULL
-+_001115_hash resize_stripes 2 61650 _001115_hash NULL
-+_001116_hash rfcomm_sock_sendmsg 4 37661 _003661_hash NULL nohasharray
-+_001117_hash roccat_common2_send_with_status 4 50343 _001117_hash NULL
-+_001118_hash rose_sendmsg 4 20249 _001118_hash NULL
-+_001119_hash rsc_mgr_init 3 16299 _001119_hash NULL
-+_001120_hash rxrpc_send_data 5 21553 _001120_hash NULL
-+_001121_hash rxrpc_setsockopt 5 50286 _001121_hash NULL
-+_001122_hash savu_sysfs_read 6 49473 _001122_hash NULL
-+_001124_hash sco_send_frame 3 41815 _001124_hash NULL
-+_001125_hash scsi_dispatch_cmd_entry 3 49848 _001125_hash NULL
-+_001126_hash scsi_host_alloc 2 63041 _001126_hash NULL
-+_001127_hash scsi_tgt_kspace_exec 8 9522 _001127_hash NULL
-+_001128_hash sctp_sendmsg 4 61919 _001128_hash NULL
-+_001129_hash sctp_setsockopt 5 44788 _001129_hash NULL
-+_001130_hash sctp_setsockopt_connectx 3 6073 _001130_hash NULL
-+_001131_hash sctp_setsockopt_connectx_old 3 22631 _001131_hash NULL
-+_001132_hash sctp_tsnmap_grow 2 32784 _001132_hash NULL
-+_001133_hash sctp_tsnmap_init 2 36446 _001133_hash NULL
-+_001134_hash sctp_user_addto_chunk 2-3 62047 _001134_hash NULL
-+_001136_hash security_context_to_sid 2 19839 _001136_hash NULL
-+_001137_hash security_context_to_sid_default 2 3492 _003841_hash NULL nohasharray
-+_001138_hash security_context_to_sid_force 2 20724 _001138_hash NULL
-+_001139_hash self_check_write 5 50856 _001139_hash NULL
-+_001140_hash selinux_transaction_write 3 59038 _001140_hash NULL
-+_001141_hash sel_write_access 3 51704 _001141_hash NULL
-+_001142_hash sel_write_create 3 11353 _001142_hash NULL
-+_001143_hash sel_write_member 3 28800 _001143_hash NULL
-+_001144_hash sel_write_relabel 3 55195 _001144_hash NULL
-+_001145_hash sel_write_user 3 45060 _001145_hash NULL
-+_001146_hash __seq_open_private 3 40715 _001146_hash NULL
-+_001147_hash serverworks_create_gatt_pages 1 46582 _001147_hash NULL
-+_001148_hash set_connectable 4 56458 _001148_hash NULL
-+_001149_hash set_dev_class 4 39645 _001921_hash NULL nohasharray
-+_001150_hash set_discoverable 4 48141 _001150_hash NULL
-+_001151_hash set_fd_set 1 35249 _001151_hash NULL
-+_001152_hash setkey 3 14987 _001152_hash NULL
-+_001153_hash set_le 4 30581 _001153_hash NULL
-+_001154_hash set_link_security 4 4502 _001154_hash NULL
-+_001155_hash set_local_name 4 55757 _001155_hash NULL
-+_001156_hash set_powered 4 12129 _001156_hash NULL
-+_001157_hash set_ssp 4 62411 _001157_hash NULL
-+_001158_hash sg_build_sgat 3 60179 _001158_hash &_000314_hash
-+_001159_hash sg_read_oxfer 3 51724 _001159_hash NULL
-+_001160_hash shmem_xattr_set 4 11843 _001160_hash NULL
-+_001161_hash simple_alloc_urb 3 60420 _001161_hash NULL
-+_001162_hash sisusb_send_bridge_packet 2 11649 _001162_hash NULL
-+_001163_hash sisusb_send_packet 2 20891 _001163_hash NULL
-+_001164_hash sisusb_write_mem_bulk 4 29678 _001164_hash NULL
-+_001165_hash skb_add_data_nocache 4 4682 _001165_hash NULL
-+_001166_hash skb_copy_datagram_from_iovec 2-5-4 52014 _001166_hash NULL
-+_001169_hash skb_copy_expand 2-3 7685 _001169_hash &_000677_hash
-+_001171_hash skb_copy_to_page_nocache 6 58624 _001171_hash NULL
-+_001172_hash __skb_cow 2 39254 _001172_hash NULL
-+_001173_hash skb_cow_data 2 11565 _001173_hash NULL
-+_001174_hash skb_pad 2 17302 _001174_hash NULL
-+_001175_hash skb_realloc_headroom 2 19516 _001175_hash NULL
-+_001176_hash sk_chk_filter 2 42095 _001176_hash NULL
-+_001177_hash skcipher_sendmsg 4 30290 _001177_hash NULL
-+_001178_hash sl_change_mtu 2 7396 _001178_hash NULL
-+_001179_hash slhc_init 1-2 58135 _001179_hash &_000931_hash
-+_001181_hash sm501_create_subdev 3-4 48668 _001245_hash NULL nohasharray
-+_001183_hash smk_user_access 3 24440 _001183_hash NULL
-+_001184_hash smk_write_cipso2 3 1021 _001184_hash NULL
-+_001185_hash smk_write_cipso 3 17989 _001185_hash NULL
-+_001186_hash smk_write_load2 3 52155 _001186_hash NULL
-+_001187_hash smk_write_load 3 26829 _001187_hash NULL
-+_001188_hash smk_write_load_self2 3 591 _001188_hash NULL
-+_001189_hash smk_write_load_self 3 7958 _001189_hash NULL
-+_001190_hash snapshot_write 3 28351 _001190_hash NULL
-+_001191_hash snd_ac97_pcm_assign 2 30218 _001191_hash NULL
-+_001192_hash snd_card_create 4 64418 _001529_hash NULL nohasharray
-+_001193_hash snd_emux_create_port 3 42533 _001193_hash NULL
-+_001194_hash snd_gus_dram_write 4 38784 _001194_hash NULL
-+_001195_hash snd_midi_channel_alloc_set 1 28153 _001195_hash NULL
-+_001196_hash _snd_pcm_lib_alloc_vmalloc_buffer 2 17820 _001196_hash NULL
-+_001197_hash snd_pcm_oss_sync1 2 45298 _001197_hash NULL
-+_001198_hash snd_pcm_oss_write 3 38108 _001198_hash NULL
-+_001199_hash snd_pcm_plugin_build 5 25505 _001199_hash NULL
-+_001200_hash snd_rawmidi_kernel_write 3 25106 _001200_hash NULL
-+_001201_hash snd_rawmidi_write 3 28008 _001201_hash NULL
-+_001202_hash snd_rme32_playback_copy 5 43732 _001202_hash NULL
-+_001203_hash snd_rme96_playback_copy 5 13111 _001203_hash NULL
-+_001204_hash snd_seq_device_new 4 31753 _001204_hash NULL
-+_001205_hash snd_seq_oss_readq_new 2 14283 _001205_hash NULL
-+_001206_hash snd_vx_create 4 40948 _001206_hash NULL
-+_001207_hash sock_setsockopt 5 50088 _001207_hash NULL
-+_001208_hash sound_write 3 5102 _001208_hash NULL
-+_001209_hash _sp2d_alloc 1-3-2 16944 _001209_hash NULL
-+_001212_hash spi_alloc_master 2 45223 _001212_hash NULL
-+_001213_hash spidev_message 3 5518 _001213_hash NULL
-+_001214_hash spi_register_board_info 2 35651 _001214_hash NULL
-+_001215_hash squashfs_cache_init 2 41656 _001215_hash NULL
-+_001216_hash squashfs_read_data 6 59440 _001216_hash NULL
-+_001217_hash squashfs_read_fragment_index_table 4 2506 _001217_hash NULL
-+_001218_hash squashfs_read_id_index_table 4 61961 _001218_hash NULL
-+_001219_hash squashfs_read_inode_lookup_table 4 64739 _001219_hash NULL
-+_001220_hash srp_alloc_iu 2 44227 _001220_hash NULL
-+_001221_hash srp_iu_pool_alloc 2 17920 _001221_hash NULL
-+_001222_hash srp_ring_alloc 2 26760 _001222_hash NULL
-+_001226_hash start_isoc_chain 2 565 _001226_hash NULL
-+_001227_hash st_write 3 16874 _001227_hash NULL
-+_001228_hash svc_pool_map_alloc_arrays 2 47181 _001228_hash NULL
-+_001229_hash symtab_init 2 61050 _001229_hash NULL
-+_001230_hash sys_bind 3 10799 _001230_hash NULL
-+_001231_hash sys_connect 3 15291 _003816_hash NULL nohasharray
-+_001232_hash sys_flistxattr 3 41407 _001232_hash NULL
-+_001233_hash sys_fsetxattr 4 49736 _001233_hash NULL
-+_001234_hash sysfs_write_file 3 57116 _001234_hash NULL
-+_001235_hash sys_ipc 3 4889 _001235_hash NULL
-+_001236_hash sys_keyctl 4 33708 _001236_hash &_001011_hash
-+_001237_hash sys_listxattr 3 27833 _001237_hash NULL
-+_001238_hash sys_llistxattr 3 4532 _001238_hash NULL
-+_001239_hash sys_lsetxattr 4 61177 _001239_hash NULL
-+_001240_hash sys_mq_timedsend 3 57661 _001240_hash NULL
-+_001241_hash sys_sched_setaffinity 2 32046 _001241_hash NULL
-+_001242_hash sys_select 1 38827 _001242_hash NULL
-+_001243_hash sys_semop 3 39457 _001243_hash NULL
-+_001244_hash sys_sendto 6 20809 _001244_hash NULL
-+_001245_hash sys_setgroups 1 48668 _001245_hash &_001181_hash
-+_001246_hash sys_setgroups16 1 48882 _001246_hash NULL
-+_001247_hash sys_setxattr 4 37880 _001247_hash NULL
-+_001248_hash t4_alloc_mem 1 32342 _001248_hash NULL
-+_001249_hash tcf_hash_create 4 54360 _001249_hash NULL
-+_001250_hash tcp_send_rcvq 3 11316 _001250_hash NULL
-+_001251_hash __team_options_register 3 63941 _001251_hash NULL
-+_001252_hash test_unaligned_bulk 3 52333 _001252_hash NULL
-+_001253_hash tifm_alloc_adapter 1 10903 _001253_hash NULL
-+_001254_hash timeout_write 3 50991 _001254_hash NULL
-+_001255_hash timeradd_entry 3 49850 _001255_hash NULL
-+_001256_hash tipc_link_send_sections_fast 4 37920 _001256_hash NULL
-+_001257_hash tipc_subseq_alloc 1 5957 _001257_hash NULL
-+_001258_hash tnode_alloc 1 49407 _001258_hash NULL
-+_001259_hash tomoyo_commit_ok 2 20167 _001259_hash NULL
-+_001260_hash tomoyo_scan_bprm 2-4 15642 _003488_hash NULL nohasharray
-+_001262_hash tps6586x_writes 3 58689 _001262_hash NULL
-+_001263_hash tty_buffer_find 2 2443 _001263_hash NULL
-+_001264_hash tty_write 3 5494 _001264_hash NULL
-+_001265_hash ubifs_setxattr 4 59650 _001477_hash NULL nohasharray
-+_001266_hash ubi_self_check_all_ff 4 41959 _001266_hash NULL
-+_001267_hash udf_sb_alloc_partition_maps 2 62313 _001267_hash NULL
-+_001268_hash udplite_getfrag 3-4 14479 _001268_hash NULL
-+_001270_hash ulong_write_file 3 26485 _001270_hash NULL
-+_001271_hash unix_stream_sendmsg 4 61455 _001271_hash NULL
-+_001272_hash unlink_queued 3-4 645 _001272_hash NULL
-+_001273_hash update_pmkid 4 2481 _001273_hash NULL
-+_001274_hash usb_alloc_coherent 2 65444 _001274_hash NULL
-+_001275_hash vc_resize 2-3 3585 _001275_hash NULL
-+_001277_hash vhci_write 3 2224 _001277_hash NULL
-+_001278_hash __vhost_add_used_n 3 26554 _001278_hash NULL
-+_001279_hash virtqueue_add_buf 3-4 59470 _001279_hash NULL
-+_001281_hash vmalloc 1 15464 _001281_hash NULL
-+_001282_hash vol_cdev_write 3 40915 _001282_hash NULL
-+_001283_hash vxge_device_register 4 7752 _001283_hash NULL
-+_001284_hash __vxge_hw_blockpool_malloc 2 5786 _001284_hash NULL
-+_001285_hash __vxge_hw_channel_allocate 3 55462 _001285_hash NULL
-+_001286_hash vzalloc 1 47421 _001286_hash NULL
-+_001287_hash vzalloc_node 1 23424 _001287_hash NULL
-+_001288_hash wa_nep_queue 2 8858 _001288_hash NULL
-+_001289_hash __wa_xfer_setup_segs 2 56725 _001289_hash NULL
-+_001290_hash wiphy_new 2 2482 _001290_hash NULL
-+_001291_hash wm8350_block_write 3 19727 _001291_hash NULL
-+_001292_hash wpan_phy_alloc 1 48056 _001292_hash NULL
-+_001293_hash write_flush_pipefs 3 2021 _001293_hash NULL
-+_001294_hash write_flush_procfs 3 44011 _001294_hash NULL
-+_001295_hash wusb_ccm_mac 7 32199 _001295_hash NULL
-+_001296_hash x25_sendmsg 4 12487 _001296_hash NULL
-+_001297_hash xfrm_hash_alloc 1 10997 _001297_hash NULL
-+_001298_hash _xfs_buf_get_pages 2 46811 _001298_hash NULL
-+_001299_hash xfs_da_grow_inode_int 3 21785 _001299_hash NULL
-+_001300_hash xfs_dir_cilookup_result 3 64288 _003160_hash NULL nohasharray
-+_001301_hash xfs_idata_realloc 2 26199 _001301_hash NULL
-+_001302_hash xfs_iext_add_indirect_multi 3 32400 _001302_hash NULL
-+_001303_hash xfs_iext_inline_to_direct 2 12384 _001303_hash NULL
-+_001304_hash xfs_iformat_local 4 49472 _001304_hash NULL
-+_001305_hash xfs_iroot_realloc 2 46826 _001305_hash NULL
-+_001306_hash xhci_alloc_stream_info 3 63902 _001306_hash NULL
-+_001307_hash xlog_recover_add_to_trans 4 62839 _001307_hash NULL
-+_001308_hash xprt_alloc 2 1475 _001308_hash NULL
-+_001309_hash xt_alloc_table_info 1 57903 _001309_hash NULL
-+_001310_hash _zd_iowrite32v_async_locked 3 39034 _001310_hash NULL
-+_001311_hash zd_usb_iowrite16v 3 49744 _001311_hash NULL
-+_001312_hash a2mp_send 4 41615 _001312_hash NULL
-+_001313_hash acpi_ds_build_internal_package_obj 3 58271 _001313_hash NULL
-+_001314_hash acpi_system_read_event 3 55362 _001314_hash NULL
-+_001315_hash acpi_ut_create_buffer_object 1 42030 _001315_hash NULL
-+_001316_hash acpi_ut_create_package_object 1 17594 _001316_hash NULL
-+_001317_hash acpi_ut_create_string_object 1 15360 _001317_hash NULL
-+_001318_hash ad7879_spi_multi_read 3 8218 _001318_hash NULL
-+_001319_hash add_child 4 45201 _001319_hash NULL
-+_001320_hash add_port 2 54941 _001320_hash NULL
-+_001321_hash adu_read 3 24177 _001321_hash NULL
-+_001322_hash afs_cell_create 2 27346 _001322_hash NULL
-+_001323_hash agp_allocate_memory 2 58761 _001323_hash NULL
-+_001324_hash agp_generic_alloc_user 1 9470 _001324_hash NULL
-+_001325_hash alc_auto_create_extra_outs 2 18975 _001325_hash NULL
-+_001326_hash alloc_agpphysmem_i8xx 1 39427 _001326_hash NULL
-+_001327_hash allocate_cnodes 1 5329 _001327_hash NULL
-+_001328_hash ___alloc_bootmem 1 11410 _001328_hash NULL
-+_001329_hash __alloc_bootmem_low_node 2 25726 _001662_hash NULL nohasharray
-+_001330_hash __alloc_bootmem_node 2 1992 _001330_hash NULL
-+_001331_hash __alloc_bootmem_node_nopanic 2 6432 _001331_hash NULL
-+_001332_hash __alloc_bootmem_nopanic 1 65397 _001332_hash NULL
-+_001333_hash alloc_candev 1-2 7776 _001333_hash NULL
-+_001335_hash _alloc_cdb_cont 2 23609 _001335_hash NULL
-+_001336_hash alloc_dummy_extent_buffer 2 56374 _001336_hash NULL
-+_001337_hash ____alloc_ei_netdev 1 51475 _001337_hash NULL
-+_001338_hash alloc_etherdev_mqs 1 36450 _001338_hash NULL
-+_001339_hash alloc_extent_buffer 3 52824 _001339_hash NULL
-+_001340_hash alloc_fcdev 1 18780 _001340_hash NULL
-+_001341_hash alloc_fddidev 1 15382 _001341_hash NULL
-+_001342_hash _alloc_get_attr_desc 2 470 _001342_hash NULL
-+_001343_hash alloc_hippi_dev 1 51320 _001343_hash NULL
-+_001344_hash alloc_irdadev 1 19140 _001344_hash NULL
-+_001345_hash alloc_ldt 2 21972 _001345_hash NULL
-+_001346_hash alloc_ltalkdev 1 38071 _001346_hash NULL
-+_001347_hash alloc_one_pg_vec_page 1 10747 _001347_hash NULL
-+_001348_hash alloc_orinocodev 1 21371 _001348_hash NULL
-+_001349_hash alloc_ring 2-4 18278 _001349_hash NULL
-+_001351_hash _alloc_set_attr_list 4 48991 _001351_hash NULL
-+_001353_hash alloc_tx 2 32143 _001353_hash NULL
-+_001354_hash alloc_wr 1-2 24635 _001354_hash NULL
-+_001356_hash async_setkey 3 35521 _001356_hash NULL
-+_001357_hash ata_host_alloc_pinfo 3 17325 _001357_hash NULL
-+_001360_hash ath6kl_connect_event 7-9-8 14267 _001360_hash NULL
-+_001361_hash ath6kl_fwlog_block_read 3 49836 _001361_hash NULL
-+_001362_hash ath6kl_fwlog_read 3 32101 _001362_hash NULL
-+_001363_hash ath9k_wmi_cmd 4 327 _001363_hash NULL
-+_001364_hash ath_rx_init 2 43564 _001364_hash NULL
-+_001365_hash ath_tx_init 2 60515 _001365_hash NULL
-+_001366_hash atm_alloc_charge 2 19517 _001914_hash NULL nohasharray
-+_001367_hash atm_get_addr 3 31221 _001367_hash NULL
-+_001368_hash audit_log_n_hex 3 45617 _001368_hash NULL
-+_001369_hash audit_log_n_string 3 31705 _001369_hash NULL
-+_001370_hash ax25_output 2 22736 _001370_hash NULL
-+_001371_hash bcsp_prepare_pkt 3 12961 _001371_hash NULL
-+_001372_hash bdx_rxdb_create 1 46525 _001372_hash NULL
-+_001373_hash bdx_tx_db_init 2 41719 _001373_hash NULL
-+_001374_hash bio_map_kern 3 64751 _001374_hash NULL
-+_001375_hash bits_to_user 2-3 47733 _001375_hash NULL
-+_001377_hash __blk_queue_init_tags 2 9778 _001377_hash NULL
-+_001378_hash blk_queue_resize_tags 2 28670 _001378_hash NULL
-+_001379_hash blk_rq_map_user_iov 5 16772 _001379_hash NULL
-+_001380_hash bm_init 2 13529 _001380_hash NULL
-+_001381_hash brcmf_alloc_wdev 1 60347 _001381_hash NULL
-+_001382_hash __btrfs_buffered_write 3 35311 _002735_hash NULL nohasharray
-+_001383_hash btrfs_insert_dir_item 4 59304 _001383_hash NULL
-+_001384_hash btrfs_map_block 3 64379 _001384_hash NULL
-+_001385_hash bt_skb_alloc 1 6404 _001385_hash NULL
-+_001386_hash c4_add_card 3 54968 _001386_hash NULL
-+_001387_hash cache_read 3 24790 _001387_hash NULL
-+_001388_hash cache_write 3 13589 _001388_hash NULL
-+_001389_hash calc_hmac 3 32010 _001389_hash NULL
-+_001390_hash capinc_tty_write 3 28539 _001390_hash NULL
-+_001391_hash ccid_getsockopt_builtin_ccids 2 53634 _001391_hash NULL
-+_001392_hash ceph_copy_page_vector_to_user 3-4 31270 _001392_hash NULL
-+_001394_hash ceph_parse_server_name 2 60318 _001394_hash NULL
-+_001395_hash ceph_read_dir 3 17005 _001395_hash NULL
-+_001396_hash cfg80211_roamed 5-7 32632 _001396_hash NULL
-+_001398_hash cfpkt_add_body 3 44630 _001398_hash NULL
-+_001399_hash cfpkt_create_pfx 1-2 23594 _001399_hash NULL
-+_001401_hash cmd_complete 6 51629 _001401_hash NULL
-+_001402_hash cmtp_add_msgpart 4 9252 _001402_hash NULL
-+_001403_hash cmtp_send_interopmsg 7 376 _001403_hash NULL
-+_001404_hash coda_psdev_read 3 35029 _001404_hash NULL
-+_001405_hash construct_key_and_link 4 8321 _001405_hash NULL
-+_001406_hash copy_counters_to_user 5 17027 _001406_hash NULL
-+_001407_hash copy_entries_to_user 1 52367 _001407_hash NULL
-+_001408_hash copy_from_buf 2-4 27308 _001408_hash NULL
-+_001410_hash copy_oldmem_page 3-1 26164 _001410_hash NULL
-+_001411_hash copy_to_user_fromio 3 57432 _001411_hash NULL
-+_001412_hash cryptd_hash_setkey 3 42781 _001412_hash NULL
-+_001413_hash crypto_authenc_esn_setkey 3 6985 _001413_hash NULL
-+_001414_hash crypto_authenc_setkey 3 80 _001414_hash NULL
-+_001415_hash cxgb3_get_cpl_reply_skb 2 10620 _001415_hash NULL
-+_001416_hash cxgbi_ddp_reserve 4 30091 _001416_hash NULL
-+_001417_hash cxio_init_resource_fifo 3 28764 _001417_hash NULL
-+_001418_hash cxio_init_resource_fifo_random 3 47151 _001418_hash NULL
-+_001419_hash datablob_hmac_append 3 40038 _001419_hash NULL
-+_001420_hash datablob_hmac_verify 4 24786 _001420_hash NULL
-+_001421_hash dataflash_read_fact_otp 3-2 33204 _001421_hash NULL
-+_001422_hash dataflash_read_user_otp 3-2 14536 _001422_hash &_000207_hash
-+_001423_hash dccp_feat_register_sp 5 17914 _001423_hash NULL
-+_001424_hash dccp_setsockopt 5 60367 _001424_hash NULL
-+_001425_hash __dev_alloc_skb 1 28681 _001425_hash NULL
-+_001426_hash disk_expand_part_tbl 2 30561 _001426_hash NULL
-+_001427_hash diva_os_alloc_message_buffer 1 64568 _001427_hash NULL
-+_001428_hash diva_os_copy_to_user 4 48508 _001428_hash NULL
-+_001429_hash diva_os_malloc 2 16406 _001429_hash NULL
-+_001430_hash dmam_declare_coherent_memory 4-2 43679 _001430_hash NULL
-+_001431_hash dm_vcalloc 1-2 16814 _001431_hash NULL
-+_001433_hash dn_alloc_skb 2 6631 _001433_hash NULL
-+_001434_hash do_proc_readlink 3 14096 _001434_hash NULL
-+_001435_hash do_readlink 2 43518 _001435_hash NULL
-+_001436_hash __do_replace 5 37227 _001436_hash NULL
-+_001437_hash do_sigpending 2 9766 _001437_hash NULL
-+_001438_hash drbd_bm_resize 2 20522 _001438_hash NULL
-+_001439_hash drbd_setsockopt 5 16280 _001439_hash &_000383_hash
-+_001440_hash dump_midi 3 51040 _001440_hash NULL
-+_001441_hash ecryptfs_filldir 3 6622 _001441_hash NULL
-+_001442_hash ecryptfs_send_message 2 18322 _001442_hash NULL
-+_001443_hash ep0_read 3 38095 _001443_hash NULL
-+_001444_hash evdev_ioctl 2 22371 _001444_hash NULL
-+_001445_hash ext4_add_new_descs 3 19509 _001445_hash NULL
-+_001446_hash fat_ioctl_filldir 3 36621 _001446_hash NULL
-+_001447_hash _fc_frame_alloc 1 43568 _001447_hash NULL
-+_001448_hash fc_host_post_vendor_event 3 30903 _001448_hash NULL
-+_001449_hash fd_copyout 3 59323 _001449_hash NULL
-+_001450_hash f_hidg_read 3 6238 _001450_hash NULL
-+_001451_hash filldir 3 55137 _001451_hash NULL
-+_001452_hash filldir64 3 46469 _001452_hash NULL
-+_001453_hash find_skb 2 20431 _001453_hash NULL
-+_001454_hash from_buffer 3 18625 _001454_hash NULL
-+_001455_hash fsm_init 2 16134 _001455_hash NULL
-+_001456_hash fs_path_add 3 15648 _001456_hash NULL
-+_001457_hash fs_path_add_from_extent_buffer 4 27702 _001457_hash NULL
-+_001458_hash fuse_perform_write 4 18457 _001458_hash NULL
-+_001459_hash gem_alloc_skb 2 51715 _001459_hash NULL
-+_001460_hash generic_file_buffered_write 4 25464 _001460_hash NULL
-+_001461_hash gen_pool_add 3 21776 _001461_hash NULL
-+_001462_hash get_packet 3 41914 _001462_hash NULL
-+_001463_hash get_packet 3 5747 _001463_hash NULL
-+_001464_hash get_packet_pg 4 28023 _001464_hash NULL
-+_001465_hash get_skb 2 63008 _001465_hash NULL
-+_001466_hash get_subdir 3 62581 _001466_hash NULL
-+_001467_hash gsm_control_message 4 18209 _001467_hash NULL
-+_001468_hash gsm_control_modem 3 55303 _001468_hash NULL
-+_001469_hash gsm_control_rls 3 3353 _001469_hash NULL
-+_001470_hash handle_received_packet 3 22457 _001470_hash NULL
-+_001471_hash hash_setkey 3 48310 _001471_hash NULL
-+_001472_hash hdlcdrv_register 2 6792 _001472_hash NULL
-+_001473_hash hiddev_ioctl 2 36816 _001473_hash NULL
-+_001474_hash hid_input_report 4 32458 _001474_hash NULL
-+_001475_hash hidp_queue_report 3 1881 _001475_hash NULL
-+_001476_hash __hidp_send_ctrl_message 4 28303 _001476_hash NULL
-+_001477_hash hidraw_read 3 59650 _001477_hash &_001265_hash
-+_001478_hash HiSax_readstatus 2 15752 _001478_hash NULL
-+_001480_hash __hwahc_op_set_gtk 4 42038 _001480_hash NULL
-+_001481_hash __hwahc_op_set_ptk 5 36510 _001481_hash NULL
-+_001482_hash hycapi_rx_capipkt 3 11602 _001482_hash NULL
-+_001483_hash i2400m_net_rx 5 27170 _001483_hash NULL
-+_001484_hash ib_copy_to_udata 3 27525 _001484_hash NULL
-+_001485_hash idetape_chrdev_read 3 2097 _001485_hash NULL
-+_001486_hash ieee80211_alloc_hw 1 43829 _001486_hash NULL
-+_001487_hash ieee80211_bss_info_update 4 13991 _001487_hash NULL
-+_001488_hash igmpv3_newpack 2 35912 _001488_hash NULL
-+_001489_hash ilo_read 3 32531 _001489_hash NULL
-+_001490_hash init_map_ipmac 3-4 63896 _001490_hash NULL
-+_001492_hash init_tid_tabs 2-4-3 13252 _001492_hash NULL
-+_001495_hash iowarrior_read 3 53483 _001495_hash NULL
-+_001496_hash ip_options_get 4 56538 _001496_hash NULL
-+_001497_hash ipv6_getsockopt_sticky 5 56711 _001497_hash NULL
-+_001498_hash ipwireless_send_packet 4 8328 _001498_hash NULL
-+_001499_hash ipx_sendmsg 4 1362 _001499_hash NULL
-+_001500_hash irq_domain_add_linear 2 29236 _001500_hash NULL
-+_001501_hash iscsi_conn_setup 2 35159 _001501_hash NULL
-+_001502_hash iscsi_create_session 3 51647 _001502_hash NULL
-+_001503_hash iscsi_host_alloc 2 36671 _001503_hash NULL
-+_001504_hash iscsi_if_send_reply 7 52219 _001504_hash NULL
-+_001505_hash iscsi_offload_mesg 5 58425 _001505_hash NULL
-+_001506_hash iscsi_ping_comp_event 5 38263 _001506_hash NULL
-+_001507_hash iscsi_post_host_event 4 13473 _001507_hash NULL
-+_001508_hash iscsi_recv_pdu 4 16755 _001508_hash NULL
-+_001509_hash iscsi_session_setup 4-5 196 _001509_hash NULL
-+_001511_hash iscsit_find_cmd_from_itt_or_dump 3 17194 _003122_hash NULL nohasharray
-+_001512_hash isdn_net_ciscohdlck_alloc_skb 2 55209 _001951_hash NULL nohasharray
-+_001513_hash isdn_ppp_ccp_xmit_reset 6 63297 _001513_hash NULL
-+_001514_hash isdn_ppp_read 4 50356 _001514_hash NULL
-+_001515_hash isdn_ppp_skb_push 2 5236 _001515_hash NULL
-+_001516_hash isku_sysfs_read 6 58806 _001516_hash NULL
-+_001517_hash isku_sysfs_write 6 49767 _001517_hash NULL
-+_001520_hash jbd2_alloc 1 41359 _001520_hash NULL
-+_001521_hash jffs2_do_link 6 42048 _001521_hash NULL
-+_001522_hash jffs2_do_unlink 4 62020 _001522_hash NULL
-+_001523_hash jffs2_security_setxattr 4 62107 _001523_hash NULL
-+_001524_hash jffs2_trusted_setxattr 4 17048 _001524_hash NULL
-+_001525_hash jffs2_user_setxattr 4 10182 _001525_hash NULL
-+_001526_hash joydev_ioctl_common 2 49359 _001526_hash NULL
-+_001527_hash kernel_setsockopt 5 35913 _001527_hash NULL
-+_001528_hash keyctl_describe_key 3 36853 _001528_hash NULL
-+_001529_hash keyctl_get_security 3 64418 _001529_hash &_001192_hash
-+_001530_hash keyring_read 3 13438 _001530_hash NULL
-+_001531_hash kfifo_copy_to_user 3 20646 _001531_hash NULL
-+_001532_hash kmem_zalloc_large 1 56128 _001532_hash NULL
-+_001533_hash kmp_init 2 41373 _001533_hash NULL
-+_001534_hash koneplus_sysfs_write 6 35993 _001534_hash NULL
-+_001535_hash kvm_clear_guest_page 4 2308 _001535_hash NULL
-+_001536_hash kvm_read_nested_guest_page 5 13337 _001536_hash NULL
-+_001537_hash _l2_alloc_skb 1 11883 _001537_hash NULL
-+_001538_hash l2cap_create_basic_pdu 3 24869 _001538_hash &_001074_hash
-+_001539_hash l2cap_create_connless_pdu 3 37327 _001539_hash NULL
-+_001540_hash l2cap_create_iframe_pdu 3 40055 _001540_hash NULL
-+_001541_hash l3_alloc_skb 1 32289 _001541_hash NULL
-+_001542_hash __lgwrite 4 57669 _001542_hash NULL
-+_001543_hash libfc_host_alloc 2 7917 _001543_hash NULL
-+_001544_hash llc_alloc_frame 4 64366 _001544_hash NULL
-+_001545_hash llcp_sock_sendmsg 4 1092 _001545_hash NULL
-+_001546_hash mac_drv_rx_init 2 48898 _001546_hash NULL
-+_001547_hash macvtap_get_user 4 28185 _001547_hash NULL
-+_001548_hash mdc800_device_read 3 22896 _001548_hash NULL
-+_001549_hash memcpy_toiovec 3 54166 _001549_hash &_000892_hash
-+_001550_hash memcpy_toiovecend 3-4 19736 _001550_hash NULL
-+_001552_hash mempool_create 1 29437 _001552_hash NULL
-+_001553_hash mgmt_event 4 12810 _001553_hash NULL
-+_001554_hash mgt_set_varlen 4 60916 _001554_hash NULL
-+_001555_hash mI_alloc_skb 1 24770 _001555_hash NULL
-+_001556_hash mlx4_en_create_rx_ring 3 62498 _001556_hash NULL
-+_001557_hash mlx4_en_create_tx_ring 4 48501 _001557_hash NULL
-+_001558_hash mlx4_init_cmpt_table 3 11569 _001558_hash NULL
-+_001559_hash mon_bin_get_event 4 52863 _001559_hash NULL
-+_001560_hash mousedev_read 3 47123 _001560_hash NULL
-+_001561_hash move_addr_to_user 2 2868 _001561_hash NULL
-+_001562_hash mpihelp_mul 5-3 27805 _001562_hash NULL
-+_001564_hash mpi_set_buffer 3 65294 _001564_hash NULL
-+_001565_hash mptctl_ioctl 2 12355 _001565_hash NULL
-+_001566_hash msnd_fifo_alloc 2 23179 _001566_hash NULL
-+_001567_hash mtdswap_init 2 55719 _001567_hash NULL
-+_001568_hash mthca_alloc_resize_buf 3 60394 _001568_hash NULL
-+_001569_hash mthca_init_cq 2 60011 _001569_hash NULL
-+_001570_hash nci_skb_alloc 2 49757 _001570_hash NULL
-+_001571_hash neigh_hash_grow 2 17283 _001571_hash NULL
-+_001572_hash netdev_alloc_skb 2 62437 _001572_hash NULL
-+_001573_hash __netdev_alloc_skb_ip_align 2 55067 _001573_hash NULL
-+_001574_hash netlink_change_ngroups 2 16457 _001574_hash NULL
-+_001575_hash new_skb 1 21148 _001575_hash NULL
-+_001576_hash nfc_alloc_recv_skb 1 10244 _001576_hash NULL
-+_001577_hash nfcwilink_skb_alloc 1 16167 _001577_hash NULL
-+_001578_hash __nf_nat_mangle_tcp_packet 5-7 8190 _001578_hash NULL
-+_001580_hash nf_nat_mangle_udp_packet 5-7 13321 _001580_hash NULL
-+_001582_hash nfqnl_mangle 4-2 36226 _001582_hash NULL
-+_001583_hash nfs4_realloc_slot_table 2 22859 _001583_hash NULL
-+_001584_hash nfs_idmap_get_key 2 39616 _001584_hash NULL
-+_001585_hash nfs_readdata_alloc 2 65015 _001585_hash NULL
-+_001586_hash nfs_writedata_alloc 2 12133 _001586_hash NULL
-+_001587_hash nfulnl_alloc_skb 2 65207 _001587_hash NULL
-+_001588_hash ni65_alloc_mem 3 10664 _001588_hash NULL
-+_001589_hash nsm_get_handle 4 52089 _001589_hash NULL
-+_001590_hash ntfs_malloc_nofs 1 49572 _001590_hash NULL
-+_001591_hash ntfs_malloc_nofs_nofail 1 63631 _001591_hash NULL
-+_001592_hash nvme_create_queue 3 170 _001592_hash NULL
-+_001593_hash ocfs2_control_write 3 54737 _001593_hash NULL
-+_001595_hash orinoco_add_extscan_result 3 18207 _001595_hash NULL
-+_001596_hash osd_req_read_sg_kern 5 6378 _001596_hash NULL
-+_001597_hash osd_req_write_sg_kern 5 10514 _001597_hash NULL
-+_001599_hash override_release 2 52032 _001599_hash NULL
-+_001600_hash p9_client_read 5 19750 _001600_hash NULL
-+_001601_hash packet_snd 3 13634 _001601_hash NULL
-+_001602_hash pcbit_stat 2 27364 _001602_hash NULL
-+_001603_hash pcpu_extend_area_map 2 12589 _001603_hash NULL
-+_001604_hash pep_alloc_skb 3 46303 _001604_hash NULL
-+_001605_hash pg_read 3 17276 _001605_hash NULL
-+_001606_hash picolcd_debug_eeprom_read 3 14549 _001606_hash NULL
-+_001607_hash pkt_alloc_packet_data 1 37928 _001607_hash NULL
-+_001608_hash pmcraid_build_passthrough_ioadls 2 62034 _001608_hash NULL
-+_001609_hash pn_raw_send 2 54330 _001609_hash NULL
-+_001610_hash posix_clock_register 2 5662 _001610_hash NULL
-+_001611_hash printer_read 3 54851 _001611_hash NULL
-+_001612_hash __proc_file_read 3 54978 _001612_hash NULL
-+_001613_hash pskb_may_pull 2 22546 _001613_hash NULL
-+_001614_hash __pskb_pull 2 42602 _001614_hash NULL
-+_001615_hash ptp_read 4 63251 _001615_hash NULL
-+_001616_hash pt_read 3 49136 _001616_hash NULL
-+_001617_hash put_cmsg 4 36589 _001617_hash NULL
-+_001618_hash px_raw_event 4 49371 _001618_hash NULL
-+_001619_hash qla4xxx_post_aen_work 3 46953 _001619_hash NULL
-+_001620_hash qla4xxx_post_ping_evt_work 4 8074 _001819_hash NULL nohasharray
-+_001621_hash raid5_resize 2 63306 _001621_hash NULL
-+_001622_hash rawv6_sendmsg 4 20080 _001622_hash NULL
-+_001623_hash rds_message_map_pages 2 31487 _001623_hash NULL
-+_001624_hash rds_sendmsg 4 40976 _001624_hash NULL
-+_001625_hash read_flush 3 43851 _001625_hash NULL
-+_001626_hash read_profile 3 27859 _001626_hash NULL
-+_001627_hash read_vmcore 3 26501 _001627_hash NULL
-+_001628_hash redirected_tty_write 3 65297 _001628_hash NULL
-+_001629_hash refill_pool 2 19477 _001629_hash NULL
-+_001630_hash __register_chrdev 2-3 54223 _001630_hash NULL
-+_001632_hash regmap_raw_write 4 53803 _001632_hash NULL
-+_001633_hash reiserfs_allocate_list_bitmaps 3 21732 _001633_hash NULL
-+_001634_hash reiserfs_resize 2 34377 _001634_hash NULL
-+_001635_hash request_key_auth_read 3 24109 _001635_hash NULL
-+_001636_hash rfcomm_wmalloc 2 58090 _001636_hash NULL
-+_001637_hash rfkill_fop_read 3 54711 _001637_hash NULL
-+_001638_hash rng_dev_read 3 41581 _001638_hash NULL
-+_001639_hash roccat_read 3 41093 _001639_hash &_001034_hash
-+_001640_hash rx 4 57944 _001640_hash NULL
-+_001641_hash rxrpc_client_sendmsg 5 23236 _001641_hash NULL
-+_001642_hash rxrpc_kernel_send_data 3 60083 _001642_hash NULL
-+_001643_hash rxrpc_server_sendmsg 4 37331 _001643_hash NULL
-+_001644_hash savu_sysfs_write 6 42273 _001644_hash NULL
-+_001645_hash sco_sock_sendmsg 4 62542 _001645_hash NULL
-+_001646_hash scsi_nl_send_vendor_msg 5 16394 _001646_hash NULL
-+_001647_hash scsi_register 2 49094 _001647_hash NULL
-+_001648_hash sctp_datamsg_from_user 4 55342 _001648_hash NULL
-+_001649_hash sctp_getsockopt_events 2 3607 _001649_hash NULL
-+_001650_hash sctp_getsockopt_maxburst 2 42941 _001650_hash NULL
-+_001651_hash sctp_getsockopt_maxseg 2 10737 _001651_hash NULL
-+_001652_hash sctp_make_chunk 4 12986 _001652_hash NULL
-+_001653_hash sctpprobe_read 3 17741 _001653_hash NULL
-+_001654_hash sctp_tsnmap_mark 2 35929 _001654_hash NULL
-+_001655_hash sctp_ulpevent_new 1 33377 _001655_hash NULL
-+_001656_hash sdhci_alloc_host 2 7509 _001656_hash NULL
-+_001657_hash selinux_inode_post_setxattr 4 26037 _001657_hash NULL
-+_001658_hash selinux_inode_setsecurity 4 18148 _001658_hash NULL
-+_001659_hash selinux_inode_setxattr 4 10708 _001659_hash NULL
-+_001660_hash selinux_secctx_to_secid 2 63744 _001660_hash NULL
-+_001661_hash selinux_setprocattr 4 55611 _001661_hash NULL
-+_001662_hash sel_write_context 3 25726 _001662_hash &_001329_hash
-+_001663_hash send_command 4 10832 _001663_hash NULL
-+_001664_hash seq_copy_in_user 3 18543 _001664_hash NULL
-+_001665_hash seq_open_net 4 8968 _001779_hash NULL nohasharray
-+_001666_hash seq_open_private 3 61589 _001666_hash NULL
-+_001667_hash set_arg 3 42824 _001667_hash NULL
-+_001668_hash sg_read 3 25799 _001668_hash NULL
-+_001669_hash shash_async_setkey 3 10720 _003506_hash NULL nohasharray
-+_001670_hash shash_compat_setkey 3 12267 _001670_hash NULL
-+_001671_hash shmem_setxattr 4 55867 _001671_hash NULL
-+_001672_hash simple_read_from_buffer 2-5 55957 _001672_hash NULL
-+_001674_hash sisusb_clear_vram 2-3 57466 _001674_hash NULL
-+_001676_hash sisusbcon_do_font_op 9 52271 _001676_hash NULL
-+_001677_hash sisusb_copy_memory 4 35016 _001677_hash NULL
-+_001678_hash sisusb_write 3 44834 _001678_hash NULL
-+_001680_hash skb_cow 2 26138 _001680_hash NULL
-+_001681_hash skb_cow_head 2 52495 _001681_hash NULL
-+_001682_hash skb_make_writable 2 24783 _001682_hash NULL
-+_001683_hash skb_padto 2 50759 _001683_hash NULL
-+_001684_hash sk_stream_alloc_skb 2 57622 _001684_hash NULL
-+_001685_hash smk_write_access2 3 19170 _001685_hash NULL
-+_001686_hash smk_write_access 3 49561 _001686_hash NULL
-+_001687_hash snd_es1938_capture_copy 5 25930 _001687_hash NULL
-+_001688_hash snd_gus_dram_peek 4 9062 _001688_hash NULL
-+_001689_hash snd_hdsp_capture_copy 5 4011 _001689_hash NULL
-+_001690_hash snd_korg1212_copy_to 6 92 _001690_hash NULL
-+_001691_hash snd_opl4_mem_proc_read 5 63774 _001691_hash NULL
-+_001692_hash snd_pcm_oss_read1 3 63771 _001692_hash NULL
-+_001693_hash snd_pcm_plugin_alloc 2 12580 _001693_hash NULL
-+_001694_hash snd_rawmidi_kernel_read1 4 36740 _001694_hash NULL
-+_001695_hash snd_rme9652_capture_copy 5 10287 _001695_hash NULL
-+_001696_hash sock_alloc_send_pskb 2 21246 _001696_hash NULL
-+_001697_hash sock_rmalloc 2 59740 _002491_hash NULL nohasharray
-+_001698_hash sock_wmalloc 2 16472 _001698_hash NULL
-+_001699_hash solos_param_store 4 34755 _001699_hash NULL
-+_001702_hash srp_target_alloc 3 37288 _001702_hash NULL
-+_001703_hash store_ifalias 4 35088 _001703_hash NULL
-+_001704_hash store_msg 3 56417 _001704_hash NULL
-+_001705_hash str_to_user 2 11411 _001705_hash NULL
-+_001706_hash subbuf_read_actor 3 2071 _001706_hash NULL
-+_001707_hash sys_fgetxattr 4 25166 _001707_hash NULL
-+_001708_hash sys_gethostname 2 49698 _001708_hash NULL
-+_001709_hash sys_getxattr 4 37418 _001709_hash NULL
-+_001710_hash sys_init_module 2 36047 _001710_hash NULL
-+_001711_hash sys_kexec_load 2 14222 _001711_hash NULL
-+_001712_hash sys_lgetxattr 4 45531 _001712_hash NULL
-+_001713_hash syslog_print 2 307 _001713_hash NULL
-+_001714_hash sys_msgsnd 3 44537 _001714_hash &_000139_hash
-+_001715_hash sys_process_vm_readv 3-5 19090 _003104_hash NULL nohasharray
-+_001717_hash sys_process_vm_writev 3-5 4928 _001717_hash NULL
-+_001719_hash sys_pselect6 1 57449 _001719_hash NULL
-+_001720_hash sys_sched_getaffinity 2 60033 _001720_hash NULL
-+_001721_hash sys_setsockopt 5 35320 _001721_hash NULL
-+_001722_hash t3_init_l2t 1 8261 _001722_hash NULL
-+_001723_hash t4vf_pktgl_to_skb 2 39005 _001723_hash NULL
-+_001724_hash tcp_collapse 5-6 63294 _001724_hash NULL
-+_001726_hash tcp_sendmsg 4 30296 _001726_hash NULL
-+_001727_hash team_options_register 3 20091 _001727_hash NULL
-+_001728_hash tipc_buf_acquire 1 60437 _001728_hash NULL
-+_001729_hash tipc_cfg_reply_alloc 1 27606 _001729_hash NULL
-+_001730_hash tipc_send2name 6 16809 _001730_hash NULL
-+_001731_hash tipc_send2port 5 63935 _001731_hash NULL
-+_001732_hash tipc_send 4 51238 _001732_hash NULL
-+_001733_hash tnode_new 3 44757 _002769_hash NULL nohasharray
-+_001734_hash tomoyo_read_self 3 33539 _001734_hash NULL
-+_001735_hash tomoyo_update_domain 2 5498 _001735_hash NULL
-+_001736_hash tomoyo_update_policy 2 40458 _001736_hash NULL
-+_001737_hash tpm_read 3 50344 _001737_hash NULL
-+_001738_hash TSS_rawhmac 3 17486 _001738_hash NULL
-+_001739_hash __tty_buffer_request_room 2 27700 _001739_hash NULL
-+_001740_hash tun_get_user 4 39099 _001740_hash NULL
-+_001741_hash ubi_dump_flash 4 46381 _001741_hash NULL
-+_001742_hash ubi_io_write 4-5 15870 _003453_hash NULL nohasharray
-+_001744_hash udp_setsockopt 5 25985 _001744_hash NULL
-+_001745_hash udpv6_setsockopt 5 18487 _001745_hash NULL
-+_001746_hash uio_read 3 49300 _001746_hash NULL
-+_001747_hash ulog_alloc_skb 1 23427 _001747_hash NULL
-+_001748_hash unix_dgram_sendmsg 4 45699 _001748_hash NULL
-+_001749_hash unlink1 3 63059 _001749_hash NULL
-+_001751_hash usbdev_read 3 45114 _001751_hash NULL
-+_001752_hash usblp_ioctl 2 30203 _001752_hash NULL
-+_001753_hash usblp_read 3 57342 _003832_hash NULL nohasharray
-+_001754_hash usbtmc_read 3 32377 _001754_hash NULL
-+_001755_hash _usb_writeN_sync 4 31682 _001755_hash NULL
-+_001756_hash user_read 3 51881 _001756_hash NULL
-+_001757_hash vcs_read 3 8017 _001757_hash NULL
-+_001758_hash vdma_mem_alloc 1 6171 _001758_hash NULL
-+_001759_hash venus_create 4 20555 _001759_hash NULL
-+_001760_hash venus_link 5 32165 _001760_hash NULL
-+_001761_hash venus_lookup 4 8121 _001761_hash NULL
-+_001762_hash venus_mkdir 4 8967 _001762_hash NULL
-+_001763_hash venus_remove 4 59781 _001763_hash NULL
-+_001764_hash venus_rename 4-5 17707 _003784_hash NULL nohasharray
-+_001766_hash venus_rmdir 4 45564 _001766_hash NULL
-+_001767_hash venus_symlink 4-6 23570 _001767_hash NULL
-+_001769_hash vfs_readlink 3 54368 _001769_hash NULL
-+_001770_hash vfs_readv 3 38011 _001770_hash NULL
-+_001771_hash vfs_writev 3 25278 _001771_hash NULL
-+_001772_hash vga_arb_read 3 4886 _001772_hash NULL
-+_001773_hash vgacon_adjust_height 2 28124 _001773_hash NULL
-+_001774_hash vhci_put_user 4 12604 _001774_hash NULL
-+_001775_hash vhost_add_used_n 3 10760 _001775_hash NULL
-+_001776_hash virtnet_send_command 5-6 61993 _001776_hash NULL
-+_001778_hash vmbus_establish_gpadl 3 4495 _001778_hash NULL
-+_001779_hash vol_cdev_read 3 8968 _001779_hash &_001665_hash
-+_001780_hash wdm_read 3 6549 _001780_hash NULL
-+_001781_hash write_adapter_mem 3 3234 _001781_hash NULL
-+_001782_hash wusb_prf 7 54261 _001782_hash &_000065_hash
-+_001783_hash xdi_copy_to_user 4 48900 _001783_hash NULL
-+_001784_hash xfs_buf_associate_memory 3 17915 _001784_hash NULL
-+_001785_hash xfs_buf_get_maps 2 4581 _001785_hash NULL
-+_001786_hash xfs_buf_get_uncached 2 51477 _001786_hash NULL
-+_001787_hash xfs_buf_item_get_format 2 189 _001787_hash NULL
-+_001788_hash xfs_buf_map_from_irec 5 2368 _002641_hash NULL nohasharray
-+_001789_hash xfs_dir2_block_to_sf 3 37868 _001789_hash NULL
-+_001790_hash xfs_dir2_leaf_getdents 3 23841 _001790_hash NULL
-+_001791_hash xfs_dir2_sf_addname_hard 3 54254 _001791_hash NULL
-+_001792_hash xfs_efd_init 3 5463 _001792_hash NULL
-+_001793_hash xfs_efi_init 2 5476 _001793_hash NULL
-+_001794_hash xfs_iext_realloc_direct 2 20521 _001794_hash NULL
-+_001795_hash xfs_iext_realloc_indirect 2 59211 _001795_hash NULL
-+_001796_hash xfs_inumbers_fmt 3 12817 _001796_hash NULL
-+_001797_hash xhci_alloc_streams 5 37586 _001797_hash NULL
-+_001798_hash xlog_recover_add_to_cont_trans 4 44102 _001798_hash NULL
-+_001799_hash xz_dec_lzma2_create 2 36353 _002713_hash NULL nohasharray
-+_001800_hash _zd_iowrite32v_locked 3 44725 _001800_hash NULL
-+_001801_hash a2mp_chan_alloc_skb_cb 2 27159 _001801_hash NULL
-+_001802_hash aat2870_reg_read_file 3 12221 _001802_hash NULL
-+_001803_hash add_partition 2 55588 _001803_hash NULL
-+_001804_hash add_sctp_bind_addr 3 12269 _001804_hash NULL
-+_001805_hash _add_sg_continuation_descriptor 3 54721 _001805_hash NULL
-+_001806_hash afs_cell_lookup 2 8482 _001806_hash NULL
-+_001807_hash afs_send_simple_reply 3 63940 _001807_hash NULL
-+_001808_hash agp_allocate_memory_wrap 1 16576 _001808_hash NULL
-+_001809_hash __alloc_bootmem 1 31498 _001809_hash NULL
-+_001810_hash __alloc_bootmem_low 1 43423 _003425_hash NULL nohasharray
-+_001811_hash __alloc_bootmem_node_high 2 65076 _001811_hash NULL
-+_001812_hash alloc_cc770dev 1 48186 _001812_hash NULL
-+_001813_hash __alloc_ei_netdev 1 29338 _001813_hash NULL
-+_001814_hash __alloc_eip_netdev 1 51549 _001814_hash NULL
-+_001815_hash alloc_libipw 1 22708 _001815_hash NULL
-+_001816_hash _alloc_mISDN_skb 3 52232 _001816_hash NULL
-+_001817_hash alloc_pg_vec 2 8533 _001817_hash NULL
-+_001818_hash alloc_sja1000dev 1 17868 _001818_hash NULL
-+_001819_hash alloc_targets 2 8074 _001819_hash &_001620_hash
-+_001822_hash ath6kl_disconnect_timeout_read 3 3650 _001822_hash NULL
-+_001823_hash ath6kl_endpoint_stats_read 3 41554 _001823_hash NULL
-+_001824_hash ath6kl_fwlog_mask_read 3 2050 _001824_hash NULL
-+_001825_hash ath6kl_keepalive_read 3 44303 _001825_hash NULL
-+_001826_hash ath6kl_listen_int_read 3 10355 _001826_hash NULL
-+_001827_hash ath6kl_lrssi_roam_read 3 61022 _001827_hash NULL
-+_001828_hash ath6kl_regdump_read 3 14393 _001828_hash NULL
-+_001829_hash ath6kl_regread_read 3 25884 _001829_hash NULL
-+_001830_hash ath6kl_regwrite_read 3 48747 _001830_hash NULL
-+_001831_hash ath6kl_roam_table_read 3 26166 _001831_hash NULL
-+_001832_hash ath9k_debugfs_read_buf 3 25316 _001832_hash NULL
-+_001833_hash ath9k_multi_regread 4 65056 _001833_hash NULL
-+_001834_hash ath_rxbuf_alloc 2 24745 _001834_hash NULL
-+_001835_hash atk_debugfs_ggrp_read 3 29522 _001835_hash NULL
-+_001836_hash audit_log_n_untrustedstring 3 9548 _001836_hash NULL
-+_001837_hash ax25_send_frame 2 19964 _001837_hash NULL
-+_001838_hash b43_debugfs_read 3 24425 _001838_hash NULL
-+_001839_hash b43legacy_debugfs_read 3 2473 _001839_hash NULL
-+_001840_hash batadv_bla_is_backbone_gw 3 58488 _001840_hash NULL
-+_001841_hash batadv_check_management_packet 3 52993 _001841_hash NULL
-+_001842_hash batadv_check_unicast_packet 2 10866 _001842_hash NULL
-+_001843_hash batadv_interface_rx 4 8568 _001843_hash NULL
-+_001844_hash batadv_skb_head_push 2 11360 _001844_hash NULL
-+_001845_hash bchannel_get_rxbuf 2 37213 _001845_hash NULL
-+_001846_hash bcm_recvmsg 4 43992 _001846_hash NULL
-+_001847_hash bfad_debugfs_read 3 13119 _001847_hash NULL
-+_001848_hash bfad_debugfs_read_regrd 3 57830 _001848_hash NULL
-+_001849_hash blk_init_tags 1 30592 _001849_hash NULL
-+_001850_hash blk_queue_init_tags 2 44355 _001850_hash &_001022_hash
-+_001851_hash blk_rq_map_kern 4 47004 _001851_hash NULL
-+_001852_hash bm_entry_read 3 10976 _001852_hash NULL
-+_001853_hash bm_status_read 3 19583 _001853_hash NULL
-+_001854_hash bnad_debugfs_read 3 50665 _001854_hash NULL
-+_001855_hash bnad_debugfs_read_regrd 3 51308 _001855_hash NULL
-+_001856_hash bnx2i_send_nl_mesg 4 53353 _001856_hash NULL
-+_001857_hash brcmf_debugfs_sdio_counter_read 3 58369 _001857_hash NULL
-+_001858_hash brcmf_sdio_assert_info 4 52653 _001858_hash NULL
-+_001859_hash brcmf_sdio_dump_console 4 37455 _001859_hash NULL
-+_001860_hash brcmf_sdio_trap_info 4 48510 _001860_hash NULL
-+_001861_hash btmrvl_curpsmode_read 3 46939 _001861_hash NULL
-+_001862_hash btmrvl_gpiogap_read 3 4718 _001862_hash NULL
-+_001863_hash btmrvl_hscfgcmd_read 3 56303 _001863_hash NULL
-+_001864_hash btmrvl_hscmd_read 3 1614 _001864_hash NULL
-+_001865_hash btmrvl_hsmode_read 3 1647 _001865_hash NULL
-+_001866_hash btmrvl_hsstate_read 3 920 _001866_hash NULL
-+_001867_hash btmrvl_pscmd_read 3 24308 _001867_hash NULL
-+_001868_hash btmrvl_psmode_read 3 22395 _001868_hash NULL
-+_001869_hash btmrvl_psstate_read 3 50683 _001869_hash NULL
-+_001870_hash btmrvl_txdnldready_read 3 413 _001870_hash NULL
-+_001871_hash btrfs_add_link 5 9973 _001871_hash NULL
-+_001872_hash __btrfs_direct_write 4 22273 _001872_hash NULL
-+_001873_hash btrfs_discard_extent 2 38547 _001873_hash NULL
-+_001874_hash btrfs_file_aio_write 4 21520 _001874_hash NULL
-+_001875_hash btrfs_find_create_tree_block 3 55812 _001875_hash NULL
-+_001876_hash btrfsic_map_block 2 56751 _001876_hash NULL
-+_001877_hash cache_read_pipefs 3 47615 _001877_hash NULL
-+_001878_hash cache_read_procfs 3 52882 _001878_hash NULL
-+_001879_hash cache_write_pipefs 3 48270 _001879_hash NULL
-+_001880_hash cache_write_procfs 3 22491 _001880_hash NULL
-+_001881_hash caif_stream_recvmsg 4 13173 _001881_hash NULL
-+_001882_hash carl9170_alloc 1 27 _001882_hash NULL
-+_001883_hash carl9170_debugfs_read 3 47738 _001883_hash NULL
-+_001884_hash ceph_msgpool_init 4 34599 _001884_hash NULL
-+_001885_hash cfpkt_add_trail 3 27260 _001885_hash NULL
-+_001886_hash cfpkt_create 1 18197 _001886_hash NULL
-+_001887_hash cfpkt_pad_trail 2 55511 _003606_hash NULL nohasharray
-+_001888_hash cfpkt_split 2 47541 _001888_hash NULL
-+_001889_hash cgroup_read_s64 5 19570 _001889_hash NULL
-+_001890_hash cgroup_read_u64 5 45532 _001890_hash NULL
-+_001891_hash channel_type_read 3 47308 _001891_hash NULL
-+_001892_hash check_header 2 56930 _001892_hash NULL
-+_001893_hash codec_list_read_file 3 24910 _001893_hash NULL
-+_001894_hash configfs_read_file 3 1683 _001894_hash NULL
-+_001895_hash console_store 4 36007 _001895_hash NULL
-+_001896_hash cpuset_common_file_read 5 8800 _001896_hash NULL
-+_001897_hash create_subvol 4 30836 _001897_hash NULL
-+_001898_hash cxio_hal_init_resource 2-7-6 29771 _001898_hash &_000295_hash
-+_001901_hash cxio_hal_init_rhdl_resource 1 25104 _001901_hash NULL
-+_001902_hash dai_list_read_file 3 25421 _001902_hash NULL
-+_001903_hash dapm_bias_read_file 3 64715 _001903_hash NULL
-+_001904_hash dapm_widget_power_read_file 3 59950 _001983_hash NULL nohasharray
-+_001907_hash dbgfs_frame 3 45917 _001907_hash NULL
-+_001908_hash dbgfs_state 3 38894 _001908_hash NULL
-+_001909_hash dccp_manip_pkt 2 30229 _001909_hash NULL
-+_001910_hash ddp_ppod_write_idata 5 25610 _001910_hash NULL
-+_001911_hash debugfs_read 3 62535 _001911_hash NULL
-+_001912_hash debug_output 3 18575 _001912_hash NULL
-+_001913_hash debug_read 3 19322 _001913_hash NULL
-+_001914_hash dev_alloc_skb 1 19517 _001914_hash &_001366_hash
-+_001915_hash dfs_file_read 3 18116 _001915_hash NULL
-+_001916_hash diva_alloc_dma_map 2 23798 _001916_hash NULL
-+_001917_hash diva_xdi_write 4 63975 _001917_hash NULL
-+_001918_hash dma_memcpy_pg_to_iovec 6 1725 _001918_hash NULL
-+_001919_hash dma_memcpy_to_iovec 5 12173 _001919_hash NULL
-+_001920_hash dma_show_regs 3 35266 _001920_hash NULL
-+_001921_hash dm_exception_table_init 2 39645 _001921_hash &_001149_hash
-+_001922_hash dn_nsp_do_disc 2-6 49474 _001922_hash NULL
-+_001924_hash dn_recvmsg 4 17213 _001924_hash NULL
-+_001925_hash dns_resolver_read 3 54658 _001925_hash NULL
-+_001926_hash do_msgrcv 4 5590 _001926_hash NULL
-+_001927_hash do_syslog 3 56807 _001927_hash NULL
-+_001928_hash dpcm_state_read_file 3 65489 _001928_hash NULL
-+_001929_hash dsp_cmx_send_member 2 15625 _001929_hash NULL
-+_001930_hash fallback_on_nodma_alloc 2 35332 _001930_hash NULL
-+_001931_hash fc_frame_alloc 2 1596 _001931_hash NULL
-+_001932_hash fc_frame_alloc_fill 2 59394 _001932_hash NULL
-+_001933_hash filter_read 3 61692 _001933_hash NULL
-+_001934_hash __finish_unordered_dir 4 33198 _001934_hash NULL
-+_001935_hash format_devstat_counter 3 32550 _001935_hash NULL
-+_001936_hash fragmentation_threshold_read 3 61718 _001936_hash NULL
-+_001937_hash fuse_conn_limit_read 3 20084 _001937_hash NULL
-+_001938_hash fuse_conn_waiting_read 3 49762 _001938_hash NULL
-+_001939_hash fuse_file_aio_write 4 46399 _001939_hash NULL
-+_001940_hash generic_readlink 3 32654 _001940_hash NULL
-+_001941_hash gre_manip_pkt 2 38785 _001941_hash NULL
-+_001942_hash handle_eviocgbit 3 44193 _001942_hash NULL
-+_001943_hash handle_response 5 55951 _001943_hash NULL
-+_001944_hash handle_response_icmp 7 39574 _001944_hash NULL
-+_001945_hash hash_recvmsg 4 50924 _001945_hash NULL
-+_001946_hash hci_send_cmd 3 43810 _001946_hash NULL
-+_001947_hash hci_si_event 3 1404 _001947_hash NULL
-+_001948_hash help 4 14971 _001948_hash NULL
-+_001949_hash hfcpci_empty_bfifo 4 62323 _001949_hash NULL
-+_001950_hash hidp_send_ctrl_message 4 43702 _001950_hash NULL
-+_001951_hash ht40allow_map_read 3 55209 _001951_hash &_001512_hash
-+_001952_hash hwflags_read 3 52318 _001952_hash NULL
-+_001953_hash hysdn_conf_read 3 42324 _001953_hash NULL
-+_001954_hash hysdn_sched_rx 3 60533 _001954_hash NULL
-+_001955_hash i2400m_rx_stats_read 3 57706 _001955_hash NULL
-+_001956_hash i2400m_tx_stats_read 3 28527 _001956_hash NULL
-+_001957_hash icmp_manip_pkt 2 48801 _001957_hash NULL
-+_001958_hash idmouse_read 3 63374 _001958_hash NULL
-+_001959_hash ieee80211_if_read 3 6785 _001959_hash NULL
-+_001960_hash ieee80211_rx_bss_info 3 61630 _001960_hash NULL
-+_001961_hash ikconfig_read_current 3 1658 _001961_hash NULL
-+_001962_hash il3945_sta_dbgfs_stats_table_read 3 48802 _001962_hash NULL
-+_001963_hash il3945_ucode_general_stats_read 3 46111 _001963_hash NULL
-+_001964_hash il3945_ucode_rx_stats_read 3 3048 _001964_hash NULL
-+_001965_hash il3945_ucode_tx_stats_read 3 36016 _001965_hash NULL
-+_001966_hash il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 _001966_hash NULL
-+_001967_hash il4965_rs_sta_dbgfs_scale_table_read 3 38564 _001967_hash NULL
-+_001968_hash il4965_rs_sta_dbgfs_stats_table_read 3 49206 _001968_hash NULL
-+_001969_hash il4965_ucode_general_stats_read 3 56277 _001969_hash NULL
-+_001970_hash il4965_ucode_rx_stats_read 3 61948 _001970_hash NULL
-+_001971_hash il4965_ucode_tx_stats_read 3 12064 _001971_hash NULL
-+_001972_hash il_dbgfs_chain_noise_read 3 38044 _001972_hash NULL
-+_001973_hash il_dbgfs_channels_read 3 25005 _001973_hash NULL
-+_001974_hash il_dbgfs_disable_ht40_read 3 42386 _001974_hash NULL
-+_001975_hash il_dbgfs_fh_reg_read 3 40993 _001975_hash NULL
-+_001976_hash il_dbgfs_force_reset_read 3 57517 _001976_hash NULL
-+_001977_hash il_dbgfs_interrupt_read 3 3351 _001977_hash NULL
-+_001978_hash il_dbgfs_missed_beacon_read 3 59956 _001978_hash NULL
-+_001979_hash il_dbgfs_nvm_read 3 12288 _001979_hash NULL
-+_001980_hash il_dbgfs_power_save_status_read 3 43165 _001980_hash NULL
-+_001981_hash il_dbgfs_qos_read 3 33615 _001981_hash NULL
-+_001982_hash il_dbgfs_rxon_filter_flags_read 3 19281 _001982_hash NULL
-+_001983_hash il_dbgfs_rxon_flags_read 3 59950 _001983_hash &_001904_hash
-+_001984_hash il_dbgfs_rx_queue_read 3 11221 _001984_hash NULL
-+_001985_hash il_dbgfs_rx_stats_read 3 15243 _001985_hash NULL
-+_001986_hash il_dbgfs_sensitivity_read 3 2370 _001986_hash NULL
-+_001987_hash il_dbgfs_sram_read 3 62296 _001987_hash NULL
-+_001988_hash il_dbgfs_stations_read 3 21532 _001988_hash NULL
-+_001989_hash il_dbgfs_status_read 3 58388 _001989_hash NULL
-+_001990_hash il_dbgfs_tx_queue_read 3 55668 _001990_hash NULL
-+_001991_hash il_dbgfs_tx_stats_read 3 32913 _001991_hash NULL
-+_001992_hash ima_show_htable_value 2 57136 _001992_hash NULL
-+_001994_hash intel_fake_agp_alloc_by_type 1 1 _001994_hash NULL
-+_001995_hash ip4ip6_err 5 36772 _001995_hash NULL
-+_001996_hash ip6_append_data 4-5 36490 _003601_hash NULL nohasharray
-+_001997_hash ip6ip6_err 5 18308 _001997_hash NULL
-+_001998_hash __ip_append_data 7-8 36191 _001998_hash NULL
-+_001999_hash ip_vs_icmp_xmit 4 59624 _001999_hash NULL
-+_002000_hash ip_vs_icmp_xmit_v6 4 20464 _002000_hash NULL
-+_002001_hash ipw_write 3 59807 _002001_hash NULL
-+_002002_hash irda_recvmsg_stream 4 35280 _002002_hash NULL
-+_002003_hash irq_domain_add_simple 2 46734 _002003_hash NULL
-+_002004_hash __iscsi_complete_pdu 4 10726 _002004_hash NULL
-+_002005_hash iscsi_nop_out_rsp 4 51117 _002005_hash NULL
-+_002006_hash iscsi_tcp_conn_setup 2 16376 _002006_hash NULL
-+_002007_hash iwl_dbgfs_bt_traffic_read 3 35534 _002007_hash NULL
-+_002008_hash iwl_dbgfs_calib_disabled_read 3 22649 _002008_hash NULL
-+_002009_hash iwl_dbgfs_chain_noise_read 3 46355 _002009_hash NULL
-+_002010_hash iwl_dbgfs_channels_read 3 6784 _002010_hash NULL
-+_002011_hash iwl_dbgfs_current_sleep_command_read 3 2081 _002011_hash NULL
-+_002012_hash iwl_dbgfs_disable_ht40_read 3 35761 _002012_hash NULL
-+_002013_hash iwl_dbgfs_fh_reg_read 3 879 _002013_hash &_000406_hash
-+_002014_hash iwl_dbgfs_interrupt_read 3 23574 _002014_hash NULL
-+_002015_hash iwl_dbgfs_log_event_read 3 2107 _002015_hash NULL
-+_002016_hash iwl_dbgfs_missed_beacon_read 3 50584 _002016_hash NULL
-+_002017_hash iwl_dbgfs_nvm_read 3 23845 _002017_hash NULL
-+_002018_hash iwl_dbgfs_plcp_delta_read 3 55407 _002018_hash NULL
-+_002019_hash iwl_dbgfs_power_save_status_read 3 54392 _002019_hash NULL
-+_002020_hash iwl_dbgfs_protection_mode_read 3 13943 _002020_hash NULL
-+_002021_hash iwl_dbgfs_qos_read 3 11753 _002021_hash NULL
-+_002022_hash iwl_dbgfs_reply_tx_error_read 3 19205 _002022_hash NULL
-+_002023_hash iwl_dbgfs_rf_reset_read 3 26512 _002023_hash NULL
-+_002024_hash iwl_dbgfs_rx_handlers_read 3 18708 _002024_hash NULL
-+_002025_hash iwl_dbgfs_rxon_filter_flags_read 3 28832 _002025_hash NULL
-+_002026_hash iwl_dbgfs_rxon_flags_read 3 20795 _002026_hash NULL
-+_002027_hash iwl_dbgfs_rx_queue_read 3 19943 _002027_hash NULL
-+_002028_hash iwl_dbgfs_sensitivity_read 3 63116 _002731_hash NULL nohasharray
-+_002029_hash iwl_dbgfs_sleep_level_override_read 3 3038 _002029_hash NULL
-+_002030_hash iwl_dbgfs_sram_read 3 44505 _002030_hash NULL
-+_002031_hash iwl_dbgfs_stations_read 3 9309 _002031_hash NULL
-+_002032_hash iwl_dbgfs_status_read 3 5171 _002032_hash NULL
-+_002033_hash iwl_dbgfs_temperature_read 3 29224 _002033_hash NULL
-+_002034_hash iwl_dbgfs_thermal_throttling_read 3 38779 _002034_hash NULL
-+_002035_hash iwl_dbgfs_tx_queue_read 3 4635 _002035_hash NULL
-+_002036_hash iwl_dbgfs_ucode_bt_stats_read 3 42820 _002036_hash NULL
-+_002037_hash iwl_dbgfs_ucode_general_stats_read 3 49199 _002037_hash NULL
-+_002038_hash iwl_dbgfs_ucode_rx_stats_read 3 58023 _002038_hash NULL
-+_002039_hash iwl_dbgfs_ucode_tracing_read 3 47983 _002039_hash &_000356_hash
-+_002040_hash iwl_dbgfs_ucode_tx_stats_read 3 31611 _002040_hash NULL
-+_002041_hash iwl_dbgfs_wowlan_sram_read 3 540 _002041_hash NULL
-+_002042_hash joydev_ioctl 2 33343 _002042_hash NULL
-+_002043_hash kernel_readv 3 35617 _002043_hash NULL
-+_002044_hash key_algorithm_read 3 57946 _002044_hash NULL
-+_002045_hash key_icverrors_read 3 20895 _002045_hash NULL
-+_002046_hash key_key_read 3 3241 _002046_hash NULL
-+_002047_hash key_replays_read 3 62746 _002047_hash NULL
-+_002048_hash key_rx_spec_read 3 12736 _002048_hash NULL
-+_002049_hash key_tx_spec_read 3 4862 _002049_hash NULL
-+_002050_hash __kfifo_to_user 3 36555 _002568_hash NULL nohasharray
-+_002051_hash __kfifo_to_user_r 3 39123 _002051_hash NULL
-+_002052_hash kmem_zalloc_greedy 2-3 65268 _002052_hash NULL
-+_002054_hash l1oip_socket_recv 6 56537 _002054_hash NULL
-+_002055_hash l2cap_build_cmd 4 48676 _002055_hash NULL
-+_002056_hash l2cap_chan_send 3 49995 _002056_hash NULL
-+_002057_hash l2cap_segment_sdu 4 48772 _002057_hash NULL
-+_002058_hash l2down_create 4 21755 _002058_hash NULL
-+_002059_hash l2tp_xmit_skb 3 42672 _002059_hash NULL
-+_002060_hash l2up_create 3 6430 _002060_hash NULL
-+_002061_hash lbs_debugfs_read 3 30721 _002061_hash NULL
-+_002062_hash lbs_dev_info 3 51023 _002062_hash NULL
-+_002063_hash lbs_host_sleep_read 3 31013 _002063_hash NULL
-+_002064_hash lbs_rdbbp_read 3 45805 _002064_hash NULL
-+_002065_hash lbs_rdmac_read 3 418 _002065_hash NULL
-+_002066_hash lbs_rdrf_read 3 41431 _002066_hash NULL
-+_002067_hash lbs_sleepparams_read 3 10840 _002067_hash NULL
-+_002068_hash lbs_threshold_read 5 21046 _002068_hash NULL
-+_002069_hash ldisc_receive 4 41516 _002069_hash NULL
-+_002070_hash libfc_vport_create 2 4415 _002070_hash NULL
-+_002073_hash lkdtm_debugfs_read 3 45752 _002073_hash NULL
-+_002074_hash llcp_sock_recvmsg 4 13556 _002074_hash NULL
-+_002075_hash long_retry_limit_read 3 59766 _002075_hash NULL
-+_002076_hash lpfc_debugfs_dif_err_read 3 36303 _002076_hash NULL
-+_002077_hash lpfc_debugfs_read 3 16566 _002077_hash NULL
-+_002078_hash lpfc_idiag_baracc_read 3 58466 _002972_hash NULL nohasharray
-+_002079_hash lpfc_idiag_ctlacc_read 3 33943 _002079_hash NULL
-+_002080_hash lpfc_idiag_drbacc_read 3 15948 _002080_hash NULL
-+_002081_hash lpfc_idiag_extacc_read 3 48301 _002081_hash NULL
-+_002082_hash lpfc_idiag_mbxacc_read 3 28061 _002082_hash NULL
-+_002083_hash lpfc_idiag_pcicfg_read 3 50334 _002083_hash NULL
-+_002084_hash lpfc_idiag_queacc_read 3 13950 _002084_hash NULL
-+_002085_hash lpfc_idiag_queinfo_read 3 55662 _002085_hash NULL
-+_002086_hash lro_gen_skb 6 2644 _002086_hash NULL
-+_002087_hash mac80211_format_buffer 2 41010 _002087_hash NULL
-+_002088_hash macvtap_alloc_skb 2-4-3 50629 _002088_hash NULL
-+_002091_hash macvtap_put_user 4 55609 _002091_hash NULL
-+_002092_hash macvtap_sendmsg 4 30629 _002092_hash NULL
-+_002093_hash mangle_packet 6-8 27864 _002093_hash NULL
-+_002095_hash manip_pkt 3 7741 _002095_hash NULL
-+_002096_hash mempool_create_kmalloc_pool 1 41650 _002096_hash NULL
-+_002097_hash mempool_create_page_pool 1 30189 _002097_hash NULL
-+_002098_hash mempool_create_slab_pool 1 62907 _002098_hash NULL
-+_002099_hash mgmt_device_found 10 14146 _002099_hash NULL
-+_002100_hash minstrel_stats_read 3 17290 _002100_hash NULL
-+_002101_hash mmc_ext_csd_read 3 13205 _002101_hash NULL
-+_002102_hash mon_bin_read 3 6841 _002102_hash NULL
-+_002103_hash mon_stat_read 3 25238 _002103_hash NULL
-+_002105_hash mqueue_read_file 3 6228 _002105_hash NULL
-+_002106_hash mwifiex_debug_read 3 53074 _002106_hash NULL
-+_002107_hash mwifiex_getlog_read 3 54269 _002107_hash NULL
-+_002108_hash mwifiex_info_read 3 53447 _002108_hash NULL
-+_002109_hash mwifiex_rdeeprom_read 3 51429 _002109_hash NULL
-+_002110_hash mwifiex_regrdwr_read 3 34472 _002110_hash NULL
-+_002111_hash named_prepare_buf 2 24532 _002111_hash NULL
-+_002112_hash nci_send_cmd 3 58206 _002112_hash NULL
-+_002113_hash netdev_alloc_skb_ip_align 2 40811 _002113_hash NULL
-+_002114_hash netpoll_send_udp 3 58955 _002114_hash NULL
-+_002115_hash nfcwilink_send_bts_cmd 3 10802 _002115_hash NULL
-+_002116_hash nf_nat_mangle_tcp_packet 5-7 8643 _002116_hash NULL
-+_002119_hash nfsd_vfs_read 6 62605 _002616_hash NULL nohasharray
-+_002120_hash nfsd_vfs_write 6 54577 _002120_hash NULL
-+_002121_hash nfs_idmap_lookup_id 2 10660 _002121_hash NULL
-+_002122_hash ntfs_rl_realloc 3 56831 _002122_hash &_000370_hash
-+_002123_hash ntfs_rl_realloc_nofail 3 32173 _002123_hash NULL
-+_002124_hash o2hb_debug_read 3 37851 _002124_hash NULL
-+_002125_hash o2net_debug_read 3 52105 _002125_hash NULL
-+_002126_hash ocfs2_control_read 3 56405 _002126_hash NULL
-+_002127_hash ocfs2_debug_read 3 14507 _002127_hash NULL
-+_002128_hash oom_adjust_read 3 25127 _002128_hash NULL
-+_002129_hash oom_score_adj_read 3 39921 _002426_hash NULL nohasharray
-+_002130_hash oprofilefs_str_to_user 3 42182 _002130_hash NULL
-+_002131_hash oprofilefs_ulong_to_user 3 11582 _002131_hash NULL
-+_002132_hash osd_req_add_get_attr_list 3 49278 _002132_hash NULL
-+_002133_hash _osd_req_list_objects 6 4204 _002133_hash NULL
-+_002134_hash osd_req_read_kern 5 59990 _002134_hash NULL
-+_002135_hash osd_req_write_kern 5 53486 _002135_hash NULL
-+_002136_hash osst_read 3 40237 _002136_hash NULL
-+_002137_hash p54_alloc_skb 3 34366 _002137_hash &_000485_hash
-+_002138_hash p54_init_common 1 23850 _002138_hash NULL
-+_002139_hash packet_alloc_skb 2-5-4 62602 _002139_hash NULL
-+_002142_hash packet_sendmsg 4 24954 _002142_hash NULL
-+_002143_hash page_readlink 3 23346 _002143_hash NULL
-+_002144_hash pcf50633_write_block 3 2124 _002144_hash NULL
-+_002145_hash pcpu_alloc_alloc_info 1-2 45813 _002145_hash NULL
-+_002147_hash pep_indicate 5 38611 _002147_hash NULL
-+_002148_hash pep_reply 5 50582 _002148_hash NULL
-+_002149_hash pipe_handler_request 5 50774 _003582_hash NULL nohasharray
-+_002150_hash platform_list_read_file 3 34734 _002150_hash NULL
-+_002151_hash pm860x_bulk_write 3 43875 _002151_hash NULL
-+_002152_hash pm_qos_power_read 3 55891 _002152_hash NULL
-+_002153_hash port_show_regs 3 5904 _002153_hash NULL
-+_002154_hash proc_coredump_filter_read 3 39153 _002154_hash NULL
-+_002155_hash proc_fdinfo_read 3 62043 _002155_hash NULL
-+_002156_hash proc_file_read 3 53905 _002156_hash NULL
-+_002157_hash proc_info_read 3 63344 _002157_hash NULL
-+_002158_hash proc_loginuid_read 3 15631 _002158_hash NULL
-+_002159_hash proc_pid_attr_read 3 10173 _002159_hash NULL
-+_002160_hash proc_pid_readlink 3 52186 _002160_hash NULL
-+_002161_hash proc_read 3 43614 _002161_hash NULL
-+_002162_hash proc_self_readlink 3 38094 _002162_hash NULL
-+_002163_hash proc_sessionid_read 3 6911 _002299_hash NULL nohasharray
-+_002164_hash provide_user_output 3 41105 _002164_hash NULL
-+_002165_hash pskb_network_may_pull 2 35336 _002165_hash NULL
-+_002166_hash pskb_pull 2 65005 _002166_hash NULL
-+_002167_hash pstore_file_read 3 57288 _002167_hash NULL
-+_002168_hash ql_process_mac_rx_page 4 15543 _002168_hash NULL
-+_002169_hash ql_process_mac_rx_skb 4 6689 _002169_hash NULL
-+_002170_hash queues_read 3 24877 _002170_hash NULL
-+_002171_hash raw_recvmsg 4 17277 _002171_hash NULL
-+_002172_hash rcname_read 3 25919 _002172_hash NULL
-+_002173_hash read_4k_modal_eeprom 3 30212 _002173_hash NULL
-+_002174_hash read_9287_modal_eeprom 3 59327 _002174_hash NULL
-+_002175_hash reada_find_extent 2 63486 _002175_hash NULL
-+_002176_hash read_def_modal_eeprom 3 14041 _002176_hash NULL
-+_002177_hash read_enabled_file_bool 3 37744 _002177_hash NULL
-+_002178_hash read_file_ani 3 23161 _002178_hash NULL
-+_002179_hash read_file_antenna 3 13574 _002179_hash NULL
-+_002180_hash read_file_base_eeprom 3 42168 _002180_hash NULL
-+_002181_hash read_file_beacon 3 32595 _002181_hash NULL
-+_002182_hash read_file_blob 3 57406 _002182_hash NULL
-+_002183_hash read_file_bool 3 4180 _002183_hash NULL
-+_002184_hash read_file_credit_dist_stats 3 54367 _002184_hash NULL
-+_002185_hash read_file_debug 3 58256 _002185_hash NULL
-+_002186_hash read_file_disable_ani 3 6536 _002186_hash NULL
-+_002187_hash read_file_dma 3 9530 _002187_hash NULL
-+_002188_hash read_file_dump_nfcal 3 18766 _002188_hash NULL
-+_002189_hash read_file_frameerrors 3 64001 _002189_hash NULL
-+_002190_hash read_file_interrupt 3 61742 _002197_hash NULL nohasharray
-+_002191_hash read_file_misc 3 9948 _002191_hash NULL
-+_002192_hash read_file_modal_eeprom 3 39909 _002192_hash NULL
-+_002193_hash read_file_queue 3 40895 _002193_hash NULL
-+_002194_hash read_file_rcstat 3 22854 _002194_hash NULL
-+_002195_hash read_file_recv 3 48232 _002195_hash NULL
-+_002196_hash read_file_regidx 3 33370 _002196_hash NULL
-+_002197_hash read_file_regval 3 61742 _002197_hash &_002190_hash
-+_002198_hash read_file_reset 3 52310 _002198_hash NULL
-+_002199_hash read_file_rx_chainmask 3 41605 _002199_hash NULL
-+_002200_hash read_file_slot 3 50111 _002200_hash NULL
-+_002201_hash read_file_stations 3 35795 _002201_hash NULL
-+_002202_hash read_file_tgt_int_stats 3 20697 _002202_hash NULL
-+_002203_hash read_file_tgt_rx_stats 3 33944 _002203_hash NULL
-+_002204_hash read_file_tgt_stats 3 8959 _002204_hash NULL
-+_002205_hash read_file_tgt_tx_stats 3 51847 _002205_hash NULL
-+_002206_hash read_file_tx_chainmask 3 3829 _002206_hash NULL
-+_002207_hash read_file_war_stats 3 292 _002207_hash NULL
-+_002208_hash read_file_xmit 3 21487 _002208_hash NULL
-+_002209_hash read_flush_pipefs 3 20171 _002209_hash NULL
-+_002210_hash read_flush_procfs 3 27642 _002210_hash NULL
-+_002211_hash read_from_oldmem 2 3337 _002211_hash NULL
-+_002212_hash read_oldmem 3 55658 _002212_hash NULL
-+_002213_hash receive_packet 2 12367 _002213_hash NULL
-+_002214_hash regmap_name_read_file 3 39379 _002214_hash NULL
-+_002215_hash repair_io_failure 4 4815 _002215_hash NULL
-+_002216_hash request_key_and_link 4 42693 _002216_hash NULL
-+_002217_hash res_counter_read 4 33499 _002217_hash NULL
-+_002218_hash rfcomm_tty_write 3 51603 _002218_hash NULL
-+_002219_hash rs_sta_dbgfs_rate_scale_data_read 3 47165 _002219_hash NULL
-+_002220_hash rs_sta_dbgfs_scale_table_read 3 40262 _002220_hash NULL
-+_002221_hash rs_sta_dbgfs_stats_table_read 3 56573 _002221_hash NULL
-+_002222_hash rts_threshold_read 3 44384 _002222_hash NULL
-+_002223_hash rxrpc_sendmsg 4 29049 _002223_hash NULL
-+_002224_hash scrub_setup_recheck_block 3-4 56245 _002224_hash NULL
-+_002226_hash scsi_adjust_queue_depth 3 12802 _002226_hash NULL
-+_002227_hash sctp_make_abort 3 34459 _002227_hash NULL
-+_002228_hash sctp_make_asconf 3 4078 _002228_hash NULL
-+_002229_hash sctp_make_asconf_ack 3 31726 _002229_hash NULL
-+_002230_hash sctp_make_datafrag_empty 3 34737 _002230_hash NULL
-+_002231_hash sctp_make_fwdtsn 3 53265 _002231_hash NULL
-+_002232_hash sctp_make_heartbeat_ack 4 34411 _002232_hash NULL
-+_002233_hash sctp_make_init 4 58401 _002233_hash NULL
-+_002234_hash sctp_make_init_ack 4 3335 _002234_hash NULL
-+_002235_hash sctp_make_op_error_space 3 5528 _002235_hash NULL
-+_002236_hash sctp_manip_pkt 2 40620 _002236_hash NULL
-+_002237_hash selinux_inode_notifysecctx 3 36896 _002237_hash NULL
-+_002238_hash sel_read_avc_cache_threshold 3 33942 _002238_hash NULL
-+_002239_hash sel_read_avc_hash_stats 3 1984 _002239_hash NULL
-+_002240_hash sel_read_bool 3 24236 _002240_hash NULL
-+_002241_hash sel_read_checkreqprot 3 33068 _002241_hash NULL
-+_002242_hash sel_read_class 3 12669 _002960_hash NULL nohasharray
-+_002243_hash sel_read_enforce 3 2828 _002243_hash NULL
-+_002244_hash sel_read_handle_status 3 56139 _002244_hash NULL
-+_002245_hash sel_read_handle_unknown 3 57933 _002245_hash NULL
-+_002246_hash sel_read_initcon 3 32362 _002246_hash NULL
-+_002247_hash sel_read_mls 3 25369 _002247_hash NULL
-+_002248_hash sel_read_perm 3 42302 _002248_hash NULL
-+_002249_hash sel_read_policy 3 55947 _002249_hash NULL
-+_002250_hash sel_read_policycap 3 28544 _002250_hash NULL
-+_002251_hash sel_read_policyvers 3 55 _002827_hash NULL nohasharray
-+_002252_hash send_mpa_reject 3 7135 _002252_hash NULL
-+_002253_hash send_mpa_reply 3 32372 _002253_hash NULL
-+_002254_hash send_msg 4 37323 _002254_hash NULL
-+_002255_hash send_packet 4 52960 _002255_hash NULL
-+_002256_hash set_rxd_buffer_pointer 8 9950 _002256_hash NULL
-+_002257_hash sge_rx 3 50594 _002257_hash NULL
-+_002258_hash short_retry_limit_read 3 4687 _002258_hash NULL
-+_002259_hash simple_attr_read 3 24738 _002259_hash NULL
-+_002260_hash simple_transaction_read 3 17076 _002260_hash NULL
-+_002261_hash sisusbcon_bmove 5-7-6 21873 _002261_hash NULL
-+_002264_hash sisusbcon_clear 3-5-4 64329 _002264_hash NULL
-+_002267_hash sisusbcon_putcs 3 57630 _002267_hash &_001043_hash
-+_002268_hash sisusbcon_scroll 5-3-2 31315 _002268_hash NULL
-+_002269_hash sisusbcon_scroll_area 3-4 25899 _002269_hash NULL
-+_002271_hash skb_copy_datagram_const_iovec 2-5-4 48102 _002271_hash NULL
-+_002274_hash skb_copy_datagram_iovec 2-4 5806 _002274_hash NULL
-+_002276_hash skb_gro_header_slow 2 34958 _002276_hash NULL
-+_002277_hash smk_read_ambient 3 61220 _002277_hash NULL
-+_002278_hash smk_read_direct 3 15803 _002278_hash NULL
-+_002279_hash smk_read_doi 3 30813 _002279_hash NULL
-+_002280_hash smk_read_logging 3 37804 _002280_hash NULL
-+_002281_hash smk_read_mapped 3 7562 _002281_hash NULL
-+_002282_hash smk_read_onlycap 3 3855 _002282_hash NULL
-+_002283_hash smp_build_cmd 3 45853 _002283_hash NULL
-+_002284_hash snapshot_read 3 22601 _002284_hash NULL
-+_002285_hash snd_cs4281_BA0_read 5 6847 _002285_hash NULL
-+_002286_hash snd_cs4281_BA1_read 5 20323 _002286_hash NULL
-+_002287_hash snd_cs46xx_io_read 5 45734 _002287_hash NULL
-+_002288_hash snd_gus_dram_read 4 56686 _002288_hash NULL
-+_002289_hash snd_mixart_BA0_read 5 45069 _002289_hash NULL
-+_002290_hash snd_mixart_BA1_read 5 5082 _002290_hash NULL
-+_002291_hash snd_pcm_oss_read 3 28317 _002291_hash NULL
-+_002292_hash snd_pcm_plug_alloc 2 42339 _002292_hash NULL
-+_002293_hash snd_rawmidi_kernel_read 3 4328 _002293_hash NULL
-+_002294_hash snd_rawmidi_read 3 56337 _002294_hash NULL
-+_002295_hash snd_rme32_capture_copy 5 39653 _002295_hash NULL
-+_002296_hash snd_rme96_capture_copy 5 58484 _002296_hash NULL
-+_002297_hash snd_soc_hw_bulk_write_raw 4 14245 _002297_hash NULL
-+_002298_hash sock_alloc_send_skb 2 23720 _002298_hash NULL
-+_002299_hash spi_show_regs 3 6911 _002299_hash &_002163_hash
-+_002300_hash sta_agg_status_read 3 14058 _002300_hash NULL
-+_002301_hash sta_connected_time_read 3 17435 _002301_hash NULL
-+_002302_hash sta_flags_read 3 56710 _002302_hash NULL
-+_002303_hash sta_ht_capa_read 3 10366 _002303_hash NULL
-+_002304_hash sta_last_seq_ctrl_read 3 19106 _002304_hash NULL
-+_002305_hash sta_num_ps_buf_frames_read 3 1488 _002305_hash NULL
-+_002306_hash st_read 3 51251 _002306_hash NULL
-+_002307_hash supply_map_read_file 3 10608 _002307_hash NULL
-+_002308_hash sysfs_read_file 3 42113 _002308_hash NULL
-+_002309_hash sys_preadv 3 17100 _002309_hash NULL
-+_002310_hash sys_pwritev 3 41722 _002310_hash NULL
-+_002311_hash sys_readv 3 50664 _002311_hash NULL
-+_002312_hash sys_rt_sigpending 2 24961 _002312_hash NULL
-+_002313_hash sys_writev 3 28384 _002313_hash NULL
-+_002314_hash tcf_csum_skb_nextlayer 3 64025 _002314_hash NULL
-+_002315_hash tcp_fragment 3 20436 _002315_hash NULL
-+_002316_hash tcp_manip_pkt 2 14202 _002316_hash NULL
-+_002317_hash teiup_create 3 43201 _002317_hash NULL
-+_002318_hash test_iso_queue 5 62534 _002318_hash NULL
-+_002319_hash tg3_run_loopback 2 30093 _002319_hash NULL
-+_002320_hash tipc_msg_build 4 12326 _002320_hash NULL
-+_002321_hash TSS_authhmac 3 12839 _002321_hash NULL
-+_002322_hash TSS_checkhmac1 5 31429 _002322_hash NULL
-+_002323_hash TSS_checkhmac2 5-7 40520 _002323_hash NULL
-+_002325_hash tty_audit_log 8 47280 _002325_hash NULL
-+_002326_hash tty_buffer_request_room 2 23228 _002326_hash NULL
-+_002327_hash tty_insert_flip_string_fixed_flag 4 37428 _002327_hash NULL
-+_002328_hash tty_insert_flip_string_flags 4 30969 _002328_hash NULL
-+_002329_hash tty_prepare_flip_string 3 39955 _002329_hash NULL
-+_002330_hash tty_prepare_flip_string_flags 4 59240 _002330_hash NULL
-+_002331_hash tun_alloc_skb 2-4-3 41216 _002331_hash NULL
-+_002334_hash tun_sendmsg 4 10337 _002334_hash NULL
-+_002335_hash u32_array_read 3 2219 _002335_hash NULL
-+_002336_hash ubi_io_write_data 4-5 40305 _002336_hash NULL
-+_002338_hash udplite_manip_pkt 2 62433 _002338_hash NULL
-+_002339_hash udp_manip_pkt 2 50770 _002339_hash NULL
-+_002340_hash uhci_debug_read 3 5911 _002340_hash NULL
-+_002341_hash um_idi_read 3 850 _002341_hash NULL
-+_002342_hash unix_seqpacket_sendmsg 4 27893 _002342_hash NULL
-+_002343_hash unix_stream_recvmsg 4 35210 _002343_hash NULL
-+_002344_hash unlink_simple 3 47506 _002344_hash NULL
-+_002345_hash use_pool 2 64607 _002345_hash NULL
-+_002346_hash v9fs_fid_readn 4 60544 _002346_hash NULL
-+_002347_hash v9fs_file_read 3 40858 _002347_hash NULL
-+_002348_hash vhci_read 3 47878 _002348_hash NULL
-+_002349_hash vhost_add_used_and_signal_n 4 8038 _002349_hash NULL
-+_002350_hash vmbus_open 2-3 12154 _002350_hash NULL
-+_002352_hash vxge_rx_alloc 3 52024 _002352_hash NULL
-+_002353_hash waiters_read 3 40902 _002353_hash NULL
-+_002354_hash wm8994_bulk_write 3 13615 _002354_hash NULL
-+_002355_hash write_pbl 4 59583 _002355_hash NULL
-+_002356_hash wusb_prf_256 7 29203 _002356_hash NULL
-+_002357_hash wusb_prf_64 7 51065 _002357_hash NULL
-+_002358_hash _xfs_buf_alloc 3 38058 _002358_hash NULL
-+_002359_hash xfs_buf_read_uncached 3 42844 _002359_hash NULL
-+_002360_hash xfs_file_buffered_aio_write 4 11492 _002360_hash NULL
-+_002361_hash xfs_iext_add 3 41422 _002361_hash NULL
-+_002362_hash xfs_iext_remove_direct 3 40744 _002362_hash NULL
-+_002363_hash xfs_readdir 3 41200 _002363_hash NULL
-+_002364_hash xfs_trans_get_efd 3 51148 _002364_hash NULL
-+_002365_hash xfs_trans_get_efi 2 7898 _002365_hash NULL
-+_002366_hash xlog_bread_offset 3 60030 _002366_hash NULL
-+_002367_hash xlog_get_bp 2 23229 _002367_hash NULL
-+_002368_hash xz_dec_init 2 29029 _002368_hash NULL
-+_002369_hash aac_change_queue_depth 2 825 _002369_hash NULL
-+_002370_hash add_rx_skb 3 8257 _002370_hash NULL
-+_002371_hash afs_extract_data 5 50261 _002371_hash NULL
-+_002372_hash arcmsr_adjust_disk_queue_depth 2 16756 _002372_hash NULL
-+_002373_hash atalk_recvmsg 4 22053 _002373_hash NULL
-+_002374_hash ath6kl_buf_alloc 1 57304 _002374_hash NULL
-+_002376_hash atomic_read_file 3 16227 _002376_hash NULL
-+_002377_hash ax25_recvmsg 4 64441 _002377_hash NULL
-+_002378_hash batadv_add_packet 3 12136 _002378_hash NULL
-+_002379_hash batadv_iv_ogm_aggregate_new 2 54761 _002379_hash NULL
-+_002380_hash batadv_tt_response_fill_table 1 39236 _002380_hash NULL
-+_002381_hash beiscsi_process_async_pdu 7 39834 _002381_hash NULL
-+_002382_hash bioset_create 1 5580 _002382_hash NULL
-+_002383_hash bioset_integrity_create 2 62708 _002383_hash NULL
-+_002384_hash biovec_create_pools 2 9575 _002384_hash NULL
-+_002385_hash bnx2fc_process_l2_frame_compl 3 65072 _002385_hash NULL
-+_002386_hash brcmf_sdbrcm_died_dump 3 15841 _002386_hash NULL
-+_002387_hash brcmu_pkt_buf_get_skb 1 5556 _002387_hash NULL
-+_002388_hash br_send_bpdu 3 29669 _002388_hash NULL
-+_002389_hash btrfs_error_discard_extent 2 50444 _002389_hash NULL
-+_002390_hash __btrfs_free_reserved_extent 2 31207 _002390_hash NULL
-+_002391_hash btrfsic_cmp_log_and_dev_bytenr 2 49628 _002391_hash NULL
-+_002392_hash btrfsic_create_link_to_next_block 4 58246 _002392_hash NULL
-+_002393_hash btrfs_init_new_buffer 4 55761 _002393_hash NULL
-+_002394_hash btrfs_mksubvol 3 58240 _002394_hash NULL
-+_002395_hash bt_skb_send_alloc 2 6581 _002395_hash NULL
-+_002396_hash bt_sock_recvmsg 4 12316 _002396_hash NULL
-+_002397_hash bt_sock_stream_recvmsg 4 52518 _002397_hash NULL
-+_002398_hash c4iw_reject_cr 3 28174 _002398_hash NULL
-+_002399_hash caif_seqpkt_recvmsg 4 32241 _002399_hash NULL
-+_002400_hash carl9170_rx_copy_data 2 21656 _002400_hash NULL
-+_002401_hash cfpkt_append 3 61206 _002401_hash NULL
-+_002402_hash cfpkt_setlen 2 49343 _002402_hash NULL
-+_002403_hash cgroup_file_read 3 28804 _002403_hash NULL
-+_002404_hash cosa_net_setup_rx 2 38594 _002404_hash NULL
-+_002405_hash cpu_type_read 3 36540 _002405_hash NULL
-+_002406_hash cxgb4_pktgl_to_skb 2 61899 _002406_hash NULL
-+_002408_hash dccp_recvmsg 4 16056 _002408_hash NULL
-+_002409_hash ddp_clear_map 4 46152 _002409_hash NULL
-+_002410_hash ddp_set_map 4 751 _002410_hash NULL
-+_002411_hash depth_read 3 31112 _002411_hash NULL
-+_002412_hash dfs_global_file_read 3 7787 _002412_hash NULL
-+_002413_hash dgram_recvmsg 4 23104 _002413_hash NULL
-+_002414_hash diva_init_dma_map 3 58336 _002414_hash NULL
-+_002415_hash divas_write 3 63901 _002415_hash NULL
-+_002416_hash dma_push_rx 2 39973 _002416_hash NULL
-+_002417_hash dma_skb_copy_datagram_iovec 3-5 21516 _002417_hash NULL
-+_002419_hash dm_table_create 3 35687 _002419_hash NULL
-+_002420_hash dn_alloc_send_pskb 2 4465 _002420_hash NULL
-+_002421_hash dn_nsp_return_disc 2 60296 _002421_hash NULL
-+_002422_hash dn_nsp_send_disc 2 23469 _002422_hash NULL
-+_002423_hash dsp_tone_hw_message 3 17678 _002423_hash NULL
-+_002424_hash e1000_check_copybreak 3 62448 _002424_hash NULL
-+_002425_hash enable_read 3 2117 _002425_hash &_000224_hash
-+_002426_hash exofs_read_kern 6 39921 _002426_hash &_002129_hash
-+_002427_hash fast_rx_path 3 59214 _002427_hash NULL
-+_002428_hash fc_change_queue_depth 2 36841 _002428_hash NULL
-+_002429_hash fc_fcp_frame_alloc 2 12624 _002429_hash NULL
-+_002430_hash fcoe_ctlr_send_keep_alive 3 15308 _002430_hash NULL
-+_002431_hash frequency_read 3 64031 _003698_hash NULL nohasharray
-+_002432_hash ftdi_process_packet 5 45005 _002432_hash NULL
-+_002433_hash fuse_conn_congestion_threshold_read 3 51028 _002433_hash NULL
-+_002434_hash fuse_conn_max_background_read 3 10855 _002434_hash NULL
-+_002435_hash fwnet_incoming_packet 3 40380 _002435_hash NULL
-+_002436_hash fwnet_pd_new 4 39947 _003402_hash NULL nohasharray
-+_002437_hash get_alua_req 3 4166 _002437_hash NULL
-+_002438_hash get_rdac_req 3 45882 _002438_hash NULL
-+_002439_hash got_frame 2 16028 _002439_hash NULL
-+_002440_hash gsm_mux_rx_netchar 3 33336 _002440_hash NULL
-+_002441_hash hci_sock_recvmsg 4 7072 _002441_hash NULL
-+_002442_hash hdlcdev_rx 3 997 _002442_hash NULL
-+_002443_hash hdlc_empty_fifo 2 18397 _002443_hash NULL
-+_002444_hash hfc_empty_fifo 2 57972 _002444_hash NULL
-+_002445_hash hfcpci_empty_fifo 4 2427 _002445_hash NULL
-+_002446_hash hfcsusb_rx_frame 3 52745 _002446_hash NULL
-+_002447_hash hidp_output_raw_report 3 5629 _002447_hash NULL
-+_002448_hash hpsa_change_queue_depth 2 15449 _002448_hash NULL
-+_002449_hash hptiop_adjust_disk_queue_depth 2 20122 _002449_hash NULL
-+_002450_hash hscx_empty_fifo 2 13360 _002450_hash NULL
-+_002451_hash hysdn_rx_netpkt 3 16136 _002451_hash NULL
-+_002452_hash i2o_pool_alloc 4 55485 _002452_hash NULL
-+_002453_hash ide_queue_pc_tail 5 11673 _002453_hash NULL
-+_002454_hash ide_raw_taskfile 4 42355 _002454_hash NULL
-+_002455_hash idetape_queue_rw_tail 3 29562 _002455_hash NULL
-+_002456_hash ieee80211_amsdu_to_8023s 5 15561 _002456_hash NULL
-+_002457_hash ieee80211_fragment 4 33112 _002457_hash NULL
-+_002458_hash ieee80211_if_read_aid 3 9705 _002458_hash NULL
-+_002459_hash ieee80211_if_read_auto_open_plinks 3 38268 _002459_hash &_000374_hash
-+_002460_hash ieee80211_if_read_ave_beacon 3 64924 _002460_hash NULL
-+_002461_hash ieee80211_if_read_bssid 3 35161 _002461_hash NULL
-+_002462_hash ieee80211_if_read_channel_type 3 23884 _002462_hash NULL
-+_002463_hash ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 _002463_hash NULL
-+_002464_hash ieee80211_if_read_dot11MeshForwarding 3 13940 _002464_hash NULL
-+_002465_hash ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 _002465_hash NULL
-+_002466_hash ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 _002466_hash NULL
-+_002467_hash ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 _002467_hash NULL
-+_002468_hash ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 _002468_hash NULL
-+_002469_hash ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 _002469_hash NULL
-+_002470_hash ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 _002470_hash NULL
-+_002471_hash ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 _002471_hash NULL
-+_002472_hash ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 _002472_hash NULL
-+_002473_hash ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 _002473_hash NULL
-+_002474_hash ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 _002474_hash NULL
-+_002475_hash ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 _002475_hash NULL
-+_002476_hash ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 _002476_hash NULL
-+_002477_hash ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 _002477_hash NULL
-+_002478_hash ieee80211_if_read_dot11MeshMaxRetries 3 12756 _002478_hash NULL
-+_002479_hash ieee80211_if_read_dot11MeshRetryTimeout 3 52168 _002479_hash NULL
-+_002480_hash ieee80211_if_read_dot11MeshTTL 3 58307 _002480_hash NULL
-+_002481_hash ieee80211_if_read_dropped_frames_congestion 3 32603 _002481_hash NULL
-+_002482_hash ieee80211_if_read_dropped_frames_no_route 3 33383 _002482_hash NULL
-+_002483_hash ieee80211_if_read_dropped_frames_ttl 3 44500 _002483_hash NULL
-+_002484_hash ieee80211_if_read_drop_unencrypted 3 37053 _002484_hash NULL
-+_002485_hash ieee80211_if_read_dtim_count 3 38419 _002485_hash NULL
-+_002486_hash ieee80211_if_read_element_ttl 3 18869 _002486_hash NULL
-+_002487_hash ieee80211_if_read_estab_plinks 3 32533 _002487_hash NULL
-+_002488_hash ieee80211_if_read_flags 3 57470 _002919_hash NULL nohasharray
-+_002489_hash ieee80211_if_read_fwded_frames 3 36520 _002489_hash NULL
-+_002490_hash ieee80211_if_read_fwded_mcast 3 39571 _002490_hash &_000162_hash
-+_002491_hash ieee80211_if_read_fwded_unicast 3 59740 _002491_hash &_001697_hash
-+_002492_hash ieee80211_if_read_ht_opmode 3 29044 _002492_hash NULL
-+_002493_hash ieee80211_if_read_last_beacon 3 31257 _002493_hash NULL
-+_002494_hash ieee80211_if_read_min_discovery_timeout 3 13946 _002494_hash NULL
-+_002495_hash ieee80211_if_read_num_buffered_multicast 3 12716 _002495_hash NULL
-+_002496_hash ieee80211_if_read_num_mcast_sta 3 12419 _002496_hash NULL
-+_002497_hash ieee80211_if_read_num_sta_ps 3 34722 _002497_hash NULL
-+_002498_hash ieee80211_if_read_path_refresh_time 3 25545 _002498_hash NULL
-+_002499_hash ieee80211_if_read_peer 3 45233 _002499_hash NULL
-+_002500_hash ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 _002500_hash NULL
-+_002501_hash ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 _002501_hash NULL
-+_002502_hash ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 _002502_hash NULL
-+_002503_hash ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 _002503_hash NULL
-+_002504_hash ieee80211_if_read_rssi_threshold 3 49260 _002504_hash NULL
-+_002505_hash ieee80211_if_read_smps 3 27416 _002505_hash NULL
-+_002506_hash ieee80211_if_read_state 3 9813 _002707_hash NULL nohasharray
-+_002507_hash ieee80211_if_read_tkip_mic_test 3 19565 _002507_hash NULL
-+_002508_hash ieee80211_if_read_tsf 3 16420 _002508_hash NULL
-+_002509_hash ieee80211_if_read_uapsd_max_sp_len 3 15067 _002509_hash NULL
-+_002510_hash ieee80211_if_read_uapsd_queues 3 55150 _002510_hash NULL
-+_002511_hash ieee80211_mgmt_tx 9 46860 _002511_hash NULL
-+_002512_hash ieee80211_probereq_get 4-6 29069 _002512_hash NULL
-+_002514_hash ieee80211_rx_mgmt_beacon 3 24430 _002514_hash NULL
-+_002515_hash ieee80211_rx_mgmt_probe_resp 3 6918 _002515_hash NULL
-+_002516_hash ieee80211_send_auth 5 24121 _002516_hash NULL
-+_002517_hash ieee80211_set_probe_resp 3 10077 _002517_hash NULL
-+_002518_hash ieee80211_tdls_mgmt 8 9581 _002518_hash NULL
-+_002519_hash ima_show_htable_violations 3 10619 _002519_hash NULL
-+_002520_hash ima_show_measurements_count 3 23536 _002520_hash NULL
-+_002521_hash insert_one_name 7 61668 _002521_hash NULL
-+_002522_hash ip6_ufo_append_data 5-7-6 4780 _002522_hash NULL
-+_002525_hash ip_append_data 5-6 16942 _002525_hash NULL
-+_002526_hash ip_make_skb 5-6 13129 _002526_hash NULL
-+_002527_hash ip_nat_sdp_port 6 52938 _002527_hash NULL
-+_002528_hash ip_nat_sip_expect 7 45693 _002528_hash NULL
-+_002529_hash ipr_change_queue_depth 2 6431 _002529_hash NULL
-+_002530_hash ip_recv_error 3 23109 _002530_hash NULL
-+_002531_hash ip_ufo_append_data 6-8-7 12775 _002531_hash NULL
-+_002534_hash ipv6_recv_error 3 56347 _002534_hash NULL
-+_002535_hash ipv6_recv_rxpmtu 3 7142 _002535_hash NULL
-+_002536_hash ipw_packet_received_skb 2 1230 _002536_hash NULL
-+_002537_hash ipx_recvmsg 4 44366 _002537_hash NULL
-+_002538_hash irda_recvmsg_dgram 4 32631 _002538_hash NULL
-+_002539_hash iscsi_change_queue_depth 2 23416 _002539_hash NULL
-+_002540_hash iscsi_complete_pdu 4 48372 _002540_hash NULL
-+_002541_hash iwch_reject_cr 3 23901 _002541_hash NULL
-+_002542_hash ixgb_check_copybreak 3 5847 _002542_hash NULL
-+_002543_hash key_conf_hw_key_idx_read 3 25003 _002543_hash NULL
-+_002544_hash key_conf_keyidx_read 3 42443 _002544_hash NULL
-+_002545_hash key_conf_keylen_read 3 49758 _002545_hash NULL
-+_002546_hash key_flags_read 3 25931 _002546_hash NULL
-+_002547_hash key_ifindex_read 3 31411 _002547_hash NULL
-+_002548_hash key_tx_rx_count_read 3 44742 _002548_hash NULL
-+_002549_hash kmsg_read 3 46514 _002549_hash NULL
-+_002550_hash l1oip_socket_parse 4 4507 _002550_hash NULL
-+_002551_hash l2cap_send_cmd 4 14548 _002551_hash NULL
-+_002552_hash l2cap_sock_sendmsg 4 63427 _002552_hash NULL
-+_002553_hash l2tp_ip6_recvmsg 4 62874 _002553_hash NULL
-+_002554_hash l2tp_ip6_sendmsg 4 7461 _002554_hash NULL
-+_002555_hash l2tp_ip_recvmsg 4 22681 _002555_hash NULL
-+_002556_hash lbs_bcnmiss_read 3 8678 _002556_hash NULL
-+_002557_hash lbs_failcount_read 3 31063 _002557_hash NULL
-+_002558_hash lbs_highrssi_read 3 64089 _002558_hash NULL
-+_002559_hash lbs_highsnr_read 3 5931 _002559_hash NULL
-+_002560_hash lbs_lowrssi_read 3 32242 _002560_hash NULL
-+_002561_hash lbs_lowsnr_read 3 29571 _002561_hash NULL
-+_002563_hash llc_ui_recvmsg 4 3826 _002563_hash NULL
-+_002564_hash lowpan_fragment_xmit 3-4 22095 _002564_hash NULL
-+_002566_hash lpfc_change_queue_depth 2 25905 _002566_hash NULL
-+_002568_hash macvtap_do_read 4 36555 _002568_hash &_002050_hash
-+_002569_hash mangle_sdp_packet 9 36279 _002569_hash NULL
-+_002570_hash map_addr 6 4666 _002570_hash NULL
-+_002571_hash mcs_unwrap_fir 3 25733 _002571_hash NULL
-+_002572_hash mcs_unwrap_mir 3 9455 _002572_hash NULL
-+_002573_hash megaraid_change_queue_depth 2 64815 _002573_hash NULL
-+_002574_hash megasas_change_queue_depth 2 32747 _002574_hash NULL
-+_002575_hash mld_newpack 2 50950 _002575_hash NULL
-+_002576_hash mptscsih_change_queue_depth 2 26036 _002576_hash NULL
-+_002577_hash named_distribute 4 48544 _002577_hash NULL
-+_002578_hash NCR_700_change_queue_depth 2 31742 _002578_hash NULL
-+_002579_hash netlink_recvmsg 4 61600 _002579_hash NULL
-+_002580_hash nfc_alloc_send_skb 4 3167 _002580_hash NULL
-+_002581_hash nf_nat_ftp 5 47948 _002581_hash NULL
-+_002582_hash nfsctl_transaction_read 3 48250 _002582_hash NULL
-+_002583_hash nfsd_read 5 19568 _002583_hash NULL
-+_002584_hash nfsd_read_file 6 62241 _002584_hash NULL
-+_002585_hash nfsd_write 6 54809 _002585_hash NULL
-+_002586_hash nfs_map_group_to_gid 3 15892 _002586_hash NULL
-+_002587_hash nfs_map_name_to_uid 3 51132 _002587_hash NULL
-+_002588_hash nr_recvmsg 4 12649 _002588_hash NULL
-+_002589_hash ntfs_rl_append 2-4 6037 _002589_hash NULL
-+_002591_hash ntfs_rl_insert 2-4 4931 _002591_hash NULL
-+_002593_hash ntfs_rl_replace 2-4 14136 _002593_hash NULL
-+_002595_hash ntfs_rl_split 2-4 52328 _002595_hash NULL
-+_002597_hash osd_req_list_collection_objects 5 36664 _002597_hash NULL
-+_002598_hash osd_req_list_partition_objects 5 56464 _002598_hash NULL
-+_002599_hash osd_req_read_sg 5 47905 _002599_hash NULL
-+_002600_hash osd_req_write_sg 5 50908 _002600_hash NULL
-+_002602_hash p54_download_eeprom 4 43842 _002602_hash NULL
-+_002604_hash packet_recv_error 3 16669 _002604_hash NULL
-+_002605_hash packet_recvmsg 4 47700 _002605_hash NULL
-+_002606_hash pep_recvmsg 4 19402 _002606_hash NULL
-+_002607_hash pfkey_recvmsg 4 53604 _002607_hash NULL
-+_002608_hash ping_recvmsg 4 25597 _002608_hash NULL
-+_002609_hash pmcraid_change_queue_depth 2 9116 _002609_hash NULL
-+_002610_hash pn_recvmsg 4 30887 _002610_hash NULL
-+_002611_hash pointer_size_read 3 51863 _002611_hash NULL
-+_002612_hash power_read 3 15939 _002612_hash NULL
-+_002613_hash pppoe_recvmsg 4 15073 _002613_hash NULL
-+_002614_hash pppol2tp_recvmsg 4 57742 _002993_hash NULL nohasharray
-+_002615_hash ppp_tx_cp 5 62044 _002615_hash NULL
-+_002616_hash prism2_send_mgmt 4 62605 _002616_hash &_002119_hash
-+_002617_hash prism2_sta_send_mgmt 5 43916 _002617_hash NULL
-+_002618_hash prison_create 1 43623 _002618_hash NULL
-+_002619_hash qla2x00_adjust_sdev_qdepth_up 2 20097 _002619_hash NULL
-+_002620_hash qla2x00_change_queue_depth 2 24742 _002620_hash NULL
-+_002621_hash _queue_data 4 54983 _002621_hash NULL
-+_002622_hash raw_recvmsg 4 52529 _002622_hash NULL
-+_002623_hash rawsock_recvmsg 4 12144 _002623_hash NULL
-+_002624_hash rawv6_recvmsg 4 30265 _002624_hash NULL
-+_002625_hash rds_tcp_data_recv 3 53476 _002625_hash NULL
-+_002626_hash reada_add_block 2 54247 _002626_hash NULL
-+_002627_hash readahead_tree_block 3 36285 _002627_hash NULL
-+_002628_hash reada_tree_block_flagged 3 18402 _002628_hash NULL
-+_002629_hash read_dma 3 55086 _002629_hash NULL
-+_002630_hash read_fifo 3 826 _002630_hash NULL
-+_002631_hash read_tree_block 3 841 _002631_hash NULL
-+_002632_hash receive_copy 3 12216 _002632_hash NULL
-+_002633_hash recover_peb 6-7 29238 _002633_hash NULL
-+_002635_hash recv_msg 4 48709 _002635_hash NULL
-+_002636_hash recv_stream 4 30138 _002636_hash NULL
-+_002637_hash _req_append_segment 2 41031 _002637_hash NULL
-+_002638_hash request_key_async 4 6990 _002638_hash NULL
-+_002639_hash request_key_async_with_auxdata 4 46624 _002639_hash NULL
-+_002640_hash request_key_with_auxdata 4 24515 _002640_hash NULL
-+_002641_hash rose_recvmsg 4 2368 _002641_hash &_001788_hash
-+_002642_hash rtl8169_try_rx_copy 3 705 _002642_hash NULL
-+_002643_hash _rtl92s_firmware_downloadcode 3 14021 _002643_hash NULL
-+_002644_hash rx_data 4 60442 _002644_hash NULL
-+_002645_hash rxrpc_recvmsg 4 26233 _002645_hash NULL
-+_002646_hash sas_change_queue_depth 2 18555 _002646_hash NULL
-+_002647_hash scsi_activate_tcq 2 42640 _002647_hash NULL
-+_002648_hash scsi_deactivate_tcq 2 47086 _002648_hash NULL
-+_002649_hash scsi_execute 5 33596 _002649_hash NULL
-+_002650_hash _scsih_adjust_queue_depth 2 1083 _002650_hash NULL
-+_002651_hash scsi_init_shared_tag_map 2 59812 _002651_hash NULL
-+_002652_hash scsi_track_queue_full 2 44239 _002652_hash NULL
-+_002653_hash sctp_abort_pkt_new 5 55218 _002653_hash NULL
-+_002654_hash sctp_make_abort_violation 4 27959 _002654_hash NULL
-+_002655_hash sctp_make_op_error 5-6 7057 _002655_hash NULL
-+_002657_hash sctp_recvmsg 4 23265 _002657_hash NULL
-+_002658_hash send_stream 4 3397 _002658_hash NULL
-+_002659_hash sis190_try_rx_copy 3 57069 _002659_hash NULL
-+_002664_hash skb_copy_and_csum_datagram_iovec 2 24466 _002664_hash NULL
-+_002666_hash skge_rx_get 3 40598 _002666_hash NULL
-+_002667_hash smp_send_cmd 3 512 _002667_hash NULL
-+_002668_hash snd_gf1_mem_proc_dump 5 16926 _003499_hash NULL nohasharray
-+_002669_hash sta_dev_read 3 14782 _002669_hash NULL
-+_002670_hash sta_inactive_ms_read 3 25690 _002670_hash NULL
-+_002671_hash sta_last_signal_read 3 31818 _002671_hash NULL
-+_002672_hash stats_dot11ACKFailureCount_read 3 45558 _002672_hash NULL
-+_002673_hash stats_dot11FCSErrorCount_read 3 28154 _002673_hash NULL
-+_002674_hash stats_dot11RTSFailureCount_read 3 43948 _002674_hash NULL
-+_002675_hash stats_dot11RTSSuccessCount_read 3 33065 _002675_hash NULL
-+_002676_hash storvsc_connect_to_vsp 2 22 _002676_hash NULL
-+_002677_hash sys_msgrcv 3 959 _002677_hash NULL
-+_002678_hash sys_syslog 3 10746 _002678_hash NULL
-+_002679_hash tcf_csum_ipv4_icmp 3 9258 _002679_hash NULL
-+_002680_hash tcf_csum_ipv4_igmp 3 60446 _002680_hash NULL
-+_002681_hash tcf_csum_ipv4_tcp 4 39713 _002681_hash NULL
-+_002682_hash tcf_csum_ipv4_udp 4 30777 _002682_hash NULL
-+_002683_hash tcf_csum_ipv6_icmp 4 11738 _002683_hash NULL
-+_002684_hash tcf_csum_ipv6_tcp 4 54877 _002684_hash NULL
-+_002685_hash tcf_csum_ipv6_udp 4 25241 _002685_hash NULL
-+_002686_hash tcm_loop_change_queue_depth 2 42454 _002686_hash NULL
-+_002687_hash tcp_copy_to_iovec 3 28344 _002687_hash NULL
-+_002688_hash tcp_mark_head_lost 2 35895 _002688_hash NULL
-+_002689_hash tcp_match_skb_to_sack 4 23568 _002689_hash NULL
-+_002690_hash timeout_read 3 47915 _002690_hash NULL
-+_002691_hash tipc_multicast 5 49144 _002691_hash NULL
-+_002692_hash tipc_port_recv_sections 4 42890 _002692_hash NULL
-+_002693_hash tipc_port_reject_sections 5 55229 _002693_hash NULL
-+_002694_hash total_ps_buffered_read 3 16365 _002694_hash NULL
-+_002695_hash tso_fragment 3 29050 _002695_hash NULL
-+_002696_hash tty_insert_flip_string 3 34042 _002696_hash NULL
-+_002698_hash tun_put_user 4 59849 _002698_hash NULL
-+_002699_hash twa_change_queue_depth 2 48808 _002699_hash NULL
-+_002700_hash tw_change_queue_depth 2 11116 _002700_hash NULL
-+_002701_hash twl_change_queue_depth 2 41342 _002701_hash NULL
-+_002702_hash ubi_eba_atomic_leb_change 5 60379 _002702_hash NULL
-+_002703_hash ubi_eba_write_leb 5-6 36029 _002703_hash NULL
-+_002705_hash ubi_eba_write_leb_st 5 44343 _002705_hash NULL
-+_002706_hash udp_recvmsg 4 42558 _002706_hash NULL
-+_002707_hash udpv6_recvmsg 4 9813 _002707_hash &_002506_hash
-+_002708_hash udpv6_sendmsg 4 22316 _002708_hash NULL
-+_002709_hash ulong_read_file 3 42304 _002709_hash &_000522_hash
-+_002710_hash unix_dgram_recvmsg 4 14952 _002710_hash NULL
-+_002711_hash user_power_read 3 39414 _002711_hash NULL
-+_002712_hash v9fs_direct_read 3 45546 _002712_hash NULL
-+_002713_hash v9fs_file_readn 4 36353 _002713_hash &_001799_hash
-+_002714_hash vcc_recvmsg 4 37198 _002714_hash NULL
-+_002715_hash velocity_rx_copy 2 34583 _002715_hash NULL
-+_002716_hash W6692_empty_Bfifo 2 47804 _002716_hash NULL
-+_002717_hash wep_iv_read 3 54744 _002717_hash NULL
-+_002718_hash x25_recvmsg 4 42777 _002718_hash NULL
-+_002719_hash xfs_buf_get_map 3 24522 _002719_hash NULL
-+_002720_hash xfs_file_aio_write 4 33234 _002720_hash NULL
-+_002721_hash xfs_iext_insert 3 18667 _002741_hash NULL nohasharray
-+_002722_hash xfs_iext_remove 3 50909 _002722_hash NULL
-+_002723_hash xlog_do_recovery_pass 3 21618 _002723_hash NULL
-+_002724_hash xlog_find_verify_log_record 2 18870 _002724_hash NULL
-+_002725_hash zd_mac_rx 3 38296 _002725_hash NULL
-+_002726_hash aircable_process_packet 5 46639 _002726_hash NULL
-+_002727_hash ath6kl_wmi_get_new_buf 1 52304 _002727_hash NULL
-+_002728_hash batadv_iv_ogm_queue_add 3 46319 _002728_hash NULL
-+_002729_hash batadv_receive_client_update_packet 3 41578 _002729_hash NULL
-+_002730_hash batadv_receive_server_sync_packet 3 26577 _002730_hash &_000494_hash
-+_002731_hash brcmf_alloc_pkt_and_read 2 63116 _002731_hash &_002028_hash
-+_002732_hash brcmf_sdcard_recv_buf 6 38179 _002732_hash NULL
-+_002733_hash brcmf_sdcard_rwdata 5 65041 _002733_hash NULL
-+_002734_hash brcmf_sdcard_send_buf 6 7713 _002734_hash NULL
-+_002735_hash brcmf_sdio_forensic_read 3 35311 _002735_hash &_001382_hash
-+_002736_hash btrfs_alloc_free_block 3 8986 _002736_hash NULL
-+_002737_hash btrfs_free_and_pin_reserved_extent 2 53016 _002737_hash NULL
-+_002738_hash btrfs_free_reserved_extent 2 9867 _002738_hash NULL
-+_002739_hash carl9170_handle_mpdu 3 11056 _002739_hash NULL
-+_002740_hash do_trimming 3 26952 _002740_hash NULL
-+_002741_hash edge_tty_recv 4 18667 _002741_hash &_002721_hash
-+_002742_hash fwnet_receive_packet 9 50537 _002742_hash NULL
-+_002743_hash gigaset_if_receive 3 4861 _002743_hash NULL
-+_002744_hash gsm_dlci_data 3 14155 _002744_hash NULL
-+_002745_hash handle_rx_packet 3 58993 _002745_hash NULL
-+_002746_hash HDLC_irq 2 8709 _002746_hash NULL
-+_002747_hash hdlc_rpr_irq 2 10240 _002747_hash NULL
-+_002749_hash ifx_spi_insert_flip_string 3 51752 _002749_hash NULL
-+_002753_hash ip_nat_sdp_media 8 23386 _002753_hash NULL
-+_002754_hash ip_send_unicast_reply 6 38714 _002754_hash NULL
-+_002756_hash ipwireless_network_packet_received 4 51277 _002756_hash NULL
-+_002757_hash ipwireless_tty_received 3 49154 _002757_hash NULL
-+_002758_hash iscsi_iser_recv 4 41948 _002758_hash NULL
-+_002759_hash l2cap_bredr_sig_cmd 3 49065 _002759_hash NULL
-+_002760_hash l2cap_sock_alloc_skb_cb 2 33532 _002760_hash NULL
-+_002761_hash l2cap_sock_recvmsg 4 59886 _002761_hash NULL
-+_002762_hash llcp_allocate_pdu 3 19866 _002762_hash NULL
-+_002763_hash macvtap_recvmsg 4 63949 _002763_hash NULL
-+_002764_hash osd_req_list_dev_partitions 4 60027 _002764_hash NULL
-+_002765_hash osd_req_list_partition_collections 5 38223 _002765_hash NULL
-+_002766_hash osst_do_scsi 4 44410 _002766_hash NULL
-+_002767_hash ping_sendmsg 4 3782 _002767_hash NULL
-+_002768_hash ppp_cp_event 6 2965 _002768_hash NULL
-+_002769_hash pty_write 3 44757 _002769_hash &_001733_hash
-+_002770_hash push_rx 3 28939 _002770_hash NULL
-+_002772_hash qla2x00_handle_queue_full 2 24365 _002772_hash NULL
-+_002773_hash qla4xxx_change_queue_depth 2 1268 _002773_hash NULL
-+_002774_hash rfcomm_sock_recvmsg 4 22227 _002774_hash NULL
-+_002775_hash scsi_execute_req 5 42088 _002775_hash NULL
-+_002776_hash _scsih_change_queue_depth 2 26230 _002776_hash NULL
-+_002777_hash sctp_sf_abort_violation 6 38380 _002777_hash NULL
-+_002778_hash send_to_tty 3 45141 _002778_hash NULL
-+_002780_hash sky2_receive 2 13407 _002780_hash NULL
-+_002781_hash spi_execute 5 28736 _002781_hash NULL
-+_002782_hash submit_inquiry 3 42108 _002782_hash NULL
-+_002783_hash tcp_dma_try_early_copy 3 4457 _002783_hash NULL
-+_002784_hash tcp_sacktag_walk 6 49703 _002784_hash NULL
-+_002785_hash tcp_write_xmit 2 64602 _002785_hash NULL
-+_002786_hash ti_recv 4 22027 _002786_hash NULL
-+_002787_hash tun_do_read 4 50800 _002787_hash NULL
-+_002788_hash ubi_leb_change 4 10289 _002788_hash NULL
-+_002789_hash ubi_leb_write 4-5 5478 _002789_hash NULL
-+_002791_hash udp_sendmsg 4 4492 _002791_hash NULL
-+_002792_hash unix_seqpacket_recvmsg 4 23062 _002792_hash &_000477_hash
-+_002793_hash v9fs_cached_file_read 3 2514 _002793_hash NULL
-+_002794_hash write_leb 5 36957 _002794_hash NULL
-+_002795_hash xfs_buf_read_map 3 40226 _002795_hash NULL
-+_002796_hash xfs_trans_get_buf_map 4 2927 _002796_hash NULL
-+_002797_hash xlog_do_log_recovery 3 17550 _002797_hash NULL
-+_002798_hash ath6kl_wmi_add_wow_pattern_cmd 4 12842 _002798_hash NULL
-+_002799_hash ath6kl_wmi_beginscan_cmd 8 25462 _002799_hash NULL
-+_002800_hash ath6kl_wmi_send_probe_response_cmd 6 31728 _002800_hash NULL
-+_002801_hash ath6kl_wmi_set_appie_cmd 5 39266 _002801_hash NULL
-+_002802_hash ath6kl_wmi_set_ie_cmd 6 37260 _002802_hash NULL
-+_002803_hash ath6kl_wmi_startscan_cmd 8 33674 _002803_hash NULL
-+_002804_hash ath6kl_wmi_test_cmd 3 27312 _002804_hash NULL
-+_002805_hash brcmf_sdbrcm_membytes 3-5 37324 _002805_hash NULL
-+_002807_hash brcmf_sdbrcm_read_control 3 22721 _002807_hash NULL
-+_002808_hash brcmf_tx_frame 3 20978 _002808_hash NULL
-+_002809_hash __carl9170_rx 3 56784 _002809_hash NULL
-+_002810_hash ch_do_scsi 4 31171 _002810_hash NULL
-+_002811_hash dbg_leb_change 4 23555 _002811_hash NULL
-+_002812_hash dbg_leb_write 4-5 63555 _002812_hash &_000971_hash
-+_002814_hash gluebi_write 3 27905 _002814_hash NULL
-+_002815_hash hdlc_irq_one 2 3944 _002815_hash NULL
-+_002819_hash iser_rcv_completion 2 8048 _002819_hash NULL
-+_002820_hash lock_loop 1 61681 _002820_hash NULL
-+_002821_hash process_rcvd_data 3 6679 _002821_hash NULL
-+_002822_hash brcmf_sdbrcm_bus_txctl 3 42492 _002822_hash NULL
-+_002823_hash carl9170_rx 3 13272 _002823_hash NULL
-+_002824_hash carl9170_rx_stream 3 1334 _002824_hash NULL
-+_002826_hash mpt_lan_receive_post_turbo 2 13592 _002826_hash NULL
-+_002827_hash padzero 1 55 _002827_hash &_002251_hash
-+_002828_hash scsi_mode_sense 5 16835 _002828_hash NULL
-+_002829_hash scsi_vpd_inquiry 4 30040 _002829_hash NULL
-+_002830_hash ses_recv_diag 4 47143 _002830_hash &_000679_hash
-+_002831_hash ses_send_diag 4 64527 _002831_hash NULL
-+_002832_hash tcp_push_one 2 48816 _002832_hash NULL
-+_002833_hash __tcp_push_pending_frames 2 48148 _002833_hash NULL
-+_002834_hash trim_bitmaps 3 24158 _002834_hash NULL
-+_002835_hash tun_recvmsg 4 48463 _002835_hash NULL
-+_002836_hash ubifs_leb_change 4 17789 _002836_hash NULL
-+_002837_hash ubifs_leb_write 4-5 22679 _002837_hash NULL
-+_002839_hash xfs_buf_readahead_map 3 44248 _002839_hash &_000851_hash
-+_002840_hash xfs_trans_read_buf_map 5 37487 _002840_hash NULL
-+_002841_hash xlog_do_recover 3 59789 _002841_hash NULL
-+_002842_hash btrfs_trim_block_group 3 28963 _002842_hash NULL
-+_002843_hash do_write_orph_node 2 64343 _002843_hash NULL
-+_002844_hash fix_unclean_leb 3 23188 _002844_hash NULL
-+_002845_hash fixup_leb 3 43256 _002845_hash NULL
-+_002846_hash recover_head 3 17904 _002846_hash NULL
-+_002847_hash scsi_get_vpd_page 4 51951 _002847_hash NULL
-+_002848_hash sd_do_mode_sense 5 11507 _002848_hash NULL
-+_002849_hash tcp_push 3 10680 _002849_hash NULL
-+_002850_hash ubifs_wbuf_write_nolock 3 64946 _002850_hash NULL
-+_002851_hash ubifs_write_node 3-5 11258 _002851_hash NULL
-+_002852_hash ubifs_recover_leb 3 60639 _002852_hash NULL
-+_002853_hash write_head 4 30481 _002853_hash NULL
-+_002854_hash write_node 4 33121 _002854_hash NULL
-+_002855_hash ubifs_recover_log_leb 3 12079 _002855_hash NULL
-+_002856_hash replay_log_leb 3 18704 _002856_hash NULL
-+_002857_hash alloc_cpu_rmap 1 65363 _002857_hash NULL
-+_002858_hash alloc_ebda_hpc 1-2 50046 _002858_hash NULL
-+_002860_hash alloc_sched_domains 1 28972 _002860_hash NULL
-+_002861_hash amthi_read 4 45831 _002861_hash NULL
-+_002862_hash bcm_char_read 3 31750 _002862_hash NULL
-+_002863_hash BcmCopySection 5 2035 _002863_hash NULL
-+_002864_hash buffer_from_user 3 51826 _002864_hash NULL
-+_002865_hash buffer_to_user 3 35439 _002865_hash NULL
-+_002866_hash card_send_command 3 40757 _002866_hash NULL
-+_002867_hash chd_dec_fetch_cdata 3 50926 _002867_hash NULL
-+_002868_hash copy_nodes_to_user 2 63807 _002868_hash NULL
-+_002869_hash create_log 2 8225 _002869_hash NULL
-+_002870_hash crystalhd_create_dio_pool 2 3427 _002870_hash NULL
-+_002871_hash crystalhd_user_data 3 18407 _002871_hash NULL
-+_002872_hash do_pages_stat 2 4437 _002872_hash NULL
-+_002873_hash do_read_log_to_user 4 3236 _002873_hash NULL
-+_002874_hash do_write_log_from_user 3 39362 _002874_hash NULL
-+_002875_hash evm_read_key 3 54674 _002875_hash NULL
-+_002876_hash evm_write_key 3 27715 _002876_hash NULL
-+_002877_hash fir16_create 3 5574 _002877_hash NULL
-+_002878_hash get_nodes 3 39012 _002878_hash NULL
-+_002879_hash __iio_allocate_kfifo 2-3 55738 _002879_hash NULL
-+_002881_hash __iio_allocate_sw_ring_buffer 3 4843 _002881_hash NULL
-+_002882_hash iio_debugfs_read_reg 3 60908 _002882_hash NULL
-+_002883_hash iio_debugfs_write_reg 3 22742 _002883_hash NULL
-+_002884_hash iio_device_alloc 1 41440 _002884_hash NULL
-+_002885_hash iio_event_chrdev_read 3 54757 _002885_hash NULL
-+_002886_hash iio_read_first_n_kfifo 2 57910 _002886_hash NULL
-+_002887_hash iio_read_first_n_sw_rb 2 51911 _002887_hash NULL
-+_002888_hash ioapic_setup_resources 1 35255 _002888_hash NULL
-+_002889_hash keymap_store 4 45406 _002889_hash NULL
-+_002890_hash line6_alloc_sysex_buffer 4 28225 _002890_hash NULL
-+_002891_hash line6_dumpreq_initbuf 3 53123 _002891_hash NULL
-+_002892_hash line6_midibuf_init 2 52425 _002892_hash NULL
-+_002893_hash _malloc 1 54077 _002893_hash NULL
-+_002894_hash mei_read 3 6507 _002894_hash NULL
-+_002895_hash mei_write 3 4005 _002895_hash NULL
-+_002896_hash msg_set 3 51725 _002896_hash NULL
-+_002897_hash newpart 6 47485 _002897_hash NULL
-+_002898_hash OS_kmalloc 1 36909 _002898_hash NULL
-+_002899_hash OS_mem_token_alloc 1 14276 _002899_hash NULL
-+_002900_hash packet_came 3 18072 _002900_hash NULL
-+_002901_hash pcpu_alloc_bootmem 2 62074 _002901_hash NULL
-+_002902_hash pcpu_build_alloc_info 1-3-2 41443 _002902_hash NULL
-+_002905_hash pcpu_get_vm_areas 3 50085 _002905_hash NULL
-+_002906_hash resource_from_user 3 30341 _002906_hash NULL
-+_002907_hash rtsx_read_cfg_seq 3-5 48139 _002907_hash NULL
-+_002909_hash rtsx_write_cfg_seq 3-5 27485 _002909_hash NULL
-+_002911_hash sca3000_read_data 4 57064 _002911_hash NULL
-+_002912_hash sca3000_read_first_n_hw_rb 2 11479 _002912_hash NULL
-+_002913_hash send_midi_async 3 57463 _002913_hash NULL
-+_002914_hash sep_create_dcb_dmatables_context 6 37551 _002914_hash NULL
-+_002915_hash sep_create_dcb_dmatables_context_kernel 6 49728 _002915_hash NULL
-+_002916_hash sep_create_msgarea_context 4 33829 _002916_hash NULL
-+_002917_hash sep_lli_table_secure_dma 2-3 64042 _002917_hash NULL
-+_002919_hash sep_lock_user_pages 2-3 57470 _002919_hash &_002488_hash
-+_002921_hash sep_prepare_input_output_dma_table_in_dcb 4-5-2-3 63087 _002921_hash NULL
-+_002923_hash sep_read 3 17161 _002923_hash NULL
-+_002924_hash TransmitTcb 4 12989 _002924_hash NULL
-+_002925_hash ValidateDSDParamsChecksum 3 63654 _002925_hash NULL
-+_002926_hash Wb35Reg_BurstWrite 4 62327 _002926_hash NULL
-+_002927_hash alloc_irq_cpu_rmap 1 28459 _002927_hash NULL
-+_002928_hash InterfaceTransmitPacket 3 42058 _002928_hash NULL
-+_002929_hash line6_dumpreq_init 3 34473 _002929_hash NULL
-+_002931_hash pcpu_embed_first_chunk 1-3-2 24224 _002931_hash NULL
-+_002933_hash pcpu_fc_alloc 2 11818 _002933_hash NULL
-+_002934_hash pcpu_page_first_chunk 1 20712 _002934_hash NULL
-+_002935_hash pod_alloc_sysex_buffer 3 31651 _002935_hash NULL
-+_002936_hash r8712_usbctrl_vendorreq 6 48489 _002936_hash NULL
-+_002937_hash r871x_set_wpa_ie 3 7000 _002937_hash NULL
-+_002938_hash sep_prepare_input_dma_table 2-3 2009 _002938_hash NULL
-+_002940_hash sep_prepare_input_output_dma_table 2-4-3 63429 _002940_hash NULL
-+_002943_hash sys_get_mempolicy 3 30379 _002943_hash NULL
-+_002944_hash sys_mbind 5 7990 _002944_hash NULL
-+_002945_hash sys_migrate_pages 2 39825 _002945_hash NULL
-+_002946_hash sys_move_pages 2 42626 _002946_hash NULL
-+_002947_hash sys_set_mempolicy 3 32608 _002947_hash NULL
-+_002948_hash variax_alloc_sysex_buffer 3 15237 _002948_hash NULL
-+_002949_hash vme_user_read 3 55338 _002949_hash NULL
-+_002950_hash vme_user_write 3 15587 _002950_hash NULL
-+_002954_hash variax_set_raw2 4 32374 _002954_hash NULL
-+_002955_hash copy_in_user 3 57502 _002955_hash NULL
-+_002956_hash __earlyonly_bootmem_alloc 2 23824 _002956_hash NULL
-+_002957_hash rfc4106_set_key 3 54519 _002957_hash NULL
-+_002958_hash sparse_early_usemaps_alloc_pgdat_section 2 62304 _002958_hash NULL
-+_002959_hash sparse_early_usemaps_alloc_node 4 9269 _002959_hash NULL
-+_002960_hash sparse_mem_maps_populate_node 4 12669 _002960_hash &_002242_hash
-+_002961_hash vmemmap_alloc_block 1 43245 _002961_hash NULL
-+_002962_hash sparse_early_mem_maps_alloc_node 4 36971 _002962_hash NULL
-+_002963_hash vmemmap_alloc_block_buf 1 61126 _002963_hash NULL
-+_002964_hash alloc_mr 1 45935 _002964_hash NULL
-+_002965_hash atomic_counters_read 3 48827 _002965_hash NULL
-+_002966_hash atomic_stats_read 3 36228 _002966_hash NULL
-+_002967_hash capabilities_read 3 58457 _002967_hash NULL
-+_002968_hash compat_core_sys_select 1 65285 _002968_hash NULL
-+_002969_hash compat_dccp_setsockopt 5 51263 _002969_hash NULL
-+_002970_hash compat_do_arpt_set_ctl 4 12184 _002970_hash NULL
-+_002971_hash compat_do_ip6t_set_ctl 4 3184 _002971_hash NULL
-+_002972_hash compat_do_ipt_set_ctl 4 58466 _002972_hash &_002078_hash
-+_002973_hash compat_filldir 3 32999 _002973_hash NULL
-+_002974_hash compat_filldir64 3 35354 _002974_hash NULL
-+_002975_hash compat_fillonedir 3 15620 _002975_hash NULL
-+_002976_hash compat_ip_setsockopt 5 13870 _003094_hash NULL nohasharray
-+_002977_hash compat_ipv6_setsockopt 5 20468 _002977_hash NULL
-+_002978_hash compat_mpctl_ioctl 2 45671 _002978_hash NULL
-+_002979_hash compat_raw_setsockopt 5 30634 _002979_hash NULL
-+_002980_hash compat_rawv6_setsockopt 5 4967 _002980_hash NULL
-+_002981_hash compat_rw_copy_check_uvector 3 22001 _003263_hash NULL nohasharray
-+_002982_hash compat_sock_setsockopt 5 23 _002982_hash NULL
-+_002983_hash compat_sys_get_mempolicy 3 31109 _002983_hash NULL
-+_002984_hash compat_sys_kexec_load 2 35674 _002984_hash NULL
-+_002985_hash compat_sys_keyctl 4 9639 _002985_hash NULL
-+_002986_hash compat_sys_mbind 5 36256 _002986_hash NULL
-+_002987_hash compat_sys_migrate_pages 2 3157 _002987_hash NULL
-+_002988_hash compat_sys_move_pages 2 5861 _002988_hash NULL
-+_002989_hash compat_sys_mq_timedsend 3 31060 _002989_hash NULL
-+_002990_hash compat_sys_msgrcv 2 7482 _002990_hash NULL
-+_002991_hash compat_sys_msgsnd 2 10738 _002991_hash NULL
-+_002992_hash compat_sys_semtimedop 3 3606 _002992_hash NULL
-+_002993_hash compat_sys_set_mempolicy 3 57742 _002993_hash &_002614_hash
-+_002994_hash __copy_in_user 3 34790 _002994_hash NULL
-+_002995_hash dev_counters_read 3 19216 _002995_hash NULL
-+_002996_hash dev_names_read 3 38509 _002996_hash NULL
-+_002997_hash driver_names_read 3 60399 _002997_hash NULL
-+_002998_hash driver_stats_read 3 8944 _002998_hash NULL
-+_002999_hash evdev_ioctl_compat 2 13851 _002999_hash NULL
-+_003000_hash evtchn_read 3 3569 _003000_hash NULL
-+_003001_hash evtchn_write 3 43278 _003001_hash NULL
-+_003002_hash fat_compat_ioctl_filldir 3 36328 _003002_hash NULL
-+_003003_hash flash_read 3 57843 _003003_hash NULL
-+_003004_hash flash_write 3 62354 _003004_hash NULL
-+_003005_hash fw_device_op_compat_ioctl 2 42804 _003005_hash NULL
-+_003006_hash gather_array 3 56641 _003006_hash NULL
-+_003007_hash ghash_async_setkey 3 60001 _003007_hash NULL
-+_003008_hash gntdev_alloc_map 2 35145 _003008_hash NULL
-+_003009_hash gnttab_map 2 56439 _003009_hash NULL
-+_003010_hash gru_alloc_gts 2-3 60056 _003010_hash &_000981_hash
-+_003012_hash hiddev_compat_ioctl 2 41255 _003012_hash NULL
-+_003013_hash init_cdev 1 8274 _003013_hash NULL
-+_003014_hash init_per_cpu 1 17880 _003014_hash NULL
-+_003015_hash ipath_create_cq 2 45586 _003015_hash NULL
-+_003016_hash ipath_get_base_info 3 7043 _003016_hash NULL
-+_003017_hash ipath_init_qp_table 2 25167 _003017_hash NULL
-+_003018_hash ipath_resize_cq 2 712 _003018_hash NULL
-+_003019_hash joydev_compat_ioctl 2 8765 _003019_hash NULL
-+_003020_hash mon_bin_compat_ioctl 3 50234 _003020_hash NULL
-+_003021_hash options_write 3 47243 _003021_hash NULL
-+_003022_hash portcntrs_1_read 3 47253 _003022_hash NULL
-+_003023_hash portcntrs_2_read 3 56586 _003023_hash NULL
-+_003024_hash portnames_read 3 41958 _003024_hash NULL
-+_003025_hash ptc_proc_write 3 12076 _003025_hash NULL
-+_003026_hash put_cmsg_compat 4 35937 _003026_hash NULL
-+_003027_hash qib_alloc_devdata 2 51819 _003027_hash NULL
-+_003028_hash qib_alloc_fast_reg_page_list 2 10507 _003028_hash NULL
-+_003029_hash qib_cdev_init 1 34778 _003029_hash NULL
-+_003030_hash qib_create_cq 2 27497 _003030_hash NULL
-+_003031_hash qib_diag_write 3 62133 _003031_hash NULL
-+_003032_hash qib_get_base_info 3 11369 _003032_hash NULL
-+_003033_hash qib_resize_cq 2 53090 _003033_hash NULL
-+_003034_hash qsfp_1_read 3 21915 _003034_hash NULL
-+_003035_hash qsfp_2_read 3 31491 _003035_hash NULL
-+_003036_hash queue_reply 3 22416 _003036_hash NULL
-+_003037_hash spidev_compat_ioctl 2 63778 _003037_hash NULL
-+_003038_hash split 2 11691 _003038_hash NULL
-+_003039_hash stats_read_ul 3 32751 _003039_hash NULL
-+_003040_hash sys32_ipc 3 7238 _003040_hash NULL
-+_003041_hash sys32_rt_sigpending 2 25814 _003041_hash NULL
-+_003042_hash tunables_read 3 36385 _003042_hash NULL
-+_003043_hash tunables_write 3 59563 _003043_hash NULL
-+_003044_hash xenbus_file_write 3 6282 _003044_hash NULL
-+_003045_hash xlbd_reserve_minors 1-2 18365 _003045_hash NULL
-+_003047_hash xpc_kmalloc_cacheline_aligned 1 42895 _003047_hash NULL
-+_003048_hash xpc_kzalloc_cacheline_aligned 1 65433 _003048_hash NULL
-+_003049_hash xsd_read 3 15653 _003049_hash NULL
-+_003050_hash compat_do_readv_writev 4 49102 _003050_hash NULL
-+_003051_hash compat_keyctl_instantiate_key_iov 3 57431 _003088_hash NULL nohasharray
-+_003052_hash compat_process_vm_rw 3-5 22254 _003052_hash NULL
-+_003054_hash compat_sys_select 1 16131 _003054_hash NULL
-+_003055_hash compat_sys_setsockopt 5 3326 _003055_hash NULL
-+_003056_hash compat_udp_setsockopt 5 38840 _003056_hash NULL
-+_003057_hash compat_udpv6_setsockopt 5 42981 _003057_hash NULL
-+_003058_hash do_compat_pselect 1 10398 _003058_hash NULL
-+_003059_hash gnttab_expand 1 15817 _003059_hash NULL
-+_003060_hash ipath_cdev_init 1 37752 _003060_hash NULL
-+_003061_hash ipath_reg_phys_mr 3 23918 _003061_hash &_000999_hash
-+_003062_hash qib_alloc_fast_reg_mr 2 12526 _003062_hash NULL
-+_003063_hash qib_reg_phys_mr 3 60202 _003063_hash &_000897_hash
-+_003064_hash compat_readv 3 30273 _003064_hash NULL
-+_003065_hash compat_sys_process_vm_readv 3-5 15374 _003065_hash NULL
-+_003067_hash compat_sys_process_vm_writev 3-5 41194 _003067_hash NULL
-+_003069_hash compat_sys_pselect6 1 14105 _003069_hash NULL
-+_003070_hash compat_writev 3 60063 _003070_hash NULL
-+_003071_hash get_free_entries 1 46030 _003071_hash NULL
-+_003072_hash compat_sys_preadv64 3 24283 _003072_hash NULL
-+_003073_hash compat_sys_pwritev64 3 51151 _003073_hash NULL
-+_003074_hash compat_sys_readv 3 20911 _003074_hash NULL
-+_003075_hash compat_sys_writev 3 5784 _003075_hash NULL
-+_003076_hash gnttab_alloc_grant_references 1 18240 _003076_hash NULL
-+_003077_hash compat_sys_preadv 3 583 _003077_hash NULL
-+_003078_hash compat_sys_pwritev 3 17886 _003078_hash NULL
-+_003079_hash aes_decrypt_fail_read 3 54815 _003079_hash NULL
-+_003080_hash aes_decrypt_interrupt_read 3 19910 _003080_hash NULL
-+_003081_hash aes_decrypt_packets_read 3 10155 _003081_hash NULL
-+_003082_hash aes_encrypt_fail_read 3 32562 _003082_hash NULL
-+_003083_hash aes_encrypt_interrupt_read 3 39919 _003083_hash NULL
-+_003084_hash aes_encrypt_packets_read 3 48666 _003084_hash NULL
-+_003085_hash agp_remap 2 30665 _003085_hash NULL
-+_003086_hash alloc_apertures 1 56561 _003086_hash NULL
-+_003087_hash allocate_probes 1 40204 _003087_hash NULL
-+_003088_hash alloc_ftrace_hash 1 57431 _003088_hash &_003051_hash
-+_003089_hash alloc_page_cgroup 1 2919 _003089_hash NULL
-+_003090_hash __alloc_preds 2 9492 _003090_hash NULL
-+_003091_hash __alloc_pred_stack 2 26687 _003091_hash NULL
-+_003092_hash alloc_sched_domains 1 47756 _003092_hash NULL
-+_003093_hash alloc_trace_probe 6 38720 _003093_hash NULL
-+_003094_hash alloc_trace_uprobe 3 13870 _003094_hash &_002976_hash
-+_003095_hash ath6kl_sdio_alloc_prep_scat_req 2 51986 _003095_hash NULL
-+_003096_hash ath6kl_usb_post_recv_transfers 2 32892 _003096_hash NULL
-+_003097_hash ath6kl_usb_submit_ctrl_in 6 32880 _003097_hash &_000795_hash
-+_003098_hash ath6kl_usb_submit_ctrl_out 6 9978 _003098_hash NULL
-+_003099_hash av7110_ipack_init 2 46655 _003099_hash NULL
-+_003100_hash av7110_vbi_write 3 34384 _003100_hash NULL
-+_003101_hash bin_uuid 3 28999 _003101_hash NULL
-+_003102_hash blk_dropped_read 3 4168 _003102_hash NULL
-+_003103_hash blk_msg_write 3 13655 _003103_hash NULL
-+_003104_hash brcmf_usbdev_qinit 2 19090 _003104_hash &_001715_hash
-+_003105_hash brcmf_usb_dl_cmd 4 53130 _003105_hash NULL
-+_003106_hash ci_ll_init 3 12930 _003106_hash NULL
-+_003107_hash ci_ll_write 4 3740 _003107_hash NULL
-+_003108_hash conf_read 3 55786 _003108_hash NULL
-+_003109_hash __copy_from_user_inatomic_nocache 3 49921 _003109_hash NULL
-+_003110_hash cx24116_writeregN 4 41975 _003110_hash NULL
-+_003111_hash cyttsp_probe 4 1940 _003111_hash NULL
-+_003112_hash dccpprobe_read 3 52549 _003112_hash NULL
-+_003113_hash ddb_input_read 3 9743 _003113_hash NULL
-+_003114_hash ddb_output_write 3 31902 _003114_hash NULL
-+_003115_hash __devres_alloc 2 25598 _003115_hash NULL
-+_003116_hash dma_rx_errors_read 3 52045 _003116_hash NULL
-+_003117_hash dma_rx_requested_read 3 65354 _003117_hash NULL
-+_003118_hash dma_tx_errors_read 3 46060 _003118_hash NULL
-+_003119_hash dma_tx_requested_read 3 16110 _003203_hash NULL nohasharray
-+_003120_hash do_dmabuf_dirty_sou 7 3017 _003120_hash NULL
-+_003121_hash do_surface_dirty_sou 7 39678 _003121_hash NULL
-+_003122_hash driver_state_read 3 17194 _003122_hash &_001511_hash
-+_003123_hash drm_agp_bind_pages 3 56748 _003123_hash NULL
-+_003124_hash drm_buffer_alloc 2 44405 _003124_hash NULL
-+_003125_hash drm_calloc_large 1-2 65421 _003125_hash NULL
-+_003127_hash drm_fb_helper_init 3-4 19044 _003127_hash NULL
-+_003129_hash drm_ht_create 2 18853 _003129_hash NULL
-+_003130_hash drm_ioctl 2 42813 _003130_hash NULL
-+_003131_hash drm_malloc_ab 1-2 16831 _003131_hash NULL
-+_003133_hash drm_mode_crtc_set_gamma_size 2 31881 _003133_hash NULL
-+_003134_hash drm_plane_init 6 28731 _003134_hash NULL
-+_003135_hash drm_property_create 4 51239 _003135_hash NULL
-+_003136_hash drm_property_create_blob 2 7414 _003136_hash NULL
-+_003137_hash drm_vblank_init 2 11362 _003137_hash NULL
-+_003138_hash drm_vmalloc_dma 1 14550 _003138_hash NULL
-+_003139_hash dvb_aplay 3 56296 _003139_hash NULL
-+_003140_hash dvb_ca_en50221_init 4 45718 _003140_hash NULL
-+_003141_hash dvb_ca_en50221_io_write 3 43533 _003141_hash NULL
-+_003142_hash dvb_dmxdev_set_buffer_size 2 55643 _003142_hash NULL
-+_003143_hash dvbdmx_write 3 19423 _003143_hash NULL
-+_003144_hash dvb_dvr_set_buffer_size 2 9840 _003144_hash NULL
-+_003145_hash dvb_net_sec 3 37884 _003145_hash NULL
-+_003146_hash dvb_play 3 50814 _003146_hash NULL
-+_003147_hash dvb_ringbuffer_pkt_read_user 2-5-3 4303 _003147_hash NULL
-+_003150_hash dvb_ringbuffer_read_user 3 56702 _003150_hash NULL
-+_003151_hash dvb_usercopy 2 14036 _003151_hash NULL
-+_003152_hash dw210x_op_rw 6 39915 _003152_hash NULL
-+_003153_hash edt_ft5x06_debugfs_raw_data_read 3 28002 _003153_hash NULL
-+_003154_hash em_canid_change 3 14150 _003154_hash NULL
-+_003155_hash event_calibration_read 3 21083 _003155_hash NULL
-+_003156_hash event_enable_read 3 7074 _003156_hash NULL
-+_003157_hash event_filter_read 3 23494 _003157_hash NULL
-+_003158_hash event_filter_write 3 56609 _003158_hash NULL
-+_003159_hash event_heart_beat_read 3 48961 _003159_hash NULL
-+_003160_hash event_id_read 3 64288 _003160_hash &_001300_hash
-+_003161_hash event_oom_late_read 3 61175 _003161_hash &_001054_hash
-+_003162_hash event_phy_transmit_error_read 3 10471 _003162_hash NULL
-+_003163_hash event_rx_mem_empty_read 3 40363 _003163_hash NULL
-+_003164_hash event_rx_mismatch_read 3 38518 _003164_hash NULL
-+_003165_hash event_rx_pool_read 3 25792 _003165_hash NULL
-+_003166_hash event_tx_stuck_read 3 19305 _003166_hash NULL
-+_003167_hash excessive_retries_read 3 60425 _003167_hash NULL
-+_003168_hash flexcop_device_kmalloc 1 54793 _003168_hash NULL
-+_003169_hash fm_send_cmd 5 39639 _003169_hash NULL
-+_003170_hash __fprog_create 2 41263 _003170_hash NULL
-+_003171_hash fq_codel_zalloc 1 15378 _003171_hash NULL
-+_003172_hash ftrace_pid_write 3 39710 _003172_hash NULL
-+_003173_hash ftrace_profile_read 3 21327 _003173_hash NULL
-+_003174_hash fw_stats_raw_read 3 1369 _003174_hash NULL
-+_003175_hash get_info 3 55681 _003175_hash NULL
-+_003176_hash __get_vm_area_node 1 55305 _003176_hash NULL
-+_003177_hash gpio_power_read 3 36059 _003177_hash NULL
-+_003178_hash h5_prepare_pkt 4 12085 _003178_hash NULL
-+_003179_hash hsc_msg_alloc 1 60990 _003179_hash NULL
-+_003180_hash hsc_write 3 55875 _003180_hash NULL
-+_003181_hash hsi_alloc_controller 1 41802 _003181_hash NULL
-+_003182_hash hsi_register_board_info 2 13820 _003182_hash NULL
-+_003183_hash hugetlb_cgroup_read 5 49259 _003183_hash NULL
-+_003184_hash i915_cache_sharing_read 3 24775 _003184_hash NULL
-+_003185_hash i915_cache_sharing_write 3 57961 _003185_hash NULL
-+_003186_hash i915_max_freq_read 3 20581 _003186_hash NULL
-+_003187_hash i915_max_freq_write 3 11350 _003187_hash NULL
-+_003188_hash i915_min_freq_read 3 38470 _003188_hash NULL
-+_003189_hash i915_min_freq_write 3 10981 _003189_hash NULL
-+_003190_hash i915_ring_stop_read 3 42549 _003190_hash &_000740_hash
-+_003191_hash i915_ring_stop_write 3 59010 _003191_hash NULL
-+_003192_hash i915_wedged_read 3 35474 _003192_hash NULL
-+_003193_hash i915_wedged_write 3 47771 _003193_hash NULL
-+_003194_hash ieee802154_alloc_device 1 13767 _003194_hash NULL
-+_003195_hash intel_sdvo_write_cmd 4 54377 _003195_hash &_000832_hash
-+_003196_hash isr_cmd_cmplt_read 3 53439 _003196_hash NULL
-+_003197_hash isr_commands_read 3 41398 _003197_hash NULL
-+_003198_hash isr_decrypt_done_read 3 49490 _003198_hash NULL
-+_003199_hash isr_dma0_done_read 3 8574 _003199_hash NULL
-+_003200_hash isr_dma1_done_read 3 48159 _003200_hash NULL
-+_003201_hash isr_fiqs_read 3 34687 _003201_hash NULL
-+_003202_hash isr_host_acknowledges_read 3 54136 _003202_hash NULL
-+_003203_hash isr_hw_pm_mode_changes_read 3 16110 _003203_hash &_003119_hash
-+_003204_hash isr_irqs_read 3 9181 _003204_hash NULL
-+_003205_hash isr_low_rssi_read 3 64789 _003205_hash NULL
-+_003206_hash isr_pci_pm_read 3 30271 _003206_hash NULL
-+_003207_hash isr_rx_headers_read 3 38325 _003207_hash NULL
-+_003208_hash isr_rx_mem_overflow_read 3 43025 _003208_hash NULL
-+_003209_hash isr_rx_procs_read 3 31804 _003209_hash NULL
-+_003210_hash isr_rx_rdys_read 3 35283 _003210_hash NULL
-+_003211_hash isr_tx_exch_complete_read 3 16103 _003211_hash NULL
-+_003212_hash isr_tx_procs_read 3 23084 _003212_hash NULL
-+_003213_hash isr_wakeups_read 3 49607 _003213_hash NULL
-+_003214_hash LoadBitmap 2 19658 _003214_hash NULL
-+_003215_hash mem_cgroup_read 5 22461 _003215_hash NULL
-+_003216_hash mic_calc_failure_read 3 59700 _003216_hash NULL
-+_003217_hash mic_rx_pkts_read 3 27972 _003217_hash NULL
-+_003218_hash __module_alloc 1 50004 _003218_hash NULL
-+_003219_hash module_alloc_update_bounds_rw 1 63233 _003219_hash NULL
-+_003220_hash module_alloc_update_bounds_rx 1 58634 _003220_hash NULL
-+_003221_hash mwifiex_usb_submit_rx_urb 2 54558 _003221_hash NULL
-+_003222_hash nfc_hci_hcp_message_tx 6 14534 _003222_hash NULL
-+_003223_hash nfc_hci_set_param 5 40697 _003223_hash NULL
-+_003224_hash nfc_shdlc_alloc_skb 2 12741 _003224_hash NULL
-+_003225_hash opera1_xilinx_rw 5 31453 _003225_hash NULL
-+_003226_hash persistent_ram_vmap 1-2 709 _003226_hash NULL
-+_003228_hash prctl_set_mm 3 64538 _003228_hash NULL
-+_003229_hash probe_kernel_write 3 17481 _003229_hash NULL
-+_003230_hash proc_fault_inject_read 3 36802 _003230_hash NULL
-+_003231_hash proc_fault_inject_write 3 21058 _003231_hash NULL
-+_003232_hash ps_pspoll_max_apturn_read 3 6699 _003232_hash NULL
-+_003233_hash ps_pspoll_timeouts_read 3 11776 _003233_hash NULL
-+_003234_hash ps_pspoll_utilization_read 3 5361 _003234_hash NULL
-+_003235_hash ps_upsd_max_apturn_read 3 19918 _003235_hash NULL
-+_003236_hash ps_upsd_max_sptime_read 3 63362 _003236_hash NULL
-+_003237_hash ps_upsd_timeouts_read 3 28924 _003237_hash NULL
-+_003238_hash ps_upsd_utilization_read 3 51669 _003238_hash NULL
-+_003239_hash ptp_filter_init 2 36780 _003239_hash NULL
-+_003240_hash pwr_disable_ps_read 3 13176 _003240_hash NULL
-+_003241_hash pwr_elp_enter_read 3 5324 _003241_hash NULL
-+_003242_hash pwr_enable_ps_read 3 17686 _003242_hash NULL
-+_003243_hash pwr_fix_tsf_ps_read 3 26627 _003243_hash NULL
-+_003244_hash pwr_missing_bcns_read 3 25824 _003244_hash NULL
-+_003245_hash pwr_power_save_off_read 3 18355 _003245_hash NULL
-+_003246_hash pwr_ps_enter_read 3 26935 _003246_hash &_000512_hash
-+_003247_hash pwr_rcvd_awake_beacons_read 3 50505 _003247_hash NULL
-+_003248_hash pwr_rcvd_beacons_read 3 52836 _003248_hash NULL
-+_003249_hash pwr_tx_without_ps_read 3 48423 _003249_hash NULL
-+_003250_hash pwr_tx_with_ps_read 3 60851 _003250_hash NULL
-+_003251_hash pwr_wake_on_host_read 3 26321 _003251_hash NULL
-+_003252_hash pwr_wake_on_timer_exp_read 3 22640 _003252_hash NULL
-+_003253_hash rb_simple_read 3 45972 _003253_hash NULL
-+_003254_hash read_file_dfs 3 43145 _003254_hash NULL
-+_003255_hash retry_count_read 3 52129 _003255_hash NULL
-+_003256_hash rx_dropped_read 3 44799 _003256_hash NULL
-+_003257_hash rx_fcs_err_read 3 62844 _003257_hash NULL
-+_003258_hash rx_hdr_overflow_read 3 64407 _003258_hash NULL
-+_003259_hash rx_hw_stuck_read 3 57179 _003259_hash NULL
-+_003260_hash rx_out_of_mem_read 3 10157 _003260_hash NULL
-+_003261_hash rx_path_reset_read 3 23801 _003261_hash NULL
-+_003262_hash rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 _003262_hash NULL
-+_003263_hash rxpipe_descr_host_int_trig_rx_data_read 3 22001 _003263_hash &_002981_hash
-+_003264_hash rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 _003264_hash NULL
-+_003265_hash rxpipe_rx_prep_beacon_drop_read 3 2403 _003265_hash NULL
-+_003266_hash rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 _003266_hash NULL
-+_003267_hash rx_reset_counter_read 3 58001 _003267_hash NULL
-+_003268_hash rx_xfr_hint_trig_read 3 40283 _003268_hash NULL
-+_003269_hash saa7146_vmalloc_build_pgtable 2 19780 _003269_hash NULL
-+_003270_hash sched_feat_write 3 55202 _003270_hash NULL
-+_003271_hash sd_alloc_ctl_entry 1 29708 _003271_hash NULL
-+_003272_hash shmem_pread_fast 3 34147 _003272_hash NULL
-+_003273_hash shmem_pread_slow 3 3198 _003273_hash NULL
-+_003274_hash shmem_pwrite_slow 3 31741 _003274_hash NULL
-+_003275_hash show_header 3 4722 _003275_hash &_000745_hash
-+_003276_hash stack_max_size_read 3 1445 _003276_hash NULL
-+_003277_hash subsystem_filter_read 3 62310 _003277_hash NULL
-+_003278_hash subsystem_filter_write 3 13022 _003278_hash NULL
-+_003279_hash swap_cgroup_swapon 2 13614 _003279_hash NULL
-+_003280_hash system_enable_read 3 25815 _003280_hash NULL
-+_003281_hash tda10048_writeregbulk 4 11050 _003281_hash NULL
-+_003282_hash tlbflush_read_file 3 64661 _003282_hash NULL
-+_003283_hash trace_options_core_read 3 47390 _003283_hash NULL
-+_003284_hash trace_options_read 3 11419 _003284_hash NULL
-+_003285_hash trace_parser_get_init 2 31379 _003285_hash NULL
-+_003286_hash traceprobe_probes_write 3 64969 _003286_hash NULL
-+_003287_hash trace_seq_to_user 3 65398 _003287_hash NULL
-+_003288_hash tracing_buffers_read 3 11124 _003288_hash NULL
-+_003289_hash tracing_clock_write 3 27961 _003289_hash NULL
-+_003290_hash tracing_cpumask_read 3 7010 _003290_hash NULL
-+_003291_hash tracing_ctrl_read 3 46922 _003291_hash NULL
-+_003292_hash tracing_entries_read 3 8345 _003292_hash NULL
-+_003293_hash tracing_max_lat_read 3 8890 _003293_hash NULL
-+_003294_hash tracing_read_dyn_info 3 45468 _003294_hash NULL
-+_003295_hash tracing_readme_read 3 16493 _003295_hash NULL
-+_003296_hash tracing_saved_cmdlines_read 3 21434 _003296_hash NULL
-+_003297_hash tracing_set_trace_read 3 44122 _003297_hash NULL
-+_003298_hash tracing_set_trace_write 3 57096 _003298_hash NULL
-+_003299_hash tracing_stats_read 3 34537 _003299_hash NULL
-+_003300_hash tracing_total_entries_read 3 62817 _003300_hash NULL
-+_003301_hash tracing_trace_options_write 3 153 _003301_hash NULL
-+_003302_hash tstats_write 3 60432 _003302_hash &_000009_hash
-+_003303_hash ttm_bo_fbdev_io 4 9805 _003303_hash NULL
-+_003304_hash ttm_bo_io 5 47000 _003304_hash NULL
-+_003305_hash ttm_dma_page_pool_free 2 34135 _003305_hash NULL
-+_003306_hash ttm_page_pool_free 2 61661 _003306_hash NULL
-+_003307_hash ttusb2_msg 4 3100 _003307_hash NULL
-+_003308_hash tx_internal_desc_overflow_read 3 47300 _003308_hash NULL
-+_003309_hash tx_queue_len_read 3 1463 _003309_hash NULL
-+_003310_hash tx_queue_status_read 3 44978 _003310_hash NULL
-+_003311_hash u_memcpya 2-3 30139 _003311_hash NULL
-+_003313_hash usb_allocate_stream_buffers 3 8964 _003313_hash NULL
-+_003314_hash vifs_state_read 3 33762 _003314_hash NULL
-+_003315_hash vmalloc_to_sg 2 58354 _003315_hash NULL
-+_003316_hash vm_map_ram 2 23078 _003316_hash &_001095_hash
-+_003317_hash vmw_execbuf_process 5 22885 _003317_hash NULL
-+_003318_hash vmw_fifo_reserve 2 12141 _003318_hash NULL
-+_003319_hash vmw_kms_present 9 38130 _003319_hash NULL
-+_003320_hash vmw_kms_readback 6 5727 _003320_hash NULL
-+_003321_hash wep_addr_key_count_read 3 20174 _003321_hash NULL
-+_003322_hash wep_decrypt_fail_read 3 58567 _003322_hash NULL
-+_003323_hash wep_default_key_count_read 3 43035 _003323_hash NULL
-+_003324_hash wep_interrupt_read 3 41492 _003324_hash NULL
-+_003325_hash wep_key_not_found_read 3 13377 _003325_hash &_000952_hash
-+_003326_hash wep_packets_read 3 18751 _003326_hash NULL
-+_003327_hash wl1251_cmd_template_set 4 6172 _003327_hash NULL
-+_003328_hash wl1271_format_buffer 2 20834 _003328_hash NULL
-+_003329_hash wl1271_rx_filter_alloc_field 5 46721 _003329_hash NULL
-+_003330_hash wl12xx_cmd_build_probe_req 6-8 54946 _003330_hash NULL
-+_003332_hash wlcore_alloc_hw 1 7785 _003332_hash NULL
-+_003333_hash aggr_size_rx_size_read 3 33526 _003333_hash NULL
-+_003334_hash aggr_size_tx_agg_vs_rate_read 3 21438 _003334_hash NULL
-+_003335_hash alloc_and_copy_ftrace_hash 1 29368 _003335_hash NULL
-+_003336_hash alloc_bulk_urbs_generic 5 12127 _003336_hash NULL
-+_003337_hash alloc_ieee80211 1 20063 _003337_hash NULL
-+_003338_hash alloc_ieee80211_rsl 1 34564 _003338_hash NULL
-+_003339_hash alloc_perm_bits 2 1532 _003339_hash NULL
-+_003340_hash alloc_private 2 22399 _003340_hash NULL
-+_003341_hash alloc_rtllib 1 51136 _003341_hash NULL
-+_003342_hash alloc_rx_desc_ring 2 18016 _003342_hash NULL
-+_003343_hash arcfb_write 3 8702 _003343_hash NULL
-+_003344_hash ath6kl_usb_bmi_read 3 48745 _003344_hash NULL
-+_003345_hash ath6kl_usb_bmi_write 3 2454 _003345_hash &_001020_hash
-+_003346_hash ath6kl_usb_ctrl_msg_exchange 4 33327 _003346_hash NULL
-+_003347_hash au0828_init_isoc 2-3 61917 _003347_hash NULL
-+_003349_hash auok190xfb_write 3 37001 _003349_hash NULL
-+_003350_hash beacon_interval_read 3 7091 _003350_hash NULL
-+_003351_hash brcmf_usb_attach 1-2 44656 _003351_hash NULL
-+_003353_hash broadsheetfb_write 3 39976 _003353_hash NULL
-+_003354_hash broadsheet_spiflash_rewrite_sector 2 54864 _003354_hash NULL
-+_003355_hash ci13xxx_add_device 3 14456 _003355_hash NULL
-+_003356_hash cmpk_message_handle_tx 4 54024 _003356_hash NULL
-+_003357_hash comedi_alloc_subdevices 2 29207 _003357_hash NULL
-+_003358_hash comedi_buf_alloc 3 24822 _003358_hash NULL
-+_003359_hash comedi_read 3 13199 _003359_hash NULL
-+_003360_hash comedi_write 3 47926 _003360_hash NULL
-+_003361_hash create_trace_probe 1 20175 _003361_hash NULL
-+_003362_hash create_trace_uprobe 1 13184 _003362_hash NULL
-+_003363_hash cx18_copy_buf_to_user 4 22735 _003363_hash NULL
-+_003364_hash cx231xx_init_bulk 2-3 47024 _003364_hash NULL
-+_003366_hash cx231xx_init_isoc 2-3 56453 _003366_hash NULL
-+_003368_hash cx231xx_init_vbi_isoc 2-3 28053 _003368_hash NULL
-+_003370_hash da9052_group_write 3 4534 _003370_hash NULL
-+_003371_hash debug_debug1_read 3 8856 _003371_hash NULL
-+_003372_hash debug_debug2_read 3 30526 _003372_hash NULL
-+_003373_hash debug_debug3_read 3 56894 _003373_hash NULL
-+_003374_hash debug_debug4_read 3 61367 _003374_hash NULL
-+_003375_hash debug_debug5_read 3 2291 _003375_hash NULL
-+_003376_hash debug_debug6_read 3 33168 _003376_hash NULL
-+_003377_hash dev_read 3 56369 _003377_hash NULL
-+_003378_hash do_dmabuf_dirty_ldu 6 52241 _003378_hash NULL
-+_003379_hash drm_compat_ioctl 2 51717 _003379_hash NULL
-+_003380_hash drm_mode_create_tv_properties 2 23122 _003380_hash NULL
-+_003381_hash drm_property_create_bitmask 5 30195 _003381_hash NULL
-+_003382_hash drm_property_create_enum 5 29201 _003382_hash NULL
-+_003383_hash dsp_buffer_alloc 2 11684 _003383_hash NULL
-+_003384_hash dt3155_alloc_coherent 2 58073 _003384_hash NULL
-+_003385_hash dtim_interval_read 3 654 _003385_hash NULL
-+_003386_hash dvb_audio_write 3 51275 _003386_hash NULL
-+_003387_hash dvb_ca_en50221_io_ioctl 2 26490 _003387_hash NULL
-+_003388_hash dvb_ca_write 3 41171 _003388_hash NULL
-+_003389_hash dvb_demux_ioctl 2 42733 _003389_hash NULL
-+_003390_hash dvb_dmxdev_buffer_read 4 20682 _003390_hash NULL
-+_003391_hash dvb_dvr_ioctl 2 49182 _003391_hash NULL
-+_003392_hash dvb_generic_ioctl 2 21810 _003392_hash NULL
-+_003393_hash dvb_net_ioctl 2 61559 _003393_hash NULL
-+_003394_hash dvb_net_sec_callback 2 28786 _003394_hash NULL
-+_003396_hash dvb_video_write 3 754 _003396_hash NULL
-+_003397_hash dynamic_ps_timeout_read 3 10110 _003397_hash NULL
-+_003398_hash easycap_alsa_vmalloc 2 14426 _003398_hash NULL
-+_003399_hash em28xx_alloc_isoc 4 46892 _003399_hash NULL
-+_003400_hash error_error_bar_retry_read 3 64305 _003400_hash NULL
-+_003401_hash error_error_frame_cts_nul_flid_read 3 17262 _003401_hash NULL
-+_003402_hash error_error_frame_read 3 39947 _003402_hash &_002436_hash
-+_003403_hash error_error_null_Frame_tx_start_read 3 55024 _003403_hash NULL
-+_003404_hash error_error_numll_frame_cts_start_read 3 47781 _003404_hash NULL
-+_003405_hash ext_sd_execute_read_data 9 48589 _003405_hash NULL
-+_003406_hash ext_sd_execute_write_data 9 8175 _003406_hash NULL
-+_003407_hash fast_user_write 5 20494 _003407_hash NULL
-+_003408_hash f_audio_buffer_alloc 1 41110 _003408_hash NULL
-+_003409_hash fb_alloc_cmap_gfp 2 20792 _003409_hash NULL
-+_003410_hash fbcon_do_set_font 2-3 4079 _003410_hash NULL
-+_003412_hash fb_read 3 33506 _003412_hash NULL
-+_003413_hash fb_sys_read 3 13778 _003413_hash NULL
-+_003414_hash fb_sys_write 3 33130 _003414_hash NULL
-+_003415_hash fb_write 3 46924 _003415_hash NULL
-+_003416_hash firmwareUpload 3 32794 _003416_hash NULL
-+_003417_hash fmc_send_cmd 5 20435 _003417_hash NULL
-+_003418_hash fops_read 3 40672 _003418_hash NULL
-+_003419_hash forced_ps_read 3 31685 _003419_hash NULL
-+_003420_hash frame_alloc 4 15981 _003420_hash NULL
-+_003421_hash framebuffer_alloc 1 59145 _003421_hash NULL
-+_003422_hash ftrace_write 3 29551 _003422_hash NULL
-+_003423_hash fw_download_code 3 13249 _003423_hash NULL
-+_003424_hash fwSendNullPacket 2 54618 _003424_hash NULL
-+_003425_hash gdm_wimax_netif_rx 3 43423 _003425_hash &_001810_hash
-+_003426_hash get_vm_area 1 18080 _003426_hash NULL
-+_003427_hash __get_vm_area 1 61599 _003427_hash NULL
-+_003428_hash get_vm_area_caller 1 10527 _003428_hash NULL
-+_003429_hash __get_vm_area_caller 1 56416 _003828_hash NULL nohasharray
-+_003430_hash gspca_dev_probe2 4 59833 _003430_hash NULL
-+_003431_hash hdpvr_read 3 9273 _003431_hash NULL
-+_003432_hash hecubafb_write 3 26942 _003432_hash NULL
-+_003433_hash i915_compat_ioctl 2 3656 _003433_hash NULL
-+_003434_hash i915_gem_execbuffer_relocate_slow 7 25355 _003434_hash NULL
-+_003435_hash ieee80211_alloc_txb 1-2 52477 _003435_hash NULL
-+_003437_hash ieee80211_authentication_req 3 63973 _003437_hash NULL
-+_003438_hash ieee80211_wx_set_gen_ie 3 51399 _003438_hash NULL
-+_003439_hash ieee80211_wx_set_gen_ie_rsl 3 3521 _003458_hash NULL nohasharray
-+_003440_hash intel_sdvo_set_value 4 2311 _003440_hash NULL
-+_003441_hash ir_lirc_transmit_ir 3 64403 _003441_hash NULL
-+_003442_hash irq_blk_threshold_read 3 33666 _003442_hash NULL
-+_003443_hash irq_pkt_threshold_read 3 33356 _003443_hash &_000154_hash
-+_003444_hash irq_timeout_read 3 54653 _003444_hash NULL
-+_003445_hash ivtv_buf_copy_from_user 4 25502 _003445_hash NULL
-+_003446_hash ivtv_copy_buf_to_user 4 6159 _003446_hash NULL
-+_003447_hash ivtvfb_write 3 40023 _003447_hash NULL
-+_003448_hash kgdb_hex2mem 3 24755 _003448_hash NULL
-+_003449_hash lirc_buffer_init 2-3 53282 _003449_hash NULL
-+_003451_hash lirc_write 3 20604 _003451_hash NULL
-+_003452_hash mce_request_packet 3 1073 _003452_hash NULL
-+_003453_hash media_entity_init 2-4 15870 _003453_hash &_001742_hash
-+_003455_hash mem_fw_gen_free_mem_blks_read 3 11413 _003455_hash NULL
-+_003456_hash mem_fwlog_free_mem_blks_read 3 59616 _003456_hash NULL
-+_003457_hash mem_rx_free_mem_blks_read 3 675 _003457_hash NULL
-+_003458_hash mem_tx_free_mem_blks_read 3 3521 _003458_hash &_003439_hash
-+_003459_hash metronomefb_write 3 8823 _003459_hash NULL
-+_003460_hash mga_compat_ioctl 2 52170 _003460_hash NULL
-+_003461_hash mmio_read 4 40348 _003461_hash NULL
-+_003462_hash netlink_send 5 38434 _003462_hash NULL
-+_003463_hash nfc_hci_execute_cmd 5 43882 _003463_hash NULL
-+_003464_hash nfc_hci_send_event 5 21452 _003464_hash NULL
-+_003465_hash nfc_hci_send_response 5 56462 _003465_hash NULL
-+_003466_hash ni_gpct_device_construct 5 610 _003466_hash NULL
-+_003467_hash nouveau_compat_ioctl 2 28305 _003467_hash NULL
-+_003468_hash odev_update 2 50169 _003468_hash NULL
-+_003469_hash opera1_usb_i2c_msgxfer 4 64521 _003469_hash NULL
-+_003470_hash OSDSetBlock 2-4 38986 _003470_hash NULL
-+_003472_hash oz_add_farewell 5 20652 _003472_hash NULL
-+_003473_hash oz_cdev_read 3 20659 _003473_hash NULL
-+_003474_hash oz_cdev_write 3 33852 _003474_hash NULL
-+_003475_hash oz_ep_alloc 2 5587 _003475_hash NULL
-+_003476_hash oz_events_read 3 47535 _003476_hash NULL
-+_003477_hash persistent_ram_buffer_map 1-2 11332 _003477_hash NULL
-+_003479_hash pipeline_cs_rx_packet_in_read 3 37089 _003479_hash NULL
-+_003480_hash pipeline_cs_rx_packet_out_read 3 58926 _003480_hash NULL
-+_003481_hash pipeline_csum_to_rx_xfer_swi_read 3 15403 _003481_hash NULL
-+_003482_hash pipeline_dec_packet_in_fifo_full_read 3 33052 _003482_hash NULL
-+_003483_hash pipeline_dec_packet_in_read 3 47076 _003483_hash NULL
-+_003484_hash pipeline_dec_packet_out_read 3 54052 _003484_hash NULL
-+_003485_hash pipeline_defrag_to_csum_swi_read 3 63037 _003485_hash NULL
-+_003486_hash pipeline_enc_rx_stat_fifo_int_read 3 7107 _003486_hash NULL
-+_003487_hash pipeline_enc_tx_stat_fifo_int_read 3 14680 _003487_hash NULL
-+_003488_hash pipeline_hs_tx_stat_fifo_int_read 3 15642 _003488_hash &_001260_hash
-+_003489_hash pipeline_pipeline_fifo_full_read 3 34095 _003489_hash NULL
-+_003490_hash pipeline_post_proc_swi_read 3 24108 _003490_hash NULL
-+_003491_hash pipeline_pre_proc_swi_read 3 3898 _003491_hash NULL
-+_003492_hash pipeline_pre_to_defrag_swi_read 3 56321 _003492_hash NULL
-+_003493_hash pipeline_rx_complete_stat_fifo_int_read 3 40671 _003493_hash NULL
-+_003494_hash pipeline_sec_frag_swi_read 3 30294 _003494_hash NULL
-+_003495_hash pipeline_tcp_rx_stat_fifo_int_read 3 26745 _003495_hash NULL
-+_003496_hash pipeline_tcp_tx_stat_fifo_int_read 3 32589 _003496_hash NULL
-+_003497_hash play_iframe 3 8219 _003497_hash NULL
-+_003498_hash probes_write 3 29711 _003498_hash NULL
-+_003499_hash psb_unlocked_ioctl 2 16926 _003499_hash &_002668_hash
-+_003500_hash ps_poll_ps_poll_max_ap_turn_read 3 53140 _003500_hash NULL
-+_003501_hash ps_poll_ps_poll_timeouts_read 3 5934 _003501_hash NULL
-+_003502_hash ps_poll_ps_poll_utilization_read 3 39383 _003502_hash NULL
-+_003503_hash ps_poll_upsd_max_ap_turn_read 3 42050 _003503_hash NULL
-+_003504_hash ps_poll_upsd_timeouts_read 3 36755 _003504_hash NULL
-+_003505_hash ps_poll_upsd_utilization_read 3 28519 _003505_hash NULL
-+_003506_hash pvr2_ioread_read 3 10720 _003506_hash &_001669_hash
-+_003507_hash pvr2_ioread_set_sync_key 3 59882 _003507_hash NULL
-+_003508_hash pvr2_stream_buffer_count 2 33719 _003508_hash NULL
-+_003509_hash pwr_connection_out_of_sync_read 3 35061 _003509_hash NULL
-+_003510_hash pwr_cont_miss_bcns_spread_read 3 39250 _003515_hash NULL nohasharray
-+_003511_hash pwr_missing_bcns_cnt_read 3 45113 _003511_hash NULL
-+_003512_hash pwr_rcvd_awake_bcns_cnt_read 3 12632 _003512_hash NULL
-+_003513_hash pwr_rcvd_bcns_cnt_read 3 4774 _003513_hash NULL
-+_003514_hash qc_capture 3 19298 _003514_hash NULL
-+_003515_hash r128_compat_ioctl 2 39250 _003515_hash &_003510_hash
-+_003516_hash radeon_compat_ioctl 2 59150 _003516_hash NULL
-+_003517_hash radeon_kms_compat_ioctl 2 51371 _003517_hash NULL
-+_003518_hash Realloc 2 34961 _003518_hash NULL
-+_003519_hash redrat3_transmit_ir 3 64244 _003519_hash NULL
-+_003520_hash reg_w_buf 3 27724 _003520_hash NULL
-+_003521_hash reg_w_ixbuf 4 34736 _003521_hash NULL
-+_003522_hash rtllib_alloc_txb 1-2 21687 _003522_hash NULL
-+_003524_hash rtllib_authentication_req 3 26713 _003524_hash NULL
-+_003525_hash rtllib_wx_set_gen_ie 3 59808 _003525_hash NULL
-+_003526_hash rts51x_transfer_data_partial 6 5735 _003526_hash NULL
-+_003527_hash rvmalloc 1 46873 _003527_hash NULL
-+_003528_hash rx_decrypt_key_not_found_read 3 37820 _003528_hash NULL
-+_003529_hash rx_defrag_called_read 3 1897 _003529_hash NULL
-+_003530_hash rx_defrag_decrypt_failed_read 3 41411 _003530_hash NULL
-+_003531_hash rx_defrag_init_called_read 3 35935 _003531_hash NULL
-+_003532_hash rx_defrag_in_process_called_read 3 59338 _003532_hash NULL
-+_003533_hash rx_defrag_need_decrypt_read 3 42253 _003533_hash NULL
-+_003534_hash rx_defrag_need_defrag_read 3 28117 _003534_hash NULL
-+_003535_hash rx_defrag_tkip_called_read 3 21031 _003535_hash NULL
-+_003536_hash rx_filter_accum_arp_pend_requests_read 3 11003 _003536_hash NULL
-+_003537_hash rx_filter_arp_filter_read 3 61914 _003537_hash NULL
-+_003538_hash rx_filter_beacon_filter_read 3 49279 _003538_hash NULL
-+_003539_hash rx_filter_data_filter_read 3 30098 _003539_hash NULL
-+_003540_hash rx_filter_dup_filter_read 3 37238 _003540_hash NULL
-+_003541_hash rx_filter_ibss_filter_read 3 50167 _003541_hash NULL
-+_003542_hash rx_filter_max_arp_queue_dep_read 3 5851 _003542_hash NULL
-+_003543_hash rx_filter_mc_filter_read 3 25712 _003543_hash NULL
-+_003544_hash rx_filter_protection_filter_read 3 39282 _003544_hash NULL
-+_003545_hash rx_rate_rx_frames_per_rates_read 3 7282 _003545_hash NULL
-+_003546_hash rx_rx_beacon_early_term_read 3 21559 _003546_hash NULL
-+_003547_hash rx_rx_checksum_result_read 3 50617 _003547_hash NULL
-+_003548_hash rx_rx_cmplt_read 3 14753 _003548_hash NULL
-+_003549_hash rx_rx_cmplt_task_read 3 35226 _003549_hash NULL
-+_003550_hash rx_rx_defrag_end_read 3 505 _003550_hash NULL
-+_003551_hash rx_rx_defrag_read 3 2010 _003551_hash NULL
-+_003552_hash rx_rx_done_read 3 65217 _003552_hash NULL
-+_003553_hash rx_rx_dropped_frame_read 3 23748 _003553_hash NULL
-+_003554_hash rx_rx_frame_checksum_read 3 40140 _003554_hash NULL
-+_003555_hash rx_rx_hdr_overflow_read 3 35002 _003555_hash NULL
-+_003556_hash rx_rx_out_of_mpdu_nodes_read 3 64668 _003556_hash NULL
-+_003557_hash rx_rx_phy_hdr_read 3 20950 _003557_hash NULL
-+_003558_hash rx_rx_pre_complt_read 3 41653 _003558_hash NULL
-+_003559_hash rx_rx_timeout_read 3 62389 _003559_hash NULL
-+_003560_hash rx_rx_timeout_wa_read 3 50204 _003560_hash NULL
-+_003561_hash rx_rx_tkip_replays_read 3 60193 _003561_hash NULL
-+_003562_hash rx_rx_wa_ba_not_expected_read 3 61341 _003562_hash NULL
-+_003563_hash rx_rx_wa_density_dropped_frame_read 3 26095 _003563_hash NULL
-+_003564_hash rx_streaming_always_read 3 49401 _003564_hash NULL
-+_003565_hash rx_streaming_interval_read 3 55291 _003565_hash NULL
-+_003566_hash saa7164_buffer_alloc_user 2 9627 _003566_hash NULL
-+_003567_hash send_control_msg 6 48498 _003567_hash NULL
-+_003568_hash SendTxCommandPacket 3 42901 _003568_hash NULL
-+_003569_hash setup_window 2-7-5-4 59178 _003569_hash NULL
-+_003573_hash shmem_pwrite_fast 3 46842 _003573_hash NULL
-+_003574_hash sleep_auth_read 3 19159 _003574_hash NULL
-+_003575_hash sn9c102_read 3 29305 _003575_hash NULL
-+_003576_hash snd_pcm_alloc_vmalloc_buffer 2 44595 _003576_hash NULL
-+_003577_hash split_scan_timeout_read 3 20029 _003577_hash NULL
-+_003578_hash stk_prepare_sio_buffers 2 57168 _003578_hash NULL
-+_003579_hash store_debug_level 3 35652 _003579_hash NULL
-+_003580_hash suspend_dtim_interval_read 3 64971 _003580_hash NULL
-+_003581_hash sys_prctl 4 8766 _003581_hash NULL
-+_003582_hash tm6000_read_write_usb 7 50774 _003582_hash &_002149_hash
-+_003583_hash tracing_read_pipe 3 35312 _003583_hash NULL
-+_003584_hash ts_read 3 44687 _003584_hash NULL
-+_003585_hash ts_write 3 64336 _003585_hash NULL
-+_003586_hash tt3650_ci_msg 4 57219 _003586_hash NULL
-+_003587_hash ttm_object_device_init 2 10321 _003587_hash NULL
-+_003588_hash ttm_object_file_init 2 27804 _003588_hash NULL
-+_003589_hash tx_frag_bad_mblk_num_read 3 28064 _003589_hash NULL
-+_003590_hash tx_frag_cache_hit_read 3 29639 _003590_hash NULL
-+_003591_hash tx_frag_cache_miss_read 3 28394 _003591_hash NULL
-+_003592_hash tx_frag_called_read 3 1748 _003592_hash NULL
-+_003593_hash tx_frag_failed_read 3 43540 _003593_hash NULL
-+_003594_hash tx_frag_init_called_read 3 48377 _003594_hash NULL
-+_003595_hash tx_frag_in_process_called_read 3 1290 _003595_hash NULL
-+_003596_hash tx_frag_key_not_found_read 3 22971 _003596_hash NULL
-+_003597_hash tx_frag_mpdu_alloc_failed_read 3 41167 _003597_hash NULL
-+_003598_hash tx_frag_need_fragmentation_read 3 50153 _003598_hash NULL
-+_003599_hash tx_frag_tkip_called_read 3 31575 _003599_hash NULL
-+_003600_hash tx_tx_burst_programmed_read 3 20320 _003600_hash NULL
-+_003601_hash tx_tx_checksum_result_read 3 36490 _003601_hash &_001996_hash
-+_003602_hash tx_tx_cmplt_read 3 35854 _003602_hash NULL
-+_003603_hash tx_tx_data_prepared_read 3 43497 _003603_hash NULL
-+_003604_hash tx_tx_data_programmed_read 3 36871 _003604_hash NULL
-+_003605_hash tx_tx_done_data_read 3 6799 _003605_hash NULL
-+_003606_hash tx_tx_done_int_template_read 3 55511 _003606_hash &_001887_hash
-+_003607_hash tx_tx_done_template_read 3 35104 _003607_hash &_000106_hash
-+_003608_hash tx_tx_exch_expiry_read 3 8749 _003608_hash NULL
-+_003609_hash tx_tx_exch_pending_read 3 53018 _003609_hash NULL
-+_003610_hash tx_tx_exch_read 3 52986 _003610_hash NULL
-+_003611_hash tx_tx_frame_checksum_read 3 41553 _003611_hash NULL
-+_003612_hash tx_tx_imm_resp_read 3 55964 _003612_hash NULL
-+_003613_hash tx_tx_prepared_descs_read 3 9221 _003613_hash NULL
-+_003614_hash tx_tx_retry_data_read 3 1926 _003614_hash NULL
-+_003615_hash tx_tx_retry_template_read 3 57623 _003615_hash NULL
-+_003616_hash tx_tx_start_data_read 3 53219 _003616_hash NULL
-+_003617_hash tx_tx_start_fw_gen_read 3 58648 _003617_hash NULL
-+_003618_hash tx_tx_start_int_templates_read 3 58324 _003618_hash NULL
-+_003619_hash tx_tx_start_null_frame_read 3 6281 _003619_hash NULL
-+_003620_hash tx_tx_starts_read 3 3617 _003620_hash NULL
-+_003621_hash tx_tx_start_templates_read 3 17164 _003621_hash NULL
-+_003622_hash tx_tx_template_prepared_read 3 30424 _003622_hash NULL
-+_003623_hash tx_tx_template_programmed_read 3 30461 _003623_hash NULL
-+_003624_hash udi_log_event 3 58105 _003624_hash NULL
-+_003625_hash udl_prime_create 2 57159 _003625_hash NULL
-+_003626_hash uf_create_device_nodes 2 24948 _003626_hash NULL
-+_003627_hash uf_sme_queue_message 3 15697 _003627_hash NULL
-+_003628_hash ufx_alloc_urb_list 3 10349 _003628_hash NULL
-+_003629_hash unifi_net_data_malloc 3 24716 _003629_hash NULL
-+_003630_hash unifi_read 3 14899 _003630_hash NULL
-+_003631_hash unifi_write 3 65012 _003631_hash NULL
-+_003632_hash usb_buffer_alloc 2 36276 _003632_hash NULL
-+_003633_hash usbvision_rvmalloc 1 19655 _003633_hash NULL
-+_003634_hash usbvision_v4l2_read 3 34386 _003634_hash NULL
-+_003635_hash uvc_alloc_buffers 2-3 9656 _003635_hash NULL
-+_003637_hash uvc_alloc_entity 3-4 20836 _003637_hash NULL
-+_003639_hash uvc_debugfs_stats_read 3 56651 _003639_hash NULL
-+_003640_hash uvc_simplify_fraction 3 31303 _003640_hash NULL
-+_003641_hash v4l2_ctrl_new 7 24927 _003641_hash NULL
-+_003642_hash v4l2_event_subscribe 3 53687 _003642_hash NULL
-+_003643_hash v4l_stk_read 3 39672 _003643_hash NULL
-+_003644_hash __vb2_perform_fileio 3 63033 _003644_hash NULL
-+_003645_hash vfd_write 3 14717 _003645_hash NULL
-+_003646_hash vfio_config_do_rw 3 46091 _003646_hash NULL
-+_003647_hash vfio_msi_enable 2 20906 _003647_hash NULL
-+_003648_hash viafb_dvp0_proc_write 3 23023 _003648_hash NULL
-+_003649_hash viafb_dvp1_proc_write 3 48864 _003649_hash NULL
-+_003650_hash viafb_vt1636_proc_write 3 16018 _003650_hash NULL
-+_003651_hash __videobuf_alloc_vb 1 27062 _003651_hash NULL
-+_003652_hash __videobuf_alloc_vb 1 5665 _003652_hash NULL
-+_003653_hash __videobuf_copy_to_user 4 15423 _003653_hash NULL
-+_003654_hash videobuf_dma_init_kernel 3 6963 _003654_hash NULL
-+_003655_hash videobuf_pages_to_sg 2 3708 _003655_hash NULL
-+_003656_hash videobuf_vmalloc_to_sg 2 4548 _003656_hash NULL
-+_003657_hash video_usercopy 2 62151 _003657_hash NULL
-+_003658_hash virtscsi_alloc_tgt 2 6643 _003658_hash NULL
-+_003659_hash vmw_cursor_update_image 3-4 16332 _003659_hash NULL
-+_003661_hash vmw_framebuffer_dmabuf_dirty 6 37661 _003661_hash &_001116_hash
-+_003662_hash vmw_framebuffer_surface_dirty 6 48132 _003662_hash NULL
-+_003663_hash vmw_gmr2_bind 3 21305 _003663_hash NULL
-+_003664_hash vmw_unlocked_ioctl 2 19212 _003664_hash NULL
-+_003665_hash w9966_v4l_read 3 31148 _003665_hash NULL
-+_003666_hash wl1273_fm_fops_write 3 60621 _003666_hash NULL
-+_003667_hash zoran_write 3 22404 _003667_hash NULL
-+_003668_hash alloc_vm_area 1 15989 _003668_hash NULL
-+_003669_hash cx18_copy_mdl_to_user 4 45549 _003669_hash NULL
-+_003670_hash dlfb_ops_write 3 64150 _003670_hash NULL
-+_003671_hash dvb_demux_read 3 13981 _003671_hash NULL
-+_003672_hash dvb_dmxdev_read_sec 4 7892 _003672_hash NULL
-+_003673_hash dvb_dvr_read 3 17073 _003673_hash NULL
-+_003674_hash em28xx_init_isoc 4 62883 _003674_hash &_000729_hash
-+_003675_hash fb_alloc_cmap 2 6554 _003675_hash NULL
-+_003676_hash gspca_dev_probe 4 2570 _003676_hash NULL
-+_003677_hash ieee80211_auth_challenge 3 18810 _003677_hash NULL
-+_003678_hash ieee80211_rtl_auth_challenge 3 61897 _003678_hash NULL
-+_003679_hash init_pci_cap_msi_perm 2 59033 _003679_hash NULL
-+_003680_hash __ioremap_caller 1-2 21800 _003680_hash NULL
-+_003682_hash ivtv_read 3 57796 _003682_hash NULL
-+_003683_hash ivtv_v4l2_write 3 39226 _003683_hash NULL
-+_003684_hash mce_async_out 3 58056 _003684_hash NULL
-+_003685_hash mce_flush_rx_buffer 2 14976 _003685_hash NULL
-+_003686_hash ms_read_multiple_pages 4-5 8052 _003686_hash NULL
-+_003688_hash ms_write_multiple_pages 5-6 10362 _003688_hash NULL
-+_003690_hash nfc_hci_send_cmd 5 55714 _003690_hash NULL
-+_003691_hash persistent_ram_new 1-2 40501 _003691_hash NULL
-+_003693_hash picolcd_fb_write 3 2318 _003693_hash NULL
-+_003694_hash process_bulk_data_command 4 38906 _003694_hash NULL
-+_003695_hash pvr2_v4l2_read 3 18006 _003695_hash NULL
-+_003696_hash qcam_read 3 13977 _003696_hash NULL
-+_003697_hash register_unifi_sdio 2 55239 _003697_hash NULL
-+_003698_hash resize_async_buffer 4 64031 _003698_hash &_002431_hash
-+_003699_hash rtllib_auth_challenge 3 12493 _003699_hash NULL
-+_003702_hash stk_allocate_buffers 2 16291 _003702_hash NULL
-+_003703_hash subdev_ioctl 2 28417 _003703_hash NULL
-+_003704_hash _sys_packet_req 4 46793 _003704_hash NULL
-+_003705_hash tm6000_i2c_recv_regs16 5 2949 _003705_hash NULL
-+_003706_hash tm6000_i2c_recv_regs 5 46215 _003706_hash NULL
-+_003707_hash tm6000_i2c_send_regs 5 20250 _003707_hash NULL
-+_003708_hash tt3650_ci_msg_locked 4 8013 _003708_hash NULL
-+_003709_hash ufx_ops_write 3 54848 _003709_hash NULL
-+_003710_hash update_macheader 7 1775 _003710_hash NULL
-+_003711_hash usbdux_attach_common 4 51764 _003750_hash NULL nohasharray
-+_003712_hash usbduxfast_attach_common 4 52538 _003712_hash NULL
-+_003713_hash usbduxsigma_attach_common 4 40847 _003713_hash NULL
-+_003714_hash uvc_v4l2_ioctl 2 8411 _003714_hash NULL
-+_003715_hash v4l2_ctrl_new_int_menu 4 41151 _003715_hash NULL
-+_003716_hash v4l2_ctrl_new_std 5 45748 _003716_hash &_000497_hash
-+_003717_hash v4l2_ctrl_new_std_menu 4 6221 _003717_hash NULL
-+_003718_hash vb2_read 3 42703 _003718_hash NULL
-+_003719_hash vb2_write 3 31948 _003719_hash NULL
-+_003720_hash vfio_pci_set_msi_trigger 3-4 26507 _003720_hash NULL
-+_003722_hash viafb_iga1_odev_proc_write 3 36241 _003722_hash NULL
-+_003723_hash viafb_iga2_odev_proc_write 3 2363 _003723_hash NULL
-+_003724_hash __videobuf_alloc_cached 1 12740 _003724_hash NULL
-+_003725_hash __videobuf_alloc_uncached 1 55711 _003725_hash NULL
-+_003726_hash __videobuf_copy_stream 4 44769 _003726_hash NULL
-+_003727_hash videobuf_read_one 3 31637 _003727_hash NULL
-+_003728_hash video_ioctl2 2 21380 _003728_hash NULL
-+_003729_hash vmap 2 15025 _003729_hash NULL
-+_003730_hash vmw_cursor_update_dmabuf 3-4 32045 _003730_hash NULL
-+_003732_hash vmw_gmr_bind 3 44130 _003732_hash NULL
-+_003733_hash xd_read_multiple_pages 4-5 11422 _003733_hash NULL
-+_003735_hash xd_write_multiple_pages 5-6 53633 _003735_hash NULL
-+_003737_hash xenfb_write 3 43412 _003737_hash NULL
-+_003738_hash arch_gnttab_map_shared 3 41306 _003738_hash NULL
-+_003739_hash arch_gnttab_map_status 3 49812 _003739_hash NULL
-+_003740_hash bttv_read 3 11432 _003740_hash NULL
-+_003741_hash cx18_read 3 23699 _003741_hash NULL
-+_003742_hash cx2341x_ctrl_new_menu 3 49700 _003742_hash NULL
-+_003743_hash cx2341x_ctrl_new_std 4 57061 _003743_hash NULL
-+_003744_hash cx25821_video_ioctl 2 30188 _003744_hash NULL
-+_003745_hash dt3155_read 3 59226 _003745_hash NULL
-+_003746_hash ioremap_cache 1-2 47189 _003746_hash NULL
-+_003748_hash ioremap_nocache 1-2 2439 _003748_hash NULL
-+_003750_hash ioremap_prot 1-2 51764 _003750_hash &_003711_hash
-+_003752_hash ioremap_wc 1-2 62695 _003752_hash NULL
-+_003754_hash ivtv_read_pos 3 34400 _003754_hash &_000312_hash
-+_003755_hash mcam_v4l_read 3 36513 _003755_hash NULL
-+_003756_hash ms_rw_multi_sector 3-4 7459 _003756_hash NULL
-+_003758_hash pvr2_v4l2_ioctl 2 24398 _003758_hash &_000877_hash
-+_003759_hash ramoops_init_prz 5 12134 _003759_hash NULL
-+_003761_hash ttm_bo_kmap_ttm 3 5922 _003761_hash NULL
-+_003762_hash uf_ap_process_data_pdu 7 25860 _003762_hash NULL
-+_003763_hash vb2_fop_read 3 24080 _003763_hash NULL
-+_003764_hash vb2_fop_write 3 30420 _003764_hash NULL
-+_003765_hash videobuf_read_stream 3 14956 _003765_hash NULL
-+_003766_hash video_read 3 28148 _003766_hash NULL
-+_003767_hash vmw_du_crtc_cursor_set 4-5 28479 _003767_hash NULL
-+_003769_hash xd_rw 3-4 49020 _003769_hash NULL
-+_003771_hash zoran_ioctl 2 30465 _003771_hash NULL
-+_003772_hash zr364xx_read 3 2354 _003772_hash NULL
-+_003773_hash acpi_os_ioremap 1-2 49523 _003773_hash NULL
-+_003775_hash au0828_v4l2_read 3 40220 _003775_hash NULL
-+_003776_hash ca91cx42_alloc_resource 2 10502 _003776_hash NULL
-+_003778_hash cx18_read_pos 3 4683 _003778_hash NULL
-+_003779_hash cx18_v4l2_read 3 21196 _003779_hash NULL
-+_003780_hash cx231xx_v4l2_read 3 55014 _003780_hash NULL
-+_003781_hash devm_ioremap_nocache 2-3 2036 _003781_hash NULL
-+_003783_hash do_test 1 15766 _003783_hash NULL
-+_003784_hash __einj_error_trigger 1 17707 _003784_hash &_001764_hash
-+_003785_hash em28xx_v4l2_read 3 16701 _003785_hash NULL
-+_003786_hash init_chip_wc_pat 2 62768 _003786_hash NULL
-+_003787_hash intel_render_ring_init_dri 2-3 45446 _003787_hash NULL
-+_003789_hash io_mapping_create_wc 1-2 1354 _003789_hash NULL
-+_003791_hash iommu_map_mmio_space 1 30919 _003791_hash NULL
-+_003792_hash ioremap 1-2 23172 _003792_hash NULL
-+_003794_hash ivtv_v4l2_read 3 1964 _003794_hash NULL
-+_003795_hash mga_ioremap 1-2 8571 _003795_hash NULL
-+_003797_hash mpeg_read 3 6708 _003797_hash NULL
-+_003798_hash msix_map_region 3 3411 _003798_hash NULL
-+_003799_hash ms_rw 3-4 17220 _003799_hash NULL
-+_003801_hash pci_iomap 3 47575 _003801_hash NULL
-+_003802_hash pd_video_read 3 24510 _003802_hash NULL
-+_003803_hash sfi_map_memory 1-2 5183 _003803_hash NULL
-+_003805_hash solo_enc_read 3 33553 _003805_hash NULL
-+_003806_hash solo_v4l2_read 3 59247 _003806_hash NULL
-+_003807_hash timblogiw_read 3 48305 _003807_hash NULL
-+_003808_hash tm6000_read 3 4151 _003808_hash NULL
-+_003809_hash tsi148_alloc_resource 2 24563 _003809_hash NULL
-+_003810_hash ttm_bo_ioremap 2-3 31082 _003810_hash NULL
-+_003812_hash ttm_bo_kmap 3-2 60118 _003812_hash NULL
-+_003813_hash vb2_vmalloc_get_userptr 3 31374 _003813_hash NULL
-+_003814_hash vbi_read 3 63673 _003814_hash NULL
-+_003815_hash viacam_read 3 54526 _003815_hash NULL
-+_003816_hash xlate_dev_mem_ptr 1 15291 _003816_hash &_001231_hash
-+_003817_hash a4t_cs_init 3 27734 _003817_hash NULL
-+_003818_hash aac_nark_ioremap 2 50163 _003818_hash &_000323_hash
-+_003819_hash aac_rkt_ioremap 2 3333 _003819_hash NULL
-+_003820_hash aac_rx_ioremap 2 52410 _003820_hash NULL
-+_003821_hash aac_sa_ioremap 2 13596 _003821_hash &_000299_hash
-+_003822_hash aac_src_ioremap 2 41688 _003822_hash NULL
-+_003823_hash aac_srcv_ioremap 2 6659 _003823_hash NULL
-+_003824_hash acpi_map 1-2 58725 _003824_hash NULL
-+_003826_hash acpi_os_read_memory 1-3 54186 _003826_hash NULL
-+_003828_hash acpi_os_write_memory 1-3 56416 _003828_hash &_003429_hash
-+_003830_hash atyfb_setup_generic 3 49151 _003830_hash NULL
-+_003831_hash ca91cx42_master_set 4 23146 _003831_hash NULL
-+_003832_hash check_mirror 1-2 57342 _003832_hash &_001753_hash
-+_003834_hash cycx_setup 4 47562 _003834_hash NULL
-+_003835_hash devm_ioremap 2-3 29235 _003835_hash NULL
-+_003837_hash divasa_remap_pci_bar 3-4 23485 _003837_hash &_000979_hash
-+_003839_hash doc_probe 1 23285 _003839_hash NULL
-+_003840_hash DoC_Probe 1 57534 _003840_hash NULL
-+_003841_hash efi_ioremap 1-2 3492 _003841_hash &_001137_hash
-+_003843_hash ems_pcmcia_add_card 2 62627 _003843_hash NULL
-+_003844_hash isp1760_register 1-2 628 _003844_hash NULL
-+_003846_hash mid_get_vbt_data_r0 2 10876 _003846_hash NULL
-+_003847_hash mid_get_vbt_data_r10 2 6308 _003847_hash NULL
-+_003848_hash mid_get_vbt_data_r1 2 26170 _003848_hash NULL
-+_003849_hash mthca_map_reg 2-3 5664 _003849_hash NULL
-+_003851_hash mthca_setup_cmd_doorbells 2 53954 _003851_hash NULL
-+_003852_hash netxen_nic_map_indirect_address_128M 2 42257 _003852_hash NULL
-+_003853_hash pcim_iomap 3 58334 _003853_hash NULL
-+_003854_hash persistent_ram_iomap 1-2 47156 _003854_hash NULL
-+_003856_hash read_vbt_r0 1 503 _003856_hash NULL
-+_003857_hash read_vbt_r10 1 60679 _003857_hash NULL
-+_003858_hash register_device 2-3 60015 _003858_hash NULL
-+_003860_hash remap_pci_mem 1-2 15966 _003860_hash NULL
-+_003862_hash rtl_port_map 1-2 2385 _003862_hash NULL
-+_003864_hash sfi_map_table 1 5462 _003864_hash NULL
-+_003865_hash sriov_enable_migration 2 14889 _003865_hash NULL
-+_003866_hash ssb_bus_scan 2 36578 _003866_hash NULL
-+_003867_hash ssb_ioremap 2 5228 _003867_hash NULL
-+_003868_hash tpci200_slot_map_space 2 3848 _003868_hash NULL
-+_003869_hash tpm_tis_init 2-3 15304 _003869_hash NULL
-+_003871_hash tsi148_master_set 4 14685 _003871_hash NULL
-+_003872_hash acpi_os_map_memory 1-2 11161 _003872_hash NULL
-+_003874_hash com90xx_found 3 13974 _003874_hash NULL
-+_003875_hash netxen_nic_hw_read_wx_128M 2 26858 _003875_hash NULL
-+_003876_hash netxen_nic_hw_write_wx_128M 2 33488 _003876_hash NULL
-+_003877_hash sfi_check_table 1 6772 _003877_hash NULL
-+_003878_hash sfi_sysfs_install_table 1 51688 _003878_hash NULL
-+_003879_hash sriov_enable 2 59689 _003879_hash NULL
-+_003880_hash ssb_bus_register 3 65183 _003880_hash NULL
-+_003881_hash acpi_ex_system_memory_space_handler 2 31192 _003881_hash NULL
-+_003882_hash acpi_tb_check_xsdt 1 21862 _003882_hash NULL
-+_003883_hash acpi_tb_install_table 1 12988 _003883_hash NULL
-+_003884_hash acpi_tb_parse_root_table 1 53455 _003884_hash NULL
-+_003885_hash check_vendor_extension 1 3254 _003885_hash NULL
-+_003886_hash pci_enable_sriov 2 35745 _003886_hash NULL
-+_003887_hash ssb_bus_pcmciabus_register 3 56020 _003887_hash NULL
-+_003888_hash ssb_bus_ssbbus_register 2 2217 _003888_hash NULL
-+_003889_hash lpfc_sli_probe_sriov_nr_virtfn 2 26004 _003889_hash NULL
-+_003890_hash alloc_vm_area 1 36149 _003890_hash NULL
-+_003891_hash cma_create_area 2 38642 _003891_hash NULL
-+_003893_hash fbcon_prepare_logo 5 6246 _003893_hash NULL
-+_003894_hash io_mapping_map_wc 2 19284 _003894_hash NULL
-+_003895_hash nfs_dns_resolve_name 3 25036 _003895_hash NULL
-+_003896_hash nfs_parse_server_name 2 1899 _003896_hash NULL
+@@ -0,0 +1,3713 @@
++intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
++ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
++batadv_orig_node_del_if_4 batadv_orig_node_del_if 2 4 NULL
++ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
++xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
++recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
++sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
++rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
++diva_os_malloc_16406 diva_os_malloc 2 16406 NULL
++compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
++xfs_dir2_leaf_getdents_23841 xfs_dir2_leaf_getdents 3 23841 NULL
++ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
++carl9170_alloc_27 carl9170_alloc 1 27 NULL
++dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
++create_log_8225 create_log 2 8225 NULL
++ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
++rproc_name_read_32805 rproc_name_read 3 32805 NULL
++rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
++mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
++il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
++sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray
++padzero_55 padzero 1 55 &sel_read_policyvers_55
++cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL
++alloc_wr_24635 alloc_wr 1-2 24635 NULL
++read_file_blob_57406 read_file_blob 3 57406 NULL
++add_rx_skb_8257 add_rx_skb 3 8257 NULL
++enclosure_register_57412 enclosure_register 3 57412 NULL
++t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
++_req_append_segment_41031 _req_append_segment 2 41031 NULL
++gre_manip_pkt_57416 gre_manip_pkt 4 57416 NULL
++netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
++mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
++DepcaSignature_80 DepcaSignature 2 80 NULL nohasharray
++crypto_authenc_setkey_80 crypto_authenc_setkey 3 80 &DepcaSignature_80
++init_cdev_8274 init_cdev 1 8274 NULL
++shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
++compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL nohasharray
++alloc_ftrace_hash_57431 alloc_ftrace_hash 1 57431 &compat_keyctl_instantiate_key_iov_57431
++copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
++rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
++snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
++load_msg_95 load_msg 2 95 NULL
++rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
++new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
++acpi_tb_check_xsdt_21862 acpi_tb_check_xsdt 1 21862 NULL
++sys_pselect6_57449 sys_pselect6 1 57449 NULL
++biovec_create_pools_9575 biovec_create_pools 2 9575 NULL
++ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
++tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
++ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 NULL nohasharray
++cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 &ath6kl_usb_submit_ctrl_in_32880
++cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
++send_midi_async_57463 send_midi_async 3 57463 NULL
++sisusb_clear_vram_57466 sisusb_clear_vram 3-2 57466 NULL
++ath6kl_usb_post_recv_transfers_32892 ath6kl_usb_post_recv_transfers 2 32892 NULL
++ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL nohasharray
++sep_lock_user_pages_57470 sep_lock_user_pages 2-3 57470 &ieee80211_if_read_flags_57470
++rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
++construct_key_and_link_8321 construct_key_and_link 4 8321 NULL
++ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
++init_q_132 init_q 4 132 NULL
++roccat_read_41093 roccat_read 3 41093 NULL nohasharray
++nvme_map_user_pages_41093 nvme_map_user_pages 3-4 41093 &roccat_read_41093
++ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
++unifi_net_data_malloc_24716 unifi_net_data_malloc 3 24716 NULL
++memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
++il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 NULL
++uio_read_49300 uio_read 3 49300 NULL
++f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
++tracing_trace_options_write_153 tracing_trace_options_write 3 153 NULL
++bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
++firmwareUpload_32794 firmwareUpload 3 32794 NULL
++simple_attr_read_24738 simple_attr_read 3 24738 NULL
++play_iframe_8219 play_iframe 3 8219 NULL
++qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
++ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
++ath_rxbuf_alloc_24745 ath_rxbuf_alloc 2 24745 NULL
++nvme_create_queue_170 nvme_create_queue 3 170 NULL
++init_tag_map_57515 init_tag_map 3 57515 NULL
++il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 NULL
++srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-3-4 49330 NULL
++kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
++lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
++xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
++DoC_Probe_57534 DoC_Probe 1 57534 NULL
++cfpkt_setlen_49343 cfpkt_setlen 2 49343 NULL
++agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
++mI_alloc_skb_24770 mI_alloc_skb 1 24770 NULL
++iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
++virtblk_add_req_197 virtblk_add_req 2-3 197 NULL
++il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
++rds_tcp_data_recv_53476 rds_tcp_data_recv 3 53476 NULL
++xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
++skb_make_writable_24783 skb_make_writable 2 24783 NULL
++datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
++dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
++cache_read_24790 cache_read 3 24790 NULL
++px_raw_event_49371 px_raw_event 4 49371 NULL
++tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
++compat_filldir_32999 compat_filldir 3 32999 NULL
++hci_si_event_1404 hci_si_event 3 1404 NULL
++compat_sys_process_vm_writev_41194 compat_sys_process_vm_writev 3-5 41194 NULL
++dfs_file_write_41196 dfs_file_write 3 41196 NULL
++afs_cell_create_27346 afs_cell_create 2 27346 NULL
++iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
++applesmc_create_nodes_49392 applesmc_create_nodes 2 49392 NULL
++snd_usb_ctl_msg_8436 snd_usb_ctl_msg 8 8436 NULL
++comedi_buf_alloc_24822 comedi_buf_alloc 3 24822 NULL
++rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
++tnode_alloc_49407 tnode_alloc 1 49407 NULL
++tun_alloc_skb_41216 tun_alloc_skb 2-4-3 41216 NULL
++proc_scsi_write_proc_267 proc_scsi_write_proc 3 267 NULL
++__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
++sk_stream_alloc_skb_57622 sk_stream_alloc_skb 2 57622 NULL
++tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
++iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
++mfd_add_devices_16668 mfd_add_devices 4 16668 NULL
++packet_recv_error_16669 packet_recv_error 3 16669 NULL
++osdmap_set_max_osd_57630 osdmap_set_max_osd 2 57630 NULL nohasharray
++sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 &osdmap_set_max_osd_57630
++mem_read_57631 mem_read 3 57631 NULL
++afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
++ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
++read_file_war_stats_292 read_file_war_stats 3 292 NULL
++pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
++l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
++hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
++stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
++sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
++queues_read_24877 queues_read 3 24877 NULL
++__fprog_create_41263 __fprog_create 2 41263 NULL
++syslog_print_307 syslog_print 2 307 NULL
++platform_device_add_data_310 platform_device_add_data 3 310 NULL
++agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
++dn_setsockopt_314 dn_setsockopt 5 314 NULL
++sys_mq_timedsend_57661 sys_mq_timedsend 3 57661 NULL
++r3964_write_57662 r3964_write 4 57662 NULL
++xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL
++savu_sysfs_read_49473 savu_sysfs_read 6 49473 NULL
++dn_nsp_do_disc_49474 dn_nsp_do_disc 6-2 49474 NULL
++alloc_context_41283 alloc_context 1 41283 NULL
++__lgwrite_57669 __lgwrite 4 57669 NULL
++ath9k_wmi_cmd_327 ath9k_wmi_cmd 4 327 NULL
++codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
++isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
++alloc_pg_vec_8533 alloc_pg_vec 2 8533 NULL
++pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
++ieee80211_fragment_33112 ieee80211_fragment 4 33112 NULL
++arch_gnttab_map_shared_41306 arch_gnttab_map_shared 3 41306 NULL
++v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL
++write_node_33121 write_node 4 33121 NULL
++vring_new_virtqueue_54673 vring_new_virtqueue 2 54673 NULL
++i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
++profile_remove_8556 profile_remove 3 8556 NULL
++rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
++iscsi_recv_pdu_16755 iscsi_recv_pdu 4 16755 NULL
++arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
++cmtp_send_interopmsg_376 cmtp_send_interopmsg 7 376 NULL
++ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
++mga_ioremap_8571 mga_ioremap 1-2 8571 NULL
++isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
++sys_rt_sigpending_24961 sys_rt_sigpending 2 24961 NULL
++tower_write_8580 tower_write 3 8580 NULL
++cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
++compat_sys_set_mempolicy_57742 compat_sys_set_mempolicy 3 57742 NULL nohasharray
++pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 &compat_sys_set_mempolicy_57742
++jbd2_alloc_41359 jbd2_alloc 1 41359 NULL
++debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
++nf_nat_sdp_port_24977 nf_nat_sdp_port 7 24977 NULL
++smk_write_access_49561 smk_write_access 3 49561 NULL
++llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL
++kmp_init_41373 kmp_init 2 41373 NULL
++context_alloc_24645 context_alloc 3 24645 NULL
++lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
++get_server_iovec_16804 get_server_iovec 2 16804 NULL
++alloc_chunk_49575 alloc_chunk 1 49575 NULL
++tipc_send2name_16809 tipc_send2name 6 16809 NULL
++sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
++key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
++shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
++il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
++dm_vcalloc_16814 dm_vcalloc 1-2 16814 NULL
++it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
++isr_commands_read_41398 isr_commands_read 3 41398 NULL
++pp_read_33210 pp_read 3 33210 NULL
++sys_flistxattr_41407 sys_flistxattr 3 41407 NULL
++scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
++ivtv_read_57796 ivtv_read 3 57796 NULL
++isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
++nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
++xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
++heap_init_49617 heap_init 2 49617 NULL
++xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL
++ieee80211_send_probe_req_38307 ieee80211_send_probe_req 6-4 38307 NULL
++isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
++smk_write_doi_49621 smk_write_doi 3 49621 NULL
++_alloc_get_attr_desc_470 _alloc_get_attr_desc 2 470 NULL
++lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
++btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
++iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
++ntfs_file_buffered_write_41442 ntfs_file_buffered_write 4-6 41442 NULL
++pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
++dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
++bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
++st_write_16874 st_write 3 16874 NULL
++copy_to_user_57835 copy_to_user 3 57835 NULL
++rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
++pidlist_resize_496 pidlist_resize 2 496 NULL
++flash_read_57843 flash_read 3 57843 NULL
++read_vbt_r0_503 read_vbt_r0 1 503 NULL
++rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
++cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
++rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
++arcfb_write_8702 arcfb_write 3 8702 NULL
++gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
++smp_send_cmd_512 smp_send_cmd 3 512 NULL
++rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
++rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 NULL nohasharray
++vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 &rfcomm_sock_sendmsg_37661
++HDLC_irq_8709 HDLC_irq 2 8709 NULL
++ctrl_out_8712 ctrl_out 3-5 8712 NULL
++cxio_hal_init_rhdl_resource_25104 cxio_hal_init_rhdl_resource 1 25104 NULL
++sock_wmalloc_16472 sock_wmalloc 2 16472 NULL
++snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
++aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
++wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
++hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
++mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
++psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray
++snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926
++iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
++sys_gethostname_49698 sys_gethostname 2 49698 NULL
++cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
++ieee80211_rx_mgmt_probe_resp_6918 ieee80211_rx_mgmt_probe_resp 3 6918 NULL
++devres_alloc_551 devres_alloc 2 551 NULL
++ldisc_receive_41516 ldisc_receive 4 41516 NULL
++tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
++ip_append_data_16942 ip_append_data 5-6 16942 NULL
++xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
++_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL
++squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
++emi26_writememory_57908 emi26_writememory 4 57908 NULL
++start_isoc_chain_565 start_isoc_chain 2 565 NULL
++iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL
++gsm_mux_rx_netchar_33336 gsm_mux_rx_netchar 3 33336 NULL
++brcmu_pkt_buf_get_skb_5556 brcmu_pkt_buf_get_skb 1 5556 NULL
++joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
++sys_prctl_8766 sys_prctl 4 8766 NULL
++joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
++sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
++compat_sys_preadv_583 compat_sys_preadv 3 583 NULL
++sys_fsetxattr_49736 sys_fsetxattr 4 49736 NULL
++keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
++create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray
++irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356
++sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
++sys_fgetxattr_25166 sys_fgetxattr 4 25166 NULL
++ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL
++zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
++tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL
++ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL
++ath6kl_buf_alloc_57304 ath6kl_buf_alloc 1 57304 NULL
++cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
++gserial_setup_41558 gserial_setup 2 41558 NULL
++rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
++rx_57944 rx 4 57944 NULL
++sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
++nci_skb_alloc_49757 nci_skb_alloc 2 49757 NULL
++key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
++cpuset_common_file_read_8800 cpuset_common_file_read 5 8800 NULL
++sctp_ulpevent_new_33377 sctp_ulpevent_new 1 33377 NULL
++fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
++mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
++isku_sysfs_write_49767 isku_sysfs_write 6 49767 NULL
++i915_cache_sharing_write_57961 i915_cache_sharing_write 3 57961 NULL
++batadv_receive_client_update_packet_41578 batadv_receive_client_update_packet 3 41578 NULL
++ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
++handle_response_icmp_39574 handle_response_icmp 7 39574 NULL
++wbcir_tx_19219 wbcir_tx 3 19219 NULL
++hfc_empty_fifo_57972 hfc_empty_fifo 2 57972 NULL
++ceph_dns_resolve_name_62488 ceph_dns_resolve_name 2 62488 NULL
++metronomefb_write_8823 metronomefb_write 3 8823 NULL
++icmpv6_manip_pkt_8833 icmpv6_manip_pkt 4 8833 NULL
++copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
++read_file_rx_chainmask_41605 read_file_rx_chainmask 3 41605 NULL
++vmw_du_crtc_cursor_set_28479 vmw_du_crtc_cursor_set 4-5 28479 NULL
++_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
++nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
++a2mp_send_41615 a2mp_send 4 41615 NULL
++ceph_copy_user_to_page_vector_656 ceph_copy_user_to_page_vector 4-3 656 NULL
++rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
++arch_gnttab_map_status_49812 arch_gnttab_map_status 3 49812 NULL
++mon_stat_read_25238 mon_stat_read 3 25238 NULL
++jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
++tcf_csum_ipv6_udp_25241 tcf_csum_ipv6_udp 4 25241 NULL
++wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
++macvtap_alloc_skb_50629 macvtap_alloc_skb 2-4-3 50629 NULL
++mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
++ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6 49829 NULL
++add_uuid_49831 add_uuid 4 49831 NULL
++send_pages_8872 send_pages 3 8872 NULL
++ath6kl_fwlog_block_read_49836 ath6kl_fwlog_block_read 3 49836 NULL
++__btrfs_map_block_49839 __btrfs_map_block 3 49839 NULL
++dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
++mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
++simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
++rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
++__kmalloc_reserve_17080 __kmalloc_reserve 1 17080 NULL
++timeradd_entry_49850 timeradd_entry 3 49850 NULL
++crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
++vfs_writev_25278 vfs_writev 3 25278 NULL
++rtl8169_try_rx_copy_705 rtl8169_try_rx_copy 3 705 NULL
++alloc_async_14208 alloc_async 1 14208 NULL
++ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
++persistent_ram_vmap_709 persistent_ram_vmap 2-1 709 NULL
++l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
++create_entry_33479 create_entry 2 33479 NULL
++mce_async_out_58056 mce_async_out 3 58056 NULL
++alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
++sys_preadv_17100 sys_preadv 3 17100 NULL
++sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
++ip_setsockopt_33487 ip_setsockopt 5 33487 NULL
++netxen_nic_hw_write_wx_128M_33488 netxen_nic_hw_write_wx_128M 2 33488 NULL
++aac_src_ioremap_41688 aac_src_ioremap 2 41688 NULL
++dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
++res_counter_read_33499 res_counter_read 4 33499 NULL
++sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
++cm4040_write_58079 cm4040_write 3 58079 NULL
++fb_read_33506 fb_read 3 33506 NULL
++help_25316 help 5 25316 NULL nohasharray
++ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 &help_25316
++rfcomm_wmalloc_58090 rfcomm_wmalloc 2 58090 NULL
++mwifiex_get_common_rates_17131 mwifiex_get_common_rates 3 17131 NULL
++musb_test_mode_write_33518 musb_test_mode_write 3 33518 NULL
++ddp_set_map_751 ddp_set_map 4 751 NULL
++driver_stats_read_8944 driver_stats_read 3 8944 NULL
++ahash_setkey_unaligned_33521 ahash_setkey_unaligned 3 33521 NULL
++dvb_video_write_754 dvb_video_write 3 754 NULL
++nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
++osd_req_add_get_attr_list_49278 osd_req_add_get_attr_list 3 49278 NULL
++aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
++bdx_tx_db_init_41719 bdx_tx_db_init 2 41719 NULL
++nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
++udi_log_event_58105 udi_log_event 3 58105 NULL
++sys_pwritev_41722 sys_pwritev 3 41722 NULL
++l2cap_sock_alloc_skb_cb_33532 l2cap_sock_alloc_skb_cb 2 33532 NULL
++ib_send_cm_mra_60202 ib_send_cm_mra 4 60202 NULL nohasharray
++qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 &ib_send_cm_mra_60202
++read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
++__copy_from_user_inatomic_nocache_49921 __copy_from_user_inatomic_nocache 3 49921 NULL
++tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL
++usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
++tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
++venus_mkdir_8967 venus_mkdir 4 8967 NULL
++vol_cdev_read_8968 vol_cdev_read 3 8968 NULL nohasharray
++seq_open_net_8968 seq_open_net 4 8968 &vol_cdev_read_8968
++sep_read_17161 sep_read 3 17161 NULL
++befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
++tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
++dup_array_33551 dup_array 3 33551 NULL
++vxge_device_register_7752 vxge_device_register 4 7752 NULL
++solo_enc_read_33553 solo_enc_read 3 33553 NULL
++fillonedir_41746 fillonedir 3 41746 NULL
++init_bch_64130 init_bch 1-2 64130 NULL
++ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
++slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135
++sel_read_mls_25369 sel_read_mls 3 25369 NULL
++btrfs_alloc_free_block_8986 btrfs_alloc_free_block 3 8986 NULL
++savemem_58129 savemem 3 58129 NULL
++batadv_tt_realloc_packet_buff_49960 batadv_tt_realloc_packet_buff 4 49960 NULL
++rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
++driver_state_read_17194 driver_state_read 3 17194 NULL nohasharray
++iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 &driver_state_read_17194
++dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL
++if_writecmd_815 if_writecmd 2 815 NULL
++aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
++read_fifo_826 read_fifo 3 826 NULL
++keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
++scsi_execute_33596 scsi_execute 5 33596 NULL
++dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
++ms_rw_17220 ms_rw 3-4 17220 NULL
++read_tree_block_841 read_tree_block 3 841 NULL
++hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
++l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
++dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
++__pskb_copy_9038 __pskb_copy 2 9038 NULL
++garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
++asix_write_cmd_58192 asix_write_cmd 5 58192 NULL
++um_idi_read_850 um_idi_read 3 850 NULL
++__module_alloc_50004 __module_alloc 1 50004 NULL
++sco_send_frame_41815 sco_send_frame 3 41815 NULL
++ts_read_44687 ts_read 3 44687 NULL
++nci_send_cmd_58206 nci_send_cmd 3 58206 NULL
++snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL
++snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
++provide_user_output_41105 provide_user_output 3 41105 NULL
++error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
++o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
++iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
++fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
++alloc_ep_17269 alloc_ep 1 17269 NULL
++ath6kl_wmi_beginscan_cmd_25462 ath6kl_wmi_beginscan_cmd 8 25462 NULL
++ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 NULL
++generic_file_buffered_write_25464 generic_file_buffered_write 4 25464 NULL
++do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
++raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
++alloc_ebda_hpc_50046 alloc_ebda_hpc 1-2 50046 NULL
++keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
++create_queues_9088 create_queues 2-3 9088 NULL
++irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
++neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
++btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
++minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
++rbd_alloc_coll_33678 rbd_alloc_coll 1 33678 NULL
++read_file_debug_58256 read_file_debug 3 58256 NULL
++skb_pad_17302 skb_pad 2 17302 NULL
++tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
++btmrvl_hsstate_read_920 btmrvl_hsstate_read 3 920 NULL
++profile_load_58267 profile_load 3 58267 NULL
++pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
++ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4 25502 NULL
++acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
++snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
++dev_set_alias_50084 dev_set_alias 3 50084 NULL
++pcpu_get_vm_areas_50085 pcpu_get_vm_areas 3 50085 NULL
++sock_setsockopt_50088 sock_setsockopt 5 50088 NULL
++altera_swap_dr_50090 altera_swap_dr 2 50090 NULL
++sys_keyctl_33708 sys_keyctl 4 33708 NULL nohasharray
++netlink_sendmsg_33708 netlink_sendmsg 4 33708 &sys_keyctl_33708
++ata_host_alloc_pinfo_17325 ata_host_alloc_pinfo 3 17325 NULL
++iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
++carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
++pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
++get_packet_41914 get_packet 3 41914 NULL
++get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
++ceph_get_direct_page_vector_41917 ceph_get_direct_page_vector 2 41917 NULL
++read_file_slot_50111 read_file_slot 3 50111 NULL
++netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
++ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL
++ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
++serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
++ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
++tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
++copy_items_50140 copy_items 6 50140 NULL
++omfs_readpages_42490 omfs_readpages 4 42490 NULL
++pcim_iomap_58334 pcim_iomap 3 58334 NULL
++diva_init_dma_map_58336 diva_init_dma_map 3 58336 NULL
++map_addr_56144 map_addr 7 56144 NULL
++vifs_state_read_33762 vifs_state_read 3 33762 NULL
++btmrvl_psstate_read_50683 btmrvl_psstate_read 3 50683 NULL
++hdlcdev_rx_997 hdlcdev_rx 3 997 NULL
++portnames_read_41958 portnames_read 3 41958 NULL
++ubi_self_check_all_ff_41959 ubi_self_check_all_ff 4 41959 NULL
++hashtab_create_33769 hashtab_create 3 33769 NULL
++alloc_group_attrs_9194 alloc_group_attrs 2 9194 NULL nohasharray
++altera_swap_ir_9194 altera_swap_ir 2 9194 &alloc_group_attrs_9194
++vmalloc_to_sg_58354 vmalloc_to_sg 2 58354 NULL
++aac_nark_ioremap_50163 aac_nark_ioremap 2 50163 NULL nohasharray
++kmalloc_node_50163 kmalloc_node 1 50163 &aac_nark_ioremap_50163
++cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
++odev_update_50169 odev_update 2 50169 NULL
++ubi_resize_volume_50172 ubi_resize_volume 2 50172 NULL
++smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
++__devres_alloc_25598 __devres_alloc 2 25598 NULL
++snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
++netpoll_send_udp_58955 netpoll_send_udp 3 58955 NULL
++tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
++ib_send_cm_drep_50186 ib_send_cm_drep 3 50186 NULL
++do_write_orph_node_64343 do_write_orph_node 2 64343 NULL
++qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
++lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
++il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
++cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL
++lguest_map_42008 lguest_map 1-2 42008 NULL
++proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
++sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
++pool_allocate_42012 pool_allocate 3 42012 NULL
++l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
++sctp_make_init_58401 sctp_make_init 4 58401 NULL
++ieee80211_skb_resize_50211 ieee80211_skb_resize 3 50211 NULL
++gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
++sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
++skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
++udplite_manip_pkt_33832 udplite_manip_pkt 4 33832 NULL
++tcf_csum_ipv4_icmp_9258 tcf_csum_ipv4_icmp 3 9258 NULL
++acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
++mce_request_packet_1073 mce_request_packet 3 1073 NULL
++agp_create_memory_1075 agp_create_memory 1 1075 NULL
++sparse_early_usemaps_alloc_node_9269 sparse_early_usemaps_alloc_node 4 9269 NULL
++__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
++iscsi_offload_mesg_58425 iscsi_offload_mesg 5 58425 NULL
++mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
++_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
++oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
++nfs_pgarray_set_1085 nfs_pgarray_set 2 1085 NULL
++irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
++sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
++ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
++llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
++probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
++InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
++__alloc_session_17485 __alloc_session 2-1 17485 NULL
++TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
++pm860x_bulk_write_43875 pm860x_bulk_write 3 43875 NULL
++afs_extract_data_50261 afs_extract_data 5 50261 NULL
++config_proc_write_33878 config_proc_write 3 33878 NULL
++capabilities_read_58457 capabilities_read 3 58457 NULL
++sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
++iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
++lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 NULL nohasharray
++compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 &lpfc_idiag_baracc_read_58466
++scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
++hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
++rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
++sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
++rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL
++ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
++snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
++event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
++batadv_bla_is_backbone_gw_58488 batadv_bla_is_backbone_gw 3 58488 NULL
++v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
++submit_inquiry_42108 submit_inquiry 3 42108 NULL
++sel_write_context_25726 sel_write_context 3 25726 NULL nohasharray
++__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 &sel_write_context_25726
++sysfs_read_file_42113 sysfs_read_file 3 42113 NULL
++mcs_unwrap_fir_25733 mcs_unwrap_fir 3 25733 NULL
++vme_user_write_15587 vme_user_write 3 15587 NULL
++xlog_do_log_recovery_17550 xlog_do_log_recovery 3 17550 NULL
++__copy_to_user_17551 __copy_to_user 3 17551 NULL
++cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
++sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
++lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
++read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
++nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
++lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
++v9fs_alloc_rdir_buf_42150 v9fs_alloc_rdir_buf 2 42150 NULL
++roccat_common2_send_with_status_50343 roccat_common2_send_with_status 4 50343 NULL
++ipc_alloc_1192 ipc_alloc 1 1192 NULL
++mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
++ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
++rndis_add_response_58544 rndis_add_response 2 58544 NULL
++isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
++read_9397 read 3 9397 NULL
++i2cdev_read_1206 i2cdev_read 3 1206 NULL
++read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
++printer_write_60276 printer_write 3 60276 NULL
++acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
++neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
++rts51x_write_mem_17598 rts51x_write_mem 4 17598 NULL
++vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
++roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
++oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
++osst_execute_17607 osst_execute 7-6 17607 NULL
++nf_nat_sip_expect_9418 nf_nat_sip_expect 8 9418 NULL
++sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
++ipw_packet_received_skb_1230 ipw_packet_received_skb 2 1230 NULL
++ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
++rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
++sys32_rt_sigpending_25814 sys32_rt_sigpending 2 25814 NULL
++bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
++acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
++joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
++ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
++xip_file_read_58592 xip_file_read 3 58592 NULL
++iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
++kmalloc_array_9444 kmalloc_array 1-2 9444 NULL
++__ntfs_malloc_34022 __ntfs_malloc 1 34022 NULL
++l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
++mcs_unwrap_mir_9455 mcs_unwrap_mir 3 9455 NULL
++ppp_write_34034 ppp_write 3 34034 NULL
++qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
++iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
++tty_insert_flip_string_34042 tty_insert_flip_string 3 34042 NULL
++packet_setsockopt_17662 packet_setsockopt 5 17662 NULL
++batadv_tt_prepare_packet_buff_1280 batadv_tt_prepare_packet_buff 4 1280 NULL
++do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
++module_alloc_update_bounds_rx_58634 module_alloc_update_bounds_rx 1 58634 NULL nohasharray
++efi_ioremap_58634 efi_ioremap 1-2 58634 &module_alloc_update_bounds_rx_58634
++btmrvl_hsmode_write_42252 btmrvl_hsmode_write 3 42252 NULL
++rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
++dsp_tone_hw_message_17678 dsp_tone_hw_message 3 17678 NULL
++netxen_nic_map_indirect_address_128M_42257 netxen_nic_map_indirect_address_128M 2 42257 NULL
++ulog_alloc_skb_23427 ulog_alloc_skb 1 23427 NULL
++__alloc_preds_9492 __alloc_preds 2 9492 NULL
++pgctrl_write_50453 pgctrl_write 3 50453 NULL
++pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
++read_file_ant_diversity_34071 read_file_ant_diversity 3 34071 NULL
++tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
++ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
++tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
++savu_sysfs_write_42273 savu_sysfs_write 6 42273 NULL
++uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 NULL
++lp_write_9511 lp_write 3 9511 NULL
++__einj_error_trigger_17707 __einj_error_trigger 1 17707 NULL nohasharray
++venus_rename_17707 venus_rename 5-4 17707 &__einj_error_trigger_17707
++cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
++nfs_readdir_make_qstr_12509 nfs_readdir_make_qstr 3 12509 NULL
++lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
++scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
++do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
++do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
++read_file_dma_9530 read_file_dma 3 9530 NULL
++sel_read_perm_42302 sel_read_perm 3 42302 NULL
++rcname_read_25919 rcname_read 3 25919 NULL
++sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray
++ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304
++tps6586x_writes_58689 tps6586x_writes 3 58689 NULL
++il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
++xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 NULL
++exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
++pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
++snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
++key_flags_read_25931 key_flags_read 3 25931 NULL
++audit_log_n_untrustedstring_9548 audit_log_n_untrustedstring 3 9548 NULL
++sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
++ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
++hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
++islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
++pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
++fw_node_create_9559 fw_node_create 2 9559 NULL
++fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
++ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
++kobj_map_9566 kobj_map 2-3 9566 NULL
++snd_pcm_plug_alloc_42339 snd_pcm_plug_alloc 2 42339 NULL
++acpi_map_58725 acpi_map 1-2 58725 NULL
++brcmf_usb_attach_17766 brcmf_usb_attach 2-3 17766 NULL
++sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
++fwnet_receive_packet_50537 fwnet_receive_packet 9 50537 NULL
++do_msgsnd_1387 do_msgsnd 4 1387 NULL
++ieee80211_tdls_mgmt_9581 ieee80211_tdls_mgmt 8 9581 NULL
++snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
++ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
++udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
++file_read_actor_1401 file_read_actor 4 1401 NULL
++av7110_ipack_init_46655 av7110_ipack_init 2 46655 NULL
++ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
++ubifs_leb_change_17789 ubifs_leb_change 4 17789 NULL
++udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
++do_sync_9604 do_sync 1 9604 NULL
++snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5 9605 NULL
++scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
++agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
++__do_config_autodelink_58763 __do_config_autodelink 3 58763 NULL
++sctp_sf_abort_violation_1420 sctp_sf_abort_violation 7 1420 NULL
++afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
++il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
++lpfc_sli_probe_sriov_nr_virtfn_26004 lpfc_sli_probe_sriov_nr_virtfn 2 26004 NULL
++qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
++fat_readpages_50582 fat_readpages 4 50582 NULL nohasharray
++pep_reply_50582 pep_reply 5 50582 &fat_readpages_50582
++iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
++saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
++_snd_pcm_lib_alloc_vmalloc_buffer_17820 _snd_pcm_lib_alloc_vmalloc_buffer 2 17820 NULL
++xfs_readdir_41200 xfs_readdir 3 41200 NULL
++sge_rx_50594 sge_rx 3 50594 NULL
++stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
++compat_sys_keyctl_9639 compat_sys_keyctl 4 9639 NULL
++skb_padto_50759 skb_padto 2 50759 NULL
++raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
++mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
++selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
++isku_sysfs_read_58806 isku_sysfs_read 6 58806 NULL
++tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
++uvc_alloc_buffers_9656 uvc_alloc_buffers 2-3 9656 NULL
++queue_received_packet_9657 queue_received_packet 5 9657 NULL
++ep_read_58813 ep_read 3 58813 NULL
++xprt_alloc_1475 xprt_alloc 2 1475 NULL
++gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
++snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
++pci_enable_sriov_35745 pci_enable_sriov 2 35745 NULL
++sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
++simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
++key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
++dns_query_9676 dns_query 3 9676 NULL
++keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
++sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
++ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
++orinoco_set_key_17878 orinoco_set_key 5-7 17878 NULL
++bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
++command_write_58841 command_write 3 58841 NULL
++short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
++dev_config_8506 dev_config 3 8506 NULL
++compat_sys_pwritev_17886 compat_sys_pwritev 3 17886 NULL
++sys_readv_50664 sys_readv 3 50664 NULL
++bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
++__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
++ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
++rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
++recover_head_17904 recover_head 3 17904 NULL
++dccp_feat_register_sp_17914 dccp_feat_register_sp 5 17914 NULL
++xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
++brcmf_sdbrcm_bus_txctl_42492 brcmf_sdbrcm_bus_txctl 3 42492 NULL
++srp_iu_pool_alloc_17920 srp_iu_pool_alloc 2 17920 NULL
++gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
++pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
++cs553x_init_one_58886 cs553x_init_one 3 58886 NULL
++ddb_input_read_9743 ddb_input_read 3 9743 NULL
++skb_cow_26138 skb_cow 2 26138 NULL
++smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
++snd_emux_create_port_42533 snd_emux_create_port 3 42533 NULL
++do_sigpending_9766 do_sigpending 2 9766 NULL
++hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL
++pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
++blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
++__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
++copy_oldmem_page_26164 copy_oldmem_page 3-1 26164 NULL
++i915_ring_stop_read_42549 i915_ring_stop_read 3 42549 NULL nohasharray
++ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 &i915_ring_stop_read_42549
++ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 NULL
++snd_mem_proc_write_9786 snd_mem_proc_write 3 9786 NULL
++fc_frame_alloc_1596 fc_frame_alloc 2 1596 NULL
++rngapi_reset_34366 rngapi_reset 3 34366 NULL nohasharray
++p54_alloc_skb_34366 p54_alloc_skb 3 34366 &rngapi_reset_34366
++iwl_calib_set_34400 iwl_calib_set 3 34400 NULL nohasharray
++ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400
++solo_v4l2_read_59247 solo_v4l2_read 3 59247 NULL
++smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
++packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
++reiserfs_resize_34377 reiserfs_resize 2 34377 NULL
++get_registers_26187 get_registers 3 26187 NULL
++cgroup_setxattr_26188 cgroup_setxattr 4 26188 NULL
++ttm_bo_fbdev_io_9805 ttm_bo_fbdev_io 4 9805 NULL
++btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
++av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
++usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
++snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3 27332 NULL
++udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 NULL nohasharray
++ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 &udpv6_recvmsg_9813
++tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL nohasharray
++pipe_handler_request_50774 pipe_handler_request 5 50774 &tm6000_read_write_usb_50774
++xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
++mce_write_26201 mce_write 3 26201 NULL
++iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
++bio_alloc_map_data_50782 bio_alloc_map_data 1-2 50782 NULL
++alloc_rx_desc_ring_18016 alloc_rx_desc_ring 2 18016 NULL
++oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
++smk_write_load2_52155 smk_write_load2 3 52155 NULL
++__pskb_pull_42602 __pskb_pull 2 42602 NULL
++sctp_make_heartbeat_ack_34411 sctp_make_heartbeat_ack 4 34411 NULL
++tpm_write_50798 tpm_write 3 50798 NULL
++btmrvl_hsmode_read_1647 btmrvl_hsmode_read 3 1647 NULL
++tun_do_read_50800 tun_do_read 4 50800 NULL
++handle_rx_packet_58993 handle_rx_packet 3 58993 NULL
++write_flush_50803 write_flush 3 50803 NULL
++_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
++rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
++ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
++dvb_play_50814 dvb_play 3 50814 NULL
++cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL
++sys_move_pages_42626 sys_move_pages 2 42626 NULL
++ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
++pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
++btrfs_free_reserved_extent_9867 btrfs_free_reserved_extent 2 9867 NULL
++usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL
++dma_attach_50831 dma_attach 6-7 50831 NULL
++scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
++br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
++vhci_put_user_12604 vhci_put_user 4 12604 NULL
++packet_came_18072 packet_came 3 18072 NULL
++init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
++kvm_read_guest_page_18074 kvm_read_guest_page 5 18074 NULL
++sctp_make_abort_34459 sctp_make_abort 3 34459 NULL
++_regmap_raw_write_42652 _regmap_raw_write 4 42652 NULL
++selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
++get_vm_area_18080 get_vm_area 1 18080 NULL
++dvb_dvr_set_buffer_size_9840 dvb_dvr_set_buffer_size 2 9840 NULL
++bm_register_write_9893 bm_register_write 3 9893 NULL nohasharray
++snd_midi_event_new_9893 snd_midi_event_new 1 9893 &bm_register_write_9893
++self_check_write_50856 self_check_write 5 50856 NULL
++line6_dumpreq_init_34473 line6_dumpreq_init 3 34473 NULL
++i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
++mpi_alloc_18094 mpi_alloc 1 18094 NULL
++coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
++l2tp_xmit_skb_42672 l2tp_xmit_skb 3 42672 NULL
++bitmap_resize_33054 bitmap_resize 2 33054 NULL
++mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
++mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
++sis190_try_rx_copy_57069 sis190_try_rx_copy 3 57069 NULL
++dfs_file_read_18116 dfs_file_read 3 18116 NULL
++request_key_and_link_42693 request_key_and_link 4 42693 NULL
++vb2_read_42703 vb2_read 3 42703 NULL
++pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
++hvc_alloc_12579 hvc_alloc 4 12579 NULL
++tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
++snd_pcm_plugin_alloc_12580 snd_pcm_plugin_alloc 2 12580 NULL
++pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
++read_file_misc_9948 read_file_misc 3 9948 NULL
++xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
++set_rxd_buffer_pointer_9950 set_rxd_buffer_pointer 8 9950 NULL
++selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
++csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL
++tracing_stats_read_34537 tracing_stats_read 3 34537 NULL
++hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
++dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
++cosa_write_1774 cosa_write 3 1774 NULL
++set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
++hugetlbfs_read_actor_34547 hugetlbfs_read_actor 2-5-4 34547 NULL
++ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
++btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
++bnx2fc_cmd_mgr_alloc_24873 bnx2fc_cmd_mgr_alloc 3-2 24873 NULL
++cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
++ath6kl_usb_submit_ctrl_out_9978 ath6kl_usb_submit_ctrl_out 6 9978 NULL
++dup_to_netobj_26363 dup_to_netobj 3 26363 NULL
++sock_bindtodevice_50942 sock_bindtodevice 3 50942 NULL
++pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
++fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
++alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL
++mld_newpack_50950 mld_newpack 2 50950 NULL
++framebuffer_alloc_59145 framebuffer_alloc 1 59145 NULL
++i915_ring_stop_write_59010 i915_ring_stop_write 3 59010 NULL
++radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
++cfpkt_create_18197 cfpkt_create 1 18197 NULL
++velocity_rx_copy_34583 velocity_rx_copy 2 34583 NULL
++x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
++init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
++tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4 37428 NULL
++xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
++orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
++gsm_control_message_18209 gsm_control_message 4 18209 NULL
++do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
++handle_request_10024 handle_request 9 10024 NULL
++__tty_alloc_driver_53799 __tty_alloc_driver 1 53799 NULL
++setup_window_59178 setup_window 4-2-5-7 59178 NULL
++timeout_write_50991 timeout_write 3 50991 NULL
++batadv_orig_hash_add_if_10033 batadv_orig_hash_add_if 2 10033 NULL
++fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
++ip_vs_create_timeout_table_64478 ip_vs_create_timeout_table 2 64478 NULL
++proc_write_51003 proc_write 3 51003 NULL
++drm_ioctl_42813 drm_ioctl 2 42813 NULL
++gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
++iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
++set_arg_42824 set_arg 3 42824 NULL
++xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
++fast_rx_path_59214 fast_rx_path 3 59214 NULL
++lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
++cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
++audit_log_n_string_31705 audit_log_n_string 3 31705 NULL
++fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 NULL
++pstore_mkfile_50830 pstore_mkfile 5 50830 NULL
++qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
++hidp_queue_report_1881 hidp_queue_report 3 1881 NULL
++dt3155_read_59226 dt3155_read 3 59226 NULL
++xfs_buf_read_uncached_42844 xfs_buf_read_uncached 3 42844 NULL
++ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
++dump_midi_51040 dump_midi 3 51040 NULL
++srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
++gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
++nf_nat_mangle_udp_packet_34661 nf_nat_mangle_udp_packet 8-6 34661 NULL
++alloc_ring_18278 alloc_ring 2-4 18278 NULL
++tty_prepare_flip_string_flags_59240 tty_prepare_flip_string_flags 4 59240 NULL
++nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 NULL
++ext4_readpages_18283 ext4_readpages 4 18283 NULL
++mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
++em28xx_v4l2_read_16701 em28xx_v4l2_read 3 16701 NULL
++configfs_read_file_1683 configfs_read_file 3 1683 NULL
++ulong_write_file_26485 ulong_write_file 3 26485 NULL
++wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
++dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL
++dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 NULL
++isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
++pskb_expand_head_42881 pskb_expand_head 2-3 42881 NULL
++ip6ip6_err_18308 ip6ip6_err 5 18308 NULL
++read_vmcore_26501 read_vmcore 3 26501 NULL
++tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
++garp_attr_create_3883 garp_attr_create 3 3883 NULL
++tipc_port_recv_sections_42890 tipc_port_recv_sections 4 42890 NULL
++vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 3-4 26507 NULL
++xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
++jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
++ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
++cyttsp_probe_1940 cyttsp_probe 4 1940 NULL
++SendTxCommandPacket_42901 SendTxCommandPacket 3 42901 NULL
++btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
++W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
++ath6kl_wmi_send_probe_response_cmd_31728 ath6kl_wmi_send_probe_response_cmd 6 31728 NULL
++ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
++exofs_read_kern_39921 exofs_read_kern 6 39921 NULL nohasharray
++oom_score_adj_read_39921 oom_score_adj_read 3 39921 &exofs_read_kern_39921
++btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
++aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
++rds_message_inc_copy_to_user_26540 rds_message_inc_copy_to_user 3 26540 NULL
++iscsi_nop_out_rsp_51117 iscsi_nop_out_rsp 4 51117 NULL
++platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
++hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL
++reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
++sctp_make_datafrag_empty_34737 sctp_make_datafrag_empty 3 34737 NULL
++pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
++asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
++__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
++fd_copyout_59323 fd_copyout 3 59323 NULL
++nfs_map_name_to_uid_51132 nfs_map_name_to_uid 3 51132 NULL
++proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
++read_9287_modal_eeprom_59327 read_9287_modal_eeprom 3 59327 NULL
++sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
++diva_alloc_dma_map_23798 diva_alloc_dma_map 2 23798 NULL
++solos_param_store_34755 solos_param_store 4 34755 NULL
++simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
++jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
++__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
++rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
++xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
++ib_send_cm_rtu_63138 ib_send_cm_rtu 3 63138 NULL
++compat_sys_pwritev64_51151 compat_sys_pwritev64 3 51151 NULL
++rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL nohasharray
++batadv_receive_server_sync_packet_26577 batadv_receive_server_sync_packet 3 26577 &rts51x_read_mem_26577
++xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL
++vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
++batadv_tt_commit_changes_2008 batadv_tt_commit_changes 4 2008 NULL
++sep_prepare_input_dma_table_2009 sep_prepare_input_dma_table 2-3 2009 NULL
++qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
++ubifs_write_node_11258 ubifs_write_node 5-3 11258 NULL
++reada_tree_block_flagged_18402 reada_tree_block_flagged 3 18402 NULL
++iscsi_if_send_reply_52219 iscsi_if_send_reply 7 52219 NULL
++write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
++__copy_in_user_34790 __copy_in_user 3 34790 NULL
++crystalhd_user_data_18407 crystalhd_user_data 3 18407 NULL
++nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL
++mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
++BcmCopySection_2035 BcmCopySection 5 2035 NULL
++devm_ioremap_nocache_2036 devm_ioremap_nocache 2-3 2036 NULL
++carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
++hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
++batadv_orig_node_add_if_18433 batadv_orig_node_add_if 2 18433 NULL
++ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
++pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
++nfc_alloc_recv_skb_10244 nfc_alloc_recv_skb 1 10244 NULL
++pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
++mangle_sdp_packet_30381 mangle_sdp_packet 10 30381 NULL
++isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
++cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
++hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
++b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
++subbuf_read_actor_2071 subbuf_read_actor 3 2071 NULL
++fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
++irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL
++regset_tls_set_18459 regset_tls_set 4 18459 NULL
++nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
++receive_DataRequest_9904 receive_DataRequest 3 9904 NULL
++acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
++tipc_send_51238 tipc_send 4 51238 NULL
++drm_property_create_51239 drm_property_create 4 51239 NULL
++snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
++squashfs_read_data_59440 squashfs_read_data 6 59440 NULL
++idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
++audit_expand_2098 audit_expand 2 2098 NULL
++st_read_51251 st_read 3 51251 NULL
++fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL
++udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL
++iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL
++ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL
++compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
++nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
++rtsx_read_cfg_seq_48139 rtsx_read_cfg_seq 5-3 48139 NULL
++__find_xattr_2117 __find_xattr 6 2117 NULL nohasharray
++enable_read_2117 enable_read 3 2117 &__find_xattr_2117
++dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
++pcf50633_write_block_2124 pcf50633_write_block 3 2124 NULL
++ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
++ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
++c4_add_card_54968 c4_add_card 3 54968 NULL
++rtllib_authentication_req_26713 rtllib_authentication_req 3 26713 NULL
++snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
++check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
++fd_do_readv_51297 fd_do_readv 3 51297 NULL
++nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 5-6-9 18530 NULL
++nfc_hci_send_cmd_async_26723 nfc_hci_send_cmd_async 5 26723 NULL
++mlx4_init_icm_table_2151 mlx4_init_icm_table 5-4 2151 NULL
++bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
++ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
++ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
++seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
++sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
++ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
++_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL
++nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
++alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
++pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
++ms_write_multiple_pages_10362 ms_write_multiple_pages 6-5 10362 NULL
++sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
++fb_sys_write_33130 fb_sys_write 3 33130 NULL
++sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
++set_bypass_pwoff_pfs_27669 set_bypass_pwoff_pfs 3 27669 NULL
++smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
++srp_ring_alloc_26760 srp_ring_alloc 2 26760 NULL
++read_file_dfs_43145 read_file_dfs 3 43145 NULL
++ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
++ntfs_malloc_nofs_nofail_63631 ntfs_malloc_nofs_nofail 1 63631 NULL
++cosa_net_setup_rx_38594 cosa_net_setup_rx 2 38594 NULL
++skb_gro_header_slow_34958 skb_gro_header_slow 2 34958 NULL
++debug_output_18575 debug_output 3 18575 NULL
++Realloc_34961 Realloc 2 34961 NULL
++il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
++do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
++_rtl92s_firmware_downloadcode_14021 _rtl92s_firmware_downloadcode 3 14021 NULL
++__netdev_alloc_skb_18595 __netdev_alloc_skb 2 18595 NULL
++slabinfo_write_18600 slabinfo_write 3 18600 NULL
++ssb_bus_ssbbus_register_2217 ssb_bus_ssbbus_register 2 2217 NULL
++radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
++iowarrior_write_18604 iowarrior_write 3 18604 NULL
++vhci_write_2224 vhci_write 3 2224 NULL
++ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
++acpi_os_ioremap_49523 acpi_os_ioremap 1-2 49523 NULL
++rb_alloc_3102 rb_alloc 1 3102 NULL
++uf_create_device_nodes_24948 uf_create_device_nodes 2 24948 NULL
++rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
++l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
++write_pbl_59583 write_pbl 4 59583 NULL
++from_buffer_18625 from_buffer 3 18625 NULL
++uio_write_43202 uio_write 3 43202 NULL
++memdup_user_59590 memdup_user 2 59590 NULL
++ieee80211_wx_set_gen_ie_51399 ieee80211_wx_set_gen_ie 3 51399 NULL
++iso_callback_43208 iso_callback 3 43208 NULL
++ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
++smk_write_load_26829 smk_write_load 3 26829 NULL
++sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
++do_update_counters_2259 do_update_counters 4 2259 NULL
++coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
++cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL
++ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
++blk_register_region_51424 blk_register_region 1-2 51424 NULL
++ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
++mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
++mtrr_write_59622 mtrr_write 3 59622 NULL
++event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
++ip_vs_icmp_xmit_59624 ip_vs_icmp_xmit 4 59624 NULL
++netxen_nic_hw_read_wx_128M_26858 netxen_nic_hw_read_wx_128M 2 26858 NULL
++edge_tty_recv_18667 edge_tty_recv 4 18667 NULL nohasharray
++xfs_iext_insert_18667 xfs_iext_insert 3 18667 &edge_tty_recv_18667
++btmrvl_gpiogap_write_35053 btmrvl_gpiogap_write 3 35053 NULL
++tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
++ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
++debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
++twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
++fixup_leb_43256 fixup_leb 3 43256 NULL
++dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
++ubifs_recover_log_leb_12079 ubifs_recover_log_leb 3 12079 NULL
++ubifs_setxattr_59650 ubifs_setxattr 4 59650 NULL nohasharray
++hidraw_read_59650 hidraw_read 3 59650 &ubifs_setxattr_59650
++kvm_clear_guest_page_2308 kvm_clear_guest_page 4 2308 NULL
++ca91cx42_alloc_resource_10502 ca91cx42_alloc_resource 2 10502 NULL
++intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
++qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
++evtchn_write_43278 evtchn_write 3 43278 NULL
++sel_write_disable_10511 sel_write_disable 3 10511 NULL
++store_ifalias_35088 store_ifalias 4 35088 NULL
++tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
++osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
++____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
++iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
++rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
++ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
++blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
++get_vm_area_caller_10527 get_vm_area_caller 1 10527 NULL
++capi_write_35104 capi_write 3 35104 NULL nohasharray
++tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
++mpage_alloc_43299 mpage_alloc 3 43299 NULL
++sys_semtimedop_4486 sys_semtimedop 3 4486 NULL
++ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
++osd_req_write_sg_50908 osd_req_write_sg 5 50908 NULL
++x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
++zr364xx_read_2354 zr364xx_read 3 2354 NULL
++mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
++scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
++pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
++pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 NULL nohasharray
++sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 &pwr_ps_enter_read_26935
++o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
++tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 NULL
++viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
++hecubafb_write_26942 hecubafb_write 3 26942 NULL
++wep_packets_read_18751 wep_packets_read 3 18751 NULL
++xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray
++rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
++il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
++ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
++do_trimming_26952 do_trimming 3 26952 NULL
++ath6kl_wmi_set_ie_cmd_37260 ath6kl_wmi_set_ie_cmd 6 37260 NULL
++read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
++prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
++iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
++alloc_buf_34532 alloc_buf 1 34532 NULL
++sock_rmalloc_59740 sock_rmalloc 2 59740 NULL nohasharray
++ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 &sock_rmalloc_59740
++__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
++icn_writecmd_38629 icn_writecmd 2 38629 NULL
++otp_read_10594 otp_read 2-4-5 10594 NULL
++rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
++sctp_manip_pkt_59749 sctp_manip_pkt 4 59749 NULL
++icmp_manip_pkt_51560 icmp_manip_pkt 4 51560 NULL
++brcmf_sdbrcm_read_control_22721 brcmf_sdbrcm_read_control 3 22721 NULL
++supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
++isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
++roccat_common2_send_2422 roccat_common2_send 4 2422 NULL
++ieee80211_auth_challenge_18810 ieee80211_auth_challenge 3 18810 NULL
++ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
++cxgb3_get_cpl_reply_skb_10620 cxgb3_get_cpl_reply_skb 2 10620 NULL
++xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
++venus_remove_59781 venus_remove 4 59781 NULL
++ioremap_nocache_2439 ioremap_nocache 1-2 2439 NULL
++sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
++unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
++tty_buffer_find_2443 tty_buffer_find 2 2443 NULL
++xlog_do_recover_59789 xlog_do_recover 3 59789 NULL
++aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
++rfcomm_tty_write_51603 rfcomm_tty_write 3 51603 NULL
++xenfb_write_43412 xenfb_write 3 43412 NULL
++chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
++nfs4_alloc_slots_2454 nfs4_alloc_slots 1 2454 NULL nohasharray
++ath6kl_usb_bmi_write_2454 ath6kl_usb_bmi_write 3 2454 &nfs4_alloc_slots_2454
++rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL
++mtf_test_write_18844 mtf_test_write 3 18844 NULL
++__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL nohasharray
++gdm_wimax_netif_rx_43423 gdm_wimax_netif_rx 3 43423 &__alloc_bootmem_low_43423
++rtllib_wx_set_gen_ie_59808 rtllib_wx_set_gen_ie 3 59808 NULL
++error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
++udp_manip_pkt_45467 udp_manip_pkt 4 45467 NULL
++nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL
++xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
++ni65_alloc_mem_10664 ni65_alloc_mem 3 10664 NULL
++b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
++usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
++cmd_complete_51629 cmd_complete 6 51629 NULL
++sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
++btmrvl_txdnldready_read_413 btmrvl_txdnldready_read 3 413 NULL
++ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
++set_fd_set_35249 set_fd_set 1 35249 NULL
++wiphy_new_2482 wiphy_new 2 2482 NULL
++bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
++ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
++__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
++ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
++tcp_push_10680 tcp_push 3 10680 NULL
++sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
++c101_run_37279 c101_run 2 37279 NULL
++iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
++dma_show_regs_35266 dma_show_regs 3 35266 NULL
++tun_put_user_59849 tun_put_user 4 59849 NULL
++squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
++alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
++irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
++dm_write_2513 dm_write 3 2513 NULL
++v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
++isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL
++selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 NULL
++ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
++ntfs_malloc_nofs_49572 ntfs_malloc_nofs 1 49572 NULL
++nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
++pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray
++shash_async_setkey_10720 shash_async_setkey 3 10720 &pvr2_ioread_read_10720
++ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
++sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
++__iscsi_complete_pdu_10726 __iscsi_complete_pdu 4 10726 NULL
++sfi_sysfs_install_table_51688 sfi_sysfs_install_table 1 51688 NULL
++tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
++pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
++__btrfs_direct_write_22273 __btrfs_direct_write 4 22273 NULL
++l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
++brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 NULL nohasharray
++__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 &brcmf_sdio_forensic_read_35311
++tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
++sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL
++compat_sys_msgsnd_10738 compat_sys_msgsnd 2 10738 NULL
++ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
++sel_write_access_51704 sel_write_access 3 51704 NULL
++sys_syslog_10746 sys_syslog 3 10746 NULL
++alloc_one_pg_vec_page_10747 alloc_one_pg_vec_page 1 10747 NULL
++new_bind_ctl_35324 new_bind_ctl 2 35324 NULL
++do_readlink_43518 do_readlink 2 43518 NULL
++tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
++gem_alloc_skb_51715 gem_alloc_skb 2 51715 NULL
++fallback_on_nodma_alloc_35332 fallback_on_nodma_alloc 2 35332 NULL
++read_file_reset_52310 read_file_reset 3 52310 NULL
++pms_capture_27142 pms_capture 4 27142 NULL
++btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
++vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
++gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
++sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
++msg_set_51725 msg_set 3 51725 NULL
++cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
++tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL
++hpi_alloc_control_cache_35351 hpi_alloc_control_cache 1 35351 NULL
++hid_parse_report_51737 hid_parse_report 3 51737 NULL
++compat_filldir64_35354 compat_filldir64 3 35354 NULL
++alc_auto_create_extra_outs_18975 alc_auto_create_extra_outs 2 18975 NULL
++i2400m_net_rx_27170 i2400m_net_rx 5 27170 NULL
++l3_alloc_skb_32289 l3_alloc_skb 1 32289 NULL
++ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
++ath_rx_init_43564 ath_rx_init 2 43564 NULL
++il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 NULL nohasharray
++dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 &il_dbgfs_rxon_flags_read_59950
++sys_bind_10799 sys_bind 3 10799 NULL
++_fc_frame_alloc_43568 _fc_frame_alloc 1 43568 NULL
++nfcwilink_send_bts_cmd_10802 nfcwilink_send_bts_cmd 3 10802 NULL
++ioremap_prot_51764 ioremap_prot 1-2 51764 NULL
++rpc_malloc_43573 rpc_malloc 2 43573 NULL
++dataflash_read_fact_otp_33204 dataflash_read_fact_otp 2-3 33204 NULL
++smk_write_logging_2618 smk_write_logging 3 2618 NULL
++rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
++drm_vblank_init_11362 drm_vblank_init 2 11362 NULL
++send_command_10832 send_command 4 10832 NULL
++lro_gen_skb_2644 lro_gen_skb 6 2644 NULL
++osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
++lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
++pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
++proc_read_43614 proc_read 3 43614 NULL
++rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
++rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
++drm_fb_helper_init_19044 drm_fb_helper_init 3-4 19044 NULL
++fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
++xlbd_reserve_minors_18365 xlbd_reserve_minors 1-2 18365 NULL
++rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
++mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
++rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL
++buffer_to_user_35439 buffer_to_user 3 35439 NULL
++lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
++vmalloc_15464 vmalloc 1 15464 NULL
++buffer_from_user_51826 buffer_from_user 3 51826 NULL
++snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
++ieee80211_key_alloc_19065 ieee80211_key_alloc 3 19065 NULL
++osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
++cfpkt_add_trail_27260 cfpkt_add_trail 3 27260 NULL
++xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
++sys_sched_getaffinity_60033 sys_sched_getaffinity 2 60033 NULL
++read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 NULL
++do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
++do_readv_writev_51849 do_readv_writev 4 51849 NULL
++adu_write_30487 adu_write 3 30487 NULL
++ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 NULL
++get_scq_10897 get_scq 2 10897 NULL
++sys_process_vm_readv_19090 sys_process_vm_readv 3-5 19090 NULL nohasharray
++brcmf_usbdev_qinit_19090 brcmf_usbdev_qinit 2 19090 &sys_process_vm_readv_19090
++memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL
++cgroup_write_string_10900 cgroup_write_string 5 10900 NULL
++pointer_size_read_51863 pointer_size_read 3 51863 NULL
++load_module_60056 load_module 2 60056 NULL nohasharray
++gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 &load_module_60056
++__videobuf_alloc_cached_12740 __videobuf_alloc_cached 1 12740 NULL
++get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
++dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4-2 43679 NULL
++ieee80211_build_probe_req_60064 ieee80211_build_probe_req 8-6 60064 NULL
++compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
++sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
++__netdev_alloc_skb_ip_align_55067 __netdev_alloc_skb_ip_align 2 55067 NULL
++read_file_regidx_33370 read_file_regidx 3 33370 NULL
++cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
++__copy_from_user_10918 __copy_from_user 3 10918 NULL
++user_read_51881 user_read 3 51881 NULL
++copy_from_buf_27308 copy_from_buf 4-2 27308 NULL
++__xip_file_write_2733 __xip_file_write 4-3 2733 NULL
++cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL
++ath6kl_wmi_test_cmd_27312 ath6kl_wmi_test_cmd 3 27312 NULL
++max77693_bulk_write_43698 max77693_bulk_write 3 43698 NULL
++rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
++hidp_send_ctrl_message_43702 hidp_send_ctrl_message 4 43702 NULL
++async_setkey_35521 async_setkey 3 35521 NULL
++set_dev_class_39645 set_dev_class 4 39645 NULL nohasharray
++dm_exception_table_init_39645 dm_exception_table_init 2 39645 &set_dev_class_39645
++cxgb4_pktgl_to_skb_61899 cxgb4_pktgl_to_skb 2 61899 NULL
++alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
++iio_read_first_n_sw_rb_51911 iio_read_first_n_sw_rb 2 51911 NULL
++hid_report_raw_event_2762 hid_report_raw_event 4 2762 NULL
++add_tty_40055 add_tty 1 40055 NULL nohasharray
++l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 &add_tty_40055
++iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
++rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
++mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL
++snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
++ttm_bo_kmap_60118 ttm_bo_kmap 3-2 60118 NULL
++sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
++alloc_context_3194 alloc_context 1 3194 NULL
++ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
++bm_entry_read_10976 bm_entry_read 3 10976 NULL
++smk_write_access2_19170 smk_write_access2 3 19170 NULL
++pcbit_stat_27364 pcbit_stat 2 27364 NULL
++i915_min_freq_write_10981 i915_min_freq_write 3 10981 NULL
++sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
++gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
++sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
++scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
++koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
++scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
++xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
++ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
++rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
++init_state_60165 init_state 2 60165 NULL
++udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
++sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
++__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3 19214 NULL
++dev_counters_read_19216 dev_counters_read 3 19216 NULL
++ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
++sg_build_sgat_60179 sg_build_sgat 3 60179 NULL nohasharray
++jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 &sg_build_sgat_60179
++ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
++ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
++calc_hmac_32010 calc_hmac 3 32010 NULL
++ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
++dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
++btrfs_copy_from_user_43806 btrfs_copy_from_user 3-1 43806 NULL
++kernel_readv_35617 kernel_readv 3 35617 NULL
++hci_send_cmd_43810 hci_send_cmd 3 43810 NULL
++sys_lgetxattr_45531 sys_lgetxattr 4 45531 NULL
++dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
++bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
++nouveau_gpio_create__11048 nouveau_gpio_create_ 4 11048 NULL
++dccp_manip_pkt_476 dccp_manip_pkt 4 476 NULL
++tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
++set_tap_pfs_60203 set_tap_pfs 3 60203 NULL
++sfq_alloc_2861 sfq_alloc 1 2861 NULL
++skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
++carl9170_handle_mpdu_11056 carl9170_handle_mpdu 3 11056 NULL
++move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
++ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
++vxge_rx_alloc_52024 vxge_rx_alloc 3 52024 NULL
++ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
++__ip_append_data_16864 __ip_append_data 8-9 16864 NULL
++p54_download_eeprom_43842 p54_download_eeprom 4 43842 NULL
++spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
++store_debug_level_35652 store_debug_level 3 35652 NULL
++l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
++read_flush_43851 read_flush 3 43851 NULL
++dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
++cmm_write_2896 cmm_write 3 2896 NULL
++il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
++io_mapping_map_wc_19284 io_mapping_map_wc 2 19284 NULL
++tunables_write_59563 tunables_write 3 59563 NULL
++compat_sys_kexec_load_35674 compat_sys_kexec_load 2 35674 NULL
++rtsx_write_cfg_seq_27485 rtsx_write_cfg_seq 5-3 27485 NULL
++v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
++kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
++isofs_readpages_52067 isofs_readpages 4 52067 NULL
++lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
++dm_table_create_35687 dm_table_create 3 35687 NULL
++qib_create_cq_27497 qib_create_cq 2 27497 NULL
++nfc_hci_execute_cmd_43882 nfc_hci_execute_cmd 5 43882 NULL
++rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
++tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
++xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
++tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL
++garmin_read_process_27509 garmin_read_process 3 27509 NULL
++alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL
++nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
++debug_read_19322 debug_read 3 19322 NULL
++v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
++__pskb_pull_tail_60287 __pskb_pull_tail 2 60287 NULL
++gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
++cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 NULL
++ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
++dn_nsp_return_disc_60296 dn_nsp_return_disc 2 60296 NULL
++o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
++prism2_sta_send_mgmt_43916 prism2_sta_send_mgmt 5 43916 NULL
++mgmt_device_found_14146 mgmt_device_found 10 14146 NULL
++snd_seq_oss_readq_new_14283 snd_seq_oss_readq_new 2 14283 NULL
++doc_probe_23285 doc_probe 1 23285 NULL
++ppp_cp_event_2965 ppp_cp_event 6 2965 NULL
++SendString_43928 SendString 3 43928 NULL
++acpi_os_map_memory_11161 acpi_os_map_memory 1-2 11161 NULL
++ceph_parse_server_name_60318 ceph_parse_server_name 2 60318 NULL
++retry_count_read_52129 retry_count_read 3 52129 NULL
++xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
++ioat2_alloc_ring_11172 ioat2_alloc_ring 2 11172 NULL
++read_zero_19366 read_zero 3 19366 NULL
++bch_alloc_4593 bch_alloc 1 4593 NULL
++stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
++iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
++libipw_alloc_txb_27579 libipw_alloc_txb 1-2-3 27579 NULL
++raid5_resize_63306 raid5_resize 2 63306 NULL
++interpret_user_input_19393 interpret_user_input 2 19393 NULL
++handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
++ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
++do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
++udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
++depth_write_3021 depth_write 3 3021 NULL
++dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
++read_file_stations_35795 read_file_stations 3 35795 NULL
++il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
++tipc_cfg_reply_alloc_27606 tipc_cfg_reply_alloc 1 27606 NULL
++bcm_recvmsg_43992 bcm_recvmsg 4 43992 NULL
++proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
++ubi_eba_atomic_leb_change_60379 ubi_eba_atomic_leb_change 5 60379 NULL
++iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 NULL
++dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
++il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
++il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
++mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
++write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
++driver_names_read_60399 driver_names_read 3 60399 NULL
++read_flush_procfs_27642 read_flush_procfs 3 27642 NULL
++add_new_gdb_27643 add_new_gdb 3 27643 NULL
++dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 NULL
++hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
++_alloc_mISDN_skb_52232 _alloc_mISDN_skb 3 52232 NULL
++qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
++tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
++cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
++do_dmabuf_dirty_ldu_52241 do_dmabuf_dirty_ldu 6 52241 NULL
++mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
++rx_data_60442 rx_data 4 60442 NULL
++ttusb2_msg_3100 ttusb2_msg 4 3100 NULL
++efivar_create_sysfs_entry_19485 efivar_create_sysfs_entry 2 19485 NULL
++tcf_csum_ipv4_igmp_60446 tcf_csum_ipv4_igmp 3 60446 NULL
++mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
++rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
++sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
++simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL
++__tty_buffer_request_room_27700 __tty_buffer_request_room 2 27700 NULL
++ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
++fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4 27702 NULL
++tcp_mark_head_lost_35895 tcp_mark_head_lost 2 35895 NULL
++skb_realloc_headroom_19516 skb_realloc_headroom 2 19516 NULL
++atm_alloc_charge_19517 atm_alloc_charge 2 19517 NULL nohasharray
++dev_alloc_skb_19517 dev_alloc_skb 1 19517 &atm_alloc_charge_19517
++construct_key_11329 construct_key 3 11329 NULL
++evm_write_key_27715 evm_write_key 3 27715 NULL
++persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL
++fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
++filldir_55137 filldir 3 55137 NULL
++igmpv3_newpack_35912 igmpv3_newpack 2 35912 NULL
++kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
++reg_w_buf_27724 reg_w_buf 3 27724 NULL
++nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
++compat_sys_migrate_pages_3157 compat_sys_migrate_pages 2 3157 NULL
++a4t_cs_init_27734 a4t_cs_init 3 27734 NULL
++sel_write_create_11353 sel_write_create 3 11353 NULL
++tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL
++request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL
++hwflags_read_52318 hwflags_read 3 52318 NULL
++nfc_alloc_send_skb_3167 nfc_alloc_send_skb 4 3167 NULL
++batadv_skb_head_push_11360 batadv_skb_head_push 2 11360 NULL
++put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
++vmw_gmr_bind_44130 vmw_gmr_bind 3 44130 NULL
++ath_tx_init_60515 ath_tx_init 2 60515 NULL
++drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
++ntfs_rl_split_52328 ntfs_rl_split 2-4 52328 NULL
++qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
++ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
++test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
++nfsd_read_19568 nfsd_read 5 19568 NULL
++cgroup_read_s64_19570 cgroup_read_s64 5 19570 NULL
++hysdn_sched_rx_60533 hysdn_sched_rx 3 60533 NULL
++mempool_create_node_3191 mempool_create_node 1 3191 NULL
++kcalloc_27770 kcalloc 1-2 27770 NULL
++shmem_pread_slow_3198 shmem_pread_slow 3 3198 NULL
++bm_status_read_19583 bm_status_read 3 19583 NULL
++v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
++zd_mac_rx_38296 zd_mac_rx 3 38296 NULL
++nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
++ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL
++acl_alloc_35979 acl_alloc 1 35979 NULL
++copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
++___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL
++str_to_user_11411 str_to_user 2 11411 NULL
++mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
++koneplus_sysfs_write_35993 koneplus_sysfs_write 6 35993 NULL
++trace_options_read_11419 trace_options_read 3 11419 NULL
++ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL
++mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
++xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 NULL
++isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
++kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
++write_adapter_mem_3234 write_adapter_mem 3 3234 NULL
++iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
++do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
++console_store_36007 console_store 4 36007 NULL
++bttv_read_11432 bttv_read 3 11432 NULL
++key_key_read_3241 key_key_read 3 3241 NULL
++aer_inject_write_52399 aer_inject_write 3 52399 NULL
++il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
++__feat_register_sp_64712 __feat_register_sp 6 64712 NULL
++ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
++check_vendor_extension_3254 check_vendor_extension 1 3254 NULL
++ieee80211_amsdu_to_8023s_15561 ieee80211_amsdu_to_8023s 5 15561 NULL
++sys_listxattr_27833 sys_listxattr 3 27833 NULL
++aac_rx_ioremap_52410 aac_rx_ioremap 2 52410 NULL
++ubi_eba_write_leb_36029 ubi_eba_write_leb 5-6 36029 NULL
++um_idi_write_18293 um_idi_write 3 18293 NULL
++cgroup_file_write_52417 cgroup_file_write 3 52417 NULL
++srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
++usbvision_rvmalloc_19655 usbvision_rvmalloc 1 19655 NULL
++line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
++LoadBitmap_19658 LoadBitmap 2 19658 NULL
++wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
++sys_init_module_36047 sys_init_module 2 36047 NULL
++read_profile_27859 read_profile 3 27859 NULL
++acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
++sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 NULL
++enlarge_skb_44248 enlarge_skb 2 44248 NULL nohasharray
++xfs_buf_readahead_map_44248 xfs_buf_readahead_map 3 44248 &enlarge_skb_44248
++scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
++refill_pool_19477 refill_pool 2 19477 NULL
++ubifs_recover_leb_60639 ubifs_recover_leb 3 60639 NULL
++ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
++iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
++xfs_file_buffered_aio_write_11492 xfs_file_buffered_aio_write 4 11492 NULL
++__btrfs_free_reserved_extent_31207 __btrfs_free_reserved_extent 2 31207 NULL
++tcp_sacktag_walk_49703 tcp_sacktag_walk 6 49703 NULL
++ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
++arvo_sysfs_write_3311 arvo_sysfs_write 6 3311 NULL
++sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
++unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
++kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
++hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
++dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
++ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1-2 52477 NULL
++ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
++blk_init_tags_30592 blk_init_tags 1 30592 NULL
++venus_symlink_23570 venus_symlink 4-6 23570 NULL
++storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
++aac_rkt_ioremap_3333 aac_rkt_ioremap 2 3333 NULL
++sctp_make_init_ack_3335 sctp_make_init_ack 4 3335 NULL
++read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
++tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
++ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
++vga_arb_write_36112 vga_arb_write 3 36112 NULL
++int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
++acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL
++simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
++il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
++memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL
++gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
++ath6kl_usb_ctrl_msg_exchange_33327 ath6kl_usb_ctrl_msg_exchange 4 33327 NULL
++dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
++pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
++mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
++gpio_power_read_36059 gpio_power_read 3 36059 NULL
++vmalloc_exec_36132 vmalloc_exec 1 36132 NULL
++init_data_container_60709 init_data_container 1 60709 NULL
++p9_client_read_19750 p9_client_read 5 19750 NULL
++skb_cow_data_11565 skb_cow_data 2 11565 NULL
++pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
++ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
++ext3_readpages_36144 ext3_readpages 4 36144 NULL
++mlx4_init_cmpt_table_11569 mlx4_init_cmpt_table 3 11569 NULL
++iwl_trans_txq_alloc_36147 iwl_trans_txq_alloc 3 36147 NULL
++alloc_vm_area_36149 alloc_vm_area 1 36149 NULL
++ubi_eba_write_leb_st_44343 ubi_eba_write_leb_st 5 44343 NULL
++tracing_clock_write_27961 tracing_clock_write 3 27961 NULL
++b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
++oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
++mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
++nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 NULL nohasharray
++blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 &nfs_fscache_get_super_cookie_44355
++saa7146_vmalloc_build_pgtable_19780 saa7146_vmalloc_build_pgtable 2 19780 NULL
++send_stream_3397 send_stream 4 3397 NULL
++snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
++fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
++ipx_recvmsg_44366 ipx_recvmsg 4 44366 NULL
++hycapi_rx_capipkt_11602 hycapi_rx_capipkt 3 11602 NULL
++msix_map_region_3411 msix_map_region 3 3411 NULL
++sys_kexec_load_14222 sys_kexec_load 2 14222 NULL
++rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
++iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
++pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
++crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
++sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
++opticon_write_60775 opticon_write 4 60775 NULL
++snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
++acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
++aoedev_flush_44398 aoedev_flush 2 44398 NULL
++irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
++drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
++pipe_iov_copy_to_user_3447 pipe_iov_copy_to_user 3 3447 NULL
++vip_read_19832 vip_read 3 19832 NULL
++osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
++llc_shdlc_alloc_skb_11645 llc_shdlc_alloc_skb 2 11645 NULL
++security_context_to_sid_19839 security_context_to_sid 2 19839 NULL
++sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
++nfqnl_mangle_36226 nfqnl_mangle 4-2 36226 NULL
++atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
++crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
++ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
++sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
++alloc_skb_fclone_3467 alloc_skb_fclone 1 3467 NULL
++cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
++viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
++cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2 28053 NULL
++ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
++llcp_allocate_pdu_19866 llcp_allocate_pdu 3 19866 NULL
++lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
++btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
++compat_sys_mbind_36256 compat_sys_mbind 5 36256 NULL
++security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
++sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
++blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
++split_11691 split 2 11691 NULL
++brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
++snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 NULL
++pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
++usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL
++__kfifo_alloc_22173 __kfifo_alloc 2-3 22173 NULL
++codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
++gdth_init_isa_28091 gdth_init_isa 1 28091 NULL
++readahead_tree_block_36285 readahead_tree_block 3 36285 NULL
++mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL nohasharray
++ieee80211_wx_set_gen_ie_rsl_3521 ieee80211_wx_set_gen_ie_rsl 3 3521 &mem_tx_free_mem_blks_read_3521
++nouveau_cli_create_36293 nouveau_cli_create 3 36293 NULL
++vmw_unlocked_ioctl_19212 vmw_unlocked_ioctl 2 19212 NULL
++ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
++lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
++ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
++rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
++ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
++iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 NULL
++tcf_csum_ipv6_icmp_11738 tcf_csum_ipv6_icmp 4 11738 NULL
++smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
++vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
++spidev_write_44510 spidev_write 3 44510 NULL
++macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
++dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
++iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
++fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL
++iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
++nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
++iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
++kone_receive_4690 kone_receive 4 4690 NULL
++alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
++jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
++evtchn_read_3569 evtchn_read 3 3569 NULL
++video_read_28148 video_read 3 28148 NULL
++compat_sys_setsockopt_3326 compat_sys_setsockopt 5 3326 NULL
++sys_msgsnd_44537 sys_msgsnd 3 44537 NULL nohasharray
++comm_write_44537 comm_write 3 44537 &sys_msgsnd_44537
++stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
++ax25_send_frame_19964 ax25_send_frame 2 19964 NULL
++blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL
++relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
++ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
++vc_resize_3585 vc_resize 2-3 3585 NULL
++gluebi_write_27905 gluebi_write 3 27905 NULL
++ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
++c4iw_reject_cr_28174 c4iw_reject_cr 3 28174 NULL
++rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL
++attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
++compat_sys_semtimedop_3606 compat_sys_semtimedop 3 3606 NULL
++sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
++macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
++edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
++key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
++pti_char_write_60960 pti_char_write 3 60960 NULL
++tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
++nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
++pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
++read_vbt_r10_60679 read_vbt_r10 1 60679 NULL
++aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
++afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL
++error_error_frame_read_39947 error_error_frame_read 3 39947 NULL nohasharray
++fwnet_pd_new_39947 fwnet_pd_new 4 39947 &error_error_frame_read_39947
++snd_pcm_alloc_vmalloc_buffer_44595 snd_pcm_alloc_vmalloc_buffer 2 44595 NULL
++zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
++sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
++rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
++__a2mp_build_60987 __a2mp_build 3 60987 NULL
++split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
++hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
++cm_copy_private_data_3649 cm_copy_private_data 2 3649 NULL
++ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
++ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 NULL nohasharray
++mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 &ieee80211_if_read_auto_open_plinks_38268
++ip_set_alloc_57953 ip_set_alloc 1 57953 NULL
++i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
++mb_cache_create_17307 mb_cache_create 2 17307 NULL
++ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
++cfpkt_add_body_44630 cfpkt_add_body 3 44630 NULL
++nf_nat_sdp_media_11863 nf_nat_sdp_media 9 11863 NULL
++alloc_extent_buffer_52824 alloc_extent_buffer 3 52824 NULL
++skb_cow_head_52495 skb_cow_head 2 52495 NULL
++ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
++sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
++alloc_ieee80211_20063 alloc_ieee80211 1 20063 NULL
++alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
++pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
++ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
++sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
++rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
++fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
++btmrvl_psmode_write_3703 btmrvl_psmode_write 3 3703 NULL
++symtab_init_61050 symtab_init 2 61050 NULL
++team_options_register_20091 team_options_register 3 20091 NULL
++videobuf_pages_to_sg_3708 videobuf_pages_to_sg 2 3708 NULL
++mon_bin_get_event_52863 mon_bin_get_event 4 52863 NULL
++oom_adj_read_21847 oom_adj_read 3 21847 NULL
++b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
++mpi_resize_44674 mpi_resize 2 44674 NULL
++ip6_append_data_36490 ip6_append_data 4-5 36490 NULL nohasharray
++tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 &ip6_append_data_36490
++kmalloc_slab_11917 kmalloc_slab 1 11917 NULL
++rng_dev_read_41581 rng_dev_read 3 41581 NULL
++nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 NULL
++cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
++fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
++hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
++xfs_trans_read_buf_map_37487 xfs_trans_read_buf_map 5 37487 NULL
++ci_ll_write_3740 ci_ll_write 4 3740 NULL
++snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
++kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
++ima_show_htable_value_57136 ima_show_htable_value 2 57136 NULL
++mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
++dccp_feat_clone_sp_val_11942 dccp_feat_clone_sp_val 3 11942 NULL
++pms_read_53873 pms_read 3 53873 NULL
++ieee80211_if_read_fwded_frames_36520 ieee80211_if_read_fwded_frames 3 36520 NULL
++get_derived_key_61100 get_derived_key 4 61100 NULL
++bm_entry_write_28338 bm_entry_write 3 28338 NULL
++_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
++tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
++clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
++dm_read_15674 dm_read 3 15674 NULL
++cpu_type_read_36540 cpu_type_read 3 36540 NULL
++__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
++nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
++kone_send_63435 kone_send 4 63435 NULL
++alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
++key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
++tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
++iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
++__kfifo_to_user_36555 __kfifo_to_user 3 36555 NULL nohasharray
++macvtap_do_read_36555 macvtap_do_read 4 36555 &__kfifo_to_user_36555
++wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
++create_trace_probe_20175 create_trace_probe 1 20175 NULL
++sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
++afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
++tnode_new_44757 tnode_new 3 44757 NULL nohasharray
++pty_write_44757 pty_write 3 44757 &tnode_new_44757
++ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
++kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4 10765 NULL
++iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
++send_packet_52960 send_packet 4 52960 NULL
++dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
++ssb_bus_scan_36578 ssb_bus_scan 2 36578 NULL
++ncp_file_write_3813 ncp_file_write 3 3813 NULL
++tipc_port_reject_sections_55229 tipc_port_reject_sections 5 55229 NULL
++tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
++set_bypass_pfs_28395 set_bypass_pfs 3 28395 NULL
++put_cmsg_36589 put_cmsg 4 36589 NULL
++__vmalloc_61168 __vmalloc 1 61168 NULL
++llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
++sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
++read_file_tx_chainmask_3829 read_file_tx_chainmask 3 3829 NULL
++pcnet32_realloc_rx_ring_36598 pcnet32_realloc_rx_ring 3 36598 NULL
++event_oom_late_read_61175 event_oom_late_read 3 61175 NULL nohasharray
++pair_device_61175 pair_device 4 61175 &event_oom_late_read_61175
++sys_lsetxattr_61177 sys_lsetxattr 4 61177 NULL
++tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
++nfs4_alloc_pages_48426 nfs4_alloc_pages 1 48426 NULL
++rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
++batadv_check_management_packet_52993 batadv_check_management_packet 3 52993 NULL
++tpci200_slot_map_space_3848 tpci200_slot_map_space 2 3848 NULL
++regmap_bulk_write_59049 regmap_bulk_write 4 59049 NULL
++create_one_cdev_3852 create_one_cdev 2 3852 NULL
++fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
++smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
++mpage_readpages_28436 mpage_readpages 3 28436 NULL
++cfpkt_append_61206 cfpkt_append 3 61206 NULL
++btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
++rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
++get_fd_set_3866 get_fd_set 1 3866 NULL
++megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
++rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
++unlink_queued_645 unlink_queued 3-4 645 NULL
++il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
++sisusb_write_44834 sisusb_write 3 44834 NULL
++smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
++raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
++alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
++ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
++hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
++uea_send_modem_cmd_3888 uea_send_modem_cmd 3 3888 NULL
++h5_prepare_pkt_12085 h5_prepare_pkt 4 12085 NULL
++nvram_write_3894 nvram_write 3 3894 NULL
++osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
++pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
++iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
++vcs_write_3910 vcs_write 3 3910 NULL
++sctp_make_abort_violation_27959 sctp_make_abort_violation 4 27959 NULL
++mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
++dtim_interval_read_654 dtim_interval_read 3 654 NULL
++btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 NULL
++packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
++alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
++do_tty_write_44896 do_tty_write 5 44896 NULL
++set_powered_12129 set_powered 4 12129 NULL
++qib_resize_cq_53090 qib_resize_cq 2 53090 NULL
++snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
++nfs_writedata_alloc_12133 nfs_writedata_alloc 2 12133 NULL
++ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
++ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
++hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
++rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
++vmw_fifo_reserve_12141 vmw_fifo_reserve 2 12141 NULL
++i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 NULL
++rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
++btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
++vmbus_open_12154 vmbus_open 2-3 12154 NULL
++capinc_tty_write_28539 capinc_tty_write 3 28539 NULL
++sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
++mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 NULL
++line6_dumpreq_initbuf_53123 line6_dumpreq_initbuf 3 53123 NULL
++snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4 36740 NULL
++gather_array_56641 gather_array 3 56641 NULL
++cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL
++b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
++dma_memcpy_to_iovec_12173 dma_memcpy_to_iovec 5 12173 NULL
++debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
++ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
++ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL
++scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
++regcache_rbtree_insert_to_block_58009 regcache_rbtree_insert_to_block 5 58009 NULL
++do_add_counters_3992 do_add_counters 3 3992 NULL
++mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 NULL
++smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
++st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 NULL
++rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL
++dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
++ip4ip6_err_36772 ip4ip6_err 5 36772 NULL
++mei_write_4005 mei_write 3 4005 NULL
++snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
++ptp_filter_init_36780 ptp_filter_init 2 36780 NULL
++__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL
++tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
++debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
++receive_copy_12216 receive_copy 3 12216 NULL
++aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 NULL
++proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
++bcsp_prepare_pkt_12961 bcsp_prepare_pkt 3 12961 NULL
++ftdi_process_packet_45005 ftdi_process_packet 5 45005 NULL
++change_xattr_61390 change_xattr 5 61390 NULL
++find_skb_20431 find_skb 2 20431 NULL
++hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
++fmc_send_cmd_20435 fmc_send_cmd 5 20435 NULL
++tcp_fragment_20436 tcp_fragment 3 20436 NULL
++ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
++ptrace_writedata_45021 ptrace_writedata 4 45021 NULL
++simple_alloc_urb_60420 simple_alloc_urb 3 60420 NULL
++sys_sethostname_42962 sys_sethostname 2 42962 NULL
++int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
++tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
++pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL
++fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
++shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
++add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
++sctp_make_asconf_4078 sctp_make_asconf 3 4078 NULL
++vhci_get_user_45039 vhci_get_user 3 45039 NULL
++ip_vs_icmp_xmit_v6_20464 ip_vs_icmp_xmit_v6 4 20464 NULL
++compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
++read_buf_20469 read_buf 2 20469 NULL
++cm_write_36858 cm_write 3 36858 NULL
++note_last_dentry_12285 note_last_dentry 3 12285 NULL
++blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
++il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 NULL
++sel_write_user_45060 sel_write_user 3 45060 NULL
++tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 NULL
++__dev_alloc_skb_28681 __dev_alloc_skb 1 28681 NULL
++svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
++snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
++fast_user_write_20494 fast_user_write 5 20494 NULL
++unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
++sctp_make_fwdtsn_53265 sctp_make_fwdtsn 3 53265 NULL
++ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
++hidraw_report_event_20503 hidraw_report_event 3 20503 NULL
++bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
++selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
++lirc_buffer_init_53282 lirc_buffer_init 3-2 53282 NULL
++tipc_msg_build_12326 tipc_msg_build 4 12326 NULL
++xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
++drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
++pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
++OS_kmalloc_36909 OS_kmalloc 1 36909 NULL
++osst_read_40237 osst_read 3 40237 NULL
++tm6000_read_4151 tm6000_read 3 4151 NULL
++amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
++usbdev_read_45114 usbdev_read 3 45114 NULL
++drm_plane_init_28731 drm_plane_init 6 28731 NULL
++spi_execute_28736 spi_execute 5 28736 NULL
++snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
++mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
++get_alua_req_4166 get_alua_req 3 4166 NULL
++scsi_report_opcode_20551 scsi_report_opcode 3 20551 NULL
++blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
++venus_create_20555 venus_create 4 20555 NULL
++__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
++batadv_interface_rx_53325 batadv_interface_rx 4 53325 NULL
++receive_packet_12367 receive_packet 2 12367 NULL
++squashfs_cache_init_41656 squashfs_cache_init 2 41656 NULL
++mem_write_22232 mem_write 3 22232 NULL
++read_file_bool_4180 read_file_bool 3 4180 NULL
++send_to_tty_45141 send_to_tty 3 45141 NULL
++fops_read_40672 fops_read 3 40672 NULL
++cxio_init_resource_fifo_28764 cxio_init_resource_fifo 3 28764 NULL
++write_leb_36957 write_leb 5 36957 NULL
++xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
++device_write_45156 device_write 3 45156 NULL
++i915_max_freq_read_20581 i915_max_freq_read 3 20581 NULL
++tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
++sparse_early_mem_maps_alloc_node_36971 sparse_early_mem_maps_alloc_node 4 36971 NULL
++batadv_tt_append_diff_20588 batadv_tt_append_diff 4 20588 NULL
++dvb_net_sec_callback_28786 dvb_net_sec_callback 2 28786 NULL
++excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
++isp1760_register_628 isp1760_register 1-2 628 NULL
++dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
++lirc_write_20604 lirc_write 3 20604 NULL
++sel_write_member_28800 sel_write_member 3 28800 NULL
++ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
++ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
++cgroup_file_read_28804 cgroup_file_read 3 28804 NULL
++sys_msgrcv_959 sys_msgrcv 3 959 NULL
++snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 NULL
++pskb_network_may_pull_35336 pskb_network_may_pull 2 35336 NULL
++auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
++ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
++setxattr_37006 setxattr 4 37006 NULL
++add_child_45201 add_child 4 45201 NULL
++seq_open_private_61589 seq_open_private 3 61589 NULL
++iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
++__get_vm_area_61599 __get_vm_area 1 61599 NULL
++iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
++nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
++kfifo_copy_to_user_20646 kfifo_copy_to_user 3 20646 NULL
++spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
++ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
++vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
++oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
++configfs_write_file_61621 configfs_write_file 3 61621 NULL
++ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 NULL
++ieee80211_rx_bss_info_61630 ieee80211_rx_bss_info 3 61630 NULL
++isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
++ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
++i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
++snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL
++x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
++dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 4 20682 NULL
++get_packet_pg_28023 get_packet_pg 4 28023 NULL
++rtllib_auth_challenge_12493 rtllib_auth_challenge 3 12493 NULL
++acpi_tb_parse_root_table_53455 acpi_tb_parse_root_table 1 53455 NULL
++resize_stripes_61650 resize_stripes 2 61650 NULL
++n2_run_53459 n2_run 3 53459 NULL
++packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
++parse_command_37079 parse_command 2 37079 NULL
++read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
++alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
++ttm_page_pool_free_61661 ttm_page_pool_free 2 61661 NULL
++input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
++pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
++bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
++insert_one_name_61668 insert_one_name 7 61668 NULL
++nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
++pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
++iowarrior_read_53483 iowarrior_read 3 53483 NULL
++osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
++lock_loop_61681 lock_loop 1 61681 NULL
++snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
++security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
++brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
++ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
++vring_add_indirect_20737 vring_add_indirect 3-4 20737 NULL
++push_rx_28939 push_rx 3 28939 NULL
++__copy_from_user_inatomic_4365 __copy_from_user_inatomic 3 4365 NULL
++vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
++idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
++sys_setdomainname_4373 sys_setdomainname 2 4373 NULL
++fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
++copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
++nouveau_dmaobj_create__61730 nouveau_dmaobj_create_ 6 61730 NULL
++btrfs_trim_block_group_28963 btrfs_trim_block_group 3 28963 NULL
++irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
++aac_srcv_ioremap_6659 aac_srcv_ioremap 2 6659 NULL
++ubi_leb_change_10289 ubi_leb_change 4 10289 NULL
++read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
++alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
++pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
++read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
++read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
++btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL
++fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
++iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
++cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 NULL
++libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
++hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
++tstats_write_60432 tstats_write 3 60432 NULL nohasharray
++kmalloc_60432 kmalloc 1 60432 &tstats_write_60432
++bin_uuid_28999 bin_uuid 3 28999 NULL
++sys_sendto_20809 sys_sendto 6 20809 NULL
++alloc_page_cgroup_2919 alloc_page_cgroup 1 2919 NULL
++set_registers_53582 set_registers 3 53582 NULL
++fc_fcp_frame_alloc_12624 fc_fcp_frame_alloc 2 12624 NULL
++do_pages_stat_4437 do_pages_stat 2 4437 NULL
++lane2_associate_req_45398 lane2_associate_req 4 45398 NULL
++tcf_csum_ipv4_udp_30777 tcf_csum_ipv4_udp 4 30777 NULL
++pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
++bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2 37213 NULL
++keymap_store_45406 keymap_store 4 45406 NULL
++pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
++dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
++wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
++il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
++pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
++xz_dec_init_29029 xz_dec_init 2 29029 NULL
++regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
++tcp_dma_try_early_copy_4457 tcp_dma_try_early_copy 3 4457 NULL
++__do_replace_37227 __do_replace 5 37227 NULL
++dn_alloc_send_pskb_4465 dn_alloc_send_pskb 2 4465 NULL
++ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
++rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL
++at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
++rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL
++tso_fragment_29050 tso_fragment 3 29050 NULL
++__alloc_pred_stack_26687 __alloc_pred_stack 2 26687 NULL
++sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
++sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
++rproc_recovery_read_36245 rproc_recovery_read 3 36245 NULL
++xd_write_multiple_pages_53633 xd_write_multiple_pages 6-5 53633 NULL
++ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
++__iio_allocate_sw_ring_buffer_4843 __iio_allocate_sw_ring_buffer 3 4843 NULL
++init_per_cpu_17880 init_per_cpu 1 17880 NULL
++iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
++intel_render_ring_init_dri_45446 intel_render_ring_init_dri 2-3 45446 NULL
++udp_sendmsg_4492 udp_sendmsg 4 4492 NULL
++ieee80211_probereq_get_29069 ieee80211_probereq_get 4-6 29069 NULL
++vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
++bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
++_alloc_cdb_cont_23609 _alloc_cdb_cont 2 23609 NULL
++set_link_security_4502 set_link_security 4 4502 NULL
++nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
++l1oip_socket_parse_4507 l1oip_socket_parse 4 4507 NULL
++tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
++fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2 61854 NULL
++key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
++srp_target_alloc_37288 srp_target_alloc 3 37288 NULL
++mmio_read_40348 mmio_read 4 40348 NULL
++vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
++ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
++compat_sys_readv_20911 compat_sys_readv 3 20911 NULL
++ivtv_write_12721 ivtv_write 3 12721 NULL
++fuse_fill_write_pages_53682 fuse_fill_write_pages 4 53682 NULL
++islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
++sys_llistxattr_4532 sys_llistxattr 3 4532 NULL
++isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
++da9052_group_write_4534 da9052_group_write 3 4534 NULL
++v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
++jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
++key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
++tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
++videobuf_vmalloc_to_sg_4548 videobuf_vmalloc_to_sg 2 4548 NULL
++rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
++ieee80211_rtl_auth_challenge_61897 ieee80211_rtl_auth_challenge 3 61897 NULL
++send_msg_37323 send_msg 4 37323 NULL
++brcmf_sdbrcm_membytes_37324 brcmf_sdbrcm_membytes 3-5 37324 NULL
++l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL
++clear_refs_write_61904 clear_refs_write 3 61904 NULL
++scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
++rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
++altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
++virtqueue_add_buf_59470 virtqueue_add_buf 3-4 59470 NULL
++proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
++dsp_buffer_alloc_11684 dsp_buffer_alloc 2 11684 NULL
++rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
++reshape_ring_29147 reshape_ring 2 29147 NULL
++cgroup_read_u64_45532 cgroup_read_u64 5 45532 NULL
++au0828_init_isoc_61917 au0828_init_isoc 3-2 61917 NULL
++copy_macs_45534 copy_macs 4 45534 NULL
++sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
++listxattr_12769 listxattr 3 12769 NULL
++xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
++wdm_write_53735 wdm_write 3 53735 NULL
++snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
++send_bulk_static_data_61932 send_bulk_static_data 3 61932 NULL
++cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
++mempool_create_29437 mempool_create 1 29437 NULL
++platform_create_bundle_12785 platform_create_bundle 4-6 12785 NULL
++brcmf_tx_frame_20978 brcmf_tx_frame 3 20978 NULL
++sock_alloc_send_pskb_21246 sock_alloc_send_pskb 2 21246 NULL
++stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
++alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
++venus_rmdir_45564 venus_rmdir 4 45564 NULL
++scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
++rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 NULL
++squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
++mgmt_event_12810 mgmt_event 4 12810 NULL
++ntfs_rl_realloc_nofail_32173 ntfs_rl_realloc_nofail 3 32173 NULL
++xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
++ipath_create_cq_45586 ipath_create_cq 2 45586 NULL
++wusb_prf_256_29203 wusb_prf_256 7 29203 NULL nohasharray
++alloc_group_attrs_29203 alloc_group_attrs 3 29203 &wusb_prf_256_29203
++comedi_alloc_subdevices_29207 comedi_alloc_subdevices 2 29207 NULL
++rdma_set_ib_paths_45592 rdma_set_ib_paths 3 45592 NULL
++compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
++rds_iw_inc_copy_to_user_29214 rds_iw_inc_copy_to_user 3 29214 NULL
++zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
++TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
++iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
++virtnet_send_command_61993 virtnet_send_command 5-6 61993 NULL
++sys_getxattr_37418 sys_getxattr 4 37418 NULL
++regmap_raw_write_53803 regmap_raw_write 4 53803 NULL
++hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
++spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
++t4vf_pktgl_to_skb_39005 t4vf_pktgl_to_skb 2 39005 NULL
++audit_log_n_hex_45617 audit_log_n_hex 3 45617 NULL
++devm_ioremap_29235 devm_ioremap 2-3 29235 NULL
++irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
++recover_peb_29238 recover_peb 6-7 29238 NULL
++security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
++proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
++i915_gem_execbuffer_relocate_slow_25355 i915_gem_execbuffer_relocate_slow 7 25355 NULL
++jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
++tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
++skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
++cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
++brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
++pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
++event_calibration_read_21083 event_calibration_read 3 21083 NULL
++ppp_tx_cp_62044 ppp_tx_cp 5 62044 NULL
++prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
++sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
++cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
++compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
++do_pselect_62061 do_pselect 1 62061 NULL
++btmrvl_gpiogap_read_4718 btmrvl_gpiogap_read 3 4718 NULL
++dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
++kmem_realloc_37489 kmem_realloc 2 37489 NULL
++ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray
++show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722
++ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL
++sn9c102_read_29305 sn9c102_read 3 29305 NULL
++pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
++smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
++sg_read_25799 sg_read 3 25799 NULL
++uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
++ci_ll_init_12930 ci_ll_init 3 12930 NULL
++unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 NULL
++nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
++pwr_disable_ps_read_13176 pwr_disable_ps_read 3 13176 NULL
++vmalloc_32_user_37519 vmalloc_32_user 1 37519 NULL
++fd_do_writev_29329 fd_do_writev 3 29329 NULL
++hugetlb_cgroup_read_49259 hugetlb_cgroup_read 5 49259 NULL
++do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
++ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
++dvb_ca_en50221_init_45718 dvb_ca_en50221_init 4 45718 NULL
++__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
++jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
++new_skb_21148 new_skb 1 21148 NULL
++ath6kl_mgmt_tx_21153 ath6kl_mgmt_tx 9 21153 NULL
++l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
++bm_status_write_12964 bm_status_write 3 12964 NULL
++mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL
++snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
++wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
++ip6_ufo_append_data_4780 ip6_ufo_append_data 5-6-7 4780 NULL
++sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL nohasharray
++nf_nat_mangle_tcp_packet_37551 nf_nat_mangle_tcp_packet 6-8 37551 &sep_create_dcb_dmatables_context_37551
++bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
++rw_copy_check_uvector_45748 rw_copy_check_uvector 3 45748 NULL nohasharray
++v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
++qib_diag_write_62133 qib_diag_write 3 62133 NULL
++gnttab_expand_15817 gnttab_expand 1 15817 NULL
++lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
++sctp_make_chunk_12986 sctp_make_chunk 4 12986 NULL
++sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
++TransmitTcb_12989 TransmitTcb 4 12989 NULL
++mthca_setup_cmd_doorbells_53954 mthca_setup_cmd_doorbells 2 53954 NULL
++ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
++video_usercopy_62151 video_usercopy 2 62151 NULL
++cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
++repair_io_failure_4815 repair_io_failure 4 4815 NULL
++xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
++p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
++bnx2i_send_nl_mesg_53353 bnx2i_send_nl_mesg 4 53353 NULL
++ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
++___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL
++subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
++tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 NULL
++raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
++alloc_upcall_62186 alloc_upcall 2 62186 NULL
++kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6 37611 NULL
++drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
++lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
++pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
++input_ff_create_21240 input_ff_create 2 21240 NULL
++sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
++key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
++__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL
++amthi_read_45831 amthi_read 4 45831 NULL
++cmpk_message_handle_tx_54024 cmpk_message_handle_tx 4 54024 NULL
++hid_register_field_4874 hid_register_field 2-3 4874 NULL
++ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
++vga_arb_read_4886 vga_arb_read 3 4886 NULL
++sys_ipc_4889 sys_ipc 3 4889 NULL
++bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
++smp_build_cmd_45853 smp_build_cmd 3 45853 NULL
++x509_process_extension_45854 x509_process_extension 5 45854 NULL
++nfsd_read_file_62241 nfsd_read_file 6 62241 NULL
++pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
++do_register_entry_29478 do_register_entry 4 29478 NULL
++isdn_write_45863 isdn_write 3 45863 NULL
++rproc_state_read_54057 rproc_state_read 3 54057 NULL
++ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
++regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
++alloc_smp_req_51337 alloc_smp_req 1 51337 NULL
++vmw_gmr2_bind_21305 vmw_gmr2_bind 3 21305 NULL
++get_rdac_req_45882 get_rdac_req 3 45882 NULL
++_malloc_54077 _malloc 1 54077 NULL
++add_res_range_21310 add_res_range 4 21310 NULL
++bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL
++sys_process_vm_writev_4928 sys_process_vm_writev 3-5 4928 NULL
++ntfs_rl_insert_4931 ntfs_rl_insert 2-4 4931 NULL
++ip_make_skb_13129 ip_make_skb 5-6 13129 NULL
++snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
++ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
++atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
++altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL
++il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
++create_xattr_54106 create_xattr 5 54106 NULL
++udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
++ep_write_59008 ep_write 3 59008 NULL
++dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
++sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
++devm_kzalloc_4966 devm_kzalloc 2 4966 NULL
++compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
++udf_sb_alloc_partition_maps_62313 udf_sb_alloc_partition_maps 2 62313 NULL
++alloc_mr_45935 alloc_mr 1 45935 NULL
++read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
++isku_receive_54130 isku_receive 4 54130 NULL
++hfcpci_empty_bfifo_62323 hfcpci_empty_bfifo 4 62323 NULL
++caif_stream_recvmsg_13173 caif_stream_recvmsg 4 13173 NULL
++ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
++Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
++ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
++idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
++alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
++i915_max_freq_write_11350 i915_max_freq_write 3 11350 NULL
++leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
++dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
++create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
++btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL
++lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
++video_ioctl2_21380 video_ioctl2 2 21380 NULL
++dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
++alloc_ldt_21972 alloc_ldt 2 21972 NULL
++ipath_resize_cq_712 ipath_resize_cq 2 712 NULL
++comedi_read_13199 comedi_read 3 13199 NULL
++flash_write_62354 flash_write 3 62354 NULL
++rb_simple_read_45972 rb_simple_read 3 45972 NULL
++mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
++i2400m_zrealloc_2x_54166 i2400m_zrealloc_2x 3 54166 NULL nohasharray
++memcpy_toiovec_54166 memcpy_toiovec 3 54166 &i2400m_zrealloc_2x_54166
++l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 NULL
++proc_file_read_53905 proc_file_read 3 53905 NULL
++mtd_device_parse_register_5024 mtd_device_parse_register 5 5024 NULL
++acpi_tb_install_table_12988 acpi_tb_install_table 1 12988 NULL
++set_wd_exp_mode_pfs_62372 set_wd_exp_mode_pfs 3 62372 NULL
++reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
++acpi_os_read_memory_54186 acpi_os_read_memory 1-3 54186 NULL
++smk_read_logging_37804 smk_read_logging 3 37804 NULL
++rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
++mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
++cru_detect_11272 cru_detect 1 11272 NULL
++altera_irscan_62396 altera_irscan 2 62396 NULL
++alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
++aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
++fw_download_code_13249 fw_download_code 3 13249 NULL
++init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
++tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
++set_ssp_62411 set_ssp 4 62411 NULL
++nfc_hci_send_event_21452 nfc_hci_send_event 5 21452 NULL
++sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
++get_free_entries_46030 get_free_entries 1 46030 NULL
++__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
++sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL
++snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
++carl9170_rx_13272 carl9170_rx 3 13272 NULL
++snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
++il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 NULL
++sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
++kfifo_copy_from_user_5091 kfifo_copy_from_user 3 5091 NULL
++netdev_alloc_skb_62437 netdev_alloc_skb 2 62437 NULL
++dma_memcpy_pg_to_iovec_1725 dma_memcpy_pg_to_iovec 6 1725 NULL
++platform_device_add_resources_13289 platform_device_add_resources 3 13289 NULL
++xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
++xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
++read_file_xmit_21487 read_file_xmit 3 21487 NULL
++e1000_check_copybreak_62448 e1000_check_copybreak 3 62448 NULL
++ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
++irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
++wusb_prf_54261 wusb_prf 7 54261 NULL nohasharray
++audio_write_54261 audio_write 4 54261 &wusb_prf_54261
++sys_setxattr_37880 sys_setxattr 4 37880 NULL
++dvb_net_sec_37884 dvb_net_sec 3 37884 NULL
++mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
++isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
++mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
++qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
++v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL nohasharray
++xz_dec_lzma2_create_36353 xz_dec_lzma2_create 2 36353 &v9fs_file_readn_36353
++vfio_config_do_rw_46091 vfio_config_do_rw 3 46091 NULL
++dma_skb_copy_datagram_iovec_21516 dma_skb_copy_datagram_iovec 3-5 21516 NULL
++ata_host_alloc_46094 ata_host_alloc 2 46094 NULL
++probes_write_29711 probes_write 3 29711 NULL
++btrfs_file_aio_write_21520 btrfs_file_aio_write 4 21520 NULL
++us122l_ctl_msg_13330 us122l_ctl_msg 8 13330 NULL
++altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
++dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
++kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5 13337 NULL
++il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
++il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 NULL
++tipc_link_send_sections_fast_37920 tipc_link_send_sections_fast 4 37920 NULL
++mlx4_en_create_rx_ring_62498 mlx4_en_create_rx_ring 3 62498 NULL
++emi62_writememory_29731 emi62_writememory 4 29731 NULL
++iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
++mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
++pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 NULL
++hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
++rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
++iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
++hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL
++pn_raw_send_54330 pn_raw_send 2 54330 NULL
++pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
++tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
++sfi_map_memory_5183 sfi_map_memory 1-2 5183 NULL
++iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
++wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
++test_iso_queue_62534 test_iso_queue 5 62534 NULL
++__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
++ddp_clear_map_46152 ddp_clear_map 4 46152 NULL
++cxio_hal_init_resource_29771 cxio_hal_init_resource 2-6-7 29771 NULL nohasharray
++ip_vs_conn_fill_param_sync_29771 ip_vs_conn_fill_param_sync 6 29771 &cxio_hal_init_resource_29771
++__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
++sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
++_osd_realloc_seg_54352 _osd_realloc_seg 3 54352 NULL
++pipe_set_size_5204 pipe_set_size 2 5204 NULL
++tcf_hash_create_54360 tcf_hash_create 4 54360 NULL
++ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
++isdn_read_50021 isdn_read 3 50021 NULL
++vfs_readlink_54368 vfs_readlink 3 54368 NULL
++pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
++ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
++subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
++ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
++netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
++ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL
++ssb_ioremap_5228 ssb_ioremap 2 5228 NULL
++xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
++xlog_do_recovery_pass_21618 xlog_do_recovery_pass 3 21618 NULL
++isdn_ppp_skb_push_5236 isdn_ppp_skb_push 2 5236 NULL
++get_subdir_62581 get_subdir 3 62581 NULL
++iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL
++sctp_abort_pkt_new_5241 sctp_abort_pkt_new 6 5241 NULL
++vfs_readv_38011 vfs_readv 3 38011 NULL
++keyring_read_13438 keyring_read 3 13438 NULL
++sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL nohasharray
++set_tap_pwup_pfs_13440 set_tap_pwup_pfs 3 13440 &sctp_setsockopt_peer_primary_addr_13440
++ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 7-8-9 13443 NULL
++crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
++tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
++packet_alloc_skb_62602 packet_alloc_skb 2-5-4 62602 NULL
++prism2_send_mgmt_62605 prism2_send_mgmt 4 62605 NULL nohasharray
++nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 &prism2_send_mgmt_62605
++__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
++aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
++kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
++ftrace_write_29551 ftrace_write 3 29551 NULL
++il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 NULL
++iscsi_post_host_event_13473 iscsi_post_host_event 4 13473 NULL
++ems_pcmcia_add_card_62627 ems_pcmcia_add_card 2 62627 NULL
++mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
++dev_write_7708 dev_write 3 7708 NULL
++_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL
++nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
++atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
++ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
++sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
++lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
++alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
++nf_nat_ftp_46265 nf_nat_ftp 6 46265 NULL
++nfc_targets_found_29886 nfc_targets_found 3 29886 NULL
++mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
++evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
++request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
++proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
++smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
++isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
++bm_init_13529 bm_init 2 13529 NULL
++check586_29914 check586 2 29914 NULL
++snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
++pep_alloc_skb_46303 pep_alloc_skb 3 46303 NULL
++reiserfs_allocate_list_bitmaps_21732 reiserfs_allocate_list_bitmaps 3 21732 NULL
++ioremap_wc_62695 ioremap_wc 1-2 62695 NULL
++pg_read_17276 pg_read 3 17276 NULL
++edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
++ep0_read_38095 ep0_read 3 38095 NULL
++batadv_iv_ogm_queue_add_46319 batadv_iv_ogm_queue_add 3 46319 NULL
++__nf_nat_mangle_tcp_packet_21744 __nf_nat_mangle_tcp_packet 8-6 21744 NULL
++ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
++cgroup_write_X64_54514 cgroup_write_X64 5 54514 NULL
++bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
++rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
++cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL
++mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
++l2down_create_21755 l2down_create 4 21755 NULL
++alloc_tio_13564 alloc_tio 3 13564 NULL
++viacam_read_54526 viacam_read 3 54526 NULL
++btrfs_mksubvol_58240 btrfs_mksubvol 3 58240 NULL
++tunables_read_36385 tunables_read 3 36385 NULL
++opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
++iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
++read_file_antenna_13574 read_file_antenna 3 13574 NULL
++__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 3-4 38153 NULL
++setsockopt_54539 setsockopt 5 54539 NULL
++gen_pool_add_21776 gen_pool_add 3 21776 NULL
++iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
++tty_register_device_4544 tty_register_device 2 4544 NULL
++cache_write_13589 cache_write 3 13589 NULL
++mpt_lan_receive_post_turbo_13592 mpt_lan_receive_post_turbo 2 13592 NULL
++xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
++key_replays_read_62746 key_replays_read 3 62746 NULL
++smk_write_direct_46363 smk_write_direct 3 46363 NULL
++aac_sa_ioremap_13596 aac_sa_ioremap 2 13596 NULL nohasharray
++irias_new_octseq_value_13596 irias_new_octseq_value 2 13596 &aac_sa_ioremap_13596
++mwifiex_usb_submit_rx_urb_54558 mwifiex_usb_submit_rx_urb 2 54558 NULL
++irias_add_octseq_attrib_29983 irias_add_octseq_attrib 4 29983 NULL
++cdev_add_38176 cdev_add 2-3 38176 NULL
++brcmf_sdcard_recv_buf_38179 brcmf_sdcard_recv_buf 6 38179 NULL
++__ioremap_caller_21800 __ioremap_caller 1-2 21800 NULL
++alloc_and_copy_ftrace_hash_29368 alloc_and_copy_ftrace_hash 1 29368 NULL
++ubi_dump_flash_46381 ubi_dump_flash 4 46381 NULL
++swap_cgroup_swapon_13614 swap_cgroup_swapon 2 13614 NULL
++wm8994_bulk_write_13615 wm8994_bulk_write 3 13615 NULL
++init_chip_wc_pat_62768 init_chip_wc_pat 2 62768 NULL
++nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
++ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL
++rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
++fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
++vmalloc_user_32308 vmalloc_user 1 32308 NULL
++get_ucode_user_38202 get_ucode_user 3 38202 NULL
++ath6kl_wmi_startscan_cmd_33674 ath6kl_wmi_startscan_cmd 8 33674 NULL
++fuse_file_aio_write_46399 fuse_file_aio_write 4 46399 NULL
++mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL
++packet_snd_13634 packet_snd 3 13634 NULL
++alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
++osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
++sfi_map_table_5462 sfi_map_table 1 5462 NULL
++blk_msg_write_13655 blk_msg_write 3 13655 NULL
++scsi_vpd_inquiry_30040 scsi_vpd_inquiry 4 30040 NULL
++fwSendNullPacket_54618 fwSendNullPacket 2 54618 NULL
++drp_wmove_30043 drp_wmove 4 30043 NULL
++tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
++cache_downcall_13666 cache_downcall 3 13666 NULL
++xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
++ubi_leb_write_5478 ubi_leb_write 4-5 5478 NULL
++cifs_security_flags_proc_write_5484 cifs_security_flags_proc_write 3 5484 NULL
++cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
++sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
++debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
++tty_write_5494 tty_write 3 5494 NULL
++iscsi_ping_comp_event_38263 iscsi_ping_comp_event 5 38263 NULL
++tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL
++rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
++irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
++teiup_create_43201 teiup_create 3 43201 NULL
++dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
++filldir64_46469 filldir64 3 46469 NULL
++line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL nohasharray
++set_dis_disc_pfs_28225 set_dis_disc_pfs 3 28225 &line6_alloc_sysex_buffer_28225
++fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
++ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
++cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
++snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
++tg3_run_loopback_30093 tg3_run_loopback 2 30093 NULL
++spidev_message_5518 spidev_message 3 5518 NULL
++vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
++bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
++ezusb_writememory_45976 ezusb_writememory 4 45976 NULL
++evm_read_key_54674 evm_read_key 3 54674 NULL
++sctp_make_op_error_space_5528 sctp_make_op_error_space 3 5528 NULL
++l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
++qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
++do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
++em28xx_init_isoc_62883 em28xx_init_isoc 4 62883 NULL nohasharray
++aoechr_write_62883 aoechr_write 3 62883 &em28xx_init_isoc_62883
++resize_info_buffer_62889 resize_info_buffer 2 62889 NULL
++if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
++u32_array_read_2219 u32_array_read 3 2219 NULL
++pin_code_reply_46510 pin_code_reply 4 46510 NULL
++mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
++sys_add_key_61288 sys_add_key 4 61288 NULL
++kmsg_read_46514 kmsg_read 3 46514 NULL
++audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
++isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
++rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
++recv_stream_30138 recv_stream 4 30138 NULL
++u_memcpya_30139 u_memcpya 2-3 30139 NULL
++getdqbuf_62908 getdqbuf 1 62908 NULL
++bdx_rxdb_create_46525 bdx_rxdb_create 1 46525 NULL
++pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
++_add_sg_continuation_descriptor_54721 _add_sg_continuation_descriptor 3 54721 NULL
++fc_frame_alloc_fill_59394 fc_frame_alloc_fill 2 59394 NULL
++fir16_create_5574 fir16_create 3 5574 NULL
++ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
++pt_write_40159 pt_write 3 40159 NULL
++bioset_create_5580 bioset_create 1 5580 NULL
++ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
++fb_sys_read_13778 fb_sys_read 3 13778 NULL
++oz_ep_alloc_5587 oz_ep_alloc 2 5587 NULL
++kzalloc_54740 kzalloc 1 54740 NULL
++ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray
++mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918
++do_msgrcv_5590 do_msgrcv 4 5590 NULL
++wep_iv_read_54744 wep_iv_read 3 54744 NULL
++link_send_sections_long_46556 link_send_sections_long 4 46556 NULL
++ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
++iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
++batadv_iv_ogm_aggregate_new_54761 batadv_iv_ogm_aggregate_new 2 54761 NULL
++ldm_frag_add_5611 ldm_frag_add 2 5611 NULL
++cx25821_video_ioctl_30188 cx25821_video_ioctl 2 30188 NULL
++mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
++rxpipe_descr_host_int_trig_rx_data_read_22001 rxpipe_descr_host_int_trig_rx_data_read 3 22001 NULL nohasharray
++compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 3 22001 &rxpipe_descr_host_int_trig_rx_data_read_22001
++drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
++dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
++usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
++hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
++hidp_output_raw_report_5629 hidp_output_raw_report 3 5629 NULL
++nfs_idmap_request_key_30208 nfs_idmap_request_key 3 30208 NULL
++read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL
++flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
++snd_ac97_pcm_assign_30218 snd_ac97_pcm_assign 2 30218 NULL
++ti_recv_22027 ti_recv 4 22027 NULL
++ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2 34135 NULL
++ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
++nfsd_write_54809 nfsd_write 6 54809 NULL
++evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
++pcnet32_realloc_tx_ring_38428 pcnet32_realloc_tx_ring 3 38428 NULL
++posix_clock_register_5662 posix_clock_register 2 5662 NULL
++pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
++get_skb_63008 get_skb 2 63008 NULL
++zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
++netlink_send_38434 netlink_send 5 38434 NULL
++atalk_recvmsg_22053 atalk_recvmsg 4 22053 NULL
++compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL nohasharray
++alloc_trace_uprobe_13870 alloc_trace_uprobe 3 13870 &compat_ip_setsockopt_13870
++aircable_process_packet_46639 aircable_process_packet 5 46639 NULL
++generic_perform_write_54832 generic_perform_write 3 54832 NULL
++write_rio_54837 write_rio 3 54837 NULL
++nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 NULL
++__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL
++pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
++get_arg_5694 get_arg 3 5694 NULL
++isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL
++ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
++compat_readv_30273 compat_readv 3 30273 NULL
++printer_read_54851 printer_read 3 54851 NULL
++mem_rw_22085 mem_rw 3 22085 NULL
++i915_min_freq_read_38470 i915_min_freq_read 3 38470 NULL
++alloc_ep_req_54860 alloc_ep_req 2 54860 NULL
++lowpan_fragment_xmit_22095 lowpan_fragment_xmit 3-4 22095 NULL
++broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
++skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
++unlink1_63059 unlink1 3 63059 NULL
++picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL
++pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
++__do_krealloc_54389 __do_krealloc 2 54389 NULL
++tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
++tcf_csum_ipv6_tcp_54877 tcf_csum_ipv6_tcp 4 54877 NULL
++vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
++replay_log_leb_18704 replay_log_leb 3 18704 NULL
++rts51x_transfer_data_partial_5735 rts51x_transfer_data_partial 6 5735 NULL
++rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
++alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
++dev_names_read_38509 dev_names_read 3 38509 NULL
++iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
++sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5-2-3 63087 NULL
++get_packet_5747 get_packet 3 5747 NULL
++ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL
++drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
++event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
++iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
++ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
++erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
++ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
++lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL
++xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
++iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL
++_l2_alloc_skb_11883 _l2_alloc_skb 1 11883 NULL
++resource_from_user_30341 resource_from_user 3 30341 NULL
++scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
++sound_write_5102 sound_write 3 5102 NULL
++pn533_dep_link_up_22154 pn533_dep_link_up 5 22154 NULL
++iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
++irq_domain_add_simple_46734 irq_domain_add_simple 2 46734 NULL
++sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
++__vmalloc_node_flags_30352 __vmalloc_node_flags 1 30352 NULL
++btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
++tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
++com90xx_found_13974 com90xx_found 3 13974 NULL
++compat_sys_writev_5784 compat_sys_writev 3 5784 NULL
++qcam_read_13977 qcam_read 3 13977 NULL
++__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
++dvb_demux_read_13981 dvb_demux_read 3 13981 NULL
++virtblk_add_buf_wait_54943 virtblk_add_buf_wait 3-4 54943 NULL
++wl12xx_cmd_build_probe_req_54946 wl12xx_cmd_build_probe_req 6-8 54946 NULL
++irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL
++il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL
++generic_readlink_32654 generic_readlink 3 32654 NULL
++ieee80211_bss_info_update_13991 ieee80211_bss_info_update 4 13991 NULL
++sys_get_mempolicy_30379 sys_get_mempolicy 3 30379 NULL
++iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
++skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL
++wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
++trace_options_core_read_47390 trace_options_core_read 3 47390 NULL
++int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
++c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
++__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
++__proc_file_read_54978 __proc_file_read 3 54978 NULL
++concat_writev_21451 concat_writev 3 21451 NULL
++smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
++_queue_data_54983 _queue_data 4 54983 NULL
++_sys_packet_req_46793 _sys_packet_req 4 46793 NULL
++pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
++extend_netdev_table_21453 extend_netdev_table 2 21453 NULL
++rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL
++vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
++ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
++ixgb_check_copybreak_5847 ixgb_check_copybreak 3 5847 NULL
++setup_req_5848 setup_req 3 5848 NULL
++read_def_modal_eeprom_14041 read_def_modal_eeprom 3 14041 NULL
++rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
++rds_ib_inc_copy_to_user_55007 rds_ib_inc_copy_to_user 3 55007 NULL
++alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
++rbd_create_rw_ops_55297 rbd_create_rw_ops 1 55297 NULL
++compat_sys_move_pages_5861 compat_sys_move_pages 2 5861 NULL
++cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
++sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
++compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
++ext2_readpages_38640 ext2_readpages 4 38640 NULL
++cma_create_area_38642 cma_create_area 2 38642 NULL
++audit_init_entry_38644 audit_init_entry 1 38644 NULL
++sriov_enable_59689 sriov_enable 2 59689 NULL
++enable_write_30456 enable_write 3 30456 NULL
++shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
++tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
++mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
++zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
++tcp_manip_pkt_16563 tcp_manip_pkt 4 16563 NULL
++qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
++nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
++ieee80211_mgmt_tx_46860 ieee80211_mgmt_tx 9 46860 NULL
++port_show_regs_5904 port_show_regs 3 5904 NULL
++nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
++ptp_read_63251 ptp_read 4 63251 NULL
++uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
++compat_sys_pselect6_14105 compat_sys_pselect6 1 14105 NULL
++iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
++__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 NULL
++stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
++mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
++ttm_bo_kmap_ttm_5922 ttm_bo_kmap_ttm 3 5922 NULL
++o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
++bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
++iscsi_iser_recv_41948 iscsi_iser_recv 4 41948 NULL
++lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
++em28xx_alloc_isoc_46892 em28xx_alloc_isoc 4 46892 NULL
++read_dma_55086 read_dma 3 55086 NULL
++isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
++dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
++edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
++ntfs_rl_replace_14136 ntfs_rl_replace 2-4 14136 NULL
++ip_send_unicast_reply_38714 ip_send_unicast_reply 6 38714 NULL
++tcp_collapse_63294 tcp_collapse 6-5 63294 NULL
++alloc_trace_probe_38720 alloc_trace_probe 6 38720 NULL
++isdn_ppp_ccp_xmit_reset_63297 isdn_ppp_ccp_xmit_reset 6 63297 NULL
++rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL
++tipc_subseq_alloc_5957 tipc_subseq_alloc 1 5957 NULL
++em_canid_change_14150 em_canid_change 3 14150 NULL
++tracing_ctrl_read_46922 tracing_ctrl_read 3 46922 NULL
++gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
++fb_write_46924 fb_write 3 46924 NULL
++btmrvl_curpsmode_read_46939 btmrvl_curpsmode_read 3 46939 NULL
++wlcore_alloc_hw_22365 wlcore_alloc_hw 1 22365 NULL
++crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
++br_send_bpdu_29669 br_send_bpdu 3 29669 NULL
++disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
++evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
++__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
++udf_readpages_38761 udf_readpages 4 38761 NULL
++reada_add_block_54247 reada_add_block 2 54247 NULL
++ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
++proc_info_read_63344 proc_info_read 3 63344 NULL
++pep_indicate_38611 pep_indicate 5 38611 NULL
++set_le_30581 set_le 4 30581 NULL
++alloc_large_system_hash_22391 alloc_large_system_hash 2 22391 NULL
++btmrvl_psmode_read_22395 btmrvl_psmode_read 3 22395 NULL
++alloc_private_22399 alloc_private 2 22399 NULL
++snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
++ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
++zoran_write_22404 zoran_write 3 22404 NULL
++dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 NULL
++idmouse_read_63374 idmouse_read 3 63374 NULL
++queue_reply_22416 queue_reply 3 22416 NULL
++sgl_map_user_pages_30610 sgl_map_user_pages 2 30610 NULL
++sel_write_bool_46996 sel_write_bool 3 46996 NULL
++ntfs_rl_append_6037 ntfs_rl_append 2-4 6037 NULL
++dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
++ttm_bo_io_47000 ttm_bo_io 5 47000 NULL
++ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
++sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
++edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 NULL
++ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
++sched_feat_write_55202 sched_feat_write 3 55202 NULL
++dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4-2 14244 NULL
++snd_soc_hw_bulk_write_raw_14245 snd_soc_hw_bulk_write_raw 4 14245 NULL
++ht40allow_map_read_55209 ht40allow_map_read 3 55209 NULL nohasharray
++isdn_net_ciscohdlck_alloc_skb_55209 isdn_net_ciscohdlck_alloc_skb 2 55209 &ht40allow_map_read_55209
++compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
++sys_select_38827 sys_select 1 38827 NULL
++rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
++do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
++cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2 47024 NULL
++direct_entry_38836 direct_entry 3 38836 NULL
++__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
++gntdev_alloc_map_35145 gntdev_alloc_map 2 35145 NULL
++compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
++handle_received_packet_22457 handle_received_packet 3 22457 NULL
++ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
++write_head_30481 write_head 4 30481 NULL
++mem_cgroup_read_22461 mem_cgroup_read 5 22461 NULL
++set_dis_bypass_pfs_47038 set_dis_bypass_pfs 3 47038 NULL
++add_numbered_child_14273 add_numbered_child 5 14273 NULL
++l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
++OS_mem_token_alloc_14276 OS_mem_token_alloc 1 14276 NULL
++sep_prepare_input_output_dma_table_63429 sep_prepare_input_output_dma_table 2-4-3 63429 NULL
++register_unifi_sdio_55239 register_unifi_sdio 2 55239 NULL
++ath6kl_wmi_get_new_buf_52304 ath6kl_wmi_get_new_buf 1 52304 NULL
++agp_remap_30665 agp_remap 2 30665 NULL
++interfaces_38859 interfaces 2 38859 NULL
++memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
++nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
++ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
++cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
++qc_capture_19298 qc_capture 3 19298 NULL
++read_default_ldt_14302 read_default_ldt 2 14302 NULL
++dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
++alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
++pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
++rtl_port_map_2385 rtl_port_map 1-2 2385 NULL
++dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
++dbgfs_state_38894 dbgfs_state 3 38894 NULL
++sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
++snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
++nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
++process_bulk_data_command_38906 process_bulk_data_command 4 38906 NULL
++rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
++reada_find_extent_63486 reada_find_extent 2 63486 NULL
++read_kcore_63488 read_kcore 3 63488 NULL
++lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
++__skb_cow_39254 __skb_cow 2 39254 NULL
++gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
++__get_vm_area_node_55305 __get_vm_area_node 1 55305 NULL
++ffs_epfile_read_18775 ffs_epfile_read 3 18775 NULL
++rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
++ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
++pskb_may_pull_22546 pskb_may_pull 2 22546 NULL
++mousedev_read_47123 mousedev_read 3 47123 NULL
++rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
++agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
++vdma_mem_alloc_6171 vdma_mem_alloc 1 6171 NULL
++wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
++ses_recv_diag_47143 ses_recv_diag 4 47143 NULL nohasharray
++acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 &ses_recv_diag_47143
++alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
++vme_user_read_55338 vme_user_read 3 55338 NULL
++sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 NULL
++cxio_init_resource_fifo_random_47151 cxio_init_resource_fifo_random 3 47151 NULL
++persistent_ram_iomap_47156 persistent_ram_iomap 1-2 47156 NULL
++ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
++__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
++__hidp_send_ctrl_message_28303 __hidp_send_ctrl_message 4 28303 NULL
++rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
++append_to_buffer_63550 append_to_buffer 3 63550 NULL
++smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
++acpi_system_read_event_55362 acpi_system_read_event 3 55362 NULL
++dbg_leb_write_63555 dbg_leb_write 4-5 63555 NULL nohasharray
++kvm_write_guest_page_63555 kvm_write_guest_page 5 63555 &dbg_leb_write_63555
++snapshot_read_22601 snapshot_read 3 22601 NULL
++OSDSetBlock_38986 OSDSetBlock 4-2 38986 NULL
++v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
++mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
++mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
++ioremap_cache_47189 ioremap_cache 1-2 47189 NULL
++__send_to_port_55383 __send_to_port 3 55383 NULL
++rproc_alloc_63577 rproc_alloc 5 63577 NULL
++nf_nat_ipv4_manip_pkt_55387 nf_nat_ipv4_manip_pkt 2 55387 NULL
++smk_read_doi_30813 smk_read_doi 3 30813 NULL
++f_hidg_read_6238 f_hidg_read 3 6238 NULL
++proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
++sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
++get_nodes_39012 get_nodes 3 39012 NULL
++fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
++sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
++ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
++iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
++pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
++create_subvol_30836 create_subvol 4 30836 NULL
++mthca_map_reg_5664 mthca_map_reg 2-3 5664 NULL
++ci13xxx_add_device_14456 ci13xxx_add_device 3 14456 NULL
++iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
++_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
++sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
++read_oldmem_55658 read_oldmem 3 55658 NULL
++tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
++xenbus_file_write_6282 xenbus_file_write 3 6282 NULL
++options_write_47243 options_write 3 47243 NULL
++module_alloc_63630 module_alloc 1 63630 NULL
++alloc_skb_55439 alloc_skb 1 55439 NULL
++nf_nat_ipv6_manip_pkt_6289 nf_nat_ipv6_manip_pkt 2 6289 NULL
++portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
++ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
++ubifs_leb_write_22679 ubifs_leb_write 4-5 22679 NULL
++nf_nat_sack_adjust_6297 nf_nat_sack_adjust 2 6297 NULL
++proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
++mid_get_vbt_data_r10_6308 mid_get_vbt_data_r10 2 6308 NULL
++vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
++__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
++pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
++rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
++hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
++ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
++lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
++tty_audit_log_47280 tty_audit_log 8 47280 NULL
++alloc_libipw_22708 alloc_libipw 1 22708 NULL
++gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
++fc_host_post_vendor_event_30903 fc_host_post_vendor_event 3 30903 NULL
++vbi_read_63673 vbi_read 3 63673 NULL
++tun_get_user_39099 tun_get_user 4 39099 NULL
++i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
++alloc_tty_driver_63681 alloc_tty_driver 1 63681 NULL
++read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
++tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
++long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL
++nfc_hci_hcp_message_tx_14534 nfc_hci_hcp_message_tx 6 14534 NULL
++iommu_map_mmio_space_30919 iommu_map_mmio_space 1 30919 NULL
++ep0_write_14536 ep0_write 3 14536 NULL nohasharray
++dataflash_read_user_otp_14536 dataflash_read_user_otp 2-3 14536 &ep0_write_14536
++dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 2-3-5 4303 NULL
++cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4 22735 NULL
++ax25_output_22736 ax25_output 2 22736 NULL
++__kfifo_to_user_r_39123 __kfifo_to_user_r 3 39123 NULL
++l2cap_send_cmd_14548 l2cap_send_cmd 4 14548 NULL
++picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
++drm_vmalloc_dma_14550 drm_vmalloc_dma 1 14550 NULL
++cfpkt_pad_trail_55511 cfpkt_pad_trail 2 55511 NULL nohasharray
++tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 &cfpkt_pad_trail_55511
++cmtp_add_msgpart_9252 cmtp_add_msgpart 4 9252 NULL
++sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
++nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
++hid_input_report_32458 hid_input_report 4 32458 NULL
++_proc_do_string_6376 _proc_do_string 2 6376 NULL
++osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL
++read_cis_cache_29735 read_cis_cache 4 29735 NULL
++ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
++alloc_ring_39151 alloc_ring 2-4 39151 NULL
++proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
++create_bounce_buffer_39155 create_bounce_buffer 3 39155 NULL
++tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
++tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
++asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
++ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
++idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
++selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
++isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
++bt_skb_alloc_6404 bt_skb_alloc 1 6404 NULL
++get_info_55681 get_info 3 55681 NULL
++setkey_14987 setkey 3 14987 NULL
++__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
++init_list_set_39188 init_list_set 2-3 39188 NULL
++ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL
++snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
++l2up_create_6430 l2up_create 3 6430 NULL
++ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
++dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
++spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
++add_partition_55588 add_partition 2 55588 NULL
++lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
++snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
++depth_read_31112 depth_read 3 31112 NULL
++macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
++ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
++selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
++profile_replace_14652 profile_replace 3 14652 NULL
++vzalloc_47421 vzalloc 1 47421 NULL
++mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
++agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
++sys_writev_28384 sys_writev 3 28384 NULL
++batadv_tt_response_fill_table_39236 batadv_tt_response_fill_table 1 39236 NULL
++read_file_rcstat_22854 read_file_rcstat 3 22854 NULL
++__videobuf_copy_stream_44769 __videobuf_copy_stream 4 44769 NULL
++rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
++pktgen_if_write_55628 pktgen_if_write 3 55628 NULL
++create_attr_set_22861 create_attr_set 1 22861 NULL
++r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray
++pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250
++compat_sys_mq_timedsend_31060 compat_sys_mq_timedsend 3 31060 NULL
++sel_write_load_63830 sel_write_load 3 63830 NULL
++lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
++pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
++bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL
++dvb_dmxdev_set_buffer_size_55643 dvb_dmxdev_set_buffer_size 2 55643 NULL
++tsi148_master_set_14685 tsi148_master_set 4 14685 NULL
++ath6kl_wmi_set_appie_cmd_39266 ath6kl_wmi_set_appie_cmd 5 39266 NULL
++probe_bios_17467 probe_bios 1 17467 NULL
++vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
++ttm_bo_ioremap_31082 ttm_bo_ioremap 2-3 31082 NULL
++mei_read_6507 mei_read 3 6507 NULL
++lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
++mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
++rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
++sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
++il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
++SetArea_50835 SetArea 4 50835 NULL
++tpm_read_50344 tpm_read 3 50344 NULL
++newpart_47485 newpart 6 47485 NULL
++jffs2_do_link_42048 jffs2_do_link 6 42048 NULL
++compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3 31109 NULL
++core_sys_select_47494 core_sys_select 1 47494 NULL
++read_file_disable_ani_6536 read_file_disable_ani 3 6536 NULL
++sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
++__vmalloc_node_39308 __vmalloc_node 1 39308 NULL
++libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
++alloc_arraycache_47505 alloc_arraycache 2 47505 NULL
++unlink_simple_47506 unlink_simple 3 47506 NULL
++rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
++wdm_read_6549 wdm_read 3 6549 NULL
++init_map_ipmac_63896 init_map_ipmac 4-3 63896 NULL
++tipc_multicast_49144 tipc_multicast 5 49144 NULL
++nfs4_realloc_slot_table_22859 nfs4_realloc_slot_table 2 22859 NULL
++fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
++xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL
++__videobuf_alloc_uncached_55711 __videobuf_alloc_uncached 1 55711 NULL
++rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
++nfc_hci_send_cmd_55714 nfc_hci_send_cmd 5 55714 NULL
++pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
++filter_read_61692 filter_read 3 61692 NULL
++mtdswap_init_55719 mtdswap_init 2 55719 NULL
++rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
++debugfs_read_62535 debugfs_read 3 62535 NULL
++w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
++process_vm_rw_47533 process_vm_rw 3-5 47533 NULL
++divas_write_63901 divas_write 3 63901 NULL
++alloc_sglist_22960 alloc_sglist 1-2-3 22960 NULL
++caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
++snd_compr_write_63923 snd_compr_write 3 63923 NULL
++cfpkt_split_47541 cfpkt_split 2 47541 NULL
++__copy_from_user_nocache_39351 __copy_from_user_nocache 3 39351 NULL
++btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
++__iio_allocate_kfifo_55738 __iio_allocate_kfifo 3-2 55738 NULL
++ipw_write_59807 ipw_write 3 59807 NULL
++sta_dev_read_14782 sta_dev_read 3 14782 NULL
++tipc_send2port_63935 tipc_send2port 5 63935 NULL
++do_write_log_from_user_39362 do_write_log_from_user 3 39362 NULL
++ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
++afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
++mwifiex_cfg80211_mgmt_tx_12022 mwifiex_cfg80211_mgmt_tx 9 12022 NULL
++cycx_setup_47562 cycx_setup 4 47562 NULL
++remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
++ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
++set_local_name_55757 set_local_name 4 55757 NULL
++printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
++btrfs_init_new_buffer_55761 btrfs_init_new_buffer 4 55761 NULL
++read_ldt_47570 read_ldt 2 47570 NULL
++regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
++pci_iomap_47575 pci_iomap 3 47575 NULL
++acpi_ex_system_memory_space_handler_31192 acpi_ex_system_memory_space_handler 2 31192 NULL
++kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
++module_alloc_update_bounds_rw_63233 module_alloc_update_bounds_rw 1 63233 NULL
++ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
++drm_ht_create_18853 drm_ht_create 2 18853 NULL
++mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
++qlcnic_alloc_msix_entries_46160 qlcnic_alloc_msix_entries 2 46160 NULL
++ieee80211_authentication_req_63973 ieee80211_authentication_req 3 63973 NULL
++dn_alloc_skb_6631 dn_alloc_skb 2 6631 NULL
++conf_read_55786 conf_read 3 55786 NULL
++do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
++rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
++viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
++virtscsi_alloc_tgt_6643 virtscsi_alloc_tgt 2 6643 NULL
++atm_get_addr_31221 atm_get_addr 3 31221 NULL
++user_power_read_39414 user_power_read 3 39414 NULL
++uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
++uea_request_47613 uea_request 4 47613 NULL
++cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
++read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
++alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
++btrfs_find_create_tree_block_55812 btrfs_find_create_tree_block 3 55812 NULL
++subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
++lcd_write_14857 lcd_write 3 14857 NULL nohasharray
++__krealloc_14857 __krealloc 2 14857 &lcd_write_14857
++_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
++get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
++kmemdup_64015 kmemdup 2 64015 NULL
++compat_sys_select_16131 compat_sys_select 1 16131 NULL
++reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
++unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
++process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
++tcf_csum_skb_nextlayer_64025 tcf_csum_skb_nextlayer 3 64025 NULL
++oz_events_read_47535 oz_events_read 3 47535 NULL
++sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL
++resize_async_buffer_64031 resize_async_buffer 4 64031 NULL
++sys_semop_39457 sys_semop 3 39457 NULL
++vm_map_ram_23078 vm_map_ram 2 23078 NULL nohasharray
++raw_sendmsg_23078 raw_sendmsg 4 23078 &vm_map_ram_23078
++update_pmkid_2481 update_pmkid 4 2481 NULL
++sriov_enable_migration_14889 sriov_enable_migration 2 14889 NULL
++sep_lli_table_secure_dma_64042 sep_lli_table_secure_dma 2-3 64042 NULL
++ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
++acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
++hysdn_rx_netpkt_16136 hysdn_rx_netpkt 3 16136 NULL
++setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
++rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
++mpeg_read_6708 mpeg_read 3 6708 NULL
++hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
++ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL
++sky2_receive_13407 sky2_receive 2 13407 NULL
++krealloc_14908 krealloc 2 14908 NULL
++pipe_iov_copy_from_user_23102 pipe_iov_copy_from_user 3 23102 NULL
++bt_skb_send_alloc_6581 bt_skb_send_alloc 2 6581 NULL
++dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
++gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
++video_proc_write_6724 video_proc_write 3 6724 NULL
++xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
++mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
++uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
++ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
++qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
++drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
++pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
++packet_recvmsg_47700 packet_recvmsg 4 47700 NULL
++command_file_write_31318 command_file_write 3 31318 NULL
++gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
++lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
++wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
++i915_cache_sharing_read_24775 i915_cache_sharing_read 3 24775 NULL
++array_zalloc_7519 array_zalloc 1-2 7519 NULL
++tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
++ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
++unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
++ca91cx42_master_set_23146 ca91cx42_master_set 4 23146 NULL
++videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
++ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
++sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
++vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
++sfi_check_table_6772 sfi_check_table 1 6772 NULL
++bits_to_user_47733 bits_to_user 2-3 47733 NULL
++int_proc_write_39542 int_proc_write 3 39542 NULL
++do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 NULL nohasharray
++intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 &do_dccp_setsockopt_54377
++read_file_ani_23161 read_file_ani 3 23161 NULL
++carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
++iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
++ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
++pp_write_39554 pp_write 3 39554 NULL
++ioremap_23172 ioremap 1-2 23172 NULL
++mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
++hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
++usblp_write_23178 usblp_write 3 23178 NULL
++sel_read_policy_55947 sel_read_policy 3 55947 NULL
++xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
++vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3 31374 NULL
++tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
++datablob_format_39571 datablob_format 2 39571 NULL nohasharray
++ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571
++fix_unclean_leb_23188 fix_unclean_leb 3 23188 NULL
++simple_read_from_buffer_55957 simple_read_from_buffer 2-5 55957 NULL
++dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
++vmalloc_32_1135 vmalloc_32 1 1135 NULL
++tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
++tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
++__team_options_register_63941 __team_options_register 3 63941 NULL
++error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
++ip_ufo_append_data_12775 ip_ufo_append_data 6-7-8 12775 NULL
++rvmalloc_46873 rvmalloc 1 46873 NULL
++vmap_15025 vmap 2 15025 NULL
++key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
++mcs7830_set_reg_31413 mcs7830_set_reg 3 31413 NULL
++mon_bin_read_6841 mon_bin_read 3 6841 NULL
++tty_buffer_request_room_23228 tty_buffer_request_room 2 23228 NULL
++xlog_get_bp_23229 xlog_get_bp 2 23229 NULL
++snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
++nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
++rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
++TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
++ttm_object_device_init_10321 ttm_object_device_init 2 10321 NULL
++ping_recvmsg_25597 ping_recvmsg 4 25597 NULL
++macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
++ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL
++cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
++ssb_bus_pcmciabus_register_56020 ssb_bus_pcmciabus_register 3 56020 NULL
++fm_send_cmd_39639 fm_send_cmd 5 39639 NULL
++ip6gre_err_19869 ip6gre_err 5 19869 NULL
++nvme_alloc_iod_56027 nvme_alloc_iod 1 56027 NULL
++opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
++nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
++ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5 15072 NULL
++sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
++snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
++get_new_cssid_51665 get_new_cssid 2 51665 NULL
++raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 NULL
++prism2_info_hostscanresults_39657 prism2_info_hostscanresults 3 39657 NULL
++ced_ioctl_36647 ced_ioctl 2 36647 NULL
++dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
++__videobuf_alloc_vb_5665 __videobuf_alloc_vb 1 5665 NULL
++kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
++redrat3_transmit_ir_64244 redrat3_transmit_ir 3 64244 NULL
++__alloc_extent_buffer_15093 __alloc_extent_buffer 3 15093 NULL
++v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
++dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
++alg_setkey_31485 alg_setkey 3 31485 NULL
++do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
++spi_show_regs_6911 spi_show_regs 3 6911 NULL nohasharray
++proc_sessionid_read_6911 proc_sessionid_read 3 6911 &spi_show_regs_6911
++qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
++vhci_read_47878 vhci_read 3 47878 NULL
++__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
++ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
++i2cdev_write_23310 i2cdev_write 3 23310 NULL
++keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
++kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
++ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
++event_id_read_64288 event_id_read 3 64288 NULL nohasharray
++xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 &event_id_read_64288
++osd_req_read_sg_47905 osd_req_read_sg 5 47905 NULL
++sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
++pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
++timeout_read_47915 timeout_read 3 47915 NULL
++hidraw_write_31536 hidraw_write 3 31536 NULL
++error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
++page_readlink_23346 page_readlink 3 23346 NULL
++videobuf_dma_init_kernel_6963 videobuf_dma_init_kernel 3 6963 NULL
++comedi_write_47926 comedi_write 3 47926 NULL
++usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
++dsp_write_46218 dsp_write 2 46218 NULL
++kmem_zalloc_large_56128 kmem_zalloc_large 1 56128 NULL
++usbvision_read_31555 usbvision_read 3 31555 NULL
++pd_video_read_24510 pd_video_read 3 24510 NULL
++crypto_authenc_esn_setkey_6985 crypto_authenc_esn_setkey 3 6985 NULL
++sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
++request_key_async_6990 request_key_async 4 6990 NULL
++ts_write_64336 ts_write 3 64336 NULL
++handle_response_55951 handle_response 5 55951 NULL
++usbtmc_write_64340 usbtmc_write 3 64340 NULL
++tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
++r871x_set_wpa_ie_7000 r871x_set_wpa_ie 3 7000 NULL
++iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
++osst_write_31581 osst_write 3 31581 NULL
++tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
++rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
++wm8350_block_write_19727 wm8350_block_write 3 19727 NULL
++diva_xdi_write_63975 diva_xdi_write 4 63975 NULL
++llc_alloc_frame_64366 llc_alloc_frame 4 64366 NULL
++iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 NULL nohasharray
++mempool_resize_47983 mempool_resize 2 47983 &iwl_dbgfs_ucode_tracing_read_47983
++mangle_packet_18920 mangle_packet 7-9 18920 NULL
++bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
++tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
++iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
++ib_umad_write_47993 ib_umad_write 3 47993 NULL
++ilo_write_64378 ilo_write 3 64378 NULL
++btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
++nilfs_alloc_seg_bio_64383 nilfs_alloc_seg_bio 3 64383 NULL
++vzalloc_node_23424 vzalloc_node 1 23424 NULL
++arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 NULL
++ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
++variax_alloc_sysex_buffer_15237 variax_alloc_sysex_buffer 3 15237 NULL
++copy_from_user_17559 copy_from_user 3 17559 NULL
++ffs_epfile_write_48014 ffs_epfile_write 3 48014 NULL
++sys_migrate_pages_39825 sys_migrate_pages 2 39825 NULL
++ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
++pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
++videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
++rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 NULL
++hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
++beiscsi_process_async_pdu_39834 beiscsi_process_async_pdu 7 39834 NULL
++sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
++hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
++snd_card_create_64418 snd_card_create 4 64418 NULL nohasharray
++keyctl_get_security_64418 keyctl_get_security 3 64418 &snd_card_create_64418
++pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
++cp210x_get_config_56229 cp210x_get_config 4 56229 NULL
++pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
++udl_prime_create_57159 udl_prime_create 2 57159 NULL
++oom_adj_write_64428 oom_adj_write 3 64428 NULL
++dn_nsp_send_disc_23469 dn_nsp_send_disc 2 23469 NULL
++do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
++ping_sendmsg_3782 ping_sendmsg 4 3782 NULL
++beacon_interval_read_7091 beacon_interval_read 3 7091 NULL
++__lgread_31668 __lgread 4 31668 NULL
++scrub_setup_recheck_block_56245 scrub_setup_recheck_block 4-3 56245 NULL
++fd_copyin_56247 fd_copyin 3 56247 NULL
++wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
++ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
++sys_connect_15291 sys_connect 3 15291 NULL nohasharray
++xlate_dev_mem_ptr_15291 xlate_dev_mem_ptr 1 15291 &sys_connect_15291
++linear_conf_23485 linear_conf 2 23485 NULL nohasharray
++divasa_remap_pci_bar_23485 divasa_remap_pci_bar 3-4 23485 &linear_conf_23485
++posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
++ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
++_usb_writeN_sync_31682 _usb_writeN_sync 4 31682 NULL
++pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
++forced_ps_read_31685 forced_ps_read 3 31685 NULL
++event_filter_read_23494 event_filter_read 3 23494 NULL
++tpm_tis_init_15304 tpm_tis_init 2-3 15304 NULL
++fcoe_ctlr_send_keep_alive_15308 fcoe_ctlr_send_keep_alive 3 15308 NULL
++pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
++sys_setsockopt_35320 sys_setsockopt 5 35320 NULL
++il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
++pkt_add_39897 pkt_add 3 39897 NULL
++RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
++send_mpa_reject_7135 send_mpa_reject 3 7135 NULL
++sctp_make_op_error_7057 sctp_make_op_error 5-6 7057 NULL
++mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
++read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
++skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
++dvb_aplay_56296 dvb_aplay 3 56296 NULL
++gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
++dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
++p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
++sctp_make_asconf_ack_31726 sctp_make_asconf_ack 3 31726 NULL
++aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
++ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
++alloc_ring_15345 alloc_ring 2-4 15345 NULL
++alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
++remove_uuid_64505 remove_uuid 4 64505 NULL
++shmem_pwrite_slow_31741 shmem_pwrite_slow 3 31741 NULL
++NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 NULL
++create_table_16213 create_table 2 16213 NULL
++acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
++pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
++dbg_leb_change_23555 dbg_leb_change 4 23555 NULL
++vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
++bcm_char_read_31750 bcm_char_read 3 31750 NULL
++snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
++journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
++set_discoverable_48141 set_discoverable 4 48141 NULL
++compat_sys_process_vm_readv_15374 compat_sys_process_vm_readv 3-5 15374 NULL
++ses_send_diag_64527 ses_send_diag 4 64527 NULL
++tcp_match_skb_to_sack_23568 tcp_match_skb_to_sack 4 23568 NULL
++snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
++fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
++tty_prepare_flip_string_39955 tty_prepare_flip_string 3 39955 NULL
++__tcp_push_pending_frames_48148 __tcp_push_pending_frames 2 48148 NULL
++iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
++prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
++ipv6_recv_error_56347 ipv6_recv_error 3 56347 NULL
++vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
++isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
++c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
++dma_push_rx_39973 dma_push_rx 2 39973 NULL
++regmap_register_patch_21681 regmap_register_patch 3 21681 NULL
++broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
++cfpkt_create_pfx_23594 cfpkt_create_pfx 1-2 23594 NULL
++pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
++iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 4 56368 NULL
++dev_read_56369 dev_read 3 56369 NULL
++mthca_array_init_39987 mthca_array_init 2 39987 NULL
++alloc_dummy_extent_buffer_56374 alloc_dummy_extent_buffer 2 56374 NULL
++diva_os_alloc_message_buffer_64568 diva_os_alloc_message_buffer 1 64568 NULL
++dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
++alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
++init_ipath_48187 init_ipath 1 48187 NULL
++isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
++__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4 15423 NULL
++tracing_saved_cmdlines_read_21434 tracing_saved_cmdlines_read 3 21434 NULL
++tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
++sys32_ipc_7238 sys32_ipc 3 7238 NULL
++sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
++rtllib_alloc_txb_21687 rtllib_alloc_txb 1-2 21687 NULL
++dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
++ddp_ppod_write_idata_25610 ddp_ppod_write_idata 5 25610 NULL
++ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
++nf_nat_icmpv6_reply_translation_40023 nf_nat_icmpv6_reply_translation 5 40023 NULL nohasharray
++ivtvfb_write_40023 ivtvfb_write 3 40023 &nf_nat_icmpv6_reply_translation_40023
++hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
++tcp_write_xmit_64602 tcp_write_xmit 2 64602 NULL
++use_pool_64607 use_pool 2 64607 NULL
++__get_vm_area_caller_56416 __get_vm_area_caller 1 56416 NULL nohasharray
++acpi_os_write_memory_56416 acpi_os_write_memory 1-3 56416 &__get_vm_area_caller_56416
++store_msg_56417 store_msg 3 56417 NULL
++__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
++nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
++datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
++read_file_recv_48232 read_file_recv 3 48232 NULL
++xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
++set_tpl_pfs_27490 set_tpl_pfs 3 27490 NULL
++fanotify_write_64623 fanotify_write 3 64623 NULL
++batadv_add_packet_12136 batadv_add_packet 3 12136 NULL
++rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL
++fl_create_56435 fl_create 5 56435 NULL
++gnttab_map_56439 gnttab_map 2 56439 NULL
++nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
++nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
++event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
++cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2 56453 NULL
++drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
++set_connectable_56458 set_connectable 4 56458 NULL
++a2mp_chan_alloc_skb_cb_27159 a2mp_chan_alloc_skb_cb 2 27159 NULL
++nfc_hci_send_response_56462 nfc_hci_send_response 5 56462 NULL
++add_port_54941 add_port 2 54941 NULL
++osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
++cx18_read_23699 cx18_read 3 23699 NULL
++tlbflush_read_file_64661 tlbflush_read_file 3 64661 NULL
++ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
++efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL
++rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL
++ddb_output_write_31902 ddb_output_write 3 31902 NULL
++send_set_info_48288 send_set_info 7 48288 NULL
++sock_alloc_send_skb_23720 sock_alloc_send_skb 2 23720 NULL
++wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
++set_disc_pwup_pfs_48300 set_disc_pwup_pfs 3 48300 NULL
++lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
++p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
++new_dir_31919 new_dir 3 31919 NULL
++kmem_alloc_31920 kmem_alloc 1 31920 NULL
++timblogiw_read_48305 timblogiw_read 3 48305 NULL
++sec_bulk_write_64691 sec_bulk_write 3 64691 NULL
++mgmt_control_7349 mgmt_control 3 7349 NULL
++hash_setkey_48310 hash_setkey 3 48310 NULL
++ql_process_mac_rx_page_15543 ql_process_mac_rx_page 4 15543 NULL
++hfcpci_empty_fifo_2427 hfcpci_empty_fifo 4 2427 NULL
++ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
++sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
++cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL
++rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
++iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4 31942 NULL
++ql_process_mac_rx_skb_6689 ql_process_mac_rx_skb 4 6689 NULL
++ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
++pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
++dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
++vb2_write_31948 vb2_write 3 31948 NULL
++cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
++bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
++l1oip_socket_recv_56537 l1oip_socket_recv 6 56537 NULL
++ip_options_get_56538 ip_options_get 4 56538 NULL
++write_62671 write 3 62671 NULL
++copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
++tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
++squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
++sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
++ceph_copy_page_vector_to_user_31270 ceph_copy_page_vector_to_user 3-4 31270 NULL
++allocate_cnodes_5329 allocate_cnodes 1 5329 NULL
++skb_add_data_48363 skb_add_data 3 48363 NULL
++bio_map_kern_64751 bio_map_kern 3 64751 NULL
++alloc_apertures_56561 alloc_apertures 1 56561 NULL
++iscsi_complete_pdu_48372 iscsi_complete_pdu 4 48372 NULL
++drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
++rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
++rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
++debug_debug2_read_30526 debug_debug2_read 3 30526 NULL
++compat_fillonedir_15620 compat_fillonedir 3 15620 NULL
++set_dis_tap_pfs_15621 set_dis_tap_pfs 3 15621 NULL
++ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL
++dsp_cmx_send_member_15625 dsp_cmx_send_member 2 15625 NULL
++portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
++system_enable_read_25815 system_enable_read 3 25815 NULL
++allocate_probes_40204 allocate_probes 1 40204 NULL
++sd_alloc_ctl_entry_29708 sd_alloc_ctl_entry 1 29708 NULL
++proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
++__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
++realloc_buffer_25816 realloc_buffer 2 25816 NULL
++isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
++rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
++ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
++tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray
++pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &tomoyo_scan_bprm_15642
++ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
++au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
++lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
++fs_path_add_15648 fs_path_add 3 15648 NULL
++event_filter_write_56609 event_filter_write 3 56609 NULL
++xfs_buf_read_map_40226 xfs_buf_read_map 3 40226 NULL
++ms_rw_multi_sector_7459 ms_rw_multi_sector 3-4 7459 NULL
++xsd_read_15653 xsd_read 3 15653 NULL
++pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
++p54_init_common_23850 p54_init_common 1 23850 NULL
++ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL
++vmw_cursor_update_dmabuf_32045 vmw_cursor_update_dmabuf 3-4 32045 NULL
++sys_sched_setaffinity_32046 sys_sched_setaffinity 2 32046 NULL
++garp_request_join_7471 garp_request_join 4 7471 NULL
++ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
++copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
++unifi_read_14899 unifi_read 3 14899 NULL
++il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
++compat_sys_msgrcv_7482 compat_sys_msgrcv 2 7482 NULL
++do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
++brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
++proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
++pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
++ipv6_recv_rxpmtu_7142 ipv6_recv_rxpmtu 3 7142 NULL
++ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
++uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
++ieee80211_if_read_channel_type_23884 ieee80211_if_read_channel_type 3 23884 NULL
++tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
++tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
++uf_sme_queue_message_15697 uf_sme_queue_message 3 15697 NULL
++gdth_search_isa_58595 gdth_search_isa 1 58595 NULL
++sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 NULL
++_xfs_buf_get_pages_46811 _xfs_buf_get_pages 2 46811 NULL
++rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
++iwch_reject_cr_23901 iwch_reject_cr 3 23901 NULL
++altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
++bio_alloc_32095 bio_alloc 2 32095 NULL
++shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
++rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
++ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
++add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL
++r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
++snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL
++ubi_io_write_data_40305 ubi_io_write_data 4-5 40305 NULL
++send_control_msg_48498 send_control_msg 6 48498 NULL
++ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
++mlx4_en_create_tx_ring_48501 mlx4_en_create_tx_ring 4 48501 NULL
++ffs_epfile_io_64886 ffs_epfile_io 3 64886 NULL
++request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
++diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
++dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3 56702 NULL
++uvc_alloc_entity_20836 uvc_alloc_entity 4-3 20836 NULL
++batadv_tt_changes_fill_buff_40323 batadv_tt_changes_fill_buff 4 40323 NULL
++__alloc_skb_23940 __alloc_skb 1 23940 NULL
++sta_flags_read_56710 sta_flags_read 3 56710 NULL
++ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
++HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
++smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
++alloc_tx_32143 alloc_tx 2 32143 NULL
++wiimote_hid_send_48528 wiimote_hid_send 3 48528 NULL
++compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
++hsc_write_55875 hsc_write 3 55875 NULL
++cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
++do_test_15766 do_test 1 15766 NULL
++ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
++ip_recv_error_23109 ip_recv_error 3 23109 NULL
++named_distribute_48544 named_distribute 4 48544 NULL
++ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
++venus_link_32165 venus_link 5 32165 NULL
++event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
++drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
++vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
++btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
++set_std_nic_pfs_15792 set_std_nic_pfs 3 15792 NULL
++ubifs_wbuf_write_nolock_64946 ubifs_wbuf_write_nolock 3 64946 NULL
++usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
++llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
++smk_read_direct_15803 smk_read_direct 3 15803 NULL
++fwnet_incoming_packet_40380 fwnet_incoming_packet 3 40380 NULL
++groups_alloc_7614 groups_alloc 1 7614 NULL
++cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
++traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
++suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
++ext_sd_execute_read_data_48589 ext_sd_execute_read_data 9 48589 NULL
++afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
++__carl9170_rx_56784 __carl9170_rx 3 56784 NULL
++__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL
++oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
++ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
++tcf_csum_ipv4_tcp_39713 tcf_csum_ipv4_tcp 4 39713 NULL
++snapshot_write_28351 snapshot_write 3 28351 NULL
++event_enable_read_7074 event_enable_read 3 7074 NULL
++brcmf_sdbrcm_died_dump_15841 brcmf_sdbrcm_died_dump 3 15841 NULL
++do_syslog_56807 do_syslog 3 56807 NULL
++sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
++pskb_pull_65005 pskb_pull 2 65005 NULL
++caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
++lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
++sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
++unifi_write_65012 unifi_write 3 65012 NULL
++agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL
++nfs_readdata_alloc_65015 nfs_readdata_alloc 2 65015 NULL
++ubi_io_write_15870 ubi_io_write 5-4 15870 NULL nohasharray
++media_entity_init_15870 media_entity_init 2-4 15870 &ubi_io_write_15870
++mtdchar_write_56831 mtdchar_write 3 56831 NULL nohasharray
++ntfs_rl_realloc_56831 ntfs_rl_realloc 3 56831 &mtdchar_write_56831
++skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
++mid_get_vbt_data_r1_26170 mid_get_vbt_data_r1 2 26170 NULL
++skb_copy_expand_7685 skb_copy_expand 2-3 7685 NULL nohasharray
++acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 &skb_copy_expand_7685
++if_write_51756 if_write 3 51756 NULL
++insert_dent_65034 insert_dent 7 65034 NULL
++blkcipher_copy_iv_24075 blkcipher_copy_iv 3 24075 NULL
++snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4 56847 NULL
++vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
++brcmf_sdcard_rwdata_65041 brcmf_sdcard_rwdata 5 65041 NULL
++nfs_map_group_to_gid_15892 nfs_map_group_to_gid 3 15892 NULL
++lc_create_48662 lc_create 3 48662 NULL
++aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
++sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL nohasharray
++sys_setgroups_48668 sys_setgroups 1 48668 &sm501_create_subdev_48668
++ath9k_multi_regread_65056 ath9k_multi_regread 4 65056 NULL
++brcmf_sdcard_send_buf_7713 brcmf_sdcard_send_buf 6 7713 NULL
++l2cap_build_cmd_48676 l2cap_build_cmd 4 48676 NULL
++batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
++pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
++request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
++bnx2fc_process_l2_frame_compl_65072 bnx2fc_process_l2_frame_compl 3 65072 NULL
++__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
++persistent_ram_new_40501 persistent_ram_new 1-2 40501 NULL
++ieee80211_send_auth_24121 ieee80211_send_auth 5 24121 NULL
++altera_drscan_48698 altera_drscan 2 48698 NULL
++tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
++set_bypass_pwup_pfs_7742 set_bypass_pwup_pfs 3 7742 NULL
++kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
++power_read_15939 power_read 3 15939 NULL
++recv_msg_48709 recv_msg 4 48709 NULL
++befs_utf2nls_25628 befs_utf2nls 3 25628 NULL
++ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
++TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL
++btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL
++irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
++nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
++process_vm_rw_pages_15954 process_vm_rw_pages 6-5 15954 NULL
++revalidate_19043 revalidate 2 19043 NULL
++t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
++aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 NULL
++trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
++alloc_candev_7776 alloc_candev 1-2 7776 NULL
++check_header_56930 check_header 2 56930 NULL
++ima_write_policy_40548 ima_write_policy 3 40548 NULL
++journal_init_revoke_56933 journal_init_revoke 2 56933 NULL
++__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
++ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
++sel_read_initcon_32362 sel_read_initcon 3 32362 NULL
++ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
++frame_alloc_15981 frame_alloc 4 15981 NULL
++esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL
++nf_nat_seq_adjust_44989 nf_nat_seq_adjust 4 44989 NULL
++diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL
++adu_read_24177 adu_read 3 24177 NULL
++alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
++send_mpa_reply_32372 send_mpa_reply 3 32372 NULL
++alloc_vm_area_15989 alloc_vm_area 1 15989 NULL
++variax_set_raw2_32374 variax_set_raw2 4 32374 NULL
++vfd_write_14717 vfd_write 3 14717 NULL
++carl9170_rx_copy_data_21656 carl9170_rx_copy_data 2 21656 NULL
++usbtmc_read_32377 usbtmc_read 3 32377 NULL
++qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
++l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL
++dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
++cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
++rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
++xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
++viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
++__cxio_init_resource_fifo_23447 __cxio_init_resource_fifo 3 23447 NULL
++skge_rx_get_40598 skge_rx_get 3 40598 NULL
++nouveau_device_create__56984 nouveau_device_create_ 6 56984 NULL
++register_device_60015 register_device 2-3 60015 NULL
++got_frame_16028 got_frame 2 16028 NULL
++ssb_bus_register_65183 ssb_bus_register 3 65183 NULL
++pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 1-2-3 24224 NULL
++il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
++scsi_register_49094 scsi_register 2 49094 NULL
++twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
++vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
++sel_read_bool_24236 sel_read_bool 3 24236 NULL
++batadv_check_unicast_packet_10866 batadv_check_unicast_packet 2 10866 NULL
++tcp_push_one_48816 tcp_push_one 2 48816 NULL
++nfulnl_alloc_skb_65207 nfulnl_alloc_skb 2 65207 NULL
++dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
++gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
++atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
++rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
++vc_do_resize_48842 vc_do_resize 3-4 48842 NULL
++svc_pool_map_alloc_arrays_47181 svc_pool_map_alloc_arrays 2 47181 NULL
++create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
++dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
++snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
++xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
++compat_sys_preadv64_24283 compat_sys_preadv64 3 24283 NULL
++pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
++viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 NULL
++wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
++__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
++cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
++isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
++sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
++mid_get_vbt_data_r0_10876 mid_get_vbt_data_r0 2 10876 NULL
++pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
++ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
++dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 NULL nohasharray
++isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 &dma_tx_requested_read_16110
++sys_setgroups16_48882 sys_setgroups16 1 48882 NULL
++kmem_zalloc_greedy_65268 kmem_zalloc_greedy 3-2 65268 NULL
++nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
++f_hidg_write_7932 f_hidg_write 3 7932 NULL
++ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
++kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
++mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
++mac_drv_rx_init_48898 mac_drv_rx_init 2 48898 NULL
++sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
++xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
++compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
++fsm_init_16134 fsm_init 2 16134 NULL
++ext_sd_execute_write_data_8175 ext_sd_execute_write_data 9 8175 NULL
++tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
++disconnect_32521 disconnect 4 32521 NULL
++__seq_open_private_40715 __seq_open_private 3 40715 NULL
++tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
++ath6kl_wmi_add_wow_pattern_cmd_12842 ath6kl_wmi_add_wow_pattern_cmd 4 12842 NULL
++mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
++redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
++ilo_read_32531 ilo_read 3 32531 NULL
++ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
++smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
++pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
++sysfs_write_file_57116 sysfs_write_file 3 57116 NULL
++gdth_isa_probe_one_48925 gdth_isa_probe_one 1 48925 NULL
++kzalloc_node_24352 kzalloc_node 1 24352 NULL
++nfc_hci_execute_cmd_async_65314 nfc_hci_execute_cmd_async 5 65314 NULL
++msnd_fifo_alloc_23179 msnd_fifo_alloc 2 23179 NULL
++format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
++nfcwilink_skb_alloc_16167 nfcwilink_skb_alloc 1 16167 NULL
++xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL
++remap_pci_mem_15966 remap_pci_mem 1-2 15966 NULL
++qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
++cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
++btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
++aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
++card_send_command_40757 card_send_command 3 40757 NULL
++sys_mbind_7990 sys_mbind 5 7990 NULL
++dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
++pg_write_40766 pg_write 3 40766 NULL
++event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
++uea_idma_write_64139 uea_idma_write 3 64139 NULL
++brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL
++carl9170_rx_stream_1334 carl9170_rx_stream 3 1334 NULL
++nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
++ath_descdma_setup_12257 ath_descdma_setup 5 12257 NULL
++alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
++dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
++batadv_orig_hash_del_if_48972 batadv_orig_hash_del_if 2 48972 NULL
++tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
++pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 NULL nohasharray
++getxattr_24398 getxattr 4 24398 &pvr2_v4l2_ioctl_24398
++stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
++vcs_read_8017 vcs_read 3 8017 NULL
++read_file_beacon_32595 read_file_beacon 3 32595 NULL
++gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
++rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
++iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
++_alloc_set_attr_list_48991 _alloc_set_attr_list 4 48991 NULL
++sys_set_mempolicy_32608 sys_set_mempolicy 3 32608 NULL
++atomic_read_file_16227 atomic_read_file 3 16227 NULL
++vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
++copy_and_check_19089 copy_and_check 3 19089 NULL
++b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
++netdev_alloc_skb_ip_align_40811 netdev_alloc_skb_ip_align 2 40811 NULL
++i915_wedged_read_35474 i915_wedged_read 3 35474 NULL
++ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
++iser_rcv_completion_8048 iser_rcv_completion 2 8048 NULL
++trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
++ms_read_multiple_pages_8052 ms_read_multiple_pages 5-4 8052 NULL
++__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
++trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
++ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 4-6 24439 NULL
++smk_user_access_24440 smk_user_access 3 24440 NULL
++xd_rw_49020 xd_rw 3-4 49020 NULL
++dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
++tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
++mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
++kvmalloc_32646 kvmalloc 1 32646 NULL
++alloc_targets_8074 alloc_targets 2 8074 NULL nohasharray
++qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 &alloc_targets_8074
++evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
++drm_calloc_large_65421 drm_calloc_large 1-2 65421 NULL
++set_disc_pfs_16270 set_disc_pfs 3 16270 NULL
++skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL
++__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
++caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL
++drbd_setsockopt_16280 drbd_setsockopt 5 16280 NULL nohasharray
++nand_bch_init_16280 nand_bch_init 3-2 16280 &drbd_setsockopt_16280
++xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
++v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
++fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
++pn533_init_target_frame_65438 pn533_init_target_frame 3 65438 NULL
++__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
++move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
++i915_wedged_write_47771 i915_wedged_write 3 47771 NULL
++usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
++aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
++l2cap_bredr_sig_cmd_49065 l2cap_bredr_sig_cmd 3 49065 NULL
++tipc_buf_acquire_60437 tipc_buf_acquire 1 60437 NULL
++alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
++venus_lookup_8121 venus_lookup 4 8121 NULL
++compat_writev_60063 compat_writev 3 60063 NULL
++io_mapping_create_wc_1354 io_mapping_create_wc 1-2 1354 NULL
++jfs_readpages_32702 jfs_readpages 4 32702 NULL
++read_file_queue_40895 read_file_queue 3 40895 NULL
++request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
++waiters_read_40902 waiters_read 3 40902 NULL
++pstore_file_read_57288 pstore_file_read 3 57288 NULL
++vmalloc_node_58700 vmalloc_node 1 58700 NULL
++xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
++ath_rx_edma_init_65483 ath_rx_edma_init 2 65483 NULL
++vmw_cursor_update_image_16332 vmw_cursor_update_image 3-4 16332 NULL
++compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
++dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
++vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
++named_prepare_buf_24532 named_prepare_buf 2 24532 NULL
++hdpvr_read_9273 hdpvr_read 3 9273 NULL
++alloc_dr_65495 alloc_dr 2 65495 NULL
++do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
++rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
++ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
++megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
++total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
++rbd_add_16366 rbd_add 3 16366 NULL
++stats_read_ul_32751 stats_read_ul 3 32751 NULL
++pt_read_49136 pt_read 3 49136 NULL
++tsi148_alloc_resource_24563 tsi148_alloc_resource 2 24563 NULL
++snd_vx_create_40948 snd_vx_create 4 40948 NULL
++iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
++check_mirror_57342 check_mirror 1-2 57342 NULL nohasharray
++usblp_read_57342 usblp_read 3 57342 &check_mirror_57342
++atyfb_setup_generic_49151 atyfb_setup_generic 3 49151 NULL
diff --git a/tools/gcc/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin.c
new file mode 100644
-index 0000000..244559e
+index 0000000..d52f2ee
--- /dev/null
+++ b/tools/gcc/size_overflow_plugin.c
-@@ -0,0 +1,1879 @@
+@@ -0,0 +1,1941 @@
+/*
+ * Copyright 2011, 2012 by Emese Revfy <re.emese@gmail.com>
+ * Licensed under the GPL v2, or (at your option) v3
+#define C_DECL_IMPLICIT(EXP) DECL_LANG_FLAG_2 (EXP)
+#endif
+
++#if BUILDING_GCC_VERSION >= 4008
++#define TODO_dump_func 0
++#endif
++
+struct size_overflow_hash {
+ const struct size_overflow_hash * const next;
+ const char * const name;
+ MARKED_NO, MARKED_YES, MARKED_NOT_INTENTIONAL
+};
+
++static unsigned int call_count = 0;
++
+#define __unused __attribute__((__unused__))
+#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node))
+#define NAME_LEN(node) IDENTIFIER_LENGTH(DECL_NAME(node))
+static unsigned int handle_function(void);
+static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
+static tree get_size_overflow_type(gimple stmt, const_tree node);
-+static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, tree size_overflow_type, tree rhs1, tree rhs2, tree __unused rhs3);
++static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
+
+static struct plugin_info size_overflow_plugin_info = {
-+ .version = "20120930beta",
++ .version = "20130109beta",
+ .help = "no-size-overflow\tturn off size overflow checking\n",
+};
+
+ const_tree type = TREE_TYPE(arg);
+ enum tree_code code = TREE_CODE(type);
+
++ if (code == BOOLEAN_TYPE)
++ return;
++
+ gcc_assert(code == INTEGER_TYPE || code == ENUMERAL_TYPE ||
+ (code == POINTER_TYPE && TREE_CODE(TREE_TYPE(type)) == VOID_TYPE) ||
+ (code == POINTER_TYPE && TREE_CODE(TREE_TYPE(type)) == INTEGER_TYPE));
+}
+
-+static int find_arg_number(const_tree arg, tree func)
++static unsigned int find_arg_number(const_tree arg, tree func)
+{
+ tree var;
+ unsigned int argnum = 1;
+{
+ tree new_var = create_tmp_var(type, "cicus");
+
++#if BUILDING_GCC_VERSION <= 4007
+ add_referenced_var(new_var);
+ mark_sym_for_renaming(new_var);
++#endif
+ return new_var;
+}
+
+ tree type = TREE_TYPE(rhs1);
+ tree lhs = create_new_var(type);
+
++ gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
+ assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
+ gimple_set_lhs(assign, make_ssa_name(lhs, assign));
+
+ return assign;
+}
+
-+static tree cast_to_new_size_overflow_type(gimple stmt, tree new_rhs1, tree size_overflow_type, bool before)
++static tree cast_to_new_size_overflow_type(gimple stmt, tree rhs, tree size_overflow_type, bool before)
+{
-+ const_gimple assign;
++ gimple assign;
+ gimple_stmt_iterator gsi;
+
-+ if (new_rhs1 == NULL_TREE)
++ if (rhs == NULL_TREE)
+ return NULL_TREE;
+
-+ if (!useless_type_conversion_p(TREE_TYPE(new_rhs1), size_overflow_type)) {
-+ gsi = gsi_for_stmt(stmt);
-+ assign = build_cast_stmt(size_overflow_type, new_rhs1, CREATE_NEW_VAR, &gsi, before);
-+ return gimple_get_lhs(assign);
-+ }
-+ return new_rhs1;
++ if (types_compatible_p(TREE_TYPE(rhs), size_overflow_type) && gimple_plf(stmt, MY_STMT))
++ return rhs;
++
++ gsi = gsi_for_stmt(stmt);
++ assign = build_cast_stmt(size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before);
++ gimple_set_plf(assign, MY_STMT, true);
++ return gimple_get_lhs(assign);
+}
+
-+static tree follow_overflow_type_and_dup(struct pointer_set_t *visited, gimple stmt, const_tree node, tree new_rhs1, tree new_rhs2, tree new_rhs3)
++static tree cast_to_TI_type(gimple stmt, tree node)
+{
-+ tree size_overflow_type = get_size_overflow_type(stmt, node);
-+
-+ new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
-+
-+ if (new_rhs2 != NULL_TREE)
-+ new_rhs2 = cast_to_new_size_overflow_type(stmt, new_rhs2, size_overflow_type, BEFORE_STMT);
++ gimple_stmt_iterator gsi;
++ gimple cast_stmt;
++ tree type = TREE_TYPE(node);
+
-+ if (new_rhs3 != NULL_TREE)
-+ new_rhs3 = cast_to_new_size_overflow_type(stmt, new_rhs3, size_overflow_type, BEFORE_STMT);
++ if (types_compatible_p(type, intTI_type_node))
++ return node;
+
-+ return dup_assign(visited, stmt, size_overflow_type, new_rhs1, new_rhs2, new_rhs3);
++ gsi = gsi_for_stmt(stmt);
++ cast_stmt = build_cast_stmt(intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT);
++ gimple_set_plf(cast_stmt, MY_STMT, true);
++ return gimple_get_lhs(cast_stmt);
+}
+
-+
+static tree create_assign(struct pointer_set_t *visited, gimple oldstmt, tree rhs1, bool before)
+{
-+ tree size_overflow_type, lhs;
-+ gimple stmt;
++ tree lhs;
+ gimple_stmt_iterator gsi;
+
+ if (rhs1 == NULL_TREE) {
+ gcc_unreachable();
+ }
+
-+ if (gimple_code(oldstmt) == GIMPLE_ASM)
++ switch (gimple_code(oldstmt)) {
++ case GIMPLE_ASM:
+ lhs = rhs1;
-+ else
++ break;
++ case GIMPLE_CALL:
++ lhs = gimple_call_lhs(oldstmt);
++ break;
++ case GIMPLE_ASSIGN:
+ lhs = gimple_get_lhs(oldstmt);
++ break;
++ default:
++ debug_gimple_stmt(oldstmt);
++ gcc_unreachable();
++ }
+
+ gsi = gsi_for_stmt(oldstmt);
+ pointer_set_insert(visited, oldstmt);
+ oldstmt = gsi_stmt(gsi);
+ }
+
-+ size_overflow_type = get_size_overflow_type(oldstmt, lhs);
-+
-+ stmt = build_cast_stmt(size_overflow_type, rhs1, CREATE_NEW_VAR, &gsi, before);
-+ gimple_set_plf(stmt, MY_STMT, true);
-+ return gimple_get_lhs(stmt);
++ return cast_to_new_size_overflow_type(oldstmt, rhs1, get_size_overflow_type(oldstmt, lhs), before);
+}
+
-+static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, tree size_overflow_type, tree rhs1, tree rhs2, tree __unused rhs3)
++static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3)
+{
+ gimple stmt;
+ gimple_stmt_iterator gsi;
-+ tree new_var, lhs = gimple_get_lhs(oldstmt);
++ tree size_overflow_type, new_var, lhs = gimple_get_lhs(oldstmt);
+
+ if (gimple_plf(oldstmt, MY_STMT))
+ return lhs;
+ if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
+ gimple_assign_set_rhs_code(stmt, MULT_EXPR);
+
++ size_overflow_type = get_size_overflow_type(oldstmt, node);
++
+ if (is_bool(lhs))
+ new_var = SSA_NAME_VAR(lhs);
+ else
+ new_var = make_ssa_name(new_var, stmt);
+ gimple_set_lhs(stmt, new_var);
+
-+ if (rhs1 != NULL_TREE) {
-+ if (!gimple_assign_cast_p(oldstmt))
-+ rhs1 = cast_a_tree(size_overflow_type, rhs1);
++ if (rhs1 != NULL_TREE)
+ gimple_assign_set_rhs1(stmt, rhs1);
-+ }
+
+ if (rhs2 != NULL_TREE)
+ gimple_assign_set_rhs2(stmt, rhs2);
+ basic_block bb;
+ gimple phi;
+ gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
++ gimple_seq seq;
+
+ bb = gsi_bb(gsi);
+
+ phi = create_phi_node(result, bb);
-+ gsi = gsi_last(phi_nodes(bb));
++ seq = phi_nodes(bb);
++ gsi = gsi_last(seq);
+ gsi_remove(&gsi, false);
+
+ gsi = gsi_for_stmt(oldstmt);
+ basic_block first_bb;
+
+ first_bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
-+ if (dom_info_available_p(CDI_DOMINATORS))
-+ set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR);
++ gcc_assert(dom_info_available_p(CDI_DOMINATORS));
++ set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR);
+ return first_bb;
+}
+
+ if (rhs_mode == SImode && lhs_mode == DImode && (TYPE_UNSIGNED(rhs_type) || !TYPE_UNSIGNED(lhs_type)))
+ return false;
+
++ // skip lhs check on signed SI -> HI cast or signed SI -> QI cast
++ if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode))
++ return false;
++
+ return true;
+}
+
+ return true;
+}
+
++static tree create_cast_assign(struct pointer_set_t *visited, gimple stmt)
++{
++ tree rhs1 = gimple_assign_rhs1(stmt);
++ tree lhs = gimple_get_lhs(stmt);
++ const_tree rhs1_type = TREE_TYPE(rhs1);
++ const_tree lhs_type = TREE_TYPE(lhs);
++
++ if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
++ return create_assign(visited, stmt, lhs, AFTER_STMT);
++
++ return create_assign(visited, stmt, rhs1, AFTER_STMT);
++}
++
+static tree handle_unary_rhs(struct pointer_set_t *visited, gimple stmt)
+{
+ tree size_overflow_type, lhs = gimple_get_lhs(stmt);
-+ tree new_rhs1, rhs1 = gimple_assign_rhs1(stmt);
++ tree new_rhs1 = NULL_TREE;
++ tree rhs1 = gimple_assign_rhs1(stmt);
+ const_tree rhs1_type = TREE_TYPE(rhs1);
+ const_tree lhs_type = TREE_TYPE(lhs);
+
-+ new_rhs1 = expand(visited, rhs1);
++ if (gimple_plf(stmt, MY_STMT))
++ return lhs;
+
-+ if (new_rhs1 == NULL_TREE || TREE_CODE(rhs1_type) == POINTER_TYPE)
++ if (TREE_CODE(rhs1_type) == POINTER_TYPE)
+ return create_assign(visited, stmt, lhs, AFTER_STMT);
+
-+ if (gimple_plf(stmt, MY_STMT))
-+ return lhs;
++ new_rhs1 = expand(visited, rhs1);
++
++ if (new_rhs1 == NULL_TREE)
++ return create_cast_assign(visited, stmt);
+
+ if (gimple_plf(stmt, NO_CAST_CHECK))
-+ return follow_overflow_type_and_dup(visited, stmt, rhs1, new_rhs1, NULL_TREE, NULL_TREE);
++ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
+
+ if (gimple_assign_rhs_code(stmt) == BIT_NOT_EXPR) {
+ size_overflow_type = get_size_overflow_type(stmt, rhs1);
+ }
+
+ if (!gimple_assign_cast_p(stmt) || check_undefined_integer_operation(stmt))
-+ return follow_overflow_type_and_dup(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
++ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
++
++ if (TYPE_UNSIGNED(rhs1_type) != TYPE_UNSIGNED(lhs_type))
++ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
+
+ size_overflow_type = get_size_overflow_type(stmt, rhs1);
+ new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
+
-+ change_rhs1(stmt, new_rhs1);
+ check_size_overflow(stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
+
-+ rhs1 = gimple_assign_rhs1(stmt);
-+ rhs1_type = TREE_TYPE(rhs1);
-+ if (TYPE_UNSIGNED(rhs1_type) != TYPE_UNSIGNED(lhs_type))
-+ return create_assign(visited, stmt, rhs1, AFTER_STMT);
++ change_rhs1(stmt, new_rhs1);
+
+ if (!check_mode_type(stmt))
+ return create_assign(visited, stmt, lhs, AFTER_STMT);
+ return create_assign(visited, stmt, lhs, AFTER_STMT);
+}
+
-+static tree handle_unary_ops(struct pointer_set_t *visited, tree lhs)
++static tree handle_unary_ops(struct pointer_set_t *visited, gimple stmt)
+{
++ tree rhs1, lhs = gimple_get_lhs(stmt);
+ gimple def_stmt = get_def_stmt(lhs);
-+ tree rhs1 = gimple_assign_rhs1(def_stmt);
++
++ gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP);
++ rhs1 = gimple_assign_rhs1(def_stmt);
+
+ if (is_gimple_constant(rhs1))
+ return create_assign(visited, def_stmt, lhs, AFTER_STMT);
+#if BUILDING_GCC_VERSION >= 4006
+ case MEM_REF:
+#endif
-+ case PARM_DECL:
+ case TARGET_MEM_REF:
-+ case VAR_DECL:
+ return create_assign(visited, def_stmt, lhs, AFTER_STMT);
++ case PARM_DECL:
++ case VAR_DECL:
++ return create_assign(visited, stmt, lhs, AFTER_STMT);
+
+ default:
+ debug_gimple_stmt(def_stmt);
+ const_tree loc_line;
+ tree loc_file, ssa_name, current_func;
+ expanded_location xloc;
-+ char ssa_name_buf[256];
++ char *ssa_name_buf;
++ int len;
+ gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
+
+ def_stmt = get_def_stmt(arg);
+ current_func = build_string(NAME_LEN(current_function_decl) + 1, NAME(current_function_decl));
+ current_func = create_string_param(current_func);
+
-+ snprintf(ssa_name_buf, 256, "%s_%u (%s)\n", NAME(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max");
-+ ssa_name = build_string(256, ssa_name_buf);
++ gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL);
++ call_count++;
++ len = asprintf(&ssa_name_buf, "%s_%u %s, count: %u\n", NAME(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max", call_count);
++ gcc_assert(len > 0);
++ ssa_name = build_string(len + 1, ssa_name_buf);
++ free(ssa_name_buf);
+ ssa_name = create_string_param(ssa_name);
+
+ // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
+ make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
+ make_edge(bb_true, join_bb, EDGE_FALLTHRU);
+
-+ if (dom_info_available_p(CDI_DOMINATORS)) {
-+ set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
-+ set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
-+ }
++ gcc_assert(dom_info_available_p(CDI_DOMINATORS));
++ set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
++ set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
+
+ if (current_loops != NULL) {
+ gcc_assert(cond_bb->loop_father == join_bb->loop_father);
+ gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == BOOLEAN_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
+
+ type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
-+ type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
++ // typemax (-1) < typemin (0)
++ if (TREE_OVERFLOW(type_max))
++ return;
+
-+ gcc_assert(!TREE_OVERFLOW(type_max));
++ type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
+
+ cast_rhs_type = TREE_TYPE(cast_rhs);
+ type_max_type = TREE_TYPE(type_max);
+ type_min_type = TREE_TYPE(type_min);
-+ gcc_assert(useless_type_conversion_p(cast_rhs_type, type_max_type));
-+ gcc_assert(useless_type_conversion_p(type_max_type, type_min_type));
++ gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
++ gcc_assert(types_compatible_p(type_max_type, type_min_type));
+
+ insert_check_size_overflow(stmt, GT_EXPR, cast_rhs, type_max, before, false);
+ insert_check_size_overflow(stmt, LT_EXPR, cast_rhs, type_min, before, true);
+ if (gimple_assign_rhs_code(def_stmt) == RSHIFT_EXPR)
+ return get_size_overflow_type(change_rhs_def_stmt, change_rhs);
+
-+ if (!useless_type_conversion_p(lhs_type, rhs1_type) || !useless_type_conversion_p(rhs1_type, rhs2_type)) {
++ if (!types_compatible_p(lhs_type, rhs1_type) || !types_compatible_p(rhs1_type, rhs2_type)) {
+ debug_gimple_stmt(def_stmt);
+ gcc_unreachable();
+ }
+ return true;
+}
+
-+static tree get_cast_def_stmt_rhs(const_tree new_rhs)
-+{
-+ gimple def_stmt;
-+
-+ def_stmt = get_def_stmt(new_rhs);
-+ // get_size_overflow_type
-+ if (LONG_TYPE_SIZE != GET_MODE_BITSIZE(SImode))
-+ gcc_assert(gimple_assign_cast_p(def_stmt));
-+ return gimple_assign_rhs1(def_stmt);
-+}
-+
-+static tree cast_to_int_TI_type_and_check(gimple stmt, tree new_rhs)
-+{
-+ gimple_stmt_iterator gsi;
-+ const_gimple cast_stmt;
-+ gimple def_stmt;
-+ enum machine_mode mode = TYPE_MODE(TREE_TYPE(new_rhs));
-+
-+ if (mode != TImode && mode != DImode) {
-+ def_stmt = get_def_stmt(new_rhs);
-+ gcc_assert(gimple_assign_cast_p(def_stmt));
-+ new_rhs = gimple_assign_rhs1(def_stmt);
-+ mode = TYPE_MODE(TREE_TYPE(new_rhs));
-+ }
-+
-+ gcc_assert(mode == TImode || mode == DImode);
-+
-+ if (mode == TYPE_MODE(intTI_type_node) && useless_type_conversion_p(TREE_TYPE(new_rhs), intTI_type_node))
-+ return new_rhs;
-+
-+ gsi = gsi_for_stmt(stmt);
-+ cast_stmt = build_cast_stmt(intTI_type_node, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT);
-+ new_rhs = gimple_get_lhs(cast_stmt);
-+
-+ if (mode == DImode)
-+ return new_rhs;
-+
-+ check_size_overflow(stmt, intTI_type_node, new_rhs, new_rhs, BEFORE_STMT);
-+
-+ return new_rhs;
-+}
-+
-+static bool is_an_integer_trunction(const_gimple stmt)
++static bool is_subtraction_special(const_gimple stmt)
+{
+ gimple rhs1_def_stmt, rhs2_def_stmt;
-+ const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1;
-+ enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode;
++ const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs;
++ enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode;
+ const_tree rhs1 = gimple_assign_rhs1(stmt);
+ const_tree rhs2 = gimple_assign_rhs2(stmt);
-+ enum machine_mode rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1));
-+ enum machine_mode rhs2_mode = TYPE_MODE(TREE_TYPE(rhs2));
+
+ if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
+ return false;
+
+ gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
+
-+ if (gimple_assign_rhs_code(stmt) != MINUS_EXPR || rhs1_mode != SImode || rhs2_mode != SImode)
++ if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
+ return false;
+
+ rhs1_def_stmt = get_def_stmt(rhs1);
+
+ rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
+ rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
++ rhs1_def_stmt_lhs = gimple_get_lhs(rhs1_def_stmt);
++ rhs2_def_stmt_lhs = gimple_get_lhs(rhs2_def_stmt);
+ rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
+ rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
-+ if (rhs1_def_stmt_rhs1_mode != DImode || rhs2_def_stmt_rhs1_mode != DImode)
++ rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
++ rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs));
++ if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode))
++ return false;
++ if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode))
+ return false;
+
+ gimple_set_plf(rhs1_def_stmt, NO_CAST_CHECK, true);
+ return true;
+}
+
++static tree get_def_stmt_rhs(const_tree var)
++{
++ tree rhs1, def_stmt_rhs1;
++ gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
++
++ def_stmt = get_def_stmt(var);
++ gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && gimple_plf(def_stmt, MY_STMT) && gimple_assign_cast_p(def_stmt));
++
++ rhs1 = gimple_assign_rhs1(def_stmt);
++ rhs1_def_stmt = get_def_stmt(rhs1);
++ if (!gimple_assign_cast_p(rhs1_def_stmt))
++ return rhs1;
++
++ def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
++ def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1);
++
++ switch (gimple_code(def_stmt_rhs1_def_stmt)) {
++ case GIMPLE_CALL:
++ case GIMPLE_NOP:
++ case GIMPLE_ASM:
++ return def_stmt_rhs1;
++ case GIMPLE_ASSIGN:
++ return rhs1;
++ default:
++ debug_gimple_stmt(def_stmt_rhs1_def_stmt);
++ gcc_unreachable();
++ }
++}
++
+static tree handle_integer_truncation(struct pointer_set_t *visited, const_tree lhs)
+{
+ tree new_rhs1, new_rhs2;
+ tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
-+ tree new_rhs1_def_stmt_rhs1_type, new_rhs2_def_stmt_rhs1_type;
+ gimple assign, stmt = get_def_stmt(lhs);
+ tree rhs1 = gimple_assign_rhs1(stmt);
+ tree rhs2 = gimple_assign_rhs2(stmt);
+
-+ if (!is_an_integer_trunction(stmt))
++ if (!is_subtraction_special(stmt))
+ return NULL_TREE;
+
+ new_rhs1 = expand(visited, rhs1);
+ new_rhs2 = expand(visited, rhs2);
+
-+ new_rhs1_def_stmt_rhs1 = get_cast_def_stmt_rhs(new_rhs1);
-+ new_rhs2_def_stmt_rhs1 = get_cast_def_stmt_rhs(new_rhs2);
++ new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs1);
++ new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs2);
+
-+ new_rhs1_def_stmt_rhs1_type = TREE_TYPE(new_rhs1_def_stmt_rhs1);
-+ new_rhs2_def_stmt_rhs1_type = TREE_TYPE(new_rhs2_def_stmt_rhs1);
-+
-+ if (!useless_type_conversion_p(new_rhs1_def_stmt_rhs1_type, new_rhs2_def_stmt_rhs1_type)) {
-+ new_rhs1_def_stmt_rhs1 = cast_to_int_TI_type_and_check(stmt, new_rhs1_def_stmt_rhs1);
-+ new_rhs2_def_stmt_rhs1 = cast_to_int_TI_type_and_check(stmt, new_rhs2_def_stmt_rhs1);
++ if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
++ new_rhs1_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs1_def_stmt_rhs1);
++ new_rhs2_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs2_def_stmt_rhs1);
+ }
+
+ assign = create_binary_assign(MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
+ new_lhs = gimple_get_lhs(assign);
+ check_size_overflow(assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
+
-+ return follow_overflow_type_and_dup(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
++ return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
+}
+
+static bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
+ if (is_a_constant_overflow(def_stmt, rhs1))
+ return handle_intentional_overflow(visited, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, NULL_TREE, new_rhs2);
+
-+ return follow_overflow_type_and_dup(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
++ return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
+}
+
+#if BUILDING_GCC_VERSION >= 4007
+ new_rhs2 = get_new_rhs(visited, size_overflow_type, rhs2);
+ new_rhs3 = get_new_rhs(visited, size_overflow_type, rhs3);
+
-+ return follow_overflow_type_and_dup(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
++ return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
+}
+#endif
+
+static tree get_size_overflow_type(gimple stmt, const_tree node)
+{
+ const_tree type;
++ tree new_type;
+
+ gcc_assert(node != NULL_TREE);
+
+
+ switch (TYPE_MODE(type)) {
+ case QImode:
-+ return (TYPE_UNSIGNED(type)) ? unsigned_intHI_type_node : intHI_type_node;
++ new_type = intHI_type_node;
++ break;
+ case HImode:
-+ return (TYPE_UNSIGNED(type)) ? unsigned_intSI_type_node : intSI_type_node;
++ new_type = intSI_type_node;
++ break;
+ case SImode:
-+ return (TYPE_UNSIGNED(type)) ? unsigned_intDI_type_node : intDI_type_node;
++ new_type = intDI_type_node;
++ break;
+ case DImode:
+ if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
-+ return (TYPE_UNSIGNED(type)) ? unsigned_intDI_type_node : intDI_type_node;
-+ return (TYPE_UNSIGNED(type)) ? unsigned_intTI_type_node : intTI_type_node;
++ new_type = intDI_type_node;
++ else
++ new_type = intTI_type_node;
++ break;
+ default:
+ debug_tree((tree)node);
+ error("%s: unsupported gcc configuration.", __func__);
+ gcc_unreachable();
+ }
++
++ if (TYPE_QUALS(type) != 0)
++ return build_qualified_type(new_type, TYPE_QUALS(type));
++ return new_type;
+}
+
+static tree expand_visited(gimple def_stmt)
+
+ gcc_assert(code == INTEGER_TYPE || code == POINTER_TYPE || code == BOOLEAN_TYPE || code == ENUMERAL_TYPE);
+
-+
+ def_stmt = get_def_stmt(lhs);
+
-+ if (!def_stmt)
++ if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
+ return NULL_TREE;
+
+ if (gimple_plf(def_stmt, MY_STMT))
+ return expand_visited(def_stmt);
+
+ switch (gimple_code(def_stmt)) {
-+ case GIMPLE_NOP:
-+ return NULL_TREE;
+ case GIMPLE_PHI:
+ return build_new_phi(visited, lhs);
+ case GIMPLE_CALL:
+ case GIMPLE_ASSIGN:
+ switch (gimple_num_ops(def_stmt)) {
+ case 2:
-+ return handle_unary_ops(visited, lhs);
++ return handle_unary_ops(visited, def_stmt);
+ case 3:
+ return handle_binary_ops(visited, lhs);
+#if BUILDING_GCC_VERSION >= 4007
+
+static bool skip_types(const_tree var)
+{
++ const_tree type;
++
+ switch (TREE_CODE(var)) {
+ case ADDR_EXPR:
+#if BUILDING_GCC_VERSION >= 4006
+ default:
+ break;
+ }
++
++ type = TREE_TYPE(TREE_TYPE(var));
++ if (!type)
++ return false;
++ switch (TREE_CODE(type)) {
++ case RECORD_TYPE:
++ return true;
++ default:
++ break;
++ }
++
+ return false;
+}
+
+ if (skip_types(lhs))
+ return false;
+
++ // skip char type (FIXME: only kernel)
++ if (TYPE_MODE(TREE_TYPE(lhs)) == QImode)
++ return false;
++
+ if (TREE_CODE(lhs) == PARM_DECL)
+ return is_already_marked(lhs);
+
+ .pass = {
+ .type = GIMPLE_PASS,
+ .name = "size_overflow",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = NULL,
+ .execute = handle_function,
+ .sub = NULL,
+ .next = NULL,
+ .static_pass_number = 0,
+ .tv_id = TV_NONE,
-+ .properties_required = PROP_cfg | PROP_referenced_vars,
++ .properties_required = PROP_cfg,
+ .properties_provided = 0,
+ .properties_destroyed = 0,
+ .todo_flags_start = 0,
+}
diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
new file mode 100644
-index 0000000..38d2014
+index 0000000..ac2901e
--- /dev/null
+++ b/tools/gcc/stackleak_plugin.c
-@@ -0,0 +1,313 @@
+@@ -0,0 +1,327 @@
+/*
-+ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
++ * Copyright 2011
-2013 by the PaX Team <pageexec@freemail.hu>
+ * Licensed under the GPL v2
+ *
+ * Note: the choice of the license means that the compilation process is
+#include "rtl.h"
+#include "emit-rtl.h"
+
++#if BUILDING_GCC_VERSION >= 4008
++#define TODO_dump_func 0
++#endif
++
+extern void print_gimple_stmt(FILE *, gimple, int, int);
+
+int plugin_is_GPL_compatible;
+static bool init_locals;
+
+static struct plugin_info stackleak_plugin_info = {
-+ .version = "201203140940",
++ .version = "201302112000",
+ .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
+// "initialize-locals\t\tforcibly initialize all stack frames\n"
+};
+ .pass = {
+ .type = GIMPLE_PASS,
+ .name = "stackleak_tree_instrument",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = gate_stackleak_track_stack,
+ .execute = execute_stackleak_tree_instrument,
+ .sub = NULL,
+ .pass = {
+ .type = RTL_PASS,
+ .name = "stackleak_final",
++#if BUILDING_GCC_VERSION >= 4008
++ .optinfo_flags = OPTGROUP_NONE,
++#endif
+ .gate = gate_stackleak_track_stack,
+ .execute = execute_stackleak_final,
+ .sub = NULL,
+
+static unsigned int execute_stackleak_final(void)
+{
-+ rtx insn;
++ rtx insn, next;
+
+ if (cfun->calls_alloca)
+ return 0;
+ return 0;
+
+ // 1. find pax_track_stack calls
-+ for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
++ for (insn = get_insns(); insn; insn = next) {
+ // rtl match: (call_insn 8 7 9 3 (call (mem (symbol_ref ("pax_track_stack") [flags 0x41] <function_decl 0xb7470e80 pax_track_stack>) [0 S1 A8]) (4)) -1 (nil) (nil))
+ rtx body;
+
++ next = NEXT_INSN(insn);
+ if (!CALL_P(insn))
+ continue;
+ body = PATTERN(insn);
+ continue;
+// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
+ // 2. delete call
-+ insn = delete_insn_and_edges(insn);
++ delete_insn_and_edges(insn);
+#if BUILDING_GCC_VERSION >= 4007
-+ if (GET_CODE(insn) == NOTE && NOTE_KIND(insn) == NOTE_INSN_CALL_ARG_LOCATION)
-+ insn = delete_insn_and_edges(insn);
++ if (GET_CODE(next) == NOTE && NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
++ insn = next;
++ next = NEXT_INSN(insn);
++ delete_insn_and_edges(insn);
++ }
+#endif
+ }
+
+
#endif
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index d617f69..6b445d2 100644
+index 6e8fa7e..37f02a5 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
-@@ -75,7 +75,7 @@ LIST_HEAD(vm_list);
+@@ -75,12 +75,17 @@ LIST_HEAD(vm_list);
static cpumask_var_t cpus_hardware_enabled;
static int kvm_usage_count = 0;
struct kmem_cache *kvm_vcpu_cache;
EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
-@@ -715,7 +715,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
+
+-static __read_mostly struct preempt_ops kvm_preempt_ops;
++static void kvm_sched_in(struct preempt_notifier *pn, int cpu);
++static void kvm_sched_out(struct preempt_notifier *pn, struct task_struct *next);
++static struct preempt_ops kvm_preempt_ops = {
++ .sched_in = kvm_sched_in,
++ .sched_out = kvm_sched_out,
++};
+
+ struct dentry *kvm_debugfs_dir;
+
+@@ -726,7 +731,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
/* We can read the guest memory with __xxx_user() later on. */
if (user_alloc &&
((mem->userspace_addr & (PAGE_SIZE - 1)) ||
(void __user *)(unsigned long)mem->userspace_addr,
mem->memory_size)))
goto out;
-@@ -2304,7 +2304,7 @@ static void hardware_enable_nolock(void *junk)
+@@ -2450,7 +2455,7 @@ static void hardware_enable_nolock(void *junk)
if (r) {
cpumask_clear_cpu(cpu, cpus_hardware_enabled);
printk(KERN_INFO "kvm: enabling virtualization on "
"CPU%d failed\n", cpu);
}
-@@ -2358,10 +2358,10 @@ static int hardware_enable_all(void)
+@@ -2504,10 +2509,10 @@ static int hardware_enable_all(void)
kvm_usage_count++;
if (kvm_usage_count == 1) {
hardware_disable_all_nolock();
r = -EBUSY;
}
-@@ -2722,7 +2722,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
+@@ -2865,7 +2870,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
kvm_arch_vcpu_put(vcpu);
}
struct module *module)
{
int r;
-@@ -2785,7 +2785,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -2901,7 +2906,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
if (!vcpu_align)
vcpu_align = __alignof__(struct kvm_vcpu);
kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
if (!kvm_vcpu_cache) {
r = -ENOMEM;
goto out_free_3;
-@@ -2795,9 +2795,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -2911,9 +2916,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
if (r)
goto out_free;
r = misc_register(&kvm_dev);
if (r) {
+@@ -2923,9 +2930,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+
+ register_syscore_ops(&kvm_syscore_ops);
+
+- kvm_preempt_ops.sched_in = kvm_sched_in;
+- kvm_preempt_ops.sched_out = kvm_sched_out;
+-
+ r = kvm_init_debug();
+ if (r) {
+ printk(KERN_ERR "kvm: create debugfs files failed\n");
projects / people / ms / ipfire-3.x.git / commitdiff
