* [gentoo-commits] proj/hardened-patchset:master commit in: 3.2.52/, 3.12.1/
@ 2013-11-27 21:05 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2013-11-27 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 6c4ef570d525e3c357c2ffefe5af9175cb278032
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 21:06:23 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 21:06:23 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=6c4ef570
Grsec/PaX: 3.0-{3.2.52,3.12.1}-201311261522
---
3.12.1/0000_README | 2 +-
... 4420_grsecurity-3.0-3.12.1-201311261522.patch} | 171 +-
3.12.1/4470_disable-compat_vdso.patch | 2 +-
3.2.52/0000_README | 2 +-
.../4420_grsecurity-3.0-3.2.52-201311261520.patch | 60199 ++++++++++---------
5 files changed, 30588 insertions(+), 29788 deletions(-)
diff --git a/3.12.1/0000_README b/3.12.1/0000_README
index 0f326f8..00a2158 100644
--- a/3.12.1/0000_README
+++ b/3.12.1/0000_README
@@ -2,7 +2,7 @@ README
-----------------------------------------------------------------------------
Individual Patch Descriptions:
-----------------------------------------------------------------------------
-Patch: 4420_grsecurity-3.0-3.12.1-201311252310.patch
+Patch: 4420_grsecurity-3.0-3.12.1-201311261522.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/3.12.1/4420_grsecurity-3.0-3.12.1-201311252310.patch b/3.12.1/4420_grsecurity-3.0-3.12.1-201311261522.patch
similarity index 99%
copy from 3.12.1/4420_grsecurity-3.0-3.12.1-201311252310.patch
copy to 3.12.1/4420_grsecurity-3.0-3.12.1-201311261522.patch
index 1088576..4b0fd79 100644
--- a/3.12.1/4420_grsecurity-3.0-3.12.1-201311252310.patch
+++ b/3.12.1/4420_grsecurity-3.0-3.12.1-201311261522.patch
@@ -54929,10 +54929,34 @@ index 9bdeca1..2247b92 100644
EXPORT_SYMBOL(dump_write);
diff --git a/fs/dcache.c b/fs/dcache.c
-index ae6ebb8..6e46065 100644
+index ae6ebb8..5977a84 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -3429,7 +3429,8 @@ void __init vfs_caches_init(unsigned long mempages)
+@@ -2881,9 +2881,9 @@ static int prepend_path(const struct path *path,
+ const struct path *root,
+ char **buffer, int *buflen)
+ {
+- struct dentry *dentry = path->dentry;
+- struct vfsmount *vfsmnt = path->mnt;
+- struct mount *mnt = real_mount(vfsmnt);
++ struct dentry *dentry;
++ struct vfsmount *vfsmnt;
++ struct mount *mnt;
+ int error = 0;
+ unsigned seq = 0;
+ char *bptr;
+@@ -2893,6 +2893,10 @@ static int prepend_path(const struct path *path,
+ restart:
+ bptr = *buffer;
+ blen = *buflen;
++ error = 0;
++ dentry = path->dentry;
++ vfsmnt = path->mnt;
++ mnt = real_mount(vfsmnt);
+ read_seqbegin_or_lock(&rename_lock, &seq);
+ while (dentry != root->dentry || vfsmnt != root->mnt) {
+ struct dentry * parent;
+@@ -3429,7 +3433,8 @@ void __init vfs_caches_init(unsigned long mempages)
mempages -= reserve;
names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -62737,10 +62761,10 @@ index 0000000..85beb79
+endif
diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
new file mode 100644
-index 0000000..857c960
+index 0000000..6affeea
--- /dev/null
+++ b/grsecurity/gracl.c
-@@ -0,0 +1,2623 @@
+@@ -0,0 +1,2679 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -63917,6 +63941,59 @@ index 0000000..857c960
+ read_lock(&grsec_exec_file_lock);
+*/
+
++struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
++{
++ char *tmpname;
++ struct acl_subject_label *tmpsubj;
++ struct file *filp;
++ struct name_entry *nmatch;
++
++ filp = task->exec_file;
++ if (filp == NULL)
++ return NULL;
++
++ /* the following is to apply the correct subject
++ on binaries running when the RBAC system
++ is enabled, when the binaries have been
++ replaced or deleted since their execution
++ -----
++ when the RBAC system starts, the inode/dev
++ from exec_file will be one the RBAC system
++ is unaware of. It only knows the inode/dev
++ of the present file on disk, or the absence
++ of it.
++ */
++
++ if (filename)
++ nmatch = __lookup_name_entry(state, filename);
++ else {
++ preempt_disable();
++ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
++
++ nmatch = __lookup_name_entry(state, tmpname);
++ preempt_enable();
++ }
++ tmpsubj = NULL;
++ if (nmatch) {
++ if (nmatch->deleted)
++ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
++ else
++ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
++ }
++ /* this also works for the reload case -- if we don't match a potentially inherited subject
++ then we fall back to a normal lookup based on the binary's ino/dev
++ */
++ if (tmpsubj == NULL)
++ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
++
++ return tmpsubj;
++}
++
++static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
++{
++ return __gr_get_subject_for_task(&running_polstate, task, filename);
++}
++
+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
+{
+ struct acl_object_label *obj;
@@ -63971,12 +64048,15 @@ index 0000000..857c960
+ struct task_struct *task = init_pid_ns.child_reaper;
+
+ if (task->role != current->role) {
++ struct acl_subject_label *subj;
++
+ task->acl_sp_role = 0;
+ task->acl_role_id = current->acl_role_id;
+ task->role = current->role;
+ rcu_read_lock();
+ read_lock(&grsec_exec_file_lock);
-+ gr_apply_subject_to_task(task, NULL);
++ subj = gr_get_subject_for_task(task, NULL);
++ gr_apply_subject_to_task(task, subj);
+ read_unlock(&grsec_exec_file_lock);
+ rcu_read_unlock();
+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
@@ -66911,10 +66991,10 @@ index 0000000..25f54ef
+};
diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
new file mode 100644
-index 0000000..d409f33
+index 0000000..36e293f
--- /dev/null
+++ b/grsecurity/gracl_policy.c
-@@ -0,0 +1,1825 @@
+@@ -0,0 +1,1777 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -66985,6 +67065,7 @@ index 0000000..d409f33
+extern void gr_remove_uid(uid_t uid);
+extern int gr_find_uid(uid_t uid);
+
++extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
@@ -68048,55 +68129,6 @@ index 0000000..d409f33
+ return err;
+}
+
-+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
-+{
-+ char *tmpname;
-+ struct acl_subject_label *tmpsubj;
-+ struct file *filp;
-+ struct name_entry *nmatch;
-+
-+ filp = task->exec_file;
-+ if (filp == NULL)
-+ return NULL;
-+
-+ /* the following is to apply the correct subject
-+ on binaries running when the RBAC system
-+ is enabled, when the binaries have been
-+ replaced or deleted since their execution
-+ -----
-+ when the RBAC system starts, the inode/dev
-+ from exec_file will be one the RBAC system
-+ is unaware of. It only knows the inode/dev
-+ of the present file on disk, or the absence
-+ of it.
-+ */
-+
-+ if (filename)
-+ nmatch = __lookup_name_entry(polstate, filename);
-+ else {
-+ preempt_disable();
-+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
-+
-+ nmatch = __lookup_name_entry(polstate, tmpname);
-+ preempt_enable();
-+ }
-+ tmpsubj = NULL;
-+ if (nmatch) {
-+ if (nmatch->deleted)
-+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
-+ else
-+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
-+ }
-+ /* this also works for the reload case -- if we don't match a potentially inherited subject
-+ then we fall back to a normal lookup based on the binary's ino/dev
-+ */
-+ if (tmpsubj == NULL)
-+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
-+ task->role);
-+
-+ return tmpsubj;
-+}
-+
+static int gracl_reload_apply_policies(void *reload)
+{
+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
@@ -68107,7 +68139,7 @@ index 0000000..d409f33
+ int role_applied;
+ int ret = 0;
+
-+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_reload_state));
++ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
+
+ /* first make sure we'll be able to apply the new policy cleanly */
@@ -68133,8 +68165,8 @@ index 0000000..d409f33
+ }
+ /* this handles non-nested inherited subjects, nested subjects will still
+ be dropped currently */
-+ subj = gr_get_subject_for_task(task, task->acl->filename);
-+ task->tmpacl = gr_get_subject_for_task(task, NULL);
++ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
++ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
+ /* change the role back so that we've made no modifications to the policy */
+ task->role = rtmp;
+
@@ -68166,7 +68198,7 @@ index 0000000..d409f33
+ /* this handles non-nested inherited subjects, nested subjects will still
+ be dropped currently */
+ if (!reload_state->oldmode && task->inherited)
-+ subj = gr_get_subject_for_task(task, task->acl->filename);
++ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
+ else {
+ /* looked up and tagged to the task previously */
+ subj = task->tmpacl;
@@ -68715,7 +68747,7 @@ index 0000000..d409f33
+ if (task->exec_file) {
+ cred = __task_cred(task);
+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
-+ subj = gr_get_subject_for_task(task, NULL);
++ subj = __gr_get_subject_for_task(polstate, task, NULL);
+ if (subj == NULL) {
+ ret = -EINVAL;
+ read_unlock(&grsec_exec_file_lock);
@@ -81953,7 +81985,7 @@ index 2a74f30..d139351 100644
/* Don't allow clients that don't understand the native
diff --git a/kernel/kmod.c b/kernel/kmod.c
-index b086006..56b1feb 100644
+index b086006..6d2e579 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
@@ -82081,7 +82113,7 @@ index b086006..56b1feb 100644
EXPORT_SYMBOL(__request_module);
#endif /* CONFIG_MODULES */
-@@ -218,6 +271,18 @@ static int ____call_usermodehelper(void *data)
+@@ -218,6 +271,19 @@ static int ____call_usermodehelper(void *data)
*/
set_user_nice(current, 0);
@@ -82090,8 +82122,9 @@ index b086006..56b1feb 100644
+ out the path to be used prior to this point and are now operating
+ on that copy
+ */
-+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/systemd/", 17)) || strstr(sub_info->path, "..")) {
-+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and /usr/lib/systemd\n", sub_info->path);
++ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
++ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) {
++ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
+ retval = -EPERM;
+ goto fail;
+ }
@@ -82100,7 +82133,7 @@ index b086006..56b1feb 100644
retval = -ENOMEM;
new = prepare_kernel_cred(current);
if (!new)
-@@ -260,6 +325,10 @@ static int call_helper(void *data)
+@@ -260,6 +326,10 @@ static int call_helper(void *data)
static void call_usermodehelper_freeinfo(struct subprocess_info *info)
{
@@ -82111,7 +82144,7 @@ index b086006..56b1feb 100644
if (info->cleanup)
(*info->cleanup)(info);
kfree(info);
-@@ -303,7 +372,7 @@ static int wait_for_helper(void *data)
+@@ -303,7 +373,7 @@ static int wait_for_helper(void *data)
*
* Thus the __user pointer cast is valid here.
*/
@@ -82120,7 +82153,7 @@ index b086006..56b1feb 100644
/*
* If ret is 0, either ____call_usermodehelper failed and the
-@@ -542,7 +611,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
+@@ -542,7 +612,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
goto out;
INIT_WORK(&sub_info->work, __call_usermodehelper);
@@ -82133,7 +82166,7 @@ index b086006..56b1feb 100644
sub_info->argv = argv;
sub_info->envp = envp;
-@@ -650,7 +724,7 @@ EXPORT_SYMBOL(call_usermodehelper);
+@@ -650,7 +725,7 @@ EXPORT_SYMBOL(call_usermodehelper);
static int proc_cap_handler(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
diff --git a/3.12.1/4470_disable-compat_vdso.patch b/3.12.1/4470_disable-compat_vdso.patch
index 4572f4f..a9b2b0f 100644
--- a/3.12.1/4470_disable-compat_vdso.patch
+++ b/3.12.1/4470_disable-compat_vdso.patch
@@ -26,7 +26,7 @@ Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
--- a/arch/x86/Kconfig 2009-07-31 01:36:57.323857684 +0100
+++ b/arch/x86/Kconfig 2009-07-31 01:51:39.395749681 +0100
-@@ -1798,17 +1798,8 @@
+@@ -1817,17 +1817,8 @@
config COMPAT_VDSO
def_bool n
diff --git a/3.2.52/0000_README b/3.2.52/0000_README
index 8c3f9ff..0137c2a 100644
--- a/3.2.52/0000_README
+++ b/3.2.52/0000_README
@@ -126,7 +126,7 @@ Patch: 1051_linux-3.2.52.patch
From: http://www.kernel.org
Desc: Linux 3.2.52
-Patch: 4420_
+Patch: 4420_grsecurity-3.0-3.2.52-201311261520.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/3.12.1/4420_grsecurity-3.0-3.12.1-201311252310.patch b/3.2.52/4420_grsecurity-3.0-3.2.52-201311261520.patch
similarity index 74%
rename from 3.12.1/4420_grsecurity-3.0-3.12.1-201311252310.patch
rename to 3.2.52/4420_grsecurity-3.0-3.2.52-201311261520.patch
index 1088576..bb4bd2e 100644
--- a/3.12.1/4420_grsecurity-3.0-3.12.1-201311252310.patch
+++ b/3.2.52/4420_grsecurity-3.0-3.2.52-201311261520.patch
@@ -1,5 +1,5 @@
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
-index b89a739..79768fb 100644
+index dfa6fc6..be27ac3 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -2,9 +2,11 @@
@@ -41,7 +41,7 @@ index b89a739..79768fb 100644
.*.d
.mm
53c700_d.h
-@@ -69,9 +75,11 @@ Image
+@@ -70,9 +76,11 @@ Kerntypes
Module.markers
Module.symvers
PENDING
@@ -53,7 +53,7 @@ index b89a739..79768fb 100644
aconf
af_names.h
aic7*reg.h*
-@@ -80,6 +88,7 @@ aic7*seq.h*
+@@ -81,6 +89,7 @@ aic7*seq.h*
aicasm
aicdb.h*
altivec*.c
@@ -61,7 +61,7 @@ index b89a739..79768fb 100644
asm-offsets.h
asm_offsets.h
autoconf.h*
-@@ -92,19 +101,24 @@ bounds.h
+@@ -93,19 +102,24 @@ bounds.h
bsetup
btfixupprep
build
@@ -86,7 +86,7 @@ index b89a739..79768fb 100644
conmakehash
consolemap_deftbl.c*
cpustr.h
-@@ -115,9 +129,11 @@ devlist.h*
+@@ -116,9 +130,11 @@ devlist.h*
dnotify_test
docproc
dslm
@@ -98,7 +98,7 @@ index b89a739..79768fb 100644
fixdep
flask.h
fore200e_mkfirm
-@@ -125,12 +141,15 @@ fore200e_pca_fw.c*
+@@ -126,12 +142,15 @@ fore200e_pca_fw.c*
gconf
gconf.glade.h
gen-devlist
@@ -114,7 +114,7 @@ index b89a739..79768fb 100644
hpet_example
hugepage-mmap
hugepage-shm
-@@ -145,14 +164,14 @@ int32.c
+@@ -146,7 +165,7 @@ int32.c
int4.c
int8.c
kallsyms
@@ -123,7 +123,8 @@ index b89a739..79768fb 100644
keywords.c
ksym.c*
ksym.h*
- kxgettext
+@@ -154,7 +173,7 @@ kxgettext
+ lkc_defs.h
lex.c
lex.*.c
-linux
@@ -131,10 +132,10 @@ index b89a739..79768fb 100644
logo_*.c
logo_*_clut224.c
logo_*_mono.c
-@@ -162,14 +181,15 @@ mach-types.h
- machtypes.h
+@@ -166,14 +185,15 @@ machtypes.h
map
map_hugetlb
+ maui_boot.h
-media
mconf
+mdp
@@ -148,35 +149,15 @@ index b89a739..79768fb 100644
mkprep
mkregtable
mktables
-@@ -185,6 +205,8 @@ oui.c*
- page-types
- parse.c
- parse.h
-+parse-events*
-+pasyms.h
- patches*
- pca200e.bin
- pca200e_ecd.bin2
-@@ -194,6 +216,7 @@ perf-archive
- piggyback
- piggy.gzip
- piggy.S
-+pmu-*
- pnmtologo
- ppc_defs.h*
- pss_boot.h
-@@ -203,7 +226,10 @@ r200_reg_safe.h
- r300_reg_safe.h
+@@ -209,6 +229,7 @@ r300_reg_safe.h
r420_reg_safe.h
r600_reg_safe.h
-+realmode.lds
-+realmode.relocs
recordmcount
+regdb.c
relocs
rlim_names.h
rn50_reg_safe.h
-@@ -213,8 +239,12 @@ series
+@@ -218,7 +239,10 @@ series
setup
setup.bin
setup.elf
@@ -185,11 +166,9 @@ index b89a739..79768fb 100644
sImage
+slabinfo
sm_tbl*
-+sortextable
split-include
syscalltab.h
- tables.c
-@@ -224,6 +254,7 @@ tftpboot.img
+@@ -229,6 +253,7 @@ tftpboot.img
timeconst.h
times.h*
trix_boot.h
@@ -197,15 +176,7 @@ index b89a739..79768fb 100644
utsrelease.h*
vdso-syms.lds
vdso.lds
-@@ -235,13 +266,17 @@ vdso32.lds
- vdso32.so.dbg
- vdso64.lds
- vdso64.so.dbg
-+vdsox32.lds
-+vdsox32-syms.lds
- version.h*
- vmImage
- vmlinux
+@@ -246,7 +271,9 @@ vmlinux
vmlinux-*
vmlinux.aout
vmlinux.bin.all
@@ -215,7 +186,7 @@ index b89a739..79768fb 100644
vmlinuz
voffset.h
vsyscall.lds
-@@ -249,9 +284,12 @@ vsyscall_32.lds
+@@ -254,9 +281,12 @@ vsyscall_32.lds
wanxlfw.inc
uImage
unifdef
@@ -229,32 +200,20 @@ index b89a739..79768fb 100644
+zconf.lex.c
zoffset.h
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index fcbb736..5508d8c 100644
+index 2ba8272..e2a9806 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -1031,6 +1031,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
- Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
- Default: 1024
+@@ -859,6 +859,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+ gpt [EFI] Forces disk with valid GPT signature but
+ invalid Protective MBR to be treated as GPT.
-+ grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
++ grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
+ ignore grsecurity's /proc restrictions
+
-+
hashdist= [KNL,NUMA] Large hashes allocated during boot
are distributed across NUMA nodes. Defaults on
for 64-bit NUMA, off otherwise.
-@@ -1999,6 +2003,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
- noexec=on: enable non-executable mappings (default)
- noexec=off: disable non-executable mappings
-
-+ nopcid [X86-64]
-+ Disable PCID (Process-Context IDentifier) even if it
-+ is supported by the processor.
-+
- nosmap [X86]
- Disable SMAP (Supervisor Mode Access Prevention)
- even if it is supported by processor.
-@@ -2266,6 +2274,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -1960,6 +1963,22 @@ 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.
@@ -274,17 +233,47 @@ index fcbb736..5508d8c 100644
+ from the first 4GB of memory as the bootmem allocator
+ passes the memory pages to the buddy allocator.
+
-+ pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
-+ when the processor supports PCID.
-+
pcbit= [HW,ISDN]
pcd. [PARIDE]
+diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
+index 88fd7f5..b318a78 100644
+--- a/Documentation/sysctl/fs.txt
++++ b/Documentation/sysctl/fs.txt
+@@ -163,16 +163,22 @@ This value can be used to query and set the core dump mode for setuid
+ or otherwise protected/tainted binaries. The modes are
+
+ 0 - (default) - traditional behaviour. Any process which has changed
+- privilege levels or is execute only will not be dumped
++ privilege levels or is execute only will not be dumped.
+ 1 - (debug) - all processes dump core when possible. The core dump is
+ owned by the current user and no security is applied. This is
+ intended for system debugging situations only. Ptrace is unchecked.
++ This is insecure as it allows regular users to examine the memory
++ contents of privileged processes.
+ 2 - (suidsafe) - any binary which normally would not be dumped is dumped
+- readable by root only. This allows the end user to remove
+- such a dump but not access it directly. For security reasons
+- core dumps in this mode will not overwrite one another or
+- other files. This mode is appropriate when administrators are
+- attempting to debug problems in a normal environment.
++ anyway, but only if the "core_pattern" kernel sysctl is set to
++ either a pipe handler or a fully qualified path. (For more details
++ on this limitation, see CVE-2006-2451.) This mode is appropriate
++ when administrators are attempting to debug problems in a normal
++ environment, and either have a core dump pipe handler that knows
++ to treat privileged core dumps with care, or specific directory
++ defined for catching core dumps. If a core dump happens without
++ a pipe handler or fully qualifid path, a message will be emitted
++ to syslog warning about the lack of a correct setting.
+
+ ==============================================================
+
diff --git a/Makefile b/Makefile
-index eb29ec7..876409e 100644
+index 1dd2c09..6f850c4 100644
--- a/Makefile
+++ b/Makefile
-@@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
HOSTCC = gcc
HOSTCXX = g++
@@ -296,7 +285,7 @@ index eb29ec7..876409e 100644
# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
-@@ -414,8 +415,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
+@@ -407,8 +408,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exc
# Rules shared between *config targets and build targets
# Basic helpers built in scripts/
@@ -307,7 +296,7 @@ index eb29ec7..876409e 100644
$(Q)$(MAKE) $(build)=scripts/basic
$(Q)rm -f .tmp_quiet_recordmcount
-@@ -576,6 +577,65 @@ else
+@@ -564,6 +565,65 @@ else
KBUILD_CFLAGS += -O2
endif
@@ -352,7 +341,7 @@ index eb29ec7..876409e 100644
+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
-+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN
++export PLUGINCC CONSTIFY_PLUGIN
+ifeq ($(KBUILD_EXTMOD),)
+gcc-plugins:
+ $(Q)$(MAKE) $(build)=tools/gcc
@@ -372,8 +361,8 @@ index eb29ec7..876409e 100644
+
include $(srctree)/arch/$(SRCARCH)/Makefile
- ifdef CONFIG_READABLE_ASM
-@@ -733,7 +793,7 @@ export mod_sign_cmd
+ ifneq ($(CONFIG_FRAME_WARN),0)
+@@ -708,7 +768,7 @@ export mod_strip_cmd
ifeq ($(KBUILD_EXTMOD),)
@@ -382,16 +371,16 @@ index eb29ec7..876409e 100644
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -782,6 +842,8 @@ endif
+@@ -932,6 +992,8 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
-+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
-+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
- $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
++$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
++$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
+ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
# Handle descending into subdirectories listed in $(vmlinux-dirs)
-@@ -791,7 +853,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
+@@ -941,7 +1003,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
# Error messages still appears in the original language
PHONY += $(vmlinux-dirs)
@@ -399,8 +388,8 @@ index eb29ec7..876409e 100644
+$(vmlinux-dirs): gcc-plugins prepare scripts
$(Q)$(MAKE) $(build)=$@
- define filechk_kernel.release
-@@ -838,6 +900,7 @@ prepare0: archprepare FORCE
+ # Store (new) KERNELRELASE string in include/config/kernel.release
+@@ -985,6 +1047,7 @@ prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.
# All the preparing..
@@ -408,7 +397,7 @@ index eb29ec7..876409e 100644
prepare: prepare0
# Generate some files
-@@ -945,6 +1008,8 @@ all: modules
+@@ -1089,6 +1152,8 @@ all: modules
# using awk while concatenating to the final file.
PHONY += modules
@@ -417,7 +406,7 @@ index eb29ec7..876409e 100644
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.';
-@@ -960,7 +1025,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
+@@ -1104,7 +1169,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
# Target to prepare building external modules
PHONY += modules_prepare
@@ -426,16 +415,16 @@ index eb29ec7..876409e 100644
# Target to install modules
PHONY += modules_install
-@@ -1026,7 +1091,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
+@@ -1163,7 +1228,7 @@ CLEAN_FILES += vmlinux System.map \
+ 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
# clean - Delete most, but leave enough to build external modules
- #
-@@ -1066,6 +1131,7 @@ distclean: mrproper
+@@ -1201,6 +1266,7 @@ distclean: mrproper
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-o -name '.*.rej' \
@@ -443,7 +432,7 @@ index eb29ec7..876409e 100644
-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-type f -print | xargs rm -f
-@@ -1227,6 +1293,8 @@ PHONY += $(module-dirs) modules
+@@ -1361,6 +1427,8 @@ PHONY += $(module-dirs) modules
$(module-dirs): crmodverdir $(objtree)/Module.symvers
$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
@@ -452,7 +441,7 @@ index eb29ec7..876409e 100644
modules: $(module-dirs)
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1366,17 +1434,21 @@ else
+@@ -1487,17 +1555,21 @@ else
target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
endif
@@ -478,7 +467,7 @@ index eb29ec7..876409e 100644
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
%.symtypes: %.c prepare scripts FORCE
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1386,11 +1458,15 @@ endif
+@@ -1507,11 +1579,15 @@ endif
$(cmd_crmodverdir)
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir)
@@ -496,11 +485,44 @@ index eb29ec7..876409e 100644
$(cmd_crmodverdir)
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir) $(@:.ko=.o)
+diff --git a/arch/Kconfig b/arch/Kconfig
+index 4b0669c..7389b35 100644
+--- a/arch/Kconfig
++++ b/arch/Kconfig
+@@ -181,4 +181,28 @@ config HAVE_RCU_TABLE_FREE
+ config ARCH_HAVE_NMI_SAFE_CMPXCHG
+ bool
+
++config HAVE_ARCH_SECCOMP_FILTER
++ bool
++ help
++ An arch should select this symbol if it provides all of these things:
++ - syscall_get_arch()
++ - syscall_get_arguments()
++ - syscall_rollback()
++ - syscall_set_return_value()
++ - SIGSYS siginfo_t support
++ - uses __secure_computing_int() or secure_computing()
++ - secure_computing is called from a ptrace_event()-safe context
++ - secure_computing return value is checked and a return value of -1
++ results in the system call being skipped immediately.
++
++config SECCOMP_FILTER
++ def_bool y
++ depends on HAVE_ARCH_SECCOMP_FILTER && SECCOMP && NET
++ help
++ Enable tasks to build secure computing environments defined
++ in terms of Berkeley Packet Filter programs which implement
++ task-defined system call filtering polices.
++
++ See Documentation/prctl/seccomp_filter.txt for details.
++
+ source "kernel/gcov/Kconfig"
diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
-index 78b03ef..da28a51 100644
+index 6f1aca7..fa956e0 100644
--- a/arch/alpha/include/asm/atomic.h
+++ b/arch/alpha/include/asm/atomic.h
-@@ -292,6 +292,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
+@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
#define atomic_dec(v) atomic_sub(1,(v))
#define atomic64_dec(v) atomic64_sub(1,(v))
@@ -544,10 +566,10 @@ index ad368a9..fbe0f25 100644
#endif
diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
-index 968d999..d36b2df 100644
+index da5449e..7418343 100644
--- a/arch/alpha/include/asm/elf.h
+++ b/arch/alpha/include/asm/elf.h
-@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
+@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -579,10 +601,10 @@ index bc2a0da..8ad11ee 100644
static inline void
diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
-index d8f9b7e..f6222fa 100644
+index de98a73..bd4f1f8 100644
--- a/arch/alpha/include/asm/pgtable.h
+++ b/arch/alpha/include/asm/pgtable.h
-@@ -102,6 +102,17 @@ struct vm_area_struct;
+@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
#define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -614,10 +636,10 @@ index 2fd00b7..cfd5069 100644
for (i = 0; i < n; i++) {
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
-index 1402fcc..0b1abd2 100644
+index 01e8715..6a5a03b 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
-@@ -1298,10 +1298,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
+@@ -1138,16 +1138,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
@@ -626,20 +648,19 @@ index 1402fcc..0b1abd2 100644
+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
+ unsigned long limit, unsigned long flags)
{
- struct vm_unmapped_area_info info;
+ struct vm_area_struct *vma = find_vma(current->mm, addr);
+-
+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
-
- info.flags = 0;
- info.length = len;
-@@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
- info.high_limit = limit;
- info.align_mask = 0;
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
- }
-
-@@ -1341,20 +1343,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ 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, offset))
+ return addr;
+ addr = vma->vm_end;
+ vma = vma->vm_next;
+@@ -1183,20 +1183,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? */
@@ -669,10 +690,10 @@ index 1402fcc..0b1abd2 100644
return addr;
}
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
-index 98838a0..b304fb4 100644
+index fadd5f8..904e73a 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
-@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
+@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
__reload_thread(pcb);
}
@@ -797,7 +818,7 @@ index 98838a0..b304fb4 100644
/*
* This routine handles page faults. It determines the address,
-@@ -133,8 +251,29 @@ retry:
+@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
good_area:
si_code = SEGV_ACCERR;
if (cause < 0) {
@@ -828,26 +849,48 @@ index 98838a0..b304fb4 100644
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 1ad6fb6..4e7fae5 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1832,7 +1832,7 @@ config ALIGNMENT_TRAP
-
- config UACCESS_WITH_MEMCPY
- bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
-- depends on MMU
-+ depends on MMU && !PAX_MEMORY_UDEREF
- default y if CPU_FEROCEON
- help
- Implement faster copy_to_user and clear_user methods for CPU
+diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
+index 7bb8bf9..4b0c4ed 100644
+--- a/arch/arm/include/asm/assembler.h
++++ b/arch/arm/include/asm/assembler.h
+@@ -231,7 +231,7 @@
+ */
+ #ifdef CONFIG_THUMB2_KERNEL
+
+- .macro usraccoff, instr, reg, ptr, inc, off, cond, abort, t=T()
++ .macro usraccoff, instr, reg, ptr, inc, off, cond, abort, t=TUSER()
+ 9999:
+ .if \inc == 1
+ \instr\cond\()b\()\t\().w \reg, [\ptr, #\off]
+@@ -271,7 +271,7 @@
+
+ #else /* !CONFIG_THUMB2_KERNEL */
+
+- .macro usracc, instr, reg, ptr, inc, cond, rept, abort, t=T()
++ .macro usracc, instr, reg, ptr, inc, cond, rept, abort, t=TUSER()
+ .rept \rept
+ 9999:
+ .if \inc == 1
+@@ -307,4 +307,12 @@
+ .size \name , . - \name
+ .endm
+
++ .macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req
++#ifndef CONFIG_CPU_USE_DOMAINS
++ adds \tmp, \addr, #\size - 1
++ sbcccs \tmp, \tmp, \limit
++ bcs \bad
++#endif
++ .endm
++
+ #endif /* __ASM_ASSEMBLER_H__ */
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
-index da1c77d..2ee6056 100644
+index 86976d0..269b872 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
-@@ -17,17 +17,35 @@
- #include <asm/barrier.h>
- #include <asm/cmpxchg.h>
+@@ -15,6 +15,10 @@
+ #include <linux/types.h>
+ #include <asm/system.h>
+#ifdef CONFIG_GENERIC_ATOMIC64
+#include <asm-generic/atomic64.h>
@@ -856,16 +899,7 @@ index da1c77d..2ee6056 100644
#define ATOMIC_INIT(i) { (i) }
#ifdef __KERNEL__
-
-+#define _ASM_EXTABLE(from, to) \
-+" .pushsection __ex_table,\"a\"\n"\
-+" .align 3\n" \
-+" .long " #from ", " #to"\n" \
-+" .popsection"
-+
- /*
- * On ARM, ordinary assignment (str instruction) doesn't clear the local
- * strex/ldrex monitor on some implementations. The reason we can use it for
+@@ -25,7 +29,15 @@
* atomic_set() is the clrex or dummy strex done on every exception return.
*/
#define atomic_read(v) (*(volatile int *)&(v)->counter)
@@ -881,7 +915,7 @@ index da1c77d..2ee6056 100644
#if __LINUX_ARM_ARCH__ >= 6
-@@ -42,6 +60,35 @@ static inline void atomic_add(int i, atomic_t *v)
+@@ -40,6 +52,35 @@ static inline void atomic_add(int i, atomic_t *v)
int result;
__asm__ __volatile__("@ atomic_add\n"
@@ -917,7 +951,7 @@ index da1c77d..2ee6056 100644
"1: ldrex %0, [%3]\n"
" add %0, %0, %4\n"
" strex %1, %0, [%3]\n"
-@@ -60,6 +107,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
+@@ -58,6 +99,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
smp_mb();
__asm__ __volatile__("@ atomic_add_return\n"
@@ -960,7 +994,7 @@ index da1c77d..2ee6056 100644
"1: ldrex %0, [%3]\n"
" add %0, %0, %4\n"
" strex %1, %0, [%3]\n"
-@@ -80,6 +163,35 @@ static inline void atomic_sub(int i, atomic_t *v)
+@@ -78,6 +155,35 @@ static inline void atomic_sub(int i, atomic_t *v)
int result;
__asm__ __volatile__("@ atomic_sub\n"
@@ -996,7 +1030,7 @@ index da1c77d..2ee6056 100644
"1: ldrex %0, [%3]\n"
" sub %0, %0, %4\n"
" strex %1, %0, [%3]\n"
-@@ -98,11 +210,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
+@@ -96,11 +202,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
smp_mb();
__asm__ __volatile__("@ atomic_sub_return\n"
@@ -1024,7 +1058,7 @@ index da1c77d..2ee6056 100644
: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
: "r" (&v->counter), "Ir" (i)
: "cc");
-@@ -134,6 +260,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
+@@ -132,6 +252,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
return oldval;
}
@@ -1053,7 +1087,7 @@ index da1c77d..2ee6056 100644
static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
{
unsigned long tmp, tmp2;
-@@ -167,7 +315,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
+@@ -165,7 +307,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
return val;
}
@@ -1071,7 +1105,7 @@ index da1c77d..2ee6056 100644
static inline int atomic_sub_return(int i, atomic_t *v)
{
-@@ -182,6 +340,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
+@@ -180,6 +332,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
return val;
}
#define atomic_sub(i, v) (void) atomic_sub_return(i, v)
@@ -1082,7 +1116,7 @@ index da1c77d..2ee6056 100644
static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
{
-@@ -197,6 +359,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+@@ -195,6 +351,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
return ret;
}
@@ -1094,7 +1128,7 @@ index da1c77d..2ee6056 100644
static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
{
unsigned long flags;
-@@ -209,6 +376,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
+@@ -207,6 +368,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
#endif /* __LINUX_ARM_ARCH__ */
#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
@@ -1105,7 +1139,7 @@ index da1c77d..2ee6056 100644
static inline int __atomic_add_unless(atomic_t *v, int a, int u)
{
-@@ -221,11 +392,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -219,11 +384,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
}
#define atomic_inc(v) atomic_add(1, v)
@@ -1133,7 +1167,7 @@ index da1c77d..2ee6056 100644
#define atomic_dec_return(v) (atomic_sub_return(1, v))
#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
-@@ -241,6 +428,14 @@ typedef struct {
+@@ -239,6 +420,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
@@ -1147,44 +1181,8 @@ index da1c77d..2ee6056 100644
+
#define ATOMIC64_INIT(i) { (i) }
- #ifdef CONFIG_ARM_LPAE
-@@ -257,6 +452,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
- return result;
- }
-
-+static inline u64 atomic64_read_unchecked(const atomic64_unchecked_t *v)
-+{
-+ u64 result;
-+
-+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
-+" ldrd %0, %H0, [%1]"
-+ : "=&r" (result)
-+ : "r" (&v->counter), "Qo" (v->counter)
-+ );
-+
-+ return result;
-+}
-+
- static inline void atomic64_set(atomic64_t *v, u64 i)
- {
- __asm__ __volatile__("@ atomic64_set\n"
-@@ -265,6 +473,15 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
- : "r" (&v->counter), "r" (i)
- );
- }
-+
-+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
-+{
-+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
-+" strd %2, %H2, [%1]"
-+ : "=Qo" (v->counter)
-+ : "r" (&v->counter), "r" (i)
-+ );
-+}
- #else
- static inline u64 atomic64_read(const atomic64_t *v)
- {
-@@ -279,6 +496,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
+ static inline u64 atomic64_read(atomic64_t *v)
+@@ -254,6 +443,19 @@ static inline u64 atomic64_read(atomic64_t *v)
return result;
}
@@ -1204,11 +1202,10 @@ index da1c77d..2ee6056 100644
static inline void atomic64_set(atomic64_t *v, u64 i)
{
u64 tmp;
-@@ -292,6 +522,21 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
- : "r" (&v->counter), "r" (i)
+@@ -268,6 +470,20 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
: "cc");
}
-+
+
+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
+{
+ u64 tmp;
@@ -1223,10 +1220,10 @@ index da1c77d..2ee6056 100644
+ : "cc");
+}
+
- #endif
-
static inline void atomic64_add(u64 i, atomic64_t *v)
-@@ -302,6 +547,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
+ {
+ u64 result;
+@@ -276,6 +492,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
__asm__ __volatile__("@ atomic64_add\n"
"1: ldrexd %0, %H0, [%3]\n"
" adds %0, %0, %4\n"
@@ -1263,7 +1260,7 @@ index da1c77d..2ee6056 100644
" adc %H0, %H0, %H4\n"
" strexd %1, %0, %H0, [%3]\n"
" teq %1, #0\n"
-@@ -313,12 +588,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
+@@ -287,12 +533,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
{
@@ -1315,7 +1312,7 @@ index da1c77d..2ee6056 100644
"1: ldrexd %0, %H0, [%3]\n"
" adds %0, %0, %4\n"
" adc %H0, %H0, %H4\n"
-@@ -342,6 +654,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
+@@ -316,6 +599,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
__asm__ __volatile__("@ atomic64_sub\n"
"1: ldrexd %0, %H0, [%3]\n"
" subs %0, %0, %4\n"
@@ -1352,7 +1349,7 @@ index da1c77d..2ee6056 100644
" sbc %H0, %H0, %H4\n"
" strexd %1, %0, %H0, [%3]\n"
" teq %1, #0\n"
-@@ -353,18 +695,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
+@@ -327,18 +640,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
{
@@ -1390,7 +1387,7 @@ index da1c77d..2ee6056 100644
: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
: "r" (&v->counter), "r" (i)
: "cc");
-@@ -398,6 +754,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
+@@ -372,6 +699,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
return oldval;
}
@@ -1421,7 +1418,7 @@ index da1c77d..2ee6056 100644
static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
{
u64 result;
-@@ -421,21 +801,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
+@@ -395,21 +746,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
static inline u64 atomic64_dec_if_positive(atomic64_t *v)
{
@@ -1463,7 +1460,7 @@ index da1c77d..2ee6056 100644
: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
: "r" (&v->counter)
: "cc");
-@@ -458,13 +851,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
+@@ -432,13 +796,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
" teq %0, %5\n"
" teqeq %H0, %H5\n"
" moveq %1, #0\n"
@@ -1492,7 +1489,7 @@ index da1c77d..2ee6056 100644
: "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
: "r" (&v->counter), "r" (u), "r" (a)
: "cc");
-@@ -477,10 +882,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
+@@ -451,10 +827,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
#define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
#define atomic64_inc(v) atomic64_add(1LL, (v))
@@ -1507,7 +1504,7 @@ index da1c77d..2ee6056 100644
#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..ba3dee4 100644
+index 75fe66b..2255c86 100644
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
@@ -4,8 +4,10 @@
@@ -1522,18 +1519,11 @@ index 75fe66b..ba3dee4 100644
/*
* 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 15f2d5b..43ffa53 100644
+index 1397408..c4f6969 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
-@@ -116,7 +116,7 @@ struct cpu_cache_fns {
+@@ -108,7 +108,7 @@ struct cpu_cache_fns {
void (*dma_unmap_area)(const void *, size_t, int);
void (*dma_flush_range)(const void *, const void *);
@@ -1542,110 +1532,39 @@ index 15f2d5b..43ffa53 100644
/*
* Select the calling method
-diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
-index 6dcc164..b14d917 100644
---- a/arch/arm/include/asm/checksum.h
-+++ b/arch/arm/include/asm/checksum.h
-@@ -37,7 +37,19 @@ __wsum
- csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
-
- __wsum
--csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
-+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
-+
-+static inline __wsum
-+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
-+{
-+ __wsum ret;
-+ pax_open_userland();
-+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
-+ pax_close_userland();
-+ return ret;
-+}
-+
-+
-
- /*
- * Fold a partial checksum without adding pseudo headers
-diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
-index 4f009c1..466c59b 100644
---- a/arch/arm/include/asm/cmpxchg.h
-+++ b/arch/arm/include/asm/cmpxchg.h
-@@ -102,6 +102,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
-
- #define xchg(ptr,x) \
- ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-+#define xchg_unchecked(ptr,x) \
-+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-
- #include <asm-generic/cmpxchg-local.h>
-
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
-index 6ddbe44..b5e38b1 100644
+index af18cea..b5dc173 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
-@@ -48,18 +48,37 @@
- * Domain types
+@@ -83,9 +83,9 @@
+ * instructions (inline assembly)
*/
- #define DOMAIN_NOACCESS 0
--#define DOMAIN_CLIENT 1
#ifdef CONFIG_CPU_USE_DOMAINS
-+#define DOMAIN_USERCLIENT 1
-+#define DOMAIN_KERNELCLIENT 1
- #define DOMAIN_MANAGER 3
-+#define DOMAIN_VECTORS DOMAIN_USER
+-#define T(instr) #instr "t"
++#define TUSER(instr) #instr "t"
#else
-+
-+#ifdef CONFIG_PAX_KERNEXEC
- #define DOMAIN_MANAGER 1
-+#define DOMAIN_KERNEXEC 3
-+#else
-+#define DOMAIN_MANAGER 1
-+#endif
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+#define DOMAIN_USERCLIENT 0
-+#define DOMAIN_UDEREF 1
-+#define DOMAIN_VECTORS DOMAIN_KERNEL
-+#else
-+#define DOMAIN_USERCLIENT 1
-+#define DOMAIN_VECTORS DOMAIN_USER
-+#endif
-+#define DOMAIN_KERNELCLIENT 1
-+
+-#define T(instr) #instr
++#define TUSER(instr) #instr
#endif
- #define domain_val(dom,type) ((type) << (2*(dom)))
-
- #ifndef __ASSEMBLY__
-
--#ifdef CONFIG_CPU_USE_DOMAINS
-+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
- static inline void set_domain(unsigned val)
- {
- asm volatile(
-@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
- isb();
- }
-
--#define modify_domain(dom,type) \
-- do { \
-- struct thread_info *thread = current_thread_info(); \
-- unsigned int domain = thread->cpu_domain; \
-- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
-- thread->cpu_domain = domain | domain_val(dom, type); \
-- set_domain(thread->cpu_domain); \
-- } while (0)
--
-+extern void modify_domain(unsigned int dom, unsigned int type);
+ #else /* __ASSEMBLY__ */
+@@ -95,9 +95,9 @@
+ * instructions
+ */
+ #ifdef CONFIG_CPU_USE_DOMAINS
+-#define T(instr) instr ## t
++#define TUSER(instr) instr ## t
#else
- static inline void set_domain(unsigned val) { }
- static inline void modify_domain(unsigned dom, unsigned type) { }
+-#define T(instr) instr
++#define TUSER(instr) instr
+ #endif
+
+ #endif /* __ASSEMBLY__ */
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
-index f4b46d3..abc9b2b 100644
+index 0e9ce8d..6ef1e03 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
-@@ -114,7 +114,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
+@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
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. */
@@ -1661,7 +1580,7 @@ index f4b46d3..abc9b2b 100644
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
-@@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
+@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
extern void elf_set_personality(const struct elf32_hdr *);
#define SET_PERSONALITY(ex) elf_set_personality(&(ex))
@@ -1669,129 +1588,52 @@ index f4b46d3..abc9b2b 100644
-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
-#define arch_randomize_brk arch_randomize_brk
-
- #ifdef CONFIG_MMU
- #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
- struct linux_binprm;
-diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
-index de53547..52b9a28 100644
---- a/arch/arm/include/asm/fncpy.h
-+++ b/arch/arm/include/asm/fncpy.h
-@@ -81,7 +81,9 @@
- BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
- (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
- \
-+ pax_open_kernel(); \
- memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
-+ pax_close_kernel(); \
- flush_icache_range((unsigned long)(dest_buf), \
- (unsigned long)(dest_buf) + (size)); \
- \
+ extern int vectors_user_mapping(void);
+ #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
+ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
-index e42cf59..7b94b8f 100644
+index 253cc86..7be5469 100644
--- a/arch/arm/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
-@@ -50,6 +50,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
- return -EFAULT;
-
-+ pax_open_userland();
-+
- smp_mb();
- __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
- "1: ldrex %1, [%4]\n"
-@@ -65,6 +67,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
- : "cc", "memory");
- smp_mb();
-
-+ pax_close_userland();
-+
- *uval = val;
- return ret;
- }
-@@ -95,6 +99,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
+@@ -75,9 +75,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+
+ #define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \
+ __asm__ __volatile__( \
+- "1: " T(ldr) " %1, [%3]\n" \
++ "1: " TUSER(ldr) " %1, [%3]\n" \
+ " " insn "\n" \
+- "2: " T(str) " %0, [%3]\n" \
++ "2: " TUSER(str) " %0, [%3]\n" \
+ " mov %0, #0\n" \
+ __futex_atomic_ex_table("%5") \
+ : "=&r" (ret), "=&r" (oldval), "=&r" (tmp) \
+@@ -95,10 +95,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
return -EFAULT;
-+ pax_open_userland();
-+
__asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
- "1: " TUSER(ldr) " %1, [%4]\n"
+- "1: " T(ldr) " %1, [%4]\n"
++ "1: " TUSER(ldr) " %1, [%4]\n"
" teq %1, %2\n"
-@@ -105,6 +111,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+ " it eq @ explicit IT needed for the 2b label\n"
+- "2: " T(streq) " %3, [%4]\n"
++ "2: " TUSER(streq) " %3, [%4]\n"
+ __futex_atomic_ex_table("%5")
+ : "+r" (ret), "=&r" (val)
: "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
- : "cc", "memory");
-
-+ pax_close_userland();
-+
- *uval = val;
- return ret;
- }
-@@ -127,6 +135,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
- return -EFAULT;
-
- pagefault_disable(); /* implies preempt_disable() */
-+ pax_open_userland();
-
- switch (op) {
- case FUTEX_OP_SET:
-@@ -148,6 +157,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
- ret = -ENOSYS;
- }
-
-+ pax_close_userland();
- pagefault_enable(); /* subsumes preempt_enable() */
-
- if (!ret) {
diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
-index 83eb2f7..ed77159 100644
+index e51b1e8..32a3113 100644
--- a/arch/arm/include/asm/kmap_types.h
+++ b/arch/arm/include/asm/kmap_types.h
-@@ -4,6 +4,6 @@
- /*
- * This is the "bare minimum". AIO seems to require this.
- */
--#define KM_TYPE_NR 16
-+#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 2fe141f..192dc01 100644
---- a/arch/arm/include/asm/mach/map.h
-+++ b/arch/arm/include/asm/mach/map.h
-@@ -27,13 +27,16 @@ struct map_desc {
- #define MT_MINICLEAN 6
- #define MT_LOW_VECTORS 7
- #define MT_HIGH_VECTORS 8
--#define MT_MEMORY 9
-+#define MT_MEMORY_RWX 9
- #define MT_ROM 10
--#define MT_MEMORY_NONCACHED 11
-+#define MT_MEMORY_NONCACHED_RX 11
- #define MT_MEMORY_DTCM 12
- #define MT_MEMORY_ITCM 13
- #define MT_MEMORY_SO 14
- #define MT_MEMORY_DMA_READY 15
-+#define MT_MEMORY_RW 16
-+#define MT_MEMORY_RX 17
-+#define MT_MEMORY_NONCACHED_RW 18
+@@ -21,6 +21,7 @@ enum km_type {
+ KM_L1_CACHE,
+ KM_L2_CACHE,
+ KM_KDB,
++ KM_CLEARPAGE,
+ KM_TYPE_NR
+ };
- #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 f94784f..41c7f61 100644
+index 53426c6..c7baff3 100644
--- a/arch/arm/include/asm/outercache.h
+++ b/arch/arm/include/asm/outercache.h
@@ -35,7 +35,7 @@ struct outer_cache_fns {
@@ -1799,15 +1641,15 @@ index f94784f..41c7f61 100644
void (*set_debug)(unsigned long);
void (*resume)(void);
-};
-+} __do_const;
++} __no_const;
- extern struct outer_cache_fns outer_cache;
+ #ifdef CONFIG_OUTER_CACHE
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
-index 4355f0e..c229913 100644
+index ca94653..6ac0d56 100644
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
-@@ -114,7 +114,7 @@ struct cpu_user_fns {
+@@ -123,7 +123,7 @@ struct cpu_user_fns {
void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
unsigned long vaddr, struct vm_area_struct *vma);
@@ -1817,440 +1659,238 @@ index 4355f0e..c229913 100644
#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..c37a730 100644
+index 3e08fd3..3f14f89 100644
--- a/arch/arm/include/asm/pgalloc.h
+++ b/arch/arm/include/asm/pgalloc.h
-@@ -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));
- }
-
-+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
-+{
-+ pud_populate(mm, pud, pmd);
-+}
-+
- #else /* !CONFIG_ARM_LPAE */
-
- /*
-@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
+@@ -31,6 +31,7 @@
#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()
-+#define pud_populate_kernel(mm,pmd,pte) BUG()
+ #define pgd_populate(mm,pmd,pte) BUG()
++#define pgd_populate_kernel(mm,pmd,pte) BUG()
- #endif /* CONFIG_ARM_LPAE */
+ extern pgd_t *pgd_alloc(struct mm_struct *mm);
+ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
+diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
+index 96187ff..7a9b049 100644
+--- a/arch/arm/include/asm/ptrace.h
++++ b/arch/arm/include/asm/ptrace.h
+@@ -72,7 +72,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 */
-@@ -126,6 +133,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
- __free_page(pte);
- }
+diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
+index 984014b..a6d914f 100644
+--- a/arch/arm/include/asm/system.h
++++ b/arch/arm/include/asm/system.h
+@@ -90,6 +90,8 @@ void hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int,
-+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
-+{
-+#ifdef CONFIG_ARM_LPAE
-+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
-+#else
-+ if (addr & SECTION_SIZE)
-+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
-+ else
-+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
-+#endif
-+ flush_pmd_entry(pmdp);
-+}
-+
- static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
- pmdval_t prot)
- {
-@@ -155,7 +175,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..f415e1a 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) /* v7 */
- #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) /* v7 */
- #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_RDONLY (_AT(pmdval_t, 0))
-
- #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
- #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
-@@ -66,6 +70,7 @@
- * - extended small page/tiny page
- */
- #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
-+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
- #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
- #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
- #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
-diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
-index f97ee02..cc9fe9e 100644
---- a/arch/arm/include/asm/pgtable-2level.h
-+++ b/arch/arm/include/asm/pgtable-2level.h
-@@ -126,6 +126,9 @@
- #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
- #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
-
-+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
-+#define L_PTE_PXN (_AT(pteval_t, 0))
-+
- /*
- * These are the memory types, defined to be compatible with
- * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
-diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
-index 626989f..9d67a33 100644
---- a/arch/arm/include/asm/pgtable-3level-hwdef.h
-+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
-@@ -75,6 +75,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 */
+ #define xchg(ptr,x) \
+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
++#define xchg_unchecked(ptr,x) \
++ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
- /*
-diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
-index 5689c18..eea12f9 100644
---- a/arch/arm/include/asm/pgtable-3level.h
-+++ b/arch/arm/include/asm/pgtable-3level.h
-@@ -82,6 +82,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 */
-@@ -95,6 +96,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 be956db..c8f25e2 100644
---- a/arch/arm/include/asm/pgtable.h
-+++ b/arch/arm/include/asm/pgtable.h
-@@ -33,6 +33,9 @@
- #include <asm/pgtable-2level.h>
- #endif
+ extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
-+#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
-@@ -48,6 +51,9 @@
- #define LIBRARY_TEXT_START 0x0c000000
+@@ -101,7 +103,7 @@ extern int __pure cpu_architecture(void);
+ extern void cpu_init(void);
- #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);
-@@ -56,6 +62,48 @@ 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)
+ void arm_machine_restart(char mode, const char *cmd);
+-extern void (*arm_pm_restart)(char str, const char *cmd);
++extern void (*arm_pm_restart)(char str, const char *cmd) __noreturn;
-+#define __HAVE_ARCH_PAX_OPEN_KERNEL
-+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
-+
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
-+#include <asm/domain.h>
-+#include <linux/thread_info.h>
-+#include <linux/preempt.h>
-+
-+static inline int test_domain(int domain, int domaintype)
-+{
-+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
-+}
-+#endif
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+static inline unsigned long pax_open_kernel(void) {
-+#ifdef CONFIG_ARM_LPAE
-+ /* TODO */
-+#else
-+ preempt_disable();
-+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
-+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
-+#endif
-+ return 0;
-+}
+ #define UDBG_UNDEFINED (1 << 0)
+ #define UDBG_SYSCALL (1 << 1)
+@@ -526,6 +528,13 @@ static inline unsigned long long __cmpxchg64_mb(volatile void *ptr,
+
+ #endif /* __LINUX_ARM_ARCH__ >= 6 */
+
++#define _ASM_EXTABLE(from, to) \
++" .pushsection __ex_table,\"a\"\n"\
++" .align 3\n" \
++" .long " #from ", " #to"\n" \
++" .popsection"
+
-+static inline unsigned long pax_close_kernel(void) {
-+#ifdef CONFIG_ARM_LPAE
-+ /* TODO */
-+#else
-+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
-+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
-+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
-+ preempt_enable_no_resched();
-+#endif
-+ return 0;
-+}
-+#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
-@@ -75,8 +123,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
-
-@@ -260,7 +308,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 |
-- L_PTE_NONE | L_PTE_VALID;
-+ L_PTE_NONE | L_PTE_VALID | __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 5324c11..bcae5f0 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/psci.h b/arch/arm/include/asm/psci.h
-index c4ae171..ea0c0c2 100644
---- a/arch/arm/include/asm/psci.h
-+++ b/arch/arm/include/asm/psci.h
-@@ -29,7 +29,7 @@ struct psci_operations {
- int (*cpu_off)(struct psci_power_state state);
- int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
- int (*migrate)(unsigned long cpuid);
--};
-+} __no_const;
-
- extern struct psci_operations psci_ops;
- extern struct smp_operations psci_smp_ops;
-diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
-index a8cae71c..65dd797 100644
---- a/arch/arm/include/asm/smp.h
-+++ b/arch/arm/include/asm/smp.h
-@@ -110,7 +110,7 @@ struct smp_operations {
- int (*cpu_disable)(unsigned int cpu);
- #endif
- #endif
--};
-+} __no_const;
+ #endif /* __ASSEMBLY__ */
- /*
- * set platform specific SMP operations
+ #define arch_align_stack(x) (x)
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
-index df5e13d..97efb82 100644
+index 7b5cc8d..5d70d88 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
-@@ -88,9 +88,9 @@ struct thread_info {
- .flags = 0, \
- .preempt_count = INIT_PREEMPT_COUNT, \
- .addr_limit = KERNEL_DS, \
-- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
-- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
-- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
-+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
-+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
-+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
- .restart_block = { \
- .fn = do_no_restart_syscall, \
- }, \
-@@ -163,7 +163,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
- #define TIF_SYSCALL_AUDIT 9
- #define TIF_SYSCALL_TRACEPOINT 10
- #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
--#define TIF_NOHZ 12 /* in adaptive nohz mode */
+@@ -139,6 +139,12 @@ extern void vfp_flush_hwstate(struct thread_info *);
+ #define TIF_NEED_RESCHED 1
+ #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
+ #define TIF_SYSCALL_TRACE 8
++
+/* within 8 bits of TIF_SYSCALL_TRACE
-+ * to meet flexible second operand requirements
-+ */
-+#define TIF_GRSEC_SETXID 12
-+#define TIF_NOHZ 13 /* in adaptive nohz mode */
++ to meet flexible second operand requirements
++*/
++#define TIF_GRSEC_SETXID 9
++
+ #define TIF_POLLING_NRFLAG 16
#define TIF_USING_IWMMXT 17
#define TIF_MEMDIE 18 /* is terminating due to OOM killer */
- #define TIF_RESTORE_SIGMASK 20
-@@ -176,10 +180,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
- #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
+@@ -155,6 +161,10 @@ extern void vfp_flush_hwstate(struct thread_info *);
+ #define _TIF_FREEZE (1 << TIF_FREEZE)
+ #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
- #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
+#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 | \
-- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
-+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
++
++/* Checks for any syscall work in entry-common.S */
++#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _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 72abdc5..9eba222 100644
+index b293616..47aa55e 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
-@@ -18,6 +18,7 @@
- #include <asm/domain.h>
- #include <asm/unified.h>
- #include <asm/compiler.h>
-+#include <asm/pgtable.h>
-
- #if __LINUX_ARM_ARCH__ < 6
- #include <asm-generic/uaccess-unaligned.h>
-@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
- static inline void set_fs(mm_segment_t fs)
- {
- current_thread_info()->addr_limit = fs;
-- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
-+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
- }
-
- #define segment_eq(a,b) ((a) == (b))
-
-+#define __HAVE_ARCH_PAX_OPEN_USERLAND
-+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
-+
-+static inline void pax_open_userland(void)
-+{
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (segment_eq(get_fs(), USER_DS)) {
-+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
-+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
-+ }
-+#endif
-+
-+}
-+
-+static inline void pax_close_userland(void)
-+{
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (segment_eq(get_fs(), USER_DS)) {
-+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
-+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
-+ }
+@@ -101,28 +101,39 @@ extern int __get_user_1(void *);
+ extern int __get_user_2(void *);
+ extern int __get_user_4(void *);
+
+-#define __get_user_x(__r2,__p,__e,__s,__i...) \
++#define __GUP_CLOBBER_1 "lr", "cc"
++#ifdef CONFIG_CPU_USE_DOMAINS
++#define __GUP_CLOBBER_2 "ip", "lr", "cc"
++#else
++#define __GUP_CLOBBER_2 "lr", "cc"
+#endif
++#define __GUP_CLOBBER_4 "lr", "cc"
+
-+}
-+
- #define __addr_ok(addr) ({ \
- unsigned long flag; \
- __asm__("cmp %2, %0; movlo %0, #0" \
-@@ -150,8 +178,12 @@ extern int __get_user_4(void *);
++#define __get_user_x(__r2,__p,__e,__l,__s) \
+ __asm__ __volatile__ ( \
+ __asmeq("%0", "r0") __asmeq("%1", "r2") \
++ __asmeq("%3", "r1") \
+ "bl __get_user_" #__s \
+ : "=&r" (__e), "=r" (__r2) \
+- : "0" (__p) \
+- : __i, "cc")
++ : "0" (__p), "r" (__l) \
++ : __GUP_CLOBBER_##__s)
#define get_user(x,p) \
({ \
-+ int __e; \
- might_fault(); \
-- __get_user_check(x,p); \
-+ pax_open_userland(); \
-+ __e = __get_user_check(x,p); \
-+ pax_close_userland(); \
-+ __e; \
- })
-
- extern int __put_user_1(void *, unsigned int);
-@@ -195,8 +227,12 @@ extern int __put_user_8(void *, unsigned long long);
++ unsigned long __limit = current_thread_info()->addr_limit - 1; \
+ register const typeof(*(p)) __user *__p asm("r0") = (p);\
+ register unsigned long __r2 asm("r2"); \
++ register unsigned long __l asm("r1") = __limit; \
+ register int __e asm("r0"); \
+ switch (sizeof(*(__p))) { \
+ case 1: \
+- __get_user_x(__r2, __p, __e, 1, "lr"); \
+- break; \
++ __get_user_x(__r2, __p, __e, __l, 1); \
++ break; \
+ case 2: \
+- __get_user_x(__r2, __p, __e, 2, "r3", "lr"); \
++ __get_user_x(__r2, __p, __e, __l, 2); \
+ break; \
+ case 4: \
+- __get_user_x(__r2, __p, __e, 4, "lr"); \
++ __get_user_x(__r2, __p, __e, __l, 4); \
+ break; \
+ default: __e = __get_user_bad(); break; \
+ } \
+@@ -135,31 +146,34 @@ extern int __put_user_2(void *, unsigned int);
+ extern int __put_user_4(void *, unsigned int);
+ extern int __put_user_8(void *, unsigned long long);
+
+-#define __put_user_x(__r2,__p,__e,__s) \
++#define __put_user_x(__r2,__p,__e,__l,__s) \
+ __asm__ __volatile__ ( \
+ __asmeq("%0", "r0") __asmeq("%2", "r2") \
++ __asmeq("%3", "r1") \
+ "bl __put_user_" #__s \
+ : "=&r" (__e) \
+- : "0" (__p), "r" (__r2) \
++ : "0" (__p), "r" (__r2), "r" (__l) \
+ : "ip", "lr", "cc")
#define put_user(x,p) \
({ \
-+ int __e; \
- might_fault(); \
-- __put_user_check(x,p); \
-+ pax_open_userland(); \
-+ __e = __put_user_check(x,p); \
-+ pax_close_userland(); \
-+ __e; \
- })
-
- #else /* CONFIG_MMU */
-@@ -237,13 +273,17 @@ static inline void set_fs(mm_segment_t fs)
- #define __get_user(x,ptr) \
- ({ \
- long __gu_err = 0; \
-+ pax_open_userland(); \
- __get_user_err((x),(ptr),__gu_err); \
-+ pax_close_userland(); \
- __gu_err; \
- })
-
- #define __get_user_error(x,ptr,err) \
- ({ \
-+ pax_open_userland(); \
- __get_user_err((x),(ptr),err); \
-+ pax_close_userland(); \
- (void) 0; \
- })
-
-@@ -319,13 +359,17 @@ do { \
- #define __put_user(x,ptr) \
- ({ \
- long __pu_err = 0; \
-+ pax_open_userland(); \
- __put_user_err((x),(ptr),__pu_err); \
-+ pax_close_userland(); \
- __pu_err; \
- })
-
- #define __put_user_error(x,ptr,err) \
- ({ \
-+ pax_open_userland(); \
- __put_user_err((x),(ptr),err); \
-+ pax_close_userland(); \
- (void) 0; \
- })
-
-@@ -425,11 +469,44 @@ do { \
++ unsigned long __limit = current_thread_info()->addr_limit - 1; \
+ register const typeof(*(p)) __r2 asm("r2") = (x); \
+ register const typeof(*(p)) __user *__p asm("r0") = (p);\
++ register unsigned long __l asm("r1") = __limit; \
+ register int __e asm("r0"); \
+ switch (sizeof(*(__p))) { \
+ case 1: \
+- __put_user_x(__r2, __p, __e, 1); \
++ __put_user_x(__r2, __p, __e, __l, 1); \
+ break; \
+ case 2: \
+- __put_user_x(__r2, __p, __e, 2); \
++ __put_user_x(__r2, __p, __e, __l, 2); \
+ break; \
+ case 4: \
+- __put_user_x(__r2, __p, __e, 4); \
++ __put_user_x(__r2, __p, __e, __l, 4); \
+ break; \
+ case 8: \
+- __put_user_x(__r2, __p, __e, 8); \
++ __put_user_x(__r2, __p, __e, __l, 8); \
+ break; \
+ default: __e = __put_user_bad(); break; \
+ } \
+@@ -227,7 +241,7 @@ do { \
+
+ #define __get_user_asm_byte(x,addr,err) \
+ __asm__ __volatile__( \
+- "1: " T(ldrb) " %1,[%2],#0\n" \
++ "1: " TUSER(ldrb) " %1,[%2],#0\n" \
+ "2:\n" \
+ " .pushsection .fixup,\"ax\"\n" \
+ " .align 2\n" \
+@@ -263,7 +277,7 @@ do { \
+
+ #define __get_user_asm_word(x,addr,err) \
+ __asm__ __volatile__( \
+- "1: " T(ldr) " %1,[%2],#0\n" \
++ "1: " TUSER(ldr) " %1,[%2],#0\n" \
+ "2:\n" \
+ " .pushsection .fixup,\"ax\"\n" \
+ " .align 2\n" \
+@@ -308,7 +322,7 @@ do { \
+
+ #define __put_user_asm_byte(x,__pu_addr,err) \
+ __asm__ __volatile__( \
+- "1: " T(strb) " %1,[%2],#0\n" \
++ "1: " TUSER(strb) " %1,[%2],#0\n" \
+ "2:\n" \
+ " .pushsection .fixup,\"ax\"\n" \
+ " .align 2\n" \
+@@ -341,7 +355,7 @@ do { \
+
+ #define __put_user_asm_word(x,__pu_addr,err) \
+ __asm__ __volatile__( \
+- "1: " T(str) " %1,[%2],#0\n" \
++ "1: " TUSER(str) " %1,[%2],#0\n" \
+ "2:\n" \
+ " .pushsection .fixup,\"ax\"\n" \
+ " .align 2\n" \
+@@ -366,10 +380,10 @@ do { \
+
+ #define __put_user_asm_dword(x,__pu_addr,err) \
+ __asm__ __volatile__( \
+- ARM( "1: " T(str) " " __reg_oper1 ", [%1], #4\n" ) \
+- ARM( "2: " T(str) " " __reg_oper0 ", [%1]\n" ) \
+- THUMB( "1: " T(str) " " __reg_oper1 ", [%1]\n" ) \
+- THUMB( "2: " T(str) " " __reg_oper0 ", [%1, #4]\n" ) \
++ ARM( "1: " TUSER(str) " " __reg_oper1 ", [%1], #4\n" ) \
++ ARM( "2: " TUSER(str) " " __reg_oper0 ", [%1]\n" ) \
++ THUMB( "1: " TUSER(str) " " __reg_oper1 ", [%1]\n" ) \
++ THUMB( "2: " TUSER(str) " " __reg_oper0 ", [%1, #4]\n" ) \
+ "3:\n" \
+ " .pushsection .fixup,\"ax\"\n" \
+ " .align 2\n" \
+@@ -387,8 +401,21 @@ do { \
#ifdef CONFIG_MMU
@@ -2261,44 +1901,20 @@ index 72abdc5..9eba222 100644
+
+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
+{
-+ unsigned long ret;
-+
+ check_object_size(to, n, false);
-+ pax_open_userland();
-+ ret = ___copy_from_user(to, from, n);
-+ pax_close_userland();
-+ return ret;
++ 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)
+{
-+ unsigned long ret;
-+
+ check_object_size(from, n, true);
-+ pax_open_userland();
-+ ret = ___copy_to_user(to, from, n);
-+ pax_close_userland();
-+ return ret;
++ 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(void __user *addr, 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);
-+
-+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
-+{
-+ unsigned long ret;
-+ pax_open_userland();
-+ ret = ___clear_user(addr, n);
-+ pax_close_userland();
-+ return ret;
-+}
-+
- #else
- #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
- #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
-@@ -438,6 +515,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
+@@ -403,6 +430,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
{
@@ -2308,7 +1924,7 @@ index 72abdc5..9eba222 100644
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else /* security hole - plug it */
-@@ -447,6 +527,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
+@@ -412,6 +442,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)
{
@@ -2318,413 +1934,48 @@ index 72abdc5..9eba222 100644
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 5af0ed1..cea83883 100644
---- a/arch/arm/include/uapi/asm/ptrace.h
-+++ b/arch/arm/include/uapi/asm/ptrace.h
-@@ -92,7 +92,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..e5a0f22 100644
+index 5b0bce6..becd81c 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
-@@ -53,7 +53,7 @@ EXPORT_SYMBOL(arm_delay_ops);
-
- /* networking */
- EXPORT_SYMBOL(csum_partial);
--EXPORT_SYMBOL(csum_partial_copy_from_user);
-+EXPORT_SYMBOL(__csum_partial_copy_from_user);
- EXPORT_SYMBOL(csum_partial_copy_nocheck);
- EXPORT_SYMBOL(__csum_ipv6_magic);
-
-@@ -89,9 +89,9 @@ EXPORT_SYMBOL(__memzero);
+@@ -95,8 +95,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
#ifdef CONFIG_MMU
EXPORT_SYMBOL(copy_page);
-EXPORT_SYMBOL(__copy_from_user);
-EXPORT_SYMBOL(__copy_to_user);
--EXPORT_SYMBOL(__clear_user);
+EXPORT_SYMBOL(___copy_from_user);
+EXPORT_SYMBOL(___copy_to_user);
-+EXPORT_SYMBOL(___clear_user);
+ EXPORT_SYMBOL(__clear_user);
EXPORT_SYMBOL(__get_user_1);
- EXPORT_SYMBOL(__get_user_2);
-diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
-index 9cbe70c..a7b5e34 100644
---- a/arch/arm/kernel/entry-armv.S
-+++ b/arch/arm/kernel/entry-armv.S
-@@ -47,6 +47,87 @@
- 9997:
- .endm
-
-+ .macro pax_enter_kernel
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
-+ @ make aligned space for saved DACR
-+ sub sp, sp, #8
-+ @ save regs
-+ stmdb sp!, {r1, r2}
-+ @ read DACR from cpu_domain into r1
-+ mov r2, sp
-+ @ assume 8K pages, since we have to split the immediate in two
-+ bic r2, r2, #(0x1fc0)
-+ bic r2, r2, #(0x3f)
-+ ldr r1, [r2, #TI_CPU_DOMAIN]
-+ @ store old DACR on stack
-+ str r1, [sp, #8]
-+#ifdef CONFIG_PAX_KERNEXEC
-+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
-+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
-+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
-+#endif
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
-+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
-+#endif
-+ @ write r1 to current_thread_info()->cpu_domain
-+ str r1, [r2, #TI_CPU_DOMAIN]
-+ @ write r1 to DACR
-+ mcr p15, 0, r1, c3, c0, 0
-+ @ instruction sync
-+ instr_sync
-+ @ restore regs
-+ ldmia sp!, {r1, r2}
-+#endif
-+ .endm
-+
-+ .macro pax_open_userland
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ @ save regs
-+ stmdb sp!, {r0, r1}
-+ @ read DACR from cpu_domain into r1
-+ mov r0, sp
-+ @ assume 8K pages, since we have to split the immediate in two
-+ bic r0, r0, #(0x1fc0)
-+ bic r0, r0, #(0x3f)
-+ ldr r1, [r0, #TI_CPU_DOMAIN]
-+ @ set current DOMAIN_USER to DOMAIN_CLIENT
-+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
-+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
-+ @ write r1 to current_thread_info()->cpu_domain
-+ str r1, [r0, #TI_CPU_DOMAIN]
-+ @ write r1 to DACR
-+ mcr p15, 0, r1, c3, c0, 0
-+ @ instruction sync
-+ instr_sync
-+ @ restore regs
-+ ldmia sp!, {r0, r1}
-+#endif
-+ .endm
-+
-+ .macro pax_close_userland
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ @ save regs
-+ stmdb sp!, {r0, r1}
-+ @ read DACR from cpu_domain into r1
-+ mov r0, sp
-+ @ assume 8K pages, since we have to split the immediate in two
-+ bic r0, r0, #(0x1fc0)
-+ bic r0, r0, #(0x3f)
-+ ldr r1, [r0, #TI_CPU_DOMAIN]
-+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
-+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
-+ @ write r1 to current_thread_info()->cpu_domain
-+ str r1, [r0, #TI_CPU_DOMAIN]
-+ @ write r1 to DACR
-+ mcr p15, 0, r1, c3, c0, 0
-+ @ instruction sync
-+ instr_sync
-+ @ restore regs
-+ ldmia sp!, {r0, r1}
-+#endif
-+ .endm
-+
- .macro pabt_helper
- @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
- #ifdef MULTI_PABORT
-@@ -89,11 +170,15 @@
- * Invalid mode handlers
- */
- .macro inv_entry, reason
-+
-+ pax_enter_kernel
-+
- sub sp, sp, #S_FRAME_SIZE
- ARM( stmib sp, {r1 - lr} )
- THUMB( stmia sp, {r0 - r12} )
- THUMB( str sp, [sp, #S_SP] )
- THUMB( str lr, [sp, #S_LR] )
-+
- mov r1, #\reason
- .endm
-
-@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
- .macro svc_entry, stack_hole=0
- UNWIND(.fnstart )
- UNWIND(.save {r0 - pc} )
-+
-+ pax_enter_kernel
-+
- sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
-+
- #ifdef CONFIG_THUMB2_KERNEL
- SPFIX( str r0, [sp] ) @ temporarily saved
- SPFIX( mov r0, sp )
-@@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
- ldmia r0, {r3 - r5}
- add r7, sp, #S_SP - 4 @ here for interlock avoidance
- mov r6, #-1 @ "" "" "" ""
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
-+ @ offset sp by 8 as done in pax_enter_kernel
-+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
-+#else
- add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
-+#endif
- SPFIX( addeq r2, r2, #4 )
- str r3, [sp, #-4]! @ save the "real" r0 copied
- @ from the exception stack
-@@ -316,6 +410,9 @@ ENDPROC(__pabt_svc)
- .macro usr_entry
- UNWIND(.fnstart )
- UNWIND(.cantunwind ) @ don't unwind the user space
-+
-+ pax_enter_kernel_user
-+
- sub sp, sp, #S_FRAME_SIZE
- ARM( stmib sp, {r1 - r12} )
- THUMB( stmia sp, {r0 - r12} )
-@@ -415,7 +512,9 @@ __und_usr:
- tst r3, #PSR_T_BIT @ Thumb mode?
- bne __und_usr_thumb
- sub r4, r2, #4 @ ARM instr at LR - 4
-+ pax_open_userland
- 1: ldrt r0, [r4]
-+ pax_close_userland
- #ifdef CONFIG_CPU_ENDIAN_BE8
- rev r0, r0 @ little endian instruction
- #endif
-@@ -450,10 +549,14 @@ __und_usr_thumb:
- */
- .arch armv6t2
- #endif
-+ pax_open_userland
- 2: ldrht r5, [r4]
-+ pax_close_userland
- cmp r5, #0xe800 @ 32bit instruction if xx != 0
- blo __und_usr_fault_16 @ 16bit undefined instruction
-+ pax_open_userland
- 3: ldrht r0, [r2]
-+ pax_close_userland
- add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
- str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
- orr r0, r0, r5, lsl #16
-@@ -482,7 +585,8 @@ ENDPROC(__und_usr)
- */
- .pushsection .fixup, "ax"
- .align 2
--4: mov pc, r9
-+4: pax_close_userland
-+ mov pc, r9
- .popsection
- .pushsection __ex_table,"a"
- .long 1b, 4b
-@@ -692,7 +796,7 @@ ENTRY(__switch_to)
- THUMB( str lr, [ip], #4 )
- ldr r4, [r2, #TI_TP_VALUE]
- ldr r5, [r2, #TI_TP_VALUE + 4]
--#ifdef CONFIG_CPU_USE_DOMAINS
-+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
- ldr r6, [r2, #TI_CPU_DOMAIN]
- #endif
- switch_tls r1, r4, r5, r3, r7
-@@ -701,7 +805,7 @@ ENTRY(__switch_to)
- ldr r8, =__stack_chk_guard
- ldr r7, [r7, #TSK_STACK_CANARY]
- #endif
--#ifdef CONFIG_CPU_USE_DOMAINS
-+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
- mcr p15, 0, r6, c3, c0, 0 @ Set domain register
- #endif
- mov r5, r0
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
-index bc6bd96..bd026cb 100644
+index b2a27b6..520889c 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
-@@ -10,18 +10,46 @@
-
- #include <asm/unistd.h>
- #include <asm/ftrace.h>
-+#include <asm/domain.h>
- #include <asm/unwind.h>
-
-+#include "entry-header.S"
-+
- #ifdef CONFIG_NEED_RET_TO_USER
- #include <mach/entry-macro.S>
- #else
- .macro arch_ret_to_user, tmp1, tmp2
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
-+ @ save regs
-+ stmdb sp!, {r1, r2}
-+ @ read DACR from cpu_domain into r1
-+ mov r2, sp
-+ @ assume 8K pages, since we have to split the immediate in two
-+ bic r2, r2, #(0x1fc0)
-+ bic r2, r2, #(0x3f)
-+ ldr r1, [r2, #TI_CPU_DOMAIN]
-+#ifdef CONFIG_PAX_KERNEXEC
-+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
-+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
-+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
-+#endif
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ @ set current DOMAIN_USER to DOMAIN_UDEREF
-+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
-+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
-+#endif
-+ @ write r1 to current_thread_info()->cpu_domain
-+ str r1, [r2, #TI_CPU_DOMAIN]
-+ @ write r1 to DACR
-+ mcr p15, 0, r1, c3, c0, 0
-+ @ instruction sync
-+ instr_sync
-+ @ restore regs
-+ ldmia sp!, {r1, r2}
-+#endif
- .endm
- #endif
-
--#include "entry-header.S"
--
--
- .align 5
- /*
- * This is the fast syscall return path. We do as little as
-@@ -413,6 +441,12 @@ ENTRY(vector_swi)
- USER( ldr scno, [lr, #-4] ) @ get SWI instruction
+@@ -87,7 +87,7 @@ ENTRY(ret_from_fork)
+ get_thread_info tsk
+ ldr r1, [tsk, #TI_FLAGS] @ check for syscall tracing
+ mov why, #1
+- tst r1, #_TIF_SYSCALL_TRACE @ are we tracing syscalls?
++ tst r1, #_TIF_SYSCALL_WORK @ are we tracing syscalls?
+ beq ret_slow_syscall
+ mov r1, sp
+ mov r0, #1 @ trace exit [IP = 1]
+@@ -443,7 +443,7 @@ ENTRY(vector_swi)
+ 1:
#endif
-+ /*
-+ * do this here to avoid a performance hit of wrapping the code above
-+ * that directly dereferences userland to parse the SWI instruction
-+ */
-+ pax_enter_kernel_user
-+
- adr tbl, sys_call_table @ load syscall table pointer
-
- #if defined(CONFIG_OABI_COMPAT)
-diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
-index 39f89fb..d612bd9 100644
---- a/arch/arm/kernel/entry-header.S
-+++ b/arch/arm/kernel/entry-header.S
-@@ -184,6 +184,60 @@
- msr cpsr_c, \rtemp @ switch back to the SVC mode
- .endm
-
-+ .macro pax_enter_kernel_user
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
-+ @ save regs
-+ stmdb sp!, {r0, r1}
-+ @ read DACR from cpu_domain into r1
-+ mov r0, sp
-+ @ assume 8K pages, since we have to split the immediate in two
-+ bic r0, r0, #(0x1fc0)
-+ bic r0, r0, #(0x3f)
-+ ldr r1, [r0, #TI_CPU_DOMAIN]
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
-+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
-+#endif
-+#ifdef CONFIG_PAX_KERNEXEC
-+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
-+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
-+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
-+#endif
-+ @ write r1 to current_thread_info()->cpu_domain
-+ str r1, [r0, #TI_CPU_DOMAIN]
-+ @ write r1 to DACR
-+ mcr p15, 0, r1, c3, c0, 0
-+ @ instruction sync
-+ instr_sync
-+ @ restore regs
-+ ldmia sp!, {r0, r1}
-+#endif
-+ .endm
-+
-+ .macro pax_exit_kernel
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
-+ @ save regs
-+ stmdb sp!, {r0, r1}
-+ @ read old DACR from stack into r1
-+ ldr r1, [sp, #(8 + S_SP)]
-+ sub r1, r1, #8
-+ ldr r1, [r1]
-+
-+ @ write r1 to current_thread_info()->cpu_domain
-+ mov r0, sp
-+ @ assume 8K pages, since we have to split the immediate in two
-+ bic r0, r0, #(0x1fc0)
-+ bic r0, r0, #(0x3f)
-+ str r1, [r0, #TI_CPU_DOMAIN]
-+ @ write r1 to DACR
-+ mcr p15, 0, r1, c3, c0, 0
-+ @ instruction sync
-+ instr_sync
-+ @ restore regs
-+ ldmia sp!, {r0, r1}
-+#endif
-+ .endm
-+
- #ifndef CONFIG_THUMB2_KERNEL
- .macro svc_exit, rpsr, irq = 0
- .if \irq != 0
-@@ -203,6 +257,9 @@
- blne trace_hardirqs_off
- #endif
- .endif
-+
-+ pax_exit_kernel
-+
- msr spsr_cxsf, \rpsr
- #if defined(CONFIG_CPU_V6)
- ldr r0, [sp]
-@@ -266,6 +323,9 @@
- blne trace_hardirqs_off
- #endif
- .endif
-+
-+ pax_exit_kernel
-+
- ldr lr, [sp, #S_SP] @ top of the stack
- ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
- clrex @ clear the exclusive monitor
-diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
-index 918875d..cd5fa27 100644
---- a/arch/arm/kernel/fiq.c
-+++ b/arch/arm/kernel/fiq.c
-@@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length)
- void *base = vectors_page;
- unsigned offset = FIQ_OFFSET;
+- tst r10, #_TIF_SYSCALL_TRACE @ are we tracing syscalls?
++ tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls?
+ bne __sys_trace
-+ pax_open_kernel();
- memcpy(base + offset, start, length);
-+ pax_close_kernel();
-+
- if (!cache_is_vipt_nonaliasing())
- flush_icache_range((unsigned long)base + offset, offset +
- length);
+ cmp scno, #NR_syscalls @ check upper syscall limit
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
-index 476de57..4857a76 100644
+index 3606e85..44ba19d 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
-@@ -52,7 +52,9 @@
+@@ -46,7 +46,9 @@
.equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE
.macro pgtbl, rd, phys
@@ -2734,107 +1985,75 @@ index 476de57..4857a76 100644
+ add \rd, \rd, \phys
.endm
- /*
-@@ -432,7 +434,7 @@ __enable_mmu:
- mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
- domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
-- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
-+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
- mcr p15, 0, r5, c3, c0, 0 @ load domain access register
- mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
- #endif
+ #ifdef CONFIG_XIP_KERNEL
+diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
+index 2bc1a8e..f433c88 100644
+--- a/arch/arm/kernel/hw_breakpoint.c
++++ b/arch/arm/kernel/hw_breakpoint.c
+@@ -986,7 +986,7 @@ static int __cpuinit dbg_reset_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata dbg_reset_nb = {
++static struct notifier_block dbg_reset_nb = {
+ .notifier_call = dbg_reset_notify,
+ };
+
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
-index 084dc88..fce4e68 100644
+index 1e9be5d..4e0f470 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
-@@ -37,12 +37,39 @@
- #endif
-
+@@ -39,6 +39,8 @@
#ifdef CONFIG_MMU
--void *module_alloc(unsigned long size)
-+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
+ void *module_alloc(unsigned long size)
{
+ 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,
+ GFP_KERNEL, PAGE_KERNEL_EXEC, -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);
-+}
-+EXPORT_SYMBOL(module_free_exec);
-+
-+void *module_alloc_exec(unsigned long size)
-+{
-+ return __module_alloc(size, PAGE_KERNEL_EXEC);
-+}
-+EXPORT_SYMBOL(module_alloc_exec);
-+#endif
- #endif
-
- int
-diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
-index 07314af..c46655c 100644
---- a/arch/arm/kernel/patch.c
-+++ b/arch/arm/kernel/patch.c
-@@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
- bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
- int size;
-
-+ pax_open_kernel();
- if (thumb2 && __opcode_is_thumb16(insn)) {
- *(u16 *)addr = __opcode_to_mem_thumb16(insn);
- size = sizeof(u16);
-@@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
- *(u32 *)addr = insn;
- size = sizeof(u32);
- }
-+ pax_close_kernel();
-
- flush_icache_range((uintptr_t)(addr),
- (uintptr_t)(addr) + size);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 94f6b05..efd7312 100644
+index e68d251..c5bac2c 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
-@@ -217,6 +217,7 @@ void machine_power_off(void)
+@@ -28,7 +28,6 @@
+ #include <linux/tick.h>
+ #include <linux/utsname.h>
+ #include <linux/uaccess.h>
+-#include <linux/random.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/cpuidle.h>
- if (pm_power_off)
- pm_power_off();
-+ BUG();
- }
+@@ -92,7 +91,7 @@ static int __init hlt_setup(char *__unused)
+ __setup("nohlt", nohlt_setup);
+ __setup("hlt", hlt_setup);
- /*
-@@ -230,7 +231,7 @@ void machine_power_off(void)
- * executing pre-reset code, and using RAM that the primary CPU's code wishes
- * to use. Implementing such co-ordination would be essentially impossible.
- */
--void machine_restart(char *cmd)
-+__noreturn void machine_restart(char *cmd)
+-void arm_machine_restart(char mode, const char *cmd)
++__noreturn void arm_machine_restart(char mode, const char *cmd)
{
+ /* Disable interrupts first */
local_irq_disable();
- smp_send_stop();
-@@ -253,8 +254,8 @@ void __show_regs(struct pt_regs *regs)
+@@ -135,7 +134,7 @@ void arm_machine_restart(char mode, const char *cmd)
+ void (*pm_power_off)(void);
+ EXPORT_SYMBOL(pm_power_off);
- show_regs_print_info(KERN_DEFAULT);
+-void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart;
++void (*arm_pm_restart)(char str, const char *cmd) __noreturn = arm_machine_restart;
+ EXPORT_SYMBOL_GPL(arm_pm_restart);
+
+ static void do_nothing(void *unused)
+@@ -250,6 +249,7 @@ void machine_power_off(void)
+ machine_shutdown();
+ if (pm_power_off)
+ pm_power_off();
++ BUG();
+ }
+ void machine_restart(char *cmd)
+@@ -268,8 +268,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", (void *)instruction_pointer(regs));
@@ -2842,7 +2061,7 @@ index 94f6b05..efd7312 100644
printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
"sp : %08lx ip : %08lx fp : %08lx\n",
regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
-@@ -422,12 +423,6 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -486,12 +486,6 @@ unsigned long get_wchan(struct task_struct *p)
return 0;
}
@@ -2853,321 +2072,69 @@ index 94f6b05..efd7312 100644
-}
-
#ifdef CONFIG_MMU
- #ifdef CONFIG_KUSER_HELPERS
/*
-@@ -443,7 +438,7 @@ static struct vm_area_struct gate_vma = {
-
- static int __init gate_vma_init(void)
- {
-- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
-+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
- return 0;
- }
- arch_initcall(gate_vma_init);
-@@ -469,41 +464,16 @@ int in_gate_area_no_mm(unsigned long addr)
-
- const char *arch_vma_name(struct vm_area_struct *vma)
- {
-- return is_gate_vma(vma) ? "[vectors]" :
-- (vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?
-- "[sigpage]" : NULL;
-+ return is_gate_vma(vma) ? "[vectors]" : NULL;
- }
-
--static struct page *signal_page;
--extern struct page *get_signal_page(void);
--
- int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
- {
- struct mm_struct *mm = current->mm;
-- unsigned long addr;
-- int ret;
--
-- if (!signal_page)
-- signal_page = get_signal_page();
-- if (!signal_page)
-- return -ENOMEM;
-
- down_write(&mm->mmap_sem);
-- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
-- if (IS_ERR_VALUE(addr)) {
-- ret = addr;
-- goto up_fail;
-- }
--
-- ret = install_special_mapping(mm, addr, PAGE_SIZE,
-- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
-- &signal_page);
--
-- if (ret == 0)
-- mm->context.sigpage = addr;
--
-- up_fail:
-+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
- up_write(&mm->mmap_sem);
-- return ret;
-+ return 0;
- }
- #endif
-diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
-index 4693188..4596c5e 100644
---- a/arch/arm/kernel/psci.c
-+++ b/arch/arm/kernel/psci.c
-@@ -24,7 +24,7 @@
- #include <asm/opcodes-virt.h>
- #include <asm/psci.h>
-
--struct psci_operations psci_ops;
-+struct psci_operations psci_ops __read_only;
-
- static int (*invoke_psci_fn)(u32, u32, u32, u32);
-
+ * 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 0dd3b79..e018f64 100644
+index 90fa8b3..a3a2212 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
-@@ -929,10 +929,19 @@ static int tracehook_report_syscall(struct pt_regs *regs,
- return current_thread_info()->syscall;
+@@ -904,10 +904,19 @@ long arch_ptrace(struct task_struct *child, long request,
+ return ret;
}
+#ifdef CONFIG_GRKERNSEC_SETXID
+extern void gr_delayed_cred_worker(void);
+#endif
+
- asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
+ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
{
- current_thread_info()->syscall = scno;
+ unsigned long ip;
+#ifdef CONFIG_GRKERNSEC_SETXID
+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
+ gr_delayed_cred_worker();
+#endif
+
- /* Do the secure computing check first; failures should be fast. */
- if (secure_computing(scno) == -1)
- return -1;
-diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index 0e1e2b3..c0e821d 100644
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -98,21 +98,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;
+ if (!test_thread_flag(TIF_SYSCALL_TRACE))
+ return scno;
+ if (!(current->ptrace & PT_PTRACED))
+diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
+index 7ac5dfd..0ce09c2 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
- #ifdef MULTI_USER
--struct cpu_user_fns cpu_user __read_mostly;
-+struct cpu_user_fns cpu_user __read_only;
- #endif
- #ifdef MULTI_CACHE
--struct cpu_cache_fns cpu_cache __read_mostly;
-+struct cpu_cache_fns cpu_cache __read_only;
- #endif
- #ifdef CONFIG_OUTER_CACHE
--struct outer_cache_fns outer_cache __read_mostly;
-+struct outer_cache_fns outer_cache __read_only;
- EXPORT_SYMBOL(outer_cache);
- #endif
-
-@@ -245,9 +247,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
-@@ -571,7 +577,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/signal.c b/arch/arm/kernel/signal.c
-index ab33042..11248a8 100644
---- a/arch/arm/kernel/signal.c
-+++ b/arch/arm/kernel/signal.c
-@@ -45,8 +45,6 @@ static const unsigned long sigreturn_codes[7] = {
- MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
- };
-
--static unsigned long signal_return_offset;
--
- #ifdef CONFIG_CRUNCH
- static int preserve_crunch_context(struct crunch_sigframe __user *frame)
- {
-@@ -411,8 +409,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
- * except when the MPU has protected the vectors
- * page from PL0
- */
-- retcode = mm->context.sigpage + signal_return_offset +
-- (idx << 2) + thumb;
-+ retcode = mm->context.sigpage + (idx << 2) + thumb;
- } else
- #endif
- {
-@@ -616,33 +613,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
- } while (thread_flags & _TIF_WORK_MASK);
- return 0;
- }
--
--struct page *get_signal_page(void)
--{
-- unsigned long ptr;
-- unsigned offset;
-- struct page *page;
-- void *addr;
--
-- page = alloc_pages(GFP_KERNEL, 0);
--
-- if (!page)
-- return NULL;
--
-- addr = page_address(page);
--
-- /* Give the signal return code some randomness */
-- offset = 0x200 + (get_random_int() & 0x7fc);
-- signal_return_offset = offset;
--
-- /*
-- * Copy signal return handlers into the vector page, and
-- * set sigreturn to be a pointer to these.
-- */
-- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
--
-- ptr = (unsigned long)addr + offset;
-- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
--
-- return page;
--}
-diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
-index 72024ea..ae302dd 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;
+@@ -259,6 +259,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
- void __init smp_set_ops(struct smp_operations *ops)
- {
-diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
-index 8fcda14..4512b9d 100644
---- a/arch/arm/kernel/traps.c
-+++ b/arch/arm/kernel/traps.c
-@@ -55,7 +55,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
-@@ -257,6 +257,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
- static int die_owner = -1;
- static unsigned int die_nest_count;
+ static DEFINE_RAW_SPINLOCK(die_lock);
+extern void gr_handle_kernel_exploit(void);
+
- static unsigned long oops_begin(void)
- {
- int cpu;
-@@ -299,6 +301,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
+ /*
+ * This function is protected against re-entrancy.
+ */
+@@ -288,6 +290,9 @@ void die(const char *str, struct pt_regs *regs, int err)
panic("Fatal exception in interrupt");
if (panic_on_oops)
panic("Fatal exception");
+
+ gr_handle_kernel_exploit();
+
- if (signr)
- do_exit(signr);
+ if (ret != NOTIFY_STOP)
+ do_exit(SIGSEGV);
}
-@@ -628,7 +633,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
- * The user helper at 0xffff0fe0 must be used instead.
- * (see entry-armv.S for details)
- */
-+ pax_open_kernel();
- *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
-+ pax_close_kernel();
- }
- return 0;
-
-@@ -885,7 +892,11 @@ void __init early_trap_init(void *vectors_base)
- kuser_init(vectors_base);
-
- flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
-- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
-+
-+#ifndef CONFIG_PAX_MEMORY_UDEREF
-+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
-+#endif
-+
- #else /* ifndef CONFIG_CPU_V7M */
- /*
- * on V7-M there is no need to copy the vector table to a dedicated
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
-index 7bcee5c..e2f3249 100644
+index 20b3041..da44b1f 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) = .; \
-@@ -34,7 +38,7 @@
- #endif
-
- #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
-- defined(CONFIG_GENERIC_BUG)
-+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
- #define ARM_EXIT_KEEP(x) x
- #define ARM_EXIT_DISCARD(x)
- #else
-@@ -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 = .;
-@@ -112,6 +121,8 @@ SECTIONS
+@@ -103,6 +103,8 @@ SECTIONS
ARM_CPU_KEEP(PROC_INFO)
}
@@ -3175,100 +2142,16 @@ index 7bcee5c..e2f3249 100644
+
RO_DATA(PAGE_SIZE)
- . = ALIGN(4);
-@@ -142,7 +153,9 @@ SECTIONS
-
- NOTES
+ #ifdef CONFIG_ARM_UNWIND
+@@ -122,8 +124,6 @@ SECTIONS
+ }
+ #endif
- _etext = .; /* End of text and rodata section */
-+#ifdef CONFIG_PAX_KERNEXEC
-+ . = ALIGN(1<<SECTION_SHIFT);
-+#endif
-
+-
#ifndef CONFIG_XIP_KERNEL
. = ALIGN(PAGE_SIZE);
-@@ -220,6 +233,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/kvm/arm.c b/arch/arm/kvm/arm.c
-index 9c697db..115237f 100644
---- a/arch/arm/kvm/arm.c
-+++ b/arch/arm/kvm/arm.c
-@@ -56,7 +56,7 @@ static unsigned long hyp_default_vectors;
- static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
-
- /* The VMID used in the VTTBR */
--static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
-+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
- static u8 kvm_next_vmid;
- static DEFINE_SPINLOCK(kvm_vmid_lock);
-
-@@ -396,7 +396,7 @@ void force_vm_exit(const cpumask_t *mask)
- */
- static bool need_new_vmid_gen(struct kvm *kvm)
- {
-- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
-+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
- }
-
- /**
-@@ -429,7 +429,7 @@ static void update_vttbr(struct kvm *kvm)
-
- /* First user of a new VMID generation? */
- if (unlikely(kvm_next_vmid == 0)) {
-- atomic64_inc(&kvm_vmid_gen);
-+ atomic64_inc_unchecked(&kvm_vmid_gen);
- kvm_next_vmid = 1;
-
- /*
-@@ -446,7 +446,7 @@ static void update_vttbr(struct kvm *kvm)
- kvm_call_hyp(__kvm_flush_vm_context);
- }
-
-- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
-+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
- kvm->arch.vmid = kvm_next_vmid;
- kvm_next_vmid++;
-
-diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
-index 14a0d98..7771a7d 100644
---- a/arch/arm/lib/clear_user.S
-+++ b/arch/arm/lib/clear_user.S
-@@ -12,14 +12,14 @@
-
- .text
-
--/* Prototype: int __clear_user(void *addr, size_t sz)
-+/* Prototype: int ___clear_user(void *addr, size_t sz)
- * Purpose : clear some user memory
- * Params : addr - user memory address to clear
- * : sz - number of bytes to clear
- * Returns : number of bytes NOT cleared
- */
- ENTRY(__clear_user_std)
--WEAK(__clear_user)
-+WEAK(___clear_user)
- stmfd sp!, {r1, lr}
- mov r2, #0
- cmp r1, #4
-@@ -44,7 +44,7 @@ WEAK(__clear_user)
- USER( strnebt r2, [r0])
- mov r0, #0
- ldmfd sp!, {r1, pc}
--ENDPROC(__clear_user)
-+ENDPROC(___clear_user)
- ENDPROC(__clear_user_std)
-
- .pushsection .fixup,"ax"
+ __init_begin = .;
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
@@ -3335,36 +2218,469 @@ index d066df6..df28194 100644
ENDPROC(__copy_to_user_std)
.pushsection .fixup,"ax"
-diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
-index 7d08b43..f7ca7ea 100644
---- a/arch/arm/lib/csumpartialcopyuser.S
-+++ b/arch/arm/lib/csumpartialcopyuser.S
-@@ -57,8 +57,8 @@
- * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
+diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
+index 1b049cd..9b06bb4 100644
+--- a/arch/arm/lib/getuser.S
++++ b/arch/arm/lib/getuser.S
+@@ -16,8 +16,9 @@
+ * __get_user_X
+ *
+ * Inputs: r0 contains the address
++ * r1 contains the address limit, which must be preserved
+ * Outputs: r0 is the error code
+- * r2, r3 contains the zero-extended value
++ * r2 contains the zero-extended value
+ * lr corrupted
+ *
+ * No other registers must be altered. (see <asm/uaccess.h>
+@@ -27,34 +28,40 @@
+ * Note also that it is intended that __get_user_bad is not global.
*/
+ #include <linux/linkage.h>
++#include <asm/assembler.h>
+ #include <asm/errno.h>
+ #include <asm/domain.h>
--#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
--#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
-+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
-+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
+ ENTRY(__get_user_1)
+-1: T(ldrb) r2, [r0]
++ check_uaccess r0, 1, r1, r2, __get_user_bad
++1: TUSER(ldrb) r2, [r0]
+ mov r0, #0
+ mov pc, lr
+ ENDPROC(__get_user_1)
- #include "csumpartialcopygeneric.S"
+ ENTRY(__get_user_2)
+-#ifdef CONFIG_THUMB2_KERNEL
+-2: T(ldrb) r2, [r0]
+-3: T(ldrb) r3, [r0, #1]
++ check_uaccess r0, 2, r1, r2, __get_user_bad
++#ifdef CONFIG_CPU_USE_DOMAINS
++rb .req ip
++2: ldrbt r2, [r0], #1
++3: ldrbt rb, [r0], #0
+ #else
+-2: T(ldrb) r2, [r0], #1
+-3: T(ldrb) r3, [r0]
++rb .req r0
++2: ldrb r2, [r0]
++3: ldrb rb, [r0, #1]
+ #endif
+ #ifndef __ARMEB__
+- orr r2, r2, r3, lsl #8
++ orr r2, r2, rb, lsl #8
+ #else
+- orr r2, r3, r2, lsl #8
++ orr r2, rb, r2, lsl #8
+ #endif
+ mov r0, #0
+ mov pc, lr
+ ENDPROC(__get_user_2)
-diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
-index 5306de3..aed6d03 100644
---- a/arch/arm/lib/delay.c
-+++ b/arch/arm/lib/delay.c
-@@ -28,7 +28,7 @@
- /*
- * Default to the loop-based delay implementation.
+ ENTRY(__get_user_4)
+-4: T(ldr) r2, [r0]
++ check_uaccess r0, 4, r1, r2, __get_user_bad
++4: TUSER(ldr) r2, [r0]
+ mov r0, #0
+ mov pc, lr
+ ENDPROC(__get_user_4)
+diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S
+index c023fc1..3d73dcb 100644
+--- a/arch/arm/lib/putuser.S
++++ b/arch/arm/lib/putuser.S
+@@ -16,6 +16,7 @@
+ * __put_user_X
+ *
+ * Inputs: r0 contains the address
++ * r1 contains the address limit, which must be preserved
+ * r2, r3 contains the value
+ * Outputs: r0 is the error code
+ * lr corrupted
+@@ -27,32 +28,35 @@
+ * Note also that it is intended that __put_user_bad is not global.
*/
--struct arm_delay_ops arm_delay_ops = {
-+struct arm_delay_ops arm_delay_ops __read_only = {
- .delay = __loop_delay,
- .const_udelay = __loop_const_udelay,
- .udelay = __loop_udelay,
+ #include <linux/linkage.h>
++#include <asm/assembler.h>
+ #include <asm/errno.h>
+ #include <asm/domain.h>
+
+ ENTRY(__put_user_1)
+-1: T(strb) r2, [r0]
++ check_uaccess r0, 1, r1, ip, __put_user_bad
++1: TUSER(strb) r2, [r0]
+ mov r0, #0
+ mov pc, lr
+ ENDPROC(__put_user_1)
+
+ ENTRY(__put_user_2)
++ check_uaccess r0, 2, r1, ip, __put_user_bad
+ mov ip, r2, lsr #8
+ #ifdef CONFIG_THUMB2_KERNEL
+ #ifndef __ARMEB__
+-2: T(strb) r2, [r0]
+-3: T(strb) ip, [r0, #1]
++2: TUSER(strb) r2, [r0]
++3: TUSER(strb) ip, [r0, #1]
+ #else
+-2: T(strb) ip, [r0]
+-3: T(strb) r2, [r0, #1]
++2: TUSER(strb) ip, [r0]
++3: TUSER(strb) r2, [r0, #1]
+ #endif
+ #else /* !CONFIG_THUMB2_KERNEL */
+ #ifndef __ARMEB__
+-2: T(strb) r2, [r0], #1
+-3: T(strb) ip, [r0]
++2: TUSER(strb) r2, [r0], #1
++3: TUSER(strb) ip, [r0]
+ #else
+-2: T(strb) ip, [r0], #1
+-3: T(strb) r2, [r0]
++2: TUSER(strb) ip, [r0], #1
++3: TUSER(strb) r2, [r0]
+ #endif
+ #endif /* CONFIG_THUMB2_KERNEL */
+ mov r0, #0
+@@ -60,18 +64,20 @@ ENTRY(__put_user_2)
+ ENDPROC(__put_user_2)
+
+ ENTRY(__put_user_4)
+-4: T(str) r2, [r0]
++ check_uaccess r0, 4, r1, ip, __put_user_bad
++4: TUSER(str) r2, [r0]
+ mov r0, #0
+ mov pc, lr
+ ENDPROC(__put_user_4)
+
+ ENTRY(__put_user_8)
++ check_uaccess r0, 8, r1, ip, __put_user_bad
+ #ifdef CONFIG_THUMB2_KERNEL
+-5: T(str) r2, [r0]
+-6: T(str) r3, [r0, #4]
++5: TUSER(str) r2, [r0]
++6: TUSER(str) r3, [r0, #4]
+ #else
+-5: T(str) r2, [r0], #4
+-6: T(str) r3, [r0]
++5: TUSER(str) r2, [r0], #4
++6: TUSER(str) r3, [r0]
+ #endif
+ mov r0, #0
+ mov pc, lr
+diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
+index d0ece2a..e712687 100644
+--- a/arch/arm/lib/uaccess.S
++++ b/arch/arm/lib/uaccess.S
+@@ -20,7 +20,7 @@
+
+ #define PAGE_SHIFT 12
+
+-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
++/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
+ * Purpose : copy a block to user memory from kernel memory
+ * Params : to - user memory
+ * : from - kernel memory
+@@ -32,15 +32,15 @@
+ rsb ip, ip, #4
+ cmp ip, #2
+ ldrb r3, [r1], #1
+-USER( T(strb) r3, [r0], #1) @ May fault
++USER( TUSER( strb) r3, [r0], #1) @ May fault
+ ldrgeb r3, [r1], #1
+-USER( T(strgeb) r3, [r0], #1) @ May fault
++USER( TUSER( strgeb) r3, [r0], #1) @ May fault
+ ldrgtb r3, [r1], #1
+-USER( T(strgtb) r3, [r0], #1) @ May fault
++USER( TUSER( strgtb) r3, [r0], #1) @ May fault
+ sub r2, r2, ip
+ b .Lc2u_dest_aligned
+
+-ENTRY(__copy_to_user)
++ENTRY(___copy_to_user)
+ stmfd sp!, {r2, r4 - r7, lr}
+ cmp r2, #4
+ blt .Lc2u_not_enough
+@@ -59,7 +59,7 @@ ENTRY(__copy_to_user)
+ addmi ip, r2, #4
+ bmi .Lc2u_0nowords
+ ldr r3, [r1], #4
+-USER( T(str) r3, [r0], #4) @ May fault
++USER( TUSER( str) r3, [r0], #4) @ May fault
+ mov ip, r0, lsl #32 - PAGE_SHIFT @ On each page, use a ld/st??t instruction
+ rsb ip, ip, #0
+ movs ip, ip, lsr #32 - PAGE_SHIFT
+@@ -88,18 +88,18 @@ USER( T(str) r3, [r0], #4) @ May fault
+ stmneia r0!, {r3 - r4} @ Shouldnt fault
+ tst ip, #4
+ ldrne r3, [r1], #4
+- T(strne) r3, [r0], #4 @ Shouldnt fault
++ TUSER( strne) r3, [r0], #4 @ Shouldnt fault
+ ands ip, ip, #3
+ beq .Lc2u_0fupi
+ .Lc2u_0nowords: teq ip, #0
+ beq .Lc2u_finished
+ .Lc2u_nowords: cmp ip, #2
+ ldrb r3, [r1], #1
+-USER( T(strb) r3, [r0], #1) @ May fault
++USER( TUSER( strb) r3, [r0], #1) @ May fault
+ ldrgeb r3, [r1], #1
+-USER( T(strgeb) r3, [r0], #1) @ May fault
++USER( TUSER( strgeb) r3, [r0], #1) @ May fault
+ ldrgtb r3, [r1], #1
+-USER( T(strgtb) r3, [r0], #1) @ May fault
++USER( TUSER( strgtb) r3, [r0], #1) @ May fault
+ b .Lc2u_finished
+
+ .Lc2u_not_enough:
+@@ -120,7 +120,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault
+ mov r3, r7, pull #8
+ ldr r7, [r1], #4
+ orr r3, r3, r7, push #24
+-USER( T(str) r3, [r0], #4) @ May fault
++USER( TUSER( str) r3, [r0], #4) @ May fault
+ mov ip, r0, lsl #32 - PAGE_SHIFT
+ rsb ip, ip, #0
+ movs ip, ip, lsr #32 - PAGE_SHIFT
+@@ -155,18 +155,18 @@ USER( T(str) r3, [r0], #4) @ May fault
+ movne r3, r7, pull #8
+ ldrne r7, [r1], #4
+ orrne r3, r3, r7, push #24
+- T(strne) r3, [r0], #4 @ Shouldnt fault
++ TUSER( strne) r3, [r0], #4 @ Shouldnt fault
+ ands ip, ip, #3
+ beq .Lc2u_1fupi
+ .Lc2u_1nowords: mov r3, r7, get_byte_1
+ teq ip, #0
+ beq .Lc2u_finished
+ cmp ip, #2
+-USER( T(strb) r3, [r0], #1) @ May fault
++USER( TUSER( strb) r3, [r0], #1) @ May fault
+ movge r3, r7, get_byte_2
+-USER( T(strgeb) r3, [r0], #1) @ May fault
++USER( TUSER( strgeb) r3, [r0], #1) @ May fault
+ movgt r3, r7, get_byte_3
+-USER( T(strgtb) r3, [r0], #1) @ May fault
++USER( TUSER( strgtb) r3, [r0], #1) @ May fault
+ b .Lc2u_finished
+
+ .Lc2u_2fupi: subs r2, r2, #4
+@@ -175,7 +175,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault
+ mov r3, r7, pull #16
+ ldr r7, [r1], #4
+ orr r3, r3, r7, push #16
+-USER( T(str) r3, [r0], #4) @ May fault
++USER( TUSER( str) r3, [r0], #4) @ May fault
+ mov ip, r0, lsl #32 - PAGE_SHIFT
+ rsb ip, ip, #0
+ movs ip, ip, lsr #32 - PAGE_SHIFT
+@@ -210,18 +210,18 @@ USER( T(str) r3, [r0], #4) @ May fault
+ movne r3, r7, pull #16
+ ldrne r7, [r1], #4
+ orrne r3, r3, r7, push #16
+- T(strne) r3, [r0], #4 @ Shouldnt fault
++ TUSER( strne) r3, [r0], #4 @ Shouldnt fault
+ ands ip, ip, #3
+ beq .Lc2u_2fupi
+ .Lc2u_2nowords: mov r3, r7, get_byte_2
+ teq ip, #0
+ beq .Lc2u_finished
+ cmp ip, #2
+-USER( T(strb) r3, [r0], #1) @ May fault
++USER( TUSER( strb) r3, [r0], #1) @ May fault
+ movge r3, r7, get_byte_3
+-USER( T(strgeb) r3, [r0], #1) @ May fault
++USER( TUSER( strgeb) r3, [r0], #1) @ May fault
+ ldrgtb r3, [r1], #0
+-USER( T(strgtb) r3, [r0], #1) @ May fault
++USER( TUSER( strgtb) r3, [r0], #1) @ May fault
+ b .Lc2u_finished
+
+ .Lc2u_3fupi: subs r2, r2, #4
+@@ -230,7 +230,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault
+ mov r3, r7, pull #24
+ ldr r7, [r1], #4
+ orr r3, r3, r7, push #8
+-USER( T(str) r3, [r0], #4) @ May fault
++USER( TUSER( str) r3, [r0], #4) @ May fault
+ mov ip, r0, lsl #32 - PAGE_SHIFT
+ rsb ip, ip, #0
+ movs ip, ip, lsr #32 - PAGE_SHIFT
+@@ -265,27 +265,27 @@ USER( T(str) r3, [r0], #4) @ May fault
+ movne r3, r7, pull #24
+ ldrne r7, [r1], #4
+ orrne r3, r3, r7, push #8
+- T(strne) r3, [r0], #4 @ Shouldnt fault
++ TUSER( strne) r3, [r0], #4 @ Shouldnt fault
+ ands ip, ip, #3
+ beq .Lc2u_3fupi
+ .Lc2u_3nowords: mov r3, r7, get_byte_3
+ teq ip, #0
+ beq .Lc2u_finished
+ cmp ip, #2
+-USER( T(strb) r3, [r0], #1) @ May fault
++USER( TUSER( strb) r3, [r0], #1) @ May fault
+ ldrgeb r3, [r1], #1
+-USER( T(strgeb) r3, [r0], #1) @ May fault
++USER( TUSER( strgeb) r3, [r0], #1) @ May fault
+ ldrgtb r3, [r1], #0
+-USER( T(strgtb) r3, [r0], #1) @ May fault
++USER( TUSER( strgtb) r3, [r0], #1) @ May fault
+ b .Lc2u_finished
+-ENDPROC(__copy_to_user)
++ENDPROC(___copy_to_user)
+
+ .pushsection .fixup,"ax"
+ .align 0
+ 9001: ldmfd sp!, {r0, r4 - r7, pc}
+ .popsection
+
+-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
++/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
+ * Purpose : copy a block from user memory to kernel memory
+ * Params : to - kernel memory
+ * : from - user memory
+@@ -295,16 +295,16 @@ ENDPROC(__copy_to_user)
+ .Lcfu_dest_not_aligned:
+ rsb ip, ip, #4
+ cmp ip, #2
+-USER( T(ldrb) r3, [r1], #1) @ May fault
++USER( TUSER( ldrb) r3, [r1], #1) @ May fault
+ strb r3, [r0], #1
+-USER( T(ldrgeb) r3, [r1], #1) @ May fault
++USER( TUSER( ldrgeb) r3, [r1], #1) @ May fault
+ strgeb r3, [r0], #1
+-USER( T(ldrgtb) r3, [r1], #1) @ May fault
++USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault
+ strgtb r3, [r0], #1
+ sub r2, r2, ip
+ b .Lcfu_dest_aligned
+
+-ENTRY(__copy_from_user)
++ENTRY(___copy_from_user)
+ stmfd sp!, {r0, r2, r4 - r7, lr}
+ cmp r2, #4
+ blt .Lcfu_not_enough
+@@ -322,7 +322,7 @@ ENTRY(__copy_from_user)
+ .Lcfu_0fupi: subs r2, r2, #4
+ addmi ip, r2, #4
+ bmi .Lcfu_0nowords
+-USER( T(ldr) r3, [r1], #4)
++USER( TUSER( ldr) r3, [r1], #4)
+ str r3, [r0], #4
+ mov ip, r1, lsl #32 - PAGE_SHIFT @ On each page, use a ld/st??t instruction
+ rsb ip, ip, #0
+@@ -351,18 +351,18 @@ USER( T(ldr) r3, [r1], #4)
+ ldmneia r1!, {r3 - r4} @ Shouldnt fault
+ stmneia r0!, {r3 - r4}
+ tst ip, #4
+- T(ldrne) r3, [r1], #4 @ Shouldnt fault
++ TUSER( ldrne) r3, [r1], #4 @ Shouldnt fault
+ strne r3, [r0], #4
+ ands ip, ip, #3
+ beq .Lcfu_0fupi
+ .Lcfu_0nowords: teq ip, #0
+ beq .Lcfu_finished
+ .Lcfu_nowords: cmp ip, #2
+-USER( T(ldrb) r3, [r1], #1) @ May fault
++USER( TUSER( ldrb) r3, [r1], #1) @ May fault
+ strb r3, [r0], #1
+-USER( T(ldrgeb) r3, [r1], #1) @ May fault
++USER( TUSER( ldrgeb) r3, [r1], #1) @ May fault
+ strgeb r3, [r0], #1
+-USER( T(ldrgtb) r3, [r1], #1) @ May fault
++USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault
+ strgtb r3, [r0], #1
+ b .Lcfu_finished
+
+@@ -375,7 +375,7 @@ USER( T(ldrgtb) r3, [r1], #1) @ May fault
+
+ .Lcfu_src_not_aligned:
+ bic r1, r1, #3
+-USER( T(ldr) r7, [r1], #4) @ May fault
++USER( TUSER( ldr) r7, [r1], #4) @ May fault
+ cmp ip, #2
+ bgt .Lcfu_3fupi
+ beq .Lcfu_2fupi
+@@ -383,7 +383,7 @@ USER( T(ldr) r7, [r1], #4) @ May fault
+ addmi ip, r2, #4
+ bmi .Lcfu_1nowords
+ mov r3, r7, pull #8
+-USER( T(ldr) r7, [r1], #4) @ May fault
++USER( TUSER( ldr) r7, [r1], #4) @ May fault
+ orr r3, r3, r7, push #24
+ str r3, [r0], #4
+ mov ip, r1, lsl #32 - PAGE_SHIFT
+@@ -418,7 +418,7 @@ USER( T(ldr) r7, [r1], #4) @ May fault
+ stmneia r0!, {r3 - r4}
+ tst ip, #4
+ movne r3, r7, pull #8
+-USER( T(ldrne) r7, [r1], #4) @ May fault
++USER( TUSER( ldrne) r7, [r1], #4) @ May fault
+ orrne r3, r3, r7, push #24
+ strne r3, [r0], #4
+ ands ip, ip, #3
+@@ -438,7 +438,7 @@ USER( T(ldrne) r7, [r1], #4) @ May fault
+ addmi ip, r2, #4
+ bmi .Lcfu_2nowords
+ mov r3, r7, pull #16
+-USER( T(ldr) r7, [r1], #4) @ May fault
++USER( TUSER( ldr) r7, [r1], #4) @ May fault
+ orr r3, r3, r7, push #16
+ str r3, [r0], #4
+ mov ip, r1, lsl #32 - PAGE_SHIFT
+@@ -474,7 +474,7 @@ USER( T(ldr) r7, [r1], #4) @ May fault
+ stmneia r0!, {r3 - r4}
+ tst ip, #4
+ movne r3, r7, pull #16
+-USER( T(ldrne) r7, [r1], #4) @ May fault
++USER( TUSER( ldrne) r7, [r1], #4) @ May fault
+ orrne r3, r3, r7, push #16
+ strne r3, [r0], #4
+ ands ip, ip, #3
+@@ -486,7 +486,7 @@ USER( T(ldrne) r7, [r1], #4) @ May fault
+ strb r3, [r0], #1
+ movge r3, r7, get_byte_3
+ strgeb r3, [r0], #1
+-USER( T(ldrgtb) r3, [r1], #0) @ May fault
++USER( TUSER( ldrgtb) r3, [r1], #0) @ May fault
+ strgtb r3, [r0], #1
+ b .Lcfu_finished
+
+@@ -494,7 +494,7 @@ USER( T(ldrgtb) r3, [r1], #0) @ May fault
+ addmi ip, r2, #4
+ bmi .Lcfu_3nowords
+ mov r3, r7, pull #24
+-USER( T(ldr) r7, [r1], #4) @ May fault
++USER( TUSER( ldr) r7, [r1], #4) @ May fault
+ orr r3, r3, r7, push #8
+ str r3, [r0], #4
+ mov ip, r1, lsl #32 - PAGE_SHIFT
+@@ -529,7 +529,7 @@ USER( T(ldr) r7, [r1], #4) @ May fault
+ stmneia r0!, {r3 - r4}
+ tst ip, #4
+ movne r3, r7, pull #24
+-USER( T(ldrne) r7, [r1], #4) @ May fault
++USER( TUSER( ldrne) r7, [r1], #4) @ May fault
+ orrne r3, r3, r7, push #8
+ strne r3, [r0], #4
+ ands ip, ip, #3
+@@ -539,12 +539,12 @@ USER( T(ldrne) r7, [r1], #4) @ May fault
+ beq .Lcfu_finished
+ cmp ip, #2
+ strb r3, [r0], #1
+-USER( T(ldrgeb) r3, [r1], #1) @ May fault
++USER( TUSER( ldrgeb) r3, [r1], #1) @ May fault
+ strgeb r3, [r0], #1
+-USER( T(ldrgtb) r3, [r1], #1) @ May fault
++USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault
+ strgtb r3, [r0], #1
+ b .Lcfu_finished
+-ENDPROC(__copy_from_user)
++ENDPROC(___copy_from_user)
+
+ .pushsection .fixup,"ax"
+ .align 0
diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
-index 025f742..a9e5b3b 100644
+index 025f742..8432b08 100644
--- a/arch/arm/lib/uaccess_with_memcpy.c
+++ b/arch/arm/lib/uaccess_with_memcpy.c
@@ -104,7 +104,7 @@ out:
@@ -3376,57 +2692,11 @@ index 025f742..a9e5b3b 100644
{
/*
* This test is stubbed out of the main function above to keep
-@@ -155,7 +155,7 @@ out:
- return n;
- }
-
--unsigned long __clear_user(void __user *addr, unsigned long n)
-+unsigned long ___clear_user(void __user *addr, unsigned long n)
- {
- /* See rational for this in __copy_to_user() above. */
- if (n < 64)
-diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
-index 1767611..d2e7e24 100644
---- a/arch/arm/mach-kirkwood/common.c
-+++ b/arch/arm/mach-kirkwood/common.c
-@@ -156,7 +156,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 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,
-@@ -190,14 +199,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 827d1500..2885dc6 100644
+index e9d5f4a..f099699 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
-@@ -627,7 +627,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
+@@ -593,7 +593,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
}
#endif
@@ -3435,411 +2705,37 @@ index 827d1500..2885dc6 100644
.late_init = n8x0_menelaus_late_init,
};
-diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
-index 579697a..1d5a3b2 100644
---- a/arch/arm/mach-omap2/gpmc.c
-+++ b/arch/arm/mach-omap2/gpmc.c
-@@ -148,7 +148,6 @@ struct omap3_gpmc_regs {
- };
-
- static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
--static struct irq_chip gpmc_irq_chip;
- static int gpmc_irq_start;
-
- static struct resource gpmc_mem_root;
-@@ -716,6 +715,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
-
- static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
-
-+static struct irq_chip gpmc_irq_chip = {
-+ .name = "gpmc",
-+ .irq_startup = gpmc_irq_noop_ret,
-+ .irq_enable = gpmc_irq_enable,
-+ .irq_disable = gpmc_irq_disable,
-+ .irq_shutdown = gpmc_irq_noop,
-+ .irq_ack = gpmc_irq_noop,
-+ .irq_mask = gpmc_irq_noop,
-+ .irq_unmask = gpmc_irq_noop,
-+
-+};
-+
- static int gpmc_setup_irq(void)
- {
- int i;
-@@ -730,15 +741,6 @@ static int gpmc_setup_irq(void)
- return gpmc_irq_start;
- }
-
-- gpmc_irq_chip.name = "gpmc";
-- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
-- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
-- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
-- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
-- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
-- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
-- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
--
- gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
- gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
-
-diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
-index f991016..145ebeb 100644
---- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
-+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
-@@ -84,7 +84,7 @@ struct cpu_pm_ops {
- int (*finish_suspend)(unsigned long cpu_state);
- void (*resume)(void);
- void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
+diff --git a/arch/arm/mach-omap2/smartreflex.h b/arch/arm/mach-omap2/smartreflex.h
+index 5f35b9e..6d09f99 100644
+--- a/arch/arm/mach-omap2/smartreflex.h
++++ b/arch/arm/mach-omap2/smartreflex.h
+@@ -183,7 +183,7 @@ struct omap_sr_class_data {
+ int (*notify)(struct voltagedomain *voltdm, u32 status);
+ u8 notify_flags;
+ u8 class_type;
-};
-+} __no_const;
++} __do_const;
- static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
- static struct powerdomain *mpuss_pd;
-@@ -102,7 +102,7 @@ static void dummy_cpu_resume(void)
- static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
- {}
-
--struct cpu_pm_ops omap_pm_ops = {
-+static struct cpu_pm_ops omap_pm_ops __read_only = {
- .finish_suspend = default_finish_suspend,
- .resume = dummy_cpu_resume,
- .scu_prepare = dummy_scu_prepare,
-diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
-index 813c615..ce467c6 100644
---- a/arch/arm/mach-omap2/omap-wakeupgen.c
-+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
-@@ -339,7 +339,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
- return NOTIFY_OK;
+ /**
+ * struct omap_sr_nvalue_table - Smartreflex n-target value info
+diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
+index 2b2d51c..0127490 100644
+--- a/arch/arm/mach-ux500/mbox-db5500.c
++++ b/arch/arm/mach-ux500/mbox-db5500.c
+@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev,
+ return sprintf(buf, "0x%X\n", mbox_value);
}
--static struct notifier_block __refdata irq_hotplug_notifier = {
-+static struct notifier_block irq_hotplug_notifier = {
- .notifier_call = irq_cpu_hotplug_notify,
- };
-
-diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
-index b69dd9a..70e5409 100644
---- a/arch/arm/mach-omap2/omap_device.c
-+++ b/arch/arm/mach-omap2/omap_device.c
-@@ -504,7 +504,7 @@ void omap_device_delete(struct omap_device *od)
- struct platform_device __init *omap_device_build(const char *pdev_name,
- int pdev_id,
- struct omap_hwmod *oh,
-- void *pdata, int pdata_len)
-+ const void *pdata, int pdata_len)
- {
- struct omap_hwmod *ohs[] = { oh };
-
-@@ -532,7 +532,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
- struct platform_device __init *omap_device_build_ss(const char *pdev_name,
- int pdev_id,
- struct omap_hwmod **ohs,
-- int oh_cnt, void *pdata,
-+ int oh_cnt, const void *pdata,
- int pdata_len)
- {
- int ret = -ENOMEM;
-diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
-index 17ca1ae..beba869 100644
---- a/arch/arm/mach-omap2/omap_device.h
-+++ b/arch/arm/mach-omap2/omap_device.h
-@@ -71,12 +71,12 @@ int omap_device_idle(struct platform_device *pdev);
- /* Core code interface */
-
- struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
-- struct omap_hwmod *oh, void *pdata,
-+ struct omap_hwmod *oh, const void *pdata,
- int pdata_len);
-
- struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
- struct omap_hwmod **oh, int oh_cnt,
-- void *pdata, int pdata_len);
-+ const void *pdata, int pdata_len);
-
- struct omap_device *omap_device_alloc(struct platform_device *pdev,
- struct omap_hwmod **ohs, int oh_cnt);
-diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index d9ee0ff..24f224a 100644
---- a/arch/arm/mach-omap2/omap_hwmod.c
-+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
- int (*init_clkdm)(struct omap_hwmod *oh);
- void (*update_context_lost)(struct omap_hwmod *oh);
- int (*get_context_lost)(struct omap_hwmod *oh);
--};
-+} __no_const;
-
- /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
--static struct omap_hwmod_soc_ops soc_ops;
-+static struct omap_hwmod_soc_ops soc_ops __read_only;
-
- /* omap_hwmod_list contains all registered struct omap_hwmods */
- static LIST_HEAD(omap_hwmod_list);
-diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
-index d15c7bb..b2d1f0c 100644
---- a/arch/arm/mach-omap2/wd_timer.c
-+++ b/arch/arm/mach-omap2/wd_timer.c
-@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
- struct omap_hwmod *oh;
- char *oh_name = "wd_timer2";
- char *dev_name = "omap_wdt";
-- struct omap_wd_timer_platform_data pdata;
-+ static struct omap_wd_timer_platform_data pdata = {
-+ .read_reset_sources = prm_read_reset_sources
-+ };
-
- if (!cpu_class_is_omap2() || of_have_populated_dt())
- return 0;
-@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
- return -EINVAL;
- }
-
-- pdata.read_reset_sources = prm_read_reset_sources;
--
- pdev = omap_device_build(dev_name, id, oh, &pdata,
- sizeof(struct omap_wd_timer_platform_data));
- WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
-diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
-index b82dcae..44ee5b6 100644
---- a/arch/arm/mach-tegra/cpuidle-tegra20.c
-+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
-@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
- bool entered_lp2 = false;
-
- if (tegra_pending_sgi())
-- ACCESS_ONCE(abort_flag) = true;
-+ ACCESS_ONCE_RW(abort_flag) = true;
-
- cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
-
-diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
-index 656324a..0beba28 100644
---- a/arch/arm/mach-ux500/setup.h
-+++ b/arch/arm/mach-ux500/setup.h
-@@ -40,13 +40,6 @@ extern void ux500_timer_init(void);
- .type = MT_DEVICE, \
- }
-
--#define __MEM_DEV_DESC(x, sz) { \
-- .virtual = IO_ADDRESS(x), \
-- .pfn = __phys_to_pfn(x), \
-- .length = sz, \
-- .type = MT_MEMORY, \
--}
--
- extern struct smp_operations ux500_smp_ops;
- extern void ux500_cpu_die(unsigned int cpu);
-
-diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
-index cd2c88e..4dd9b67 100644
---- a/arch/arm/mm/Kconfig
-+++ b/arch/arm/mm/Kconfig
-@@ -446,7 +446,7 @@ config CPU_32v5
-
- config CPU_32v6
- bool
-- select CPU_USE_DOMAINS if CPU_V6 && MMU
-+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
- select TLS_REG_EMUL if !CPU_32v6K && !MMU
-
- config CPU_32v6K
-@@ -601,6 +601,7 @@ config CPU_CP15_MPU
-
- config CPU_USE_DOMAINS
- bool
-+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
- help
- This option enables or disables the use of domain switching
- via the set_fs() function.
-@@ -800,6 +801,7 @@ config NEED_KUSER_HELPERS
- config KUSER_HELPERS
- bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
- default y
-+ depends on !(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND
- help
- Warning: disabling this option may break user programs.
-
-@@ -812,7 +814,7 @@ config KUSER_HELPERS
- See Documentation/arm/kernel_user_helpers.txt for details.
-
- However, the fixed address nature of these helpers can be used
-- by ROP (return orientated programming) authors when creating
-+ by ROP (Return Oriented Programming) authors when creating
- exploits.
-
- If all of the binaries and libraries which run on your platform
-diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
-index 6f4585b..7b6f52b 100644
---- a/arch/arm/mm/alignment.c
-+++ b/arch/arm/mm/alignment.c
-@@ -211,10 +211,12 @@ union offset_union {
- #define __get16_unaligned_check(ins,val,addr) \
- do { \
- unsigned int err = 0, v, a = addr; \
-+ pax_open_userland(); \
- __get8_unaligned_check(ins,v,a,err); \
- val = v << ((BE) ? 8 : 0); \
- __get8_unaligned_check(ins,v,a,err); \
- val |= v << ((BE) ? 0 : 8); \
-+ pax_close_userland(); \
- if (err) \
- goto fault; \
- } while (0)
-@@ -228,6 +230,7 @@ union offset_union {
- #define __get32_unaligned_check(ins,val,addr) \
- do { \
- unsigned int err = 0, v, a = addr; \
-+ pax_open_userland(); \
- __get8_unaligned_check(ins,v,a,err); \
- val = v << ((BE) ? 24 : 0); \
- __get8_unaligned_check(ins,v,a,err); \
-@@ -236,6 +239,7 @@ union offset_union {
- val |= v << ((BE) ? 8 : 16); \
- __get8_unaligned_check(ins,v,a,err); \
- val |= v << ((BE) ? 0 : 24); \
-+ pax_close_userland(); \
- if (err) \
- goto fault; \
- } while (0)
-@@ -249,6 +253,7 @@ union offset_union {
- #define __put16_unaligned_check(ins,val,addr) \
- do { \
- unsigned int err = 0, v = val, a = addr; \
-+ pax_open_userland(); \
- __asm__( FIRST_BYTE_16 \
- ARM( "1: "ins" %1, [%2], #1\n" ) \
- THUMB( "1: "ins" %1, [%2]\n" ) \
-@@ -268,6 +273,7 @@ union offset_union {
- " .popsection\n" \
- : "=r" (err), "=&r" (v), "=&r" (a) \
- : "0" (err), "1" (v), "2" (a)); \
-+ pax_close_userland(); \
- if (err) \
- goto fault; \
- } while (0)
-@@ -281,6 +287,7 @@ union offset_union {
- #define __put32_unaligned_check(ins,val,addr) \
- do { \
- unsigned int err = 0, v = val, a = addr; \
-+ pax_open_userland(); \
- __asm__( FIRST_BYTE_32 \
- ARM( "1: "ins" %1, [%2], #1\n" ) \
- THUMB( "1: "ins" %1, [%2]\n" ) \
-@@ -310,6 +317,7 @@ union offset_union {
- " .popsection\n" \
- : "=r" (err), "=&r" (v), "=&r" (a) \
- : "0" (err), "1" (v), "2" (a)); \
-+ pax_close_userland(); \
- if (err) \
- goto fault; \
- } while (0)
-diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
-index 84e6f77..0b52f31 100644
---- a/arch/arm/mm/context.c
-+++ b/arch/arm/mm/context.c
-@@ -43,7 +43,7 @@
- #define NUM_USER_ASIDS ASID_FIRST_VERSION
-
- static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
--static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
-+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
- static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
+-static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
++static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
- static DEFINE_PER_CPU(atomic64_t, active_asids);
-@@ -180,7 +180,7 @@ static int is_reserved_asid(u64 asid)
- static u64 new_context(struct mm_struct *mm, unsigned int cpu)
+ static int mbox_show(struct seq_file *s, void *data)
{
- u64 asid = atomic64_read(&mm->context.id);
-- u64 generation = atomic64_read(&asid_generation);
-+ u64 generation = atomic64_read_unchecked(&asid_generation);
-
- if (asid != 0 && is_reserved_asid(asid)) {
- /*
-@@ -198,7 +198,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
- */
- asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
- if (asid == NUM_USER_ASIDS) {
-- generation = atomic64_add_return(ASID_FIRST_VERSION,
-+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
- &asid_generation);
- flush_context(cpu);
- asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
-@@ -227,14 +227,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
- cpu_set_reserved_ttbr0();
-
- asid = atomic64_read(&mm->context.id);
-- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
-+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
- && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
- goto switch_mm_fastpath;
-
- raw_spin_lock_irqsave(&cpu_asid_lock, flags);
- /* Check that our ASID belongs to the current generation. */
- asid = atomic64_read(&mm->context.id);
-- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
-+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
- asid = new_context(mm, cpu);
- atomic64_set(&mm->context.id, asid);
- }
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
-index eb8830a..5360ce7 100644
+index 4b0bc37..d556b08 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
-@@ -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,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
- if (fixup_exception(regs))
- return;
-
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (addr < TASK_SIZE) {
-+ if (current->signal->curr_ip)
-+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", ¤t->signal->curr_ip, current->comm, task_pid_nr(current),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
-+ else
-+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
-+ }
-+#endif
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+ if ((fsr & FSR_WRITE) &&
-+ (((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),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&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),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
-+ }
-+#endif
-+
- /*
- * No handler, we'll have to terminate things with extreme prejudice.
- */
-@@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
- }
- #endif
-
-+#ifdef CONFIG_PAX_PAGEEXEC
-+ if (fsr & FSR_LNX_PF) {
-+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
-+ do_group_exit(SIGKILL);
-+ }
-+#endif
-+
- tsk->thread.address = addr;
- tsk->thread.error_code = fsr;
- tsk->thread.trap_no = 14;
-@@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
+@@ -386,6 +386,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
}
#endif /* CONFIG_MMU */
@@ -3873,112 +2769,15 @@ index eb8830a..5360ce7 100644
/*
* First Level Translation Fault Handler
*
-@@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
- const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
- struct siginfo info;
-
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
-+ if (current->signal->curr_ip)
-+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", ¤t->signal->curr_ip, current->comm, task_pid_nr(current),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
-+ else
-+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
-+ goto die;
-+ }
-+#endif
-+
- if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
- return;
-
-+die:
- printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
- inf->name, fsr, addr);
-
-@@ -574,15 +647,98 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
- ifsr_info[nr].name = name;
- }
-
-+asmlinkage int sys_sigreturn(struct pt_regs *regs);
-+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
-+
- asmlinkage void __exception
- do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
- {
+@@ -630,6 +657,20 @@ 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;
-+ unsigned long pc = instruction_pointer(regs);
-+
-+ if (user_mode(regs)) {
-+ unsigned long sigpage = current->mm->context.sigpage;
-+
-+ if (sigpage <= pc && pc < sigpage + 7*4) {
-+ if (pc < sigpage + 3*4)
-+ sys_sigreturn(regs);
-+ else
-+ sys_rt_sigreturn(regs);
-+ return;
-+ }
-+ if (pc == 0xffff0f60UL) {
-+ /*
-+ * PaX: __kuser_cmpxchg64 emulation
-+ */
-+ // TODO
-+ //regs->ARM_pc = regs->ARM_lr;
-+ //return;
-+ }
-+ if (pc == 0xffff0fa0UL) {
-+ /*
-+ * PaX: __kuser_memory_barrier emulation
-+ */
-+ // dmb(); implied by the exception
-+ regs->ARM_pc = regs->ARM_lr;
-+ return;
-+ }
-+ if (pc == 0xffff0fc0UL) {
-+ /*
-+ * PaX: __kuser_cmpxchg emulation
-+ */
-+ // TODO
-+ //long new;
-+ //int op;
-+
-+ //op = FUTEX_OP_SET << 28;
-+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
-+ //regs->ARM_r0 = old != new;
-+ //regs->ARM_pc = regs->ARM_lr;
-+ //return;
-+ }
-+ if (pc == 0xffff0fe0UL) {
-+ /*
-+ * PaX: __kuser_get_tls emulation
-+ */
-+ regs->ARM_r0 = current_thread_info()->tp_value[0];
-+ regs->ARM_pc = regs->ARM_lr;
-+ return;
-+ }
-+ }
-+
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
-+ else if (is_domain_fault(ifsr) || 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),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
-+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
-+ 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),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
-+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
-+ goto die;
-+ }
-+#endif
-+
+
+#ifdef CONFIG_PAX_REFCOUNT
-+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
++ if (fsr_fs(ifsr) == 2) {
+ unsigned int bkpt;
+
-+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
++ if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
+ current->thread.error_code = ifsr;
+ current->thread.trap_no = 0;
+ pax_report_refcount_overflow(regs);
@@ -3987,133 +2786,23 @@ index eb8830a..5360ce7 100644
+ }
+ }
+#endif
-
++
if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
return;
-+die:
- printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
- inf->name, ifsr, addr);
-
-diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
-index cf08bdf..772656c 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,17 @@ 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);
-+}
-+
-+static inline int is_domain_fault(unsigned int fsr)
-+{
-+ return ((fsr_fs(fsr) & 0xD) == 0x9);
-+}
-+
- 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 18ec4c5..479bb6a 100644
---- a/arch/arm/mm/init.c
-+++ b/arch/arm/mm/init.c
-@@ -30,6 +30,8 @@
- #include <asm/setup.h>
- #include <asm/tlb.h>
- #include <asm/fixmap.h>
-+#include <asm/system_info.h>
-+#include <asm/cp15.h>
-
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-@@ -684,7 +686,46 @@ void free_initmem(void)
- {
- #ifdef CONFIG_HAVE_TCM
- extern char __tcm_start, __tcm_end;
-+#endif
-
-+#ifdef CONFIG_PAX_KERNEXEC
-+ unsigned long addr;
-+ pgd_t *pgd;
-+ pud_t *pud;
-+ pmd_t *pmd;
-+ int cpu_arch = cpu_architecture();
-+ unsigned int cr = get_cr();
-+
-+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
-+ /* make pages tables, etc before .text NX */
-+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ __section_update(pmd, addr, PMD_SECT_XN);
-+ }
-+ /* make init NX */
-+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ __section_update(pmd, addr, PMD_SECT_XN);
-+ }
-+ /* make kernel code/rodata RX */
-+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+#ifdef CONFIG_ARM_LPAE
-+ __section_update(pmd, addr, PMD_SECT_RDONLY);
-+#else
-+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
-+#endif
-+ }
-+ }
-+#endif
-+
-+#ifdef CONFIG_HAVE_TCM
- poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
- free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
- #endif
-diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
-index f123d6e..04bf569 100644
---- a/arch/arm/mm/ioremap.c
-+++ b/arch/arm/mm/ioremap.c
-@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
- unsigned int mtype;
-
- if (cached)
-- mtype = MT_MEMORY;
-+ mtype = MT_MEMORY_RX;
- else
-- mtype = MT_MEMORY_NONCACHED;
-+ mtype = MT_MEMORY_NONCACHED_RX;
-
- return __arm_ioremap_caller(phys_addr, size, mtype,
- __builtin_return_address(0));
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
-index 0c63562..7128a90 100644
+index 44b628e..be706ee 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
-@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
- struct vm_area_struct *vma;
+@@ -33,6 +33,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);
- struct vm_unmapped_area_info info;
/*
-@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ * We only need to do colour alignment if either the I or D
+@@ -54,6 +55,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
if (len > TASK_SIZE)
return -ENOMEM;
@@ -4124,449 +2813,63 @@ index 0c63562..7128a90 100644
if (addr) {
if (do_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -61,16 +66,20 @@ 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, offset))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, &addr, len, offset))
return addr;
}
-
-@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
- info.high_limit = TASK_SIZE;
- info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
- info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
- }
-
-@@ -112,6 +117,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);
- struct vm_unmapped_area_info info;
-
- /*
-@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- return addr;
+ if (len > mm->cached_hole_size) {
+- start_addr = addr = mm->free_area_cache;
++ start_addr = addr = mm->free_area_cache;
+ } else {
+- start_addr = addr = TASK_UNMAPPED_BASE;
+- mm->cached_hole_size = 0;
++ start_addr = addr = mm->mmap_base;
++ mm->cached_hole_size = 0;
}
-
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
-+#endif
+
- /* requesting a specific address */
- if (addr) {
- if (do_align)
-@@ -139,8 +149,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;
- }
-
-@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- info.high_limit = mm->mmap_base;
- info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
- info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
-
- /*
-@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
- {
- unsigned long random_factor = 0UL;
-
+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_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))
-@@ -180,9 +194,21 @@ 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;
- } 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;
- }
- }
-diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
-index b1d17ee..7a6f4d3 100644
---- a/arch/arm/mm/mmu.c
-+++ b/arch/arm/mm/mmu.c
-@@ -36,6 +36,22 @@
- #include "mm.h"
- #include "tcm.h"
-
-+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
-+void modify_domain(unsigned int dom, unsigned int type)
-+{
-+ struct thread_info *thread = current_thread_info();
-+ unsigned int domain = thread->cpu_domain;
-+ /*
-+ * DOMAIN_MANAGER might be defined to some other value,
-+ * use the arch-defined constant
-+ */
-+ domain &= ~domain_val(dom, 3);
-+ thread->cpu_domain = domain | domain_val(dom, type);
-+ set_domain(thread->cpu_domain);
-+}
-+EXPORT_SYMBOL(modify_domain);
-+#endif
-+
- /*
- * empty_zero_page is a special page that is used for
- * zero-initialized data and COW.
-@@ -228,10 +244,18 @@ __setup("noalign", noalign_setup);
-
- #endif /* ifdef CONFIG_CPU_CP15 / else */
-
--#define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_XN
-+#define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY
- #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
-
--static struct mem_type mem_types[] = {
-+#ifdef CONFIG_PAX_KERNEXEC
-+#define L_PTE_KERNEXEC L_PTE_RDONLY
-+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
-+#else
-+#define L_PTE_KERNEXEC L_PTE_DIRTY
-+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
-+#endif
-+
-+static struct mem_type mem_types[] __read_only = {
- [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
- .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
- L_PTE_SHARED,
-@@ -260,16 +284,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,
- .domain = DOMAIN_IO,
- },
- [MT_CACHECLEAN] = {
-- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
-+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_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_MINICACHE | PMD_SECT_RDONLY,
- .domain = DOMAIN_KERNEL,
- },
- #endif
-@@ -277,36 +301,54 @@ static struct mem_type mem_types[] = {
- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
- L_PTE_RDONLY,
- .prot_l1 = PMD_TYPE_TABLE,
-- .domain = DOMAIN_USER,
-+ .domain = DOMAIN_VECTORS,
- },
- [MT_HIGH_VECTORS] = {
- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
- L_PTE_USER | L_PTE_RDONLY,
- .prot_l1 = PMD_TYPE_TABLE,
-- .domain = DOMAIN_USER,
-+ .domain = DOMAIN_VECTORS,
- },
-- [MT_MEMORY] = {
-+ [MT_MEMORY_RWX] = {
- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
- .prot_l1 = PMD_TYPE_TABLE,
- .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
- .domain = DOMAIN_KERNEL,
- },
-+ [MT_MEMORY_RW] = {
-+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
-+ .prot_l1 = PMD_TYPE_TABLE,
-+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
-+ .domain = DOMAIN_KERNEL,
-+ },
-+ [MT_MEMORY_RX] = {
-+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
-+ .prot_l1 = PMD_TYPE_TABLE,
-+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
-+ .domain = DOMAIN_KERNEL,
-+ },
- [MT_ROM] = {
-- .prot_sect = PMD_TYPE_SECT,
-+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
- .domain = DOMAIN_KERNEL,
- },
-- [MT_MEMORY_NONCACHED] = {
-+ [MT_MEMORY_NONCACHED_RW] = {
- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
- L_PTE_MT_BUFFERABLE,
- .prot_l1 = PMD_TYPE_TABLE,
- .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
- .domain = DOMAIN_KERNEL,
- },
-+ [MT_MEMORY_NONCACHED_RX] = {
-+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
-+ L_PTE_MT_BUFFERABLE,
-+ .prot_l1 = PMD_TYPE_TABLE,
-+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
-+ .domain = DOMAIN_KERNEL,
-+ },
- [MT_MEMORY_DTCM] = {
-- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
-- L_PTE_XN,
-+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
- .prot_l1 = PMD_TYPE_TABLE,
-- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
-+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
- .domain = DOMAIN_KERNEL,
- },
- [MT_MEMORY_ITCM] = {
-@@ -316,10 +358,10 @@ static struct mem_type mem_types[] = {
- },
- [MT_MEMORY_SO] = {
- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
-- L_PTE_MT_UNCACHED | L_PTE_XN,
-+ L_PTE_MT_UNCACHED,
- .prot_l1 = PMD_TYPE_TABLE,
- .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S |
-- PMD_SECT_UNCACHED | PMD_SECT_XN,
-+ PMD_SECT_UNCACHED,
- .domain = DOMAIN_KERNEL,
- },
- [MT_MEMORY_DMA_READY] = {
-@@ -405,9 +447,35 @@ static void __init build_mem_type_table(void)
- * to prevent speculative instruction fetches.
+@@ -89,14 +98,14 @@ full_search:
+ * Start a new search - just in case we missed
+ * some holes.
*/
- mem_types[MT_DEVICE].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_DEVICE].prot_pte |= L_PTE_XN;
- mem_types[MT_DEVICE_NONSHARED].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_DEVICE_NONSHARED].prot_pte |= L_PTE_XN;
- mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_XN;
- mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_XN;
-+
-+ /* Mark other regions on ARMv6+ as execute-never */
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+ mem_types[MT_UNCACHED].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_UNCACHED].prot_pte |= L_PTE_XN;
-+ mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_CACHECLEAN].prot_pte |= L_PTE_XN;
-+#ifndef CONFIG_ARM_LPAE
-+ mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_MINICLEAN].prot_pte |= L_PTE_XN;
-+#endif
-+ mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_XN;
-+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_MEMORY_NONCACHED_RW].prot_pte |= PMD_SECT_XN;
-+ mem_types[MT_MEMORY_DTCM].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_MEMORY_DTCM].prot_pte |= L_PTE_XN;
-+#endif
-+
-+ mem_types[MT_MEMORY_SO].prot_sect |= PMD_SECT_XN;
-+ mem_types[MT_MEMORY_SO].prot_pte |= L_PTE_XN;
+- if (start_addr != TASK_UNMAPPED_BASE) {
+- start_addr = addr = TASK_UNMAPPED_BASE;
++ if (start_addr != mm->mmap_base) {
++ start_addr = addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
+ goto full_search;
+ }
+ return -ENOMEM;
}
- if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
+- if (!vma || addr + len <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, &addr, len, offset)) {
/*
-@@ -468,6 +536,9 @@ 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;
-+#ifdef CONFIG_PAX_KERNEXEC
-+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
-+#endif
- 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
-@@ -485,11 +556,17 @@ static void __init build_mem_type_table(void)
- mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
- mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
- 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_RWX].prot_sect |= PMD_SECT_S;
-+ mem_types[MT_MEMORY_RWX].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;
-+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_S;
-+ mem_types[MT_MEMORY_NONCACHED_RW].prot_pte |= L_PTE_SHARED;
-+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= PMD_SECT_S;
-+ mem_types[MT_MEMORY_NONCACHED_RX].prot_pte |= L_PTE_SHARED;
- }
- }
-
-@@ -500,15 +577,20 @@ static void __init build_mem_type_table(void)
- if (cpu_arch >= CPU_ARCH_ARMv6) {
- if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
- /* Non-cacheable Normal is XCB = 001 */
-- mem_types[MT_MEMORY_NONCACHED].prot_sect |=
-+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |=
-+ PMD_SECT_BUFFERED;
-+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |=
- PMD_SECT_BUFFERED;
- } else {
- /* For both ARMv6 and non-TEX-remapping ARMv7 */
-- mem_types[MT_MEMORY_NONCACHED].prot_sect |=
-+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |=
-+ PMD_SECT_TEX(1);
-+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |=
- PMD_SECT_TEX(1);
- }
- } else {
-- mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
-+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_BUFFERABLE;
-+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= PMD_SECT_BUFFERABLE;
+ * Remember the place where we stopped the search:
+ */
+@@ -111,7 +120,6 @@ full_search:
}
+ }
- #ifdef CONFIG_ARM_LPAE
-@@ -524,6 +606,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);
-@@ -541,10 +625,15 @@ static void __init build_mem_type_table(void)
-
- mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
- 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_RWX].prot_sect |= ecc_mask | cp->pmd;
-+ mem_types[MT_MEMORY_RWX].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_MEMORY_NONCACHED_RW].prot_sect |= ecc_mask;
-+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= ecc_mask;
- mem_types[MT_ROM].prot_sect |= cp->pmd;
-
- switch (cp->pmd) {
-@@ -1186,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
- * called function. This means you can't use any function or debugging
- * method which may touch any device, otherwise the kernel _will_ crash.
- */
-+
-+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
-+
- static void __init devicemaps_init(const struct machine_desc *mdesc)
- {
- struct map_desc map;
- unsigned long addr;
-- void *vectors;
-
-- /*
-- * Allocate the vector page early.
-- */
-- vectors = early_alloc(PAGE_SIZE * 2);
-
-- early_trap_init(vectors);
-+ early_trap_init(&vectors);
-
- for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
- pmd_clear(pmd_off_k(addr));
-@@ -1237,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
- * location (0xffff0000). If we aren't using high-vectors, also
- * create a mapping at the low-vectors virtual address.
- */
-- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
-+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
- map.virtual = 0xffff0000;
- map.length = PAGE_SIZE;
- #ifdef CONFIG_KUSER_HELPERS
-@@ -1309,8 +1395,39 @@ static void __init map_lowmem(void)
- map.pfn = __phys_to_pfn(start);
- map.virtual = __phys_to_virt(start);
- map.length = end - start;
-- map.type = MT_MEMORY;
-
-+#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_RWX;
-+ 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_RWX;
-+ create_mapping(&kernel);
-+
-+ if (map.virtual < (unsigned long)_stext) {
-+ map.length = (unsigned long)_stext - map.virtual;
-+ map.type = MT_MEMORY_RWX;
-+ create_mapping(&map);
-+ }
-+
-+ map.pfn = __phys_to_pfn(__pa(_sdata));
-+ map.virtual = (unsigned long)_sdata;
-+ map.length = end - __pa(_sdata);
-+ }
-+#endif
-+
-+ map.type = MT_MEMORY_RW;
- create_mapping(&map);
- }
- }
-diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
-index a5bc92d..0bb4730 100644
---- a/arch/arm/plat-omap/sram.c
-+++ b/arch/arm/plat-omap/sram.c
-@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
- * Looks like we need to preserve some bootloader code at the
- * beginning of SRAM for jumping to flash for reboot to work...
- */
-+ pax_open_kernel();
- memset_io(omap_sram_base + omap_sram_skip, 0,
- omap_sram_size - omap_sram_skip);
-+ pax_close_kernel();
- }
+ /*
+ * You really shouldn't be using read() or write() on /dev/mem. This
+ * might go away in the future.
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
-index ce6d763..cfea917 100644
+index 4c1a363..df311d0 100644
--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
-@@ -47,7 +47,7 @@ struct samsung_dma_ops {
+@@ -41,7 +41,7 @@ struct samsung_dma_ops {
int (*started)(unsigned ch);
int (*flush)(unsigned ch);
int (*stop)(unsigned ch);
@@ -4575,6 +2878,19 @@ index ce6d763..cfea917 100644
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
@@ -4592,7 +2908,7 @@ index c3a58a1..78fbf54 100644
/*
* 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 d232888..87c8df1 100644
+index 3b3159b..425ea94d 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;
@@ -4612,23 +2928,21 @@ index d232888..87c8df1 100644
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
-index 479330b..53717a8 100644
+index b7f5c68..556135c 100644
--- a/arch/avr32/include/asm/kmap_types.h
+++ b/arch/avr32/include/asm/kmap_types.h
-@@ -2,9 +2,9 @@
- #define __ASM_AVR32_KMAP_TYPES_H
-
- #ifdef CONFIG_DEBUG_HIGHMEM
--# define KM_TYPE_NR 29
-+# define KM_TYPE_NR 30
- #else
--# define KM_TYPE_NR 14
-+# define KM_TYPE_NR 15
- #endif
+@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
+ D(11) KM_IRQ1,
+ D(12) KM_SOFTIRQ0,
+ D(13) KM_SOFTIRQ1,
+-D(14) KM_TYPE_NR
++D(14) KM_CLEARPAGE,
++D(15) KM_TYPE_NR
+ };
- #endif /* __ASM_AVR32_KMAP_TYPES_H */
+ #undef D
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
-index 0eca933..eb78c7b 100644
+index f7040a1..db9f300 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)
@@ -4655,7 +2969,7 @@ index 0eca933..eb78c7b 100644
/*
* This routine handles page faults. It determines the address and the
* problem, and then passes it off to one of the appropriate routines.
-@@ -176,6 +193,16 @@ bad_area:
+@@ -156,6 +173,16 @@ bad_area:
up_read(&mm->mmap_sem);
if (user_mode(regs)) {
@@ -4709,7 +3023,7 @@ index aea2718..3639a60 100644
#endif /* _ASM_ARCH_CACHE_H */
diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
-index 7caf25d..ee65ac5 100644
+index 1de779f..336fad3 100644
--- a/arch/cris/include/arch-v32/arch/cache.h
+++ b/arch/cris/include/arch-v32/arch/cache.h
@@ -1,11 +1,12 @@
@@ -4724,13 +3038,13 @@ index 7caf25d..ee65ac5 100644
#define L1_CACHE_SHIFT 5
+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
- #define __read_mostly __attribute__((__section__(".data..read_mostly")))
+ #define __read_mostly __attribute__((__section__(".data.read_mostly")))
diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
-index b86329d..6709906 100644
+index 0d8a7d6..d0c9ff5 100644
--- a/arch/frv/include/asm/atomic.h
+++ b/arch/frv/include/asm/atomic.h
-@@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
+@@ -241,6 +241,16 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
#define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
#define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
@@ -4765,25 +3079,25 @@ index 2797163..c2a401d 100644
#define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
#define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
-index 43901f2..0d8b865 100644
+index f8e16b2..c73ff79 100644
--- a/arch/frv/include/asm/kmap_types.h
+++ b/arch/frv/include/asm/kmap_types.h
-@@ -2,6 +2,6 @@
- #ifndef _ASM_KMAP_TYPES_H
- #define _ASM_KMAP_TYPES_H
-
--#define KM_TYPE_NR 17
-+#define KM_TYPE_NR 18
+@@ -23,6 +23,7 @@ enum km_type {
+ KM_IRQ1,
+ KM_SOFTIRQ0,
+ KM_SOFTIRQ1,
++ KM_CLEARPAGE,
+ KM_TYPE_NR
+ };
- #endif
diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
-index 836f147..4cf23f5 100644
+index 385fd30..27cf8ba 100644
--- a/arch/frv/mm/elf-fdpic.c
+++ b/arch/frv/mm/elf-fdpic.c
@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
{
struct vm_area_struct *vma;
- struct vm_unmapped_area_info info;
+ unsigned long limit;
+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
if (len > TASK_SIZE)
@@ -4794,20 +3108,46 @@ index 836f147..4cf23f5 100644
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, offset))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, &addr, len, offset))
goto success;
}
-@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
- info.high_limit = (current->mm->start_stack - 0x00200000);
- info.align_mask = 0;
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
- if (!(addr & ~PAGE_MASK))
- goto success;
+@@ -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, offset))
+ goto success;
+ addr = vma->vm_end;
+ }
+@@ -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, 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 f4ca594..adc72fd6 100644
+index 0f01de2..d37d309 100644
--- a/arch/hexagon/include/asm/cache.h
+++ b/arch/hexagon/include/asm/cache.h
@@ -21,9 +21,11 @@
@@ -4825,10 +3165,10 @@ index f4ca594..adc72fd6 100644
#define __cacheline_aligned __aligned(L1_CACHE_BYTES)
#define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
-index 6e6fe18..a6ae668 100644
+index 2fc214b..7597423 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
-@@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
+@@ -209,6 +209,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
#define atomic64_inc(v) atomic64_add(1, (v))
#define atomic64_dec(v) atomic64_sub(1, (v))
@@ -4867,7 +3207,7 @@ index 988254a..e1ee885 100644
#ifdef CONFIG_SMP
# define SMP_CACHE_SHIFT L1_CACHE_SHIFT
diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
-index 5a83c5c..4d7f553 100644
+index b5298eb..67c6e62 100644
--- a/arch/ia64/include/asm/elf.h
+++ b/arch/ia64/include/asm/elf.h
@@ -42,6 +42,13 @@
@@ -4915,7 +3255,7 @@ index 96a8d92..617a1cf 100644
{
return quicklist_alloc(0, GFP_KERNEL, NULL);
diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
-index 7935115..c0eca6a 100644
+index 1a97af3..7529d31 100644
--- a/arch/ia64/include/asm/pgtable.h
+++ b/arch/ia64/include/asm/pgtable.h
@@ -12,7 +12,7 @@
@@ -4927,7 +3267,7 @@ index 7935115..c0eca6a 100644
#include <asm/mman.h>
#include <asm/page.h>
#include <asm/processor.h>
-@@ -142,6 +142,17 @@
+@@ -143,6 +143,17 @@
#define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
#define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
#define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
@@ -4946,10 +3286,10 @@ index 7935115..c0eca6a 100644
#define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
-index 45698cd..e8e2dbc 100644
+index b77768d..e0795eb 100644
--- a/arch/ia64/include/asm/spinlock.h
+++ b/arch/ia64/include/asm/spinlock.h
-@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
+@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
@@ -5020,8 +3360,34 @@ index 449c8c0..18965fb 100644
__cu_len; \
})
-diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
-index 24603be..948052d 100644
+diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
+index c539c68..c95d3db 100644
+--- a/arch/ia64/kernel/err_inject.c
++++ b/arch/ia64/kernel/err_inject.c
+@@ -256,7 +256,7 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata err_inject_cpu_notifier =
++static struct notifier_block err_inject_cpu_notifier =
+ {
+ .notifier_call = err_inject_cpu_callback,
+ };
+diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
+index 9b97303..69464a9 100644
+--- a/arch/ia64/kernel/mca.c
++++ b/arch/ia64/kernel/mca.c
+@@ -1919,7 +1919,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block mca_cpu_notifier __cpuinitdata = {
++static struct notifier_block mca_cpu_notifier = {
+ .notifier_call = mca_cpu_callback
+ };
+
+diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
+index 24603be..948052d 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
@@ -5113,10 +3479,19 @@ index 24603be..948052d 100644
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
-index ab33328..f39506c 100644
+index 77597e5..189dd62f 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
-@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
+@@ -977,7 +977,7 @@ create_palinfo_proc_entries(unsigned int cpu)
+ struct proc_dir_entry **pdir;
+ struct proc_dir_entry *cpu_dir;
+ int j;
+- char cpustr[sizeof(CPUSTR)];
++ char cpustr[3+4+1];
+
+
+ /*
+@@ -1045,7 +1045,7 @@ static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
@@ -5125,14 +3500,47 @@ index ab33328..f39506c 100644
{
.notifier_call = palinfo_cpu_callback,
.priority = 0,
+diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
+index 89accc6..236d389 100644
+--- a/arch/ia64/kernel/perfmon.c
++++ b/arch/ia64/kernel/perfmon.c
+@@ -632,6 +632,7 @@ static struct file_system_type pfm_fs_type = {
+ .mount = pfmfs_mount,
+ .kill_sb = kill_anon_super,
+ };
++MODULE_ALIAS_FS("pfmfs");
+
+ DEFINE_PER_CPU(unsigned long, pfm_syst_info);
+ DEFINE_PER_CPU(struct task_struct *, pmu_owner);
+@@ -2370,7 +2371,6 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
+ */
+ insert_vm_struct(mm, vma);
+
+- mm->total_vm += size >> PAGE_SHIFT;
+ vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
+ vma_pages(vma));
+ up_write(&task->mm->mmap_sem);
+diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
+index 79802e5..1a89ec5 100644
+--- a/arch/ia64/kernel/salinfo.c
++++ b/arch/ia64/kernel/salinfo.c
+@@ -616,7 +616,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block salinfo_cpu_notifier __cpuinitdata =
++static struct notifier_block salinfo_cpu_notifier =
+ {
+ .notifier_call = salinfo_cpu_callback,
+ .priority = 0,
diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
-index 41e33f8..65180b2 100644
+index 609d500..254a3d7 100644
--- a/arch/ia64/kernel/sys_ia64.c
+++ b/arch/ia64/kernel/sys_ia64.c
@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
- unsigned long align_mask = 0;
+ unsigned long start_addr, align_mask = PAGE_SIZE - 1;
struct mm_struct *mm = current->mm;
- struct vm_unmapped_area_info info;
+ struct vm_area_struct *vma;
+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
if (len > RGN_MAP_LIMIT)
@@ -5149,21 +3557,44 @@ index 41e33f8..65180b2 100644
+#endif
+
if (!addr)
- addr = TASK_UNMAPPED_BASE;
-
-@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
- info.high_limit = TASK_SIZE;
- info.align_mask = align_mask;
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
+ addr = mm->free_area_cache;
+
+@@ -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)) {
+- if (start_addr != TASK_UNMAPPED_BASE) {
++ if (start_addr != mm->mmap_base) {
+ /* Start a new search --- just in case we missed some holes. */
+- addr = TASK_UNMAPPED_BASE;
++ addr = mm->mmap_base;
+ goto full_search;
+ }
+ return -ENOMEM;
+ }
+- if (!vma || addr + len <= vma->vm_start) {
++ 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 9be1f11..f2eef30 100644
+--- a/arch/ia64/kernel/topology.c
++++ b/arch/ia64/kernel/topology.c
+@@ -444,7 +444,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
+index 53c0ba0..2accdde 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
-@@ -198,7 +198,7 @@ SECTIONS {
+@@ -199,7 +199,7 @@ SECTIONS {
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
@@ -5173,10 +3604,10 @@ index 0ccb28f..8992469 100644
* ensure percpu data fits
* into percpu page size
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
-index 7225dad..2a7c8256 100644
+index 20b3593..1ce77f0 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)
+@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned long address)
return pte_present(pte);
}
@@ -5197,12 +3628,12 @@ index 7225dad..2a7c8256 100644
+}
+#endif
+
- # define VM_READ_BIT 0
- # define VM_WRITE_BIT 1
- # define VM_EXEC_BIT 2
-@@ -151,8 +168,21 @@ retry:
- if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
- goto bad_area;
+ void __kprobes
+ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
+ {
+@@ -146,9 +163,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
+ mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
+ | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
- if ((vma->vm_flags & mask) != mask)
+ if ((vma->vm_flags & mask) != mask) {
@@ -5219,32 +3650,35 @@ index 7225dad..2a7c8256 100644
+#endif
+
goto bad_area;
-+ }
++ }
++
/*
* If for any reason at all we couldn't handle the fault, make
+ * sure we exit gracefully rather than endlessly redo the
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
-index 68232db..6ca80af 100644
+index 5ca674b..0d1395a 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
-@@ -154,6 +154,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_unmapped_area_info info;
+ struct vm_area_struct *vmm;
+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
if (len > RGN_MAP_LIMIT)
return -ENOMEM;
-@@ -177,6 +178,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
- info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
- info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
- }
-
+@@ -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, 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 b6f7f43..c04320d 100644
+index 00cb0e2..2ad8024 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
@@ -5324,18 +3758,6 @@ index 0395c51..5f26031 100644
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
-diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
-index 0424315..defcca9 100644
---- a/arch/metag/mm/hugetlbpage.c
-+++ b/arch/metag/mm/hugetlbpage.c
-@@ -205,6 +205,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
- info.high_limit = TASK_SIZE;
- info.align_mask = PAGE_MASK & HUGEPT_MASK;
- info.align_offset = 0;
-+ info.threadstack_offset = 0;
- return vm_unmapped_area(&info);
- }
-
diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
index 4efe96a..60e8699 100644
--- a/arch/microblaze/include/asm/cache.h
@@ -5355,912 +3777,37 @@ index 4efe96a..60e8699 100644
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
-index 08b6079..8b554d2 100644
+index 1d93f81..67794d0 100644
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
-@@ -21,15 +21,39 @@
- #include <asm/cmpxchg.h>
+@@ -21,6 +21,10 @@
#include <asm/war.h>
+ #include <asm/system.h>
+#ifdef CONFIG_GENERIC_ATOMIC64
+#include <asm-generic/atomic64.h>
+#endif
+
- #define ATOMIC_INIT(i) { (i) }
-
-+#ifdef CONFIG_64BIT
-+#define _ASM_EXTABLE(from, to) \
-+" .section __ex_table,\"a\"\n" \
-+" .dword " #from ", " #to"\n" \
-+" .previous\n"
-+#else
-+#define _ASM_EXTABLE(from, to) \
-+" .section __ex_table,\"a\"\n" \
-+" .word " #from ", " #to"\n" \
-+" .previous\n"
-+#endif
-+
- /*
- * atomic_read - read atomic variable
- * @v: pointer of type atomic_t
- *
- * Atomically reads the value of @v.
- */
--#define atomic_read(v) (*(volatile int *)&(v)->counter)
-+static inline int atomic_read(const atomic_t *v)
-+{
-+ return (*(volatile const int *) &v->counter);
-+}
-+
-+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
-+{
-+ return (*(volatile const int *) &v->counter);
-+}
-
- /*
- * atomic_set - set atomic variable
-@@ -38,7 +62,15 @@
- *
- * Atomically sets the value of @v to @i.
- */
--#define atomic_set(v, i) ((v)->counter = (i))
-+static inline void atomic_set(atomic_t *v, int i)
-+{
-+ v->counter = i;
-+}
-+
-+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
-+{
-+ v->counter = i;
-+}
-
- /*
- * atomic_add - add integer to atomic variable
-@@ -47,7 +79,67 @@
- *
- * Atomically adds @i to @v.
- */
--static __inline__ void atomic_add(int i, atomic_t * v)
-+static __inline__ void atomic_add(int i, atomic_t *v)
-+{
-+ int temp;
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic_add \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: add %0, %2 \n"
-+#else
-+ " addu %0, %2 \n"
-+#endif
-+ " sc %0, %1 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic_add \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: add %0, %2 \n"
-+#else
-+ " addu %0, %2 \n"
-+#endif
-+ " sc %0, %1 \n"
-+ " beqz %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: add %0, %1 \n"
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#else
-+ " addu %0, %1 \n"
-+#endif
-+ : "+r" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+}
-+
-+static __inline__ void atomic_add_unchecked(int i, atomic_unchecked_t *v)
- {
- if (kernel_uses_llsc && R10000_LLSC_WAR) {
- int temp;
-@@ -90,7 +182,67 @@ static __inline__ void atomic_add(int i, atomic_t * v)
- *
- * Atomically subtracts @i from @v.
- */
--static __inline__ void atomic_sub(int i, atomic_t * v)
-+static __inline__ void atomic_sub(int i, atomic_t *v)
-+{
-+ int temp;
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic64_sub \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: sub %0, %2 \n"
-+#else
-+ " subu %0, %2 \n"
-+#endif
-+ " sc %0, %1 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic64_sub \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: sub %0, %2 \n"
-+#else
-+ " subu %0, %2 \n"
-+#endif
-+ " sc %0, %1 \n"
-+ " beqz %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: sub %0, %1 \n"
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#else
-+ " subu %0, %1 \n"
-+#endif
-+ : "+r" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+}
-+
-+static __inline__ void atomic_sub_unchecked(long i, atomic_unchecked_t *v)
- {
- if (kernel_uses_llsc && R10000_LLSC_WAR) {
- int temp;
-@@ -129,7 +281,93 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
- /*
- * Same as above, but return the result value
- */
--static __inline__ int atomic_add_return(int i, atomic_t * v)
-+static __inline__ int atomic_add_return(int i, atomic_t *v)
-+{
-+ int result;
-+ int temp;
-+
-+ smp_mb__before_llsc();
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %1, %2 # atomic_add_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: add %0, %1, %3 \n"
-+#else
-+ " addu %0, %1, %3 \n"
-+#endif
-+ " sc %0, %2 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " b 4f \n"
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: addu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %1, %2 # atomic_add_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: add %0, %1, %3 \n"
-+#else
-+ " addu %0, %1, %3 \n"
-+#endif
-+ " sc %0, %2 \n"
-+ " bnez %0, 4f \n"
-+ " b 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: addu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+ " lw %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: add %0, %2 \n"
-+#else
-+ " addu %0, %2 \n"
-+#endif
-+ " sw %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Note: Dest reg is not modified on overflow */
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#endif
-+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+
-+ smp_llsc_mb();
-+
-+ return result;
-+}
-+
-+static __inline__ int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
- {
- int result;
-
-@@ -178,7 +416,93 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
- return result;
- }
+ #define ATOMIC_INIT(i) { (i) }
--static __inline__ int atomic_sub_return(int i, atomic_t * v)
-+static __inline__ int atomic_sub_return(int i, atomic_t *v)
-+{
-+ int result;
-+ int temp;
-+
-+ smp_mb__before_llsc();
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %1, %2 # atomic_sub_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: sub %0, %1, %3 \n"
-+#else
-+ " subu %0, %1, %3 \n"
-+#endif
-+ " sc %0, %2 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " b 4f \n"
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: subu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-+ : "Ir" (i), "m" (v->counter)
-+ : "memory");
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %1, %2 # atomic_sub_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: sub %0, %1, %3 \n"
-+#else
-+ " subu %0, %1, %3 \n"
-+#endif
-+ " sc %0, %2 \n"
-+ " bnez %0, 4f \n"
-+ " b 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: subu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+ " lw %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: sub %0, %2 \n"
-+#else
-+ " subu %0, %2 \n"
-+#endif
-+ " sw %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Note: Dest reg is not modified on overflow */
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#endif
-+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+
-+ smp_llsc_mb();
-+
-+ return result;
-+}
-+static __inline__ int atomic_sub_return_unchecked(int i, atomic_unchecked_t *v)
- {
- int result;
-
-@@ -238,7 +562,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
- * Atomically test @v and subtract @i if @v is greater or equal than @i.
- * The function returns the old value of @v minus @i.
- */
--static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
-+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
- {
- int result;
-
-@@ -295,8 +619,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
- return result;
- }
-
--#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
--#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
-+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
-+{
-+ return cmpxchg(&v->counter, old, new);
-+}
-+
-+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
-+ int new)
-+{
-+ return cmpxchg(&(v->counter), old, new);
-+}
-+
-+static inline int atomic_xchg(atomic_t *v, int new)
-+{
-+ return xchg(&v->counter, new);
-+}
-+
-+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
-+{
-+ return xchg(&(v->counter), new);
-+}
-
- /**
- * __atomic_add_unless - add unless the number is a given value
-@@ -324,6 +666,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
-
- #define atomic_dec_return(v) atomic_sub_return(1, (v))
- #define atomic_inc_return(v) atomic_add_return(1, (v))
-+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
-+{
-+ return atomic_add_return_unchecked(1, v);
-+}
-
- /*
- * atomic_sub_and_test - subtract value from variable and test result
-@@ -345,6 +691,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
- * other cases.
- */
- #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
-+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
-+{
-+ return atomic_add_return_unchecked(1, v) == 0;
-+}
-
- /*
- * atomic_dec_and_test - decrement by 1 and test
-@@ -369,6 +719,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
- * Atomically increments @v by 1.
- */
- #define atomic_inc(v) atomic_add(1, (v))
-+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
-+{
-+ atomic_add_unchecked(1, v);
-+}
-
- /*
- * atomic_dec - decrement and test
-@@ -377,6 +731,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
- * Atomically decrements @v by 1.
- */
- #define atomic_dec(v) atomic_sub(1, (v))
-+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
-+{
-+ atomic_sub_unchecked(1, v);
-+}
-
- /*
- * atomic_add_negative - add and test if negative
-@@ -398,14 +756,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
- * @v: pointer of type atomic64_t
- *
- */
--#define atomic64_read(v) (*(volatile long *)&(v)->counter)
-+static inline long atomic64_read(const atomic64_t *v)
-+{
-+ return (*(volatile const long *) &v->counter);
-+}
-+
-+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
-+{
-+ return (*(volatile const long *) &v->counter);
-+}
-
- /*
- * atomic64_set - set atomic variable
- * @v: pointer of type atomic64_t
- * @i: required value
- */
--#define atomic64_set(v, i) ((v)->counter = (i))
-+static inline void atomic64_set(atomic64_t *v, long i)
-+{
-+ v->counter = i;
-+}
-+
-+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
-+{
-+ v->counter = i;
-+}
-
- /*
- * atomic64_add - add integer to atomic variable
-@@ -414,7 +788,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
- *
- * Atomically adds @i to @v.
- */
--static __inline__ void atomic64_add(long i, atomic64_t * v)
-+static __inline__ void atomic64_add(long i, atomic64_t *v)
-+{
-+ long temp;
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %0, %1 # atomic64_add \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: dadd %0, %2 \n"
-+#else
-+ " daddu %0, %2 \n"
-+#endif
-+ " scd %0, %1 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %0, %1 # atomic64_add \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: dadd %0, %2 \n"
-+#else
-+ " daddu %0, %2 \n"
-+#endif
-+ " scd %0, %1 \n"
-+ " beqz %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: dadd %0, %1 \n"
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#else
-+ " daddu %0, %1 \n"
-+#endif
-+ : "+r" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+}
-+static __inline__ void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
- {
- if (kernel_uses_llsc && R10000_LLSC_WAR) {
- long temp;
-@@ -457,7 +890,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
- *
- * Atomically subtracts @i from @v.
- */
--static __inline__ void atomic64_sub(long i, atomic64_t * v)
-+static __inline__ void atomic64_sub(long i, atomic64_t *v)
-+{
-+ long temp;
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %0, %1 # atomic64_sub \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: dsub %0, %2 \n"
-+#else
-+ " dsubu %0, %2 \n"
-+#endif
-+ " scd %0, %1 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %0, %1 # atomic64_sub \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "2: dsub %0, %2 \n"
-+#else
-+ " dsubu %0, %2 \n"
-+#endif
-+ " scd %0, %1 \n"
-+ " beqz %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "3: \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: dsub %0, %1 \n"
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#else
-+ " dsubu %0, %1 \n"
-+#endif
-+ : "+r" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+}
-+
-+static __inline__ void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
- {
- if (kernel_uses_llsc && R10000_LLSC_WAR) {
- long temp;
-@@ -496,7 +989,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
/*
- * Same as above, but return the result value
+@@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
*/
--static __inline__ long atomic64_add_return(long i, atomic64_t * v)
-+static __inline__ long atomic64_add_return(long i, atomic64_t *v)
-+{
-+ long result;
-+ long temp;
-+
-+ smp_mb__before_llsc();
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %1, %2 # atomic64_add_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: dadd %0, %1, %3 \n"
-+#else
-+ " daddu %0, %1, %3 \n"
-+#endif
-+ " scd %0, %2 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " b 4f \n"
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: daddu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-+ : "Ir" (i));
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %1, %2 # atomic64_add_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: dadd %0, %1, %3 \n"
-+#else
-+ " daddu %0, %1, %3 \n"
-+#endif
-+ " scd %0, %2 \n"
-+ " bnez %0, 4f \n"
-+ " b 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: daddu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-+ : "Ir" (i), "m" (v->counter)
-+ : "memory");
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+ " ld %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: dadd %0, %2 \n"
-+#else
-+ " daddu %0, %2 \n"
-+#endif
-+ " sd %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Note: Dest reg is not modified on overflow */
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#endif
-+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+
-+ smp_llsc_mb();
-+
-+ return result;
-+}
-+static __inline__ long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
- {
- long result;
-
-@@ -546,7 +1125,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
- return result;
- }
-
--static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
-+static __inline__ long atomic64_sub_return(long i, atomic64_t *v)
-+{
-+ long result;
-+ long temp;
-+
-+ smp_mb__before_llsc();
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ long temp;
-+
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %1, %2 # atomic64_sub_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: dsub %0, %1, %3 \n"
-+#else
-+ " dsubu %0, %1, %3 \n"
-+#endif
-+ " scd %0, %2 \n"
-+ " beqzl %0, 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " b 4f \n"
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: dsubu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-+ : "Ir" (i), "m" (v->counter)
-+ : "memory");
-+ } else if (kernel_uses_llsc) {
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: lld %1, %2 # atomic64_sub_return \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "2: dsub %0, %1, %3 \n"
-+#else
-+ " dsubu %0, %1, %3 \n"
-+#endif
-+ " scd %0, %2 \n"
-+ " bnez %0, 4f \n"
-+ " b 1b \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ " .set noreorder \n"
-+ "3: b 5f \n"
-+ " move %0, %1 \n"
-+ " .set reorder \n"
-+ _ASM_EXTABLE(2b, 3b)
-+#endif
-+ "4: dsubu %0, %1, %3 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ "5: \n"
-+#endif
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
-+ : "Ir" (i), "m" (v->counter)
-+ : "memory");
-+ } else {
-+ unsigned long flags;
-+
-+ raw_local_irq_save(flags);
-+ __asm__ __volatile__(
-+ " ld %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Exception on overflow. */
-+ "1: dsub %0, %2 \n"
-+#else
-+ " dsubu %0, %2 \n"
-+#endif
-+ " sd %0, %1 \n"
-+#ifdef CONFIG_PAX_REFCOUNT
-+ /* Note: Dest reg is not modified on overflow */
-+ "2: \n"
-+ _ASM_EXTABLE(1b, 2b)
-+#endif
-+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
-+ raw_local_irq_restore(flags);
-+ }
-+
-+ smp_llsc_mb();
-+
-+ return result;
-+}
-+
-+static __inline__ long atomic64_sub_return_unchecked(long i, atomic64_unchecked_t *v)
- {
- long result;
-
-@@ -605,7 +1274,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
- * Atomically test @v and subtract @i if @v is greater or equal than @i.
- * The function returns the old value of @v minus @i.
- */
--static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
-+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
- {
- long result;
-
-@@ -662,9 +1331,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
- return result;
- }
+ #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
--#define atomic64_cmpxchg(v, o, n) \
-- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
--#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
-+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
-+{
-+ return cmpxchg(&v->counter, old, new);
-+}
-+
-+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
-+ long new)
-+{
-+ return cmpxchg(&(v->counter), old, new);
-+}
-+
-+static inline long atomic64_xchg(atomic64_t *v, long new)
-+{
-+ return xchg(&v->counter, new);
-+}
++#define atomic64_read_unchecked(v) atomic64_read(v)
++#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
++#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
++#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
++#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
++#define atomic64_inc_unchecked(v) atomic64_inc(v)
++#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
++#define atomic64_dec_unchecked(v) atomic64_dec(v)
++#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
+
-+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
-+{
-+ return xchg(&(v->counter), new);
-+}
-
- /**
- * atomic64_add_unless - add unless the number is a given value
-@@ -694,6 +1380,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
-
- #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
- #define atomic64_inc_return(v) atomic64_add_return(1, (v))
-+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
-
- /*
- * atomic64_sub_and_test - subtract value from variable and test result
-@@ -715,6 +1402,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
- * other cases.
- */
- #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
-+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
-
- /*
- * atomic64_dec_and_test - decrement by 1 and test
-@@ -739,6 +1427,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
- * Atomically increments @v by 1.
- */
- #define atomic64_inc(v) atomic64_add(1, (v))
-+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
-
- /*
- * atomic64_dec - decrement and test
-@@ -747,6 +1436,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
- * Atomically decrements @v by 1.
- */
- #define atomic64_dec(v) atomic64_sub(1, (v))
-+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
+ #endif /* CONFIG_64BIT */
/*
- * atomic64_add_negative - add and test if negative
diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
index b4db69f..8f3b093 100644
--- a/arch/mips/include/asm/cache.h
@@ -6279,11 +3826,11 @@ index b4db69f..8f3b093 100644
#define SMP_CACHE_SHIFT L1_CACHE_SHIFT
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
-index cf3ae24..238d22f 100644
+index 455c0ac..ad65fbe 100644
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
@@ -372,13 +372,16 @@ extern const char *__elf_platform;
- #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
+ #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
+#ifdef CONFIG_PAX_ASLR
@@ -6303,122 +3850,19 @@ index cf3ae24..238d22f 100644
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_ELF_H */
-diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
-index c1f6afa..38cc6e9 100644
---- a/arch/mips/include/asm/exec.h
-+++ b/arch/mips/include/asm/exec.h
-@@ -12,6 +12,6 @@
- #ifndef _ASM_EXEC_H
- #define _ASM_EXEC_H
-
--extern unsigned long arch_align_stack(unsigned long sp);
-+#define arch_align_stack(x) ((x) & ~0xfUL)
-
- #endif /* _ASM_EXEC_H */
-diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
-index d44622c..64990d2 100644
---- a/arch/mips/include/asm/local.h
-+++ b/arch/mips/include/asm/local.h
-@@ -12,15 +12,25 @@ 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_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_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)
-
- /*
- * Same as above, but return the result value
-@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
- return result;
- }
-
-+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
-+{
-+ unsigned long result;
-+
-+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
-+ unsigned long temp;
-+
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1:" __LL "%1, %2 # local_add_return \n"
-+ " addu %0, %1, %3 \n"
-+ __SC "%0, %2 \n"
-+ " beqzl %0, 1b \n"
-+ " addu %0, %1, %3 \n"
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
-+ : "Ir" (i), "m" (l->a.counter)
-+ : "memory");
-+ } else if (kernel_uses_llsc) {
-+ unsigned long temp;
-+
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1:" __LL "%1, %2 # local_add_return \n"
-+ " addu %0, %1, %3 \n"
-+ __SC "%0, %2 \n"
-+ " beqz %0, 1b \n"
-+ " addu %0, %1, %3 \n"
-+ " .set mips0 \n"
-+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
-+ : "Ir" (i), "m" (l->a.counter)
-+ : "memory");
-+ } else {
-+ unsigned long flags;
-+
-+ local_irq_save(flags);
-+ result = l->a.counter;
-+ result += i;
-+ l->a.counter = result;
-+ local_irq_restore(flags);
-+ }
-+
-+ return result;
-+}
-+
- static __inline__ long local_sub_return(long i, local_t * l)
- {
- unsigned long result;
-@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
-
- #define local_cmpxchg(l, o, n) \
- ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
-+#define local_cmpxchg_unchecked(l, o, n) \
-+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
- #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
-
- /**
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
-index f6be474..12ad554 100644
+index e59cd1a..8e329d6 100644
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
-@@ -95,7 +95,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
+@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
- #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
-- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
-+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
+ #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
+- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
++ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
#else
typedef struct { unsigned long long pte; } pte_t;
- #define pte_val(x) ((x).pte)
+ #define pte_val(x) ((x).pte)
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
index 881d18b..cea38bc 100644
--- a/arch/mips/include/asm/pgalloc.h
@@ -6435,23 +3879,23 @@ index 881d18b..cea38bc 100644
#endif
/*
-diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
-index 25da651..ae2a259 100644
---- a/arch/mips/include/asm/smtc_proc.h
-+++ b/arch/mips/include/asm/smtc_proc.h
-@@ -18,6 +18,6 @@ extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
-
- /* Count of number of recoveries of "stolen" FPU access rights on 34K */
+diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
+index 6018c80..7c37203 100644
+--- a/arch/mips/include/asm/system.h
++++ b/arch/mips/include/asm/system.h
+@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
+ */
+ #define __ARCH_WANT_UNLOCKED_CTXSW
--extern atomic_t smtc_fpu_recoveries;
-+extern atomic_unchecked_t smtc_fpu_recoveries;
+-extern unsigned long arch_align_stack(unsigned long sp);
++#define arch_align_stack(x) ((x) & ~0xfUL)
- #endif /* __ASM_SMTC_PROC_H */
+ #endif /* _ASM_SYSTEM_H */
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
-index 61215a3..213ee0e 100644
+index adda036..e0f33bb 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
-@@ -116,6 +116,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -124,6 +124,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 */
@@ -6459,39 +3903,35 @@ index 61215a3..213ee0e 100644
+#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
#define TIF_SYSCALL_TRACE 31 /* syscall trace active */
- #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
-@@ -132,20 +134,18 @@ static inline struct thread_info *current_thread_info(void)
+ #ifdef CONFIG_MIPS32_O32
+@@ -148,15 +150,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_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
-
--#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
-- _TIF_SYSCALL_AUDIT)
-+#define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
++
++#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
/* work to do in syscall_trace_leave() */
--#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
-- _TIF_SYSCALL_AUDIT)
-+#define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
+-#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
++#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 \
- (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME)
+ #define _TIF_WORK_MASK (0x0000ffef & \
+ ~(_TIF_SECCOMP | _TIF_SYSCALL_AUDIT))
/* work to do on any return to u-space */
--#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
-- _TIF_WORK_SYSCALL_EXIT)
-+#define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID)
+-#define _TIF_ALLWORK_MASK (0x8000ffff & ~_TIF_SECCOMP)
++#define _TIF_ALLWORK_MASK ((0x8000ffff & ~_TIF_SECCOMP) | _TIF_GRSEC_SETXID)
#endif /* __KERNEL__ */
diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
-index 1188e00..41cf144 100644
+index 9fdd8bc..4bd7f1a 100644
--- a/arch/mips/kernel/binfmt_elfn32.c
+++ b/arch/mips/kernel/binfmt_elfn32.c
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
#undef ELF_ET_DYN_BASE
- #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
+ #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
+#ifdef CONFIG_PAX_ASLR
+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
@@ -6504,12 +3944,12 @@ index 1188e00..41cf144 100644
#include <linux/module.h>
#include <linux/elfcore.h>
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
-index 202e581..689ca79 100644
+index ff44823..97f8906 100644
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
-@@ -56,6 +56,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
+@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
#undef ELF_ET_DYN_BASE
- #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
+ #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
+#ifdef CONFIG_PAX_ASLR
+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
@@ -6521,36 +3961,11 @@ index 202e581..689ca79 100644
#include <asm/processor.h>
/*
-diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
-index d1fea7a..45602ea 100644
---- a/arch/mips/kernel/irq.c
-+++ b/arch/mips/kernel/irq.c
-@@ -77,17 +77,17 @@ void ack_bad_irq(unsigned int irq)
- printk("unexpected IRQ # %d\n", irq);
- }
-
--atomic_t irq_err_count;
-+atomic_unchecked_t irq_err_count;
-
- int arch_show_interrupts(struct seq_file *p, int prec)
- {
-- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
-+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
- return 0;
- }
-
- asmlinkage void spurious_interrupt(void)
- {
-- atomic_inc(&irq_err_count);
-+ atomic_inc_unchecked(&irq_err_count);
- }
-
- void __init init_IRQ(void)
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
-index ddc7610..8c58f17 100644
+index bf128d7..bc244d6 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
-@@ -566,15 +566,3 @@ unsigned long get_wchan(struct task_struct *task)
+@@ -479,15 +479,3 @@ unsigned long get_wchan(struct task_struct *task)
out:
return pc;
}
@@ -6567,7 +3982,7 @@ index ddc7610..8c58f17 100644
- return sp & ALMASK;
-}
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
-index 8ae1ebe..1bcbf47 100644
+index 4e6ea1f..0922422 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -529,6 +529,10 @@ static inline int audit_arch(void)
@@ -6581,9 +3996,9 @@ index 8ae1ebe..1bcbf47 100644
/*
* Notification of system call entry/exit
* - triggered by current->work.syscall_trace
-@@ -540,6 +544,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
+@@ -538,6 +542,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
/* do the secure computing check first */
- secure_computing_strict(regs->regs[2]);
+ secure_computing(regs->regs[2]);
+#ifdef CONFIG_GRKERNSEC_SETXID
+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
@@ -6593,145 +4008,60 @@ index 8ae1ebe..1bcbf47 100644
if (!(current->ptrace & PT_PTRACED))
goto out;
-diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
-index c10aa84..9ec2e60 100644
---- a/arch/mips/kernel/smtc-proc.c
-+++ b/arch/mips/kernel/smtc-proc.c
-@@ -31,7 +31,7 @@ unsigned long selfipis[NR_CPUS];
-
- struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
-
--atomic_t smtc_fpu_recoveries;
-+atomic_unchecked_t smtc_fpu_recoveries;
-
- static int smtc_proc_show(struct seq_file *m, void *v)
- {
-@@ -48,7 +48,7 @@ static int smtc_proc_show(struct seq_file *m, void *v)
- for(i = 0; i < NR_CPUS; i++)
- seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
- seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
-- atomic_read(&smtc_fpu_recoveries));
-+ atomic_read_unchecked(&smtc_fpu_recoveries));
- return 0;
- }
-
-@@ -73,7 +73,7 @@ void init_smtc_stats(void)
- smtc_cpu_stats[i].selfipis = 0;
- }
-
-- atomic_set(&smtc_fpu_recoveries, 0);
-+ atomic_set_unchecked(&smtc_fpu_recoveries, 0);
-
- proc_create("smtc", 0444, NULL, &smtc_proc_fops);
- }
-diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
-index dfc1b91..11a2c07 100644
---- a/arch/mips/kernel/smtc.c
-+++ b/arch/mips/kernel/smtc.c
-@@ -1359,7 +1359,7 @@ void smtc_soft_dump(void)
- }
- smtc_ipi_qdump();
- printk("%d Recoveries of \"stolen\" FPU\n",
-- atomic_read(&smtc_fpu_recoveries));
-+ atomic_read_unchecked(&smtc_fpu_recoveries));
- }
-
-
-diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
-index 84536bf..79caa4d 100644
---- a/arch/mips/kernel/sync-r4k.c
-+++ b/arch/mips/kernel/sync-r4k.c
-@@ -21,8 +21,8 @@
- #include <asm/mipsregs.h>
-
- static atomic_t count_start_flag = ATOMIC_INIT(0);
--static atomic_t count_count_start = ATOMIC_INIT(0);
--static atomic_t count_count_stop = ATOMIC_INIT(0);
-+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
-+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
- static atomic_t count_reference = ATOMIC_INIT(0);
-
- #define COUNTON 100
-@@ -69,13 +69,13 @@ void synchronise_count_master(int cpu)
-
- for (i = 0; i < NR_LOOPS; i++) {
- /* slaves loop on '!= 2' */
-- while (atomic_read(&count_count_start) != 1)
-+ while (atomic_read_unchecked(&count_count_start) != 1)
- mb();
-- atomic_set(&count_count_stop, 0);
-+ atomic_set_unchecked(&count_count_stop, 0);
- smp_wmb();
-
- /* this lets the slaves write their count register */
-- atomic_inc(&count_count_start);
-+ atomic_inc_unchecked(&count_count_start);
-
- /*
- * Everyone initialises count in the last loop:
-@@ -86,11 +86,11 @@ void synchronise_count_master(int cpu)
- /*
- * Wait for all slaves to leave the synchronization point:
- */
-- while (atomic_read(&count_count_stop) != 1)
-+ while (atomic_read_unchecked(&count_count_stop) != 1)
- mb();
-- atomic_set(&count_count_start, 0);
-+ atomic_set_unchecked(&count_count_start, 0);
- smp_wmb();
-- atomic_inc(&count_count_stop);
-+ atomic_inc_unchecked(&count_count_stop);
- }
- /* Arrange for an interrupt in a short while */
- write_c0_compare(read_c0_count() + COUNTON);
-@@ -131,8 +131,8 @@ void synchronise_count_slave(int cpu)
- initcount = atomic_read(&count_reference);
-
- for (i = 0; i < NR_LOOPS; i++) {
-- atomic_inc(&count_count_start);
-- while (atomic_read(&count_count_start) != 2)
-+ atomic_inc_unchecked(&count_count_start);
-+ while (atomic_read_unchecked(&count_count_start) != 2)
- mb();
-
- /*
-@@ -141,8 +141,8 @@ void synchronise_count_slave(int cpu)
- if (i == NR_LOOPS-1)
- write_c0_count(initcount);
-
-- atomic_inc(&count_count_stop);
-- while (atomic_read(&count_count_stop) != 2)
-+ atomic_inc_unchecked(&count_count_stop);
-+ while (atomic_read_unchecked(&count_count_stop) != 2)
- mb();
- }
- /* Arrange for an interrupt in a short while */
-diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
-index 524841f..3eef41e 100644
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -684,7 +684,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
- siginfo_t info;
-
- prev_state = exception_enter();
-- die_if_kernel("Integer overflow", regs);
-+ if (unlikely(!user_mode(regs))) {
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+ if (fixup_exception(regs)) {
-+ pax_report_refcount_overflow(regs);
-+ exception_exit(prev_state);
-+ return;
-+ }
-+#endif
-+
-+ die("Integer overflow", regs);
-+ }
+diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
+index a632bc1..0b77c7c 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)
+
+ stack_done:
+ lw t0, TI_FLAGS($28) # syscall tracing enabled?
+- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
++ li t1, _TIF_SYSCALL_WORK
+ and t0, t1
+ 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
+--- a/arch/mips/kernel/scall64-64.S
++++ b/arch/mips/kernel/scall64-64.S
+@@ -54,7 +54,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
+
+ sd a3, PT_R26(sp) # save a3 for syscall restarting
+
+- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
++ li t1, _TIF_SYSCALL_WORK
+ LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
+ 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
+--- a/arch/mips/kernel/scall64-n32.S
++++ b/arch/mips/kernel/scall64-n32.S
+@@ -53,7 +53,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
+
+ sd a3, PT_R26(sp) # save a3 for syscall restarting
+
+- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
++ li t1, _TIF_SYSCALL_WORK
+ LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
+ 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
+--- a/arch/mips/kernel/scall64-o32.S
++++ b/arch/mips/kernel/scall64-o32.S
+@@ -81,7 +81,7 @@ NESTED(handle_sys, PT_SIZE, sp)
+ PTR 4b, bad_stack
+ .previous
- info.si_code = FPE_INTOVF;
- info.si_signo = SIGFPE;
+- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
++ li t1, _TIF_SYSCALL_WORK
+ LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
+ and t0, t1, t0
+ bnez t0, trace_a_syscall
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
-index becc42b..9e43d4b 100644
+index 937cf33..adb39bb 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -28,6 +28,23 @@
@@ -6758,34 +4088,19 @@ index becc42b..9e43d4b 100644
/*
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
-@@ -199,6 +216,14 @@ bad_area:
- bad_area_nosemaphore:
- /* User mode accesses just cause a SIGSEGV */
- if (user_mode(regs)) {
-+
-+#ifdef CONFIG_PAX_PAGEEXEC
-+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
-+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
-+ do_group_exit(SIGKILL);
-+ }
-+#endif
-+
- tsk->thread.cp0_badvaddr = address;
- tsk->thread.error_code = write;
- #if 0
diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
-index f1baadd..8537544 100644
+index 302d779..3845a09 100644
--- a/arch/mips/mm/mmap.c
+++ b/arch/mips/mm/mmap.c
-@@ -59,6 +59,7 @@ 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);
- struct vm_unmapped_area_info info;
if (unlikely(len > TASK_SIZE))
-@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+ 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 */
@@ -6797,35 +4112,86 @@ index f1baadd..8537544 100644
if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -91,14 +97,14 @@ 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, offset))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, &addr, len, offset))
return addr;
}
- info.length = len;
- info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
- info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
+@@ -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, offset))
+ return addr;
+ addr = vma->vm_end;
+ if (do_color_align)
+@@ -144,10 +149,11 @@ 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) {
++ addr -= len;
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vmm, &addr, len, offset))
+ /* cache the address as a hint for next time */
+- return mm->free_area_cache = addr - len;
++ return (mm->free_area_cache = addr);
+ }
+ }
+
+@@ -155,17 +161,17 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
+ goto bottomup;
- if (dir == DOWN) {
- info.flags = VM_UNMAPPED_AREA_TOPDOWN;
-@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+ 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, offset)) {
+ /* cache the address as a hint for next time */
+ return mm->free_area_cache = addr;
+ }
+@@ -175,10 +181,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 +227,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
{
unsigned long random_factor = 0UL;
+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_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;
-@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -234,38 +242,23 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
if (mmap_is_legacy()) {
mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
@@ -6836,6 +4202,7 @@ index f1baadd..8537544 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area;
+ mm->unmap_area = arch_unmap_area;
} else {
mm->mmap_base = mmap_base(random_factor);
+
@@ -6845,9 +4212,10 @@ index f1baadd..8537544 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
+ mm->unmap_area = arch_unmap_area_topdown;
}
}
-
+-
-static inline unsigned long brk_rnd(void)
-{
- unsigned long rnd = get_random_int();
@@ -6874,35 +4242,6 @@ index f1baadd..8537544 100644
-
- return ret;
-}
--
- int __virt_addr_valid(const volatile void *kaddr)
- {
- return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
-diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
-index a2358b4..7cead4f 100644
---- a/arch/mips/sgi-ip27/ip27-nmi.c
-+++ b/arch/mips/sgi-ip27/ip27-nmi.c
-@@ -187,9 +187,9 @@ void
- cont_nmi_dump(void)
- {
- #ifndef REAL_NMI_SIGNAL
-- static atomic_t nmied_cpus = ATOMIC_INIT(0);
-+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
-
-- atomic_inc(&nmied_cpus);
-+ atomic_inc_unchecked(&nmied_cpus);
- #endif
- /*
- * Only allow 1 cpu to proceed
-@@ -233,7 +233,7 @@ cont_nmi_dump(void)
- udelay(10000);
- }
- #else
-- while (atomic_read(&nmied_cpus) != num_online_cpus());
-+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
- #endif
-
- /*
diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
index 967d144..db12197 100644
--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
@@ -6964,12 +4303,12 @@ index 4ce7a01..449202a 100644
#endif /* __ASM_OPENRISC_CACHE_H */
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
-index 472886c..00e7df9 100644
+index c4b779b..775b66b 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
-@@ -252,6 +252,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
- return dec;
- }
+@@ -335,6 +335,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+
+ #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
+#define atomic64_read_unchecked(v) atomic64_read(v)
+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
@@ -7013,7 +4352,7 @@ index 47f11c7..3420df2 100644
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
-index ad2b503..bdf1651 100644
+index 19f6cb1..6c78cf2 100644
--- a/arch/parisc/include/asm/elf.h
+++ b/arch/parisc/include/asm/elf.h
@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
@@ -7055,10 +4394,31 @@ index fc987a1..6e068ef 100644
#endif
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
-index 34899b5..02dd060 100644
+index 9d35a3e..af9b6d3 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
-@@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
+@@ -16,6 +16,8 @@
+ #include <asm/processor.h>
+ #include <asm/cache.h>
+
++extern spinlock_t pa_dbit_lock;
++
+ /*
+ * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel
+ * memory. For the return value to be meaningful, ADDR must be >=
+@@ -44,8 +46,11 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
+
+ #define set_pte_at(mm, addr, ptep, pteval) \
+ do { \
++ unsigned long flags; \
++ spin_lock_irqsave(&pa_dbit_lock, flags); \
+ set_pte(ptep, pteval); \
+ purge_tlb_entries(mm, addr); \
++ spin_unlock_irqrestore(&pa_dbit_lock, flags); \
+ } while (0)
+
+ #endif /* !__ASSEMBLY__ */
+@@ -216,6 +221,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
#define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
@@ -7076,11 +4436,80 @@ index 34899b5..02dd060 100644
#define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
#define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
#define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
+@@ -433,48 +449,46 @@ extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *);
+
+ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
+ {
+-#ifdef CONFIG_SMP
++ pte_t pte;
++ unsigned long flags;
++
+ if (!pte_young(*ptep))
+ return 0;
+- return test_and_clear_bit(xlate_pabit(_PAGE_ACCESSED_BIT), &pte_val(*ptep));
+-#else
+- pte_t pte = *ptep;
+- if (!pte_young(pte))
++
++ spin_lock_irqsave(&pa_dbit_lock, flags);
++ pte = *ptep;
++ if (!pte_young(pte)) {
++ spin_unlock_irqrestore(&pa_dbit_lock, flags);
+ return 0;
+- set_pte_at(vma->vm_mm, addr, ptep, pte_mkold(pte));
++ }
++ set_pte(ptep, pte_mkold(pte));
++ purge_tlb_entries(vma->vm_mm, addr);
++ spin_unlock_irqrestore(&pa_dbit_lock, flags);
+ return 1;
+-#endif
+ }
+
+-extern spinlock_t pa_dbit_lock;
+-
+ struct mm_struct;
+ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+ {
+ pte_t old_pte;
++ unsigned long flags;
+
+- spin_lock(&pa_dbit_lock);
++ spin_lock_irqsave(&pa_dbit_lock, flags);
+ old_pte = *ptep;
+ pte_clear(mm,addr,ptep);
+- spin_unlock(&pa_dbit_lock);
++ purge_tlb_entries(mm, addr);
++ spin_unlock_irqrestore(&pa_dbit_lock, flags);
+
+ return old_pte;
+ }
+
+ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+ {
+-#ifdef CONFIG_SMP
+- unsigned long new, old;
+-
+- do {
+- old = pte_val(*ptep);
+- new = pte_val(pte_wrprotect(__pte (old)));
+- } while (cmpxchg((unsigned long *) ptep, old, new) != old);
++ unsigned long flags;
++ spin_lock_irqsave(&pa_dbit_lock, flags);
++ set_pte(ptep, pte_wrprotect(*ptep));
+ purge_tlb_entries(mm, addr);
+-#else
+- pte_t old_pte = *ptep;
+- set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
+-#endif
++ spin_unlock_irqrestore(&pa_dbit_lock, flags);
+ }
+
+ #define pte_same(A,B) (pte_val(A) == pte_val(B))
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
-index e0a8235..ce2f1e1 100644
+index ff4cf9d..c0564bb 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
-@@ -245,10 +245,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
+@@ -253,10 +253,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
const void __user *from,
unsigned long n)
{
@@ -7093,8 +4522,41 @@ index e0a8235..ce2f1e1 100644
ret = __copy_from_user(to, from, n);
else
copy_from_user_overflow();
+diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
+index 5241698..91dcb12 100644
+--- a/arch/parisc/kernel/cache.c
++++ b/arch/parisc/kernel/cache.c
+@@ -428,14 +428,11 @@ void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
+ /* Note: purge_tlb_entries can be called at startup with
+ no context. */
+
+- /* Disable preemption while we play with %sr1. */
+- preempt_disable();
++ purge_tlb_start(flags);
+ mtsp(mm->context, 1);
+- purge_tlb_start(flags);
+ pdtlb(addr);
+ pitlb(addr);
+ purge_tlb_end(flags);
+- preempt_enable();
+ }
+ EXPORT_SYMBOL(purge_tlb_entries);
+
+diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
+index 5709c5e..14285ca 100644
+--- a/arch/parisc/kernel/drivers.c
++++ b/arch/parisc/kernel/drivers.c
+@@ -394,7 +394,7 @@ EXPORT_SYMBOL(print_pci_hwpath);
+ static void setup_bus_id(struct parisc_device *padev)
+ {
+ struct hardware_path path;
+- char name[20];
++ char name[28];
+ char *output = name;
+ int i;
+
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
-index 2a625fb..9908930 100644
+index 5e34ccf..672bc9c 100644
--- a/arch/parisc/kernel/module.c
+++ b/arch/parisc/kernel/module.c
@@ -98,16 +98,38 @@
@@ -7140,7 +4602,7 @@ index 2a625fb..9908930 100644
}
static inline int in_local(struct module *me, void *loc)
-@@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
+@@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
}
/* align things a bit */
@@ -7160,7 +4622,7 @@ index 2a625fb..9908930 100644
me->arch.got_max = gots;
me->arch.fdesc_max = fdescs;
-@@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
+@@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
BUG_ON(value == 0);
@@ -7169,7 +4631,7 @@ index 2a625fb..9908930 100644
for (i = 0; got[i].addr; i++)
if (got[i].addr == value)
goto out;
-@@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
+@@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
#ifdef CONFIG_64BIT
static Elf_Addr get_fdesc(struct module *me, unsigned long value)
{
@@ -7178,7 +4640,7 @@ index 2a625fb..9908930 100644
if (!value) {
printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
-@@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
+@@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
/* Create new one */
fdesc->addr = value;
@@ -7187,7 +4649,7 @@ index 2a625fb..9908930 100644
return (Elf_Addr)fdesc;
}
#endif /* CONFIG_64BIT */
-@@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
+@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
end = table + sechdrs[me->arch.unwind_section].sh_size;
@@ -7196,8 +4658,22 @@ index 2a625fb..9908930 100644
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/setup.c b/arch/parisc/kernel/setup.c
+index a3328c2..3b812eb 100644
+--- a/arch/parisc/kernel/setup.c
++++ b/arch/parisc/kernel/setup.c
+@@ -69,7 +69,8 @@ void __init setup_cmdline(char **cmdline_p)
+ /* called from hpux boot loader */
+ boot_command_line[0] = '\0';
+ } else {
+- strcpy(boot_command_line, (char *)__va(boot_args[1]));
++ strlcpy(boot_command_line, (char *)__va(boot_args[1]),
++ COMMAND_LINE_SIZE);
+
+ #ifdef CONFIG_BLK_DEV_INITRD
+ if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
-index 5dfd248..64914ac 100644
+index 7ea75d1..5075226 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -33,9 +33,11 @@
@@ -7206,23 +4682,24 @@ index 5dfd248..64914ac 100644
-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)
++ unsigned long flags)
{
- struct vm_unmapped_area_info info;
+ struct vm_area_struct *vma;
+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
- info.flags = 0;
- info.length = len;
-@@ -43,6 +45,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
- info.high_limit = TASK_SIZE;
- info.align_mask = 0;
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
- }
+ addr = PAGE_ALIGN(addr);
-@@ -61,10 +64,11 @@ static int get_offset(struct address_space *mapping)
- return (unsigned long) mapping >> 8;
+@@ -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, offset))
+ return addr;
+ addr = vma->vm_end;
+ }
+@@ -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,
@@ -7230,34 +4707,28 @@ index 5dfd248..64914ac 100644
+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_unmapped_area_info info;
-+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, 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);
- info.flags = 0;
- info.length = len;
-@@ -72,6 +76,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
- info.high_limit = TASK_SIZE;
- info.align_mask = PAGE_MASK & (SHMLBA - 1);
- info.align_offset = (get_offset(mapping) + pgoff) << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
- }
+ offset = (offset + (pgoff << PAGE_SHIFT)) & 0x3FF000;
-@@ -86,15 +91,22 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
- return -EINVAL;
+@@ -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, rand_offset))
+ return addr;
+ addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
+ if (addr < vma->vm_end) /* handle wraparound */
+@@ -100,14 +103,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ if (flags & MAP_FIXED)
return addr;
- }
-- if (!addr)
-+ if (!addr) {
- addr = TASK_UNMAPPED_BASE;
+ if (!addr)
+- addr = TASK_UNMAPPED_BASE;
++ addr = current->mm->mmap_base;
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
-+ addr += current->mm->delta_mmap;
-+#endif
-+
-+ }
-+
if (filp) {
- addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
+ addr = get_shared_area(filp, filp->f_mapping, addr, len, pgoff, flags);
@@ -7271,10 +4742,10 @@ index 5dfd248..64914ac 100644
return addr;
}
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
-index 1cd1d0c..44ec918 100644
+index f19e660..414fe24 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
-@@ -722,9 +722,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
+@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
down_read(¤t->mm->mmap_sem);
vma = find_vma(current->mm,regs->iaoq[0]);
@@ -7286,7 +4757,7 @@ index 1cd1d0c..44ec918 100644
fault_space = regs->iasq[0];
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
-index 0293588..3b229aa 100644
+index 18162ce..94de376 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -15,6 +15,7 @@
@@ -7423,9 +4894,9 @@ index 0293588..3b229aa 100644
int fixup_exception(struct pt_regs *regs)
{
const struct exception_table_entry *fix;
-@@ -204,8 +315,33 @@ retry:
+@@ -192,8 +303,33 @@ good_area:
- good_area:
+ acc_type = parisc_acctyp(code,regs->iir);
- if ((vma->vm_flags & acc_type) != acc_type)
+ if ((vma->vm_flags & acc_type) != acc_type) {
@@ -7459,12 +4930,12 @@ index 0293588..3b229aa 100644
/*
* 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 e3b1d41..8e81edf 100644
+index 02e41b5..ec6e26c 100644
--- a/arch/powerpc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
-@@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
- return t1;
- }
+@@ -469,6 +469,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+
+ #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
+#define atomic64_read_unchecked(v) atomic64_read(v)
+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
@@ -7480,7 +4951,7 @@ index e3b1d41..8e81edf 100644
#endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
-index 9e495c9..b6878e5 100644
+index 4b50941..5605819 100644
--- a/arch/powerpc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
@@ -3,6 +3,7 @@
@@ -7501,10 +4972,10 @@ index 9e495c9..b6878e5 100644
#define SMP_CACHE_BYTES L1_CACHE_BYTES
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
-index cc0655a..13eac2e 100644
+index 3bf9cca..e7457d0 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
-@@ -28,8 +28,19 @@
+@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
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. */
@@ -7526,47 +4997,33 @@ index cc0655a..13eac2e 100644
/*
* Our registers are always unsigned longs, whether we're a 32 bit
-@@ -123,10 +134,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+@@ -274,9 +285,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
-
--
- #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
-+++ b/arch/powerpc/include/asm/exec.h
-@@ -4,6 +4,6 @@
- #ifndef _ASM_POWERPC_EXEC_H
- #define _ASM_POWERPC_EXEC_H
-
--extern unsigned long arch_align_stack(unsigned long sp);
-+#define arch_align_stack(x) ((x) & ~0xfUL)
+ #endif /* __KERNEL__ */
- #endif /* _ASM_POWERPC_EXEC_H */
+ /*
diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
-index 5acabbd..7ea14fa 100644
+index bca8fdc..61e9580 100644
--- a/arch/powerpc/include/asm/kmap_types.h
+++ b/arch/powerpc/include/asm/kmap_types.h
-@@ -10,7 +10,7 @@
- * 2 of the License, or (at your option) any later version.
- */
-
--#define KM_TYPE_NR 16
-+#define KM_TYPE_NR 17
+@@ -27,6 +27,7 @@ enum km_type {
+ KM_PPC_SYNC_PAGE,
+ KM_PPC_SYNC_ICACHE,
+ KM_KDB,
++ KM_CLEARPAGE,
+ KM_TYPE_NR
+ };
- #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 8565c25..2865190 100644
+index d4a7f64..451de1c 100644
--- a/arch/powerpc/include/asm/mman.h
+++ b/arch/powerpc/include/asm/mman.h
-@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
+@@ -44,7 +44,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)
@@ -7576,10 +5033,10 @@ index 8565c25..2865190 100644
return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
}
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
-index b9f4262..dcf04f7 100644
+index 5b0bde2..9f83e1a 100644
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
-@@ -230,8 +230,9 @@ extern long long virt_phys_offset;
+@@ -151,8 +151,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
*/
@@ -7591,21 +5048,21 @@ index b9f4262..dcf04f7 100644
#define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-@@ -259,6 +260,9 @@ extern long long virt_phys_offset;
+@@ -180,6 +181,9 @@ extern phys_addr_t kernstart_addr;
#define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
#endif
+#define ktla_ktva(addr) (addr)
+#define ktva_ktla(addr) (addr)
+
- #ifndef CONFIG_PPC_BOOK3S_64
/*
* 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 88693ce..ac6f9ab 100644
+index fb40ede..d3ce956 100644
--- a/arch/powerpc/include/asm/page_64.h
+++ b/arch/powerpc/include/asm/page_64.h
-@@ -153,15 +153,18 @@ do { \
+@@ -144,15 +144,18 @@ do { \
* stack by default, so in the absence of a PT_GNU_STACK program header
* we turn execute permission off.
*/
@@ -7627,10 +5084,10 @@ index 88693ce..ac6f9ab 100644
#include <asm-generic/getorder.h>
diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
-index f65e27b..23ffb5b 100644
+index 292725c..f87ae14 100644
--- a/arch/powerpc/include/asm/pgalloc-64.h
+++ b/arch/powerpc/include/asm/pgalloc-64.h
-@@ -53,6 +53,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
+@@ -50,6 +50,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
#ifndef CONFIG_PPC_64K_PAGES
#define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
@@ -7638,7 +5095,7 @@ index f65e27b..23ffb5b 100644
static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
{
-@@ -70,6 +71,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
+@@ -67,6 +68,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
pud_set(pud, (unsigned long)pmd);
}
@@ -7650,8 +5107,8 @@ index f65e27b..23ffb5b 100644
#define pmd_populate(mm, pmd, pte_page) \
pmd_populate_kernel(mm, pmd, page_address(pte_page))
#define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
-@@ -171,6 +177,7 @@ extern void __tlb_remove_table(void *_table);
- #endif
+@@ -76,6 +82,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
+ #else /* CONFIG_PPC_64K_PAGES */
#define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
@@ -7659,7 +5116,7 @@ index f65e27b..23ffb5b 100644
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 7d6eacf..14c0240 100644
+index 88b0bd9..e32bc67 100644
--- a/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@ -2,6 +2,7 @@
@@ -7683,10 +5140,10 @@ index 4aad413..85d86bf 100644
#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 10d1ef0..8f83abc 100644
+index 578e5a0..2ab6a8a 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
-@@ -234,6 +234,7 @@
+@@ -212,6 +212,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 */
@@ -7695,7 +5152,7 @@ index 10d1ef0..8f83abc 100644
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
-index 98da78e..dc68271 100644
+index adba970..ef0d917 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -50,7 +50,7 @@ struct smp_ops_t {
@@ -7707,45 +5164,59 @@ index 98da78e..dc68271 100644
extern void smp_send_debugger_break(void);
extern void start_secondary_resume(void);
+diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
+index e30a13d..2b7d994 100644
+--- a/arch/powerpc/include/asm/system.h
++++ b/arch/powerpc/include/asm/system.h
+@@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
+ #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
+ #endif
+
+-extern unsigned long arch_align_stack(unsigned long sp);
++#define arch_align_stack(x) ((x) & ~0xfUL)
+
+ /* Used in very early kernel initialization. */
+ extern unsigned long reloc_offset(void);
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
-index ba7b197..d292e26 100644
+index 836f231..39d0b94 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
-@@ -93,7 +93,6 @@ static inline struct thread_info *current_thread_info(void)
- #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
- TIF_NEED_RESCHED */
- #define TIF_32BIT 4 /* 32 bit binary */
--#define TIF_PERFMON_WORK 5 /* work for pfm_handle_work() */
+@@ -104,7 +104,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 */
-@@ -107,6 +106,9 @@ static inline struct thread_info *current_thread_info(void)
- #define TIF_EMULATE_STACK_STORE 16 /* Is an instruction emulation
- for stack store? */
- #define TIF_MEMDIE 17 /* is terminating due to OOM killer */
-+#define TIF_PERFMON_WORK 18 /* work for pfm_handle_work() */
+-#define TIF_MEMDIE 9 /* is terminating due to OOM killer */
+ #define TIF_SECCOMP 10 /* secure computing */
+ #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */
+ #define TIF_NOERROR 12 /* Force successful syscall return */
+@@ -112,6 +111,9 @@ static inline struct thread_info *current_thread_info(void)
+ #define TIF_FREEZE 14 /* Freezing for suspend */
+ #define TIF_SYSCALL_TRACEPOINT 15 /* syscall tracepoint instrumentation */
+ #define TIF_RUNLATCH 16 /* Is the runlatch enabled? */
++#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 5 /* update credentials on syscall entry/exit */
++#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)
-@@ -126,9 +128,10 @@ static inline struct thread_info *current_thread_info(void)
+@@ -130,8 +132,11 @@ static inline struct thread_info *current_thread_info(void)
+ #define _TIF_FREEZE (1<<TIF_FREEZE)
#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
- #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
- #define _TIF_NOHZ (1<<TIF_NOHZ)
+ #define _TIF_RUNLATCH (1<<TIF_RUNLATCH)
+#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_NOHZ)
-+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
+- _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT)
++ _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
++ _TIF_GRSEC_SETXID)
#define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
- _TIF_NOTIFY_RESUME | _TIF_UPROBE)
+ _TIF_NOTIFY_RESUME)
diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
-index 9485b43..4718d50 100644
+index bd0fb84..1f2d065 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
-@@ -318,52 +318,6 @@ do { \
+@@ -327,52 +327,6 @@ do { \
extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);
@@ -7798,7 +5269,7 @@ index 9485b43..4718d50 100644
static inline unsigned long __copy_from_user_inatomic(void *to,
const void __user *from, unsigned long n)
{
-@@ -387,6 +341,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
+@@ -396,6 +350,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
if (ret == 0)
return 0;
}
@@ -7809,7 +5280,7 @@ index 9485b43..4718d50 100644
return __copy_tofrom_user((__force void __user *)to, from, n);
}
-@@ -413,6 +371,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
+@@ -422,6 +380,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
if (ret == 0)
return 0;
}
@@ -7820,7 +5291,7 @@ index 9485b43..4718d50 100644
return __copy_tofrom_user(to, (__force const void __user *)from, n);
}
-@@ -430,6 +392,92 @@ static inline unsigned long __copy_to_user(void __user *to,
+@@ -439,6 +401,92 @@ static inline unsigned long __copy_to_user(void __user *to,
return __copy_to_user_inatomic(to, from, size);
}
@@ -7914,10 +5385,10 @@ index 9485b43..4718d50 100644
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 2d06704..1616f1b 100644
+index 429983c..7af363b 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
-@@ -757,6 +757,7 @@ storage_fault_common:
+@@ -587,6 +587,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
@@ -7925,7 +5396,7 @@ index 2d06704..1616f1b 100644
mr r4,r14
mr r5,r15
ld r14,PACA_EXGEN+EX_R14(r13)
-@@ -765,8 +766,7 @@ storage_fault_common:
+@@ -596,8 +597,7 @@ storage_fault_common:
cmpdi r3,0
bne- 1f
b .ret_from_except_lite
@@ -7936,21 +5407,49 @@ index 2d06704..1616f1b 100644
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 3a9ed6a..b534681 100644
+index 8c3baa0..4d8c6f1 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
-@@ -1364,10 +1364,10 @@ handle_page_fault:
+@@ -1004,10 +1004,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD
+ bl .save_nvgprs
bl .do_page_fault
cmpdi r3,0
- beq+ 12f
+ beq+ 13f
- bl .save_nvgprs
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
+diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
+index 745c1e7..59d97a6 100644
+--- a/arch/powerpc/kernel/irq.c
++++ b/arch/powerpc/kernel/irq.c
+@@ -547,9 +547,6 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
+ host->ops = ops;
+ host->of_node = of_node_get(of_node);
+
+- if (host->ops->match == NULL)
+- host->ops->match = default_irq_host_match;
+-
+ raw_spin_lock_irqsave(&irq_big_lock, flags);
+
+ /* If it's a legacy controller, check for duplicates and
+@@ -622,7 +619,12 @@ struct irq_host *irq_find_host(struct device_node *node)
+ */
+ raw_spin_lock_irqsave(&irq_big_lock, flags);
+ list_for_each_entry(h, &irq_hosts, link)
+- if (h->ops->match(h, node)) {
++ if (h->ops->match) {
++ if (h->ops->match(h, node)) {
++ found = h;
++ break;
++ }
++ } else if (default_irq_host_match(h, node)) {
+ found = h;
+ break;
+ }
diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
index 2e3200c..72095ce 100644
--- a/arch/powerpc/kernel/module_32.c
@@ -7985,10 +5484,10 @@ index 2e3200c..72095ce 100644
/* 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 96d2fdf..f6d10c8 100644
+index d687e3f..074a8cd 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
-@@ -886,8 +886,8 @@ void show_regs(struct pt_regs * regs)
+@@ -660,8 +660,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
*/
@@ -7997,9 +5496,9 @@ index 96d2fdf..f6d10c8 100644
+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
#endif
- #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
- printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch);
-@@ -1352,10 +1352,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+ show_stack(current, (unsigned long *) regs->gpr[1]);
+ if (!user_mode(regs))
+@@ -1157,10 +1157,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
newsp = stack[0];
ip = stack[STACK_FRAME_LR_SAVE];
if (!firstframe || ip != lr) {
@@ -8012,7 +5511,7 @@ index 96d2fdf..f6d10c8 100644
(void *)current->ret_stack[curr_frame].ret);
curr_frame--;
}
-@@ -1375,7 +1375,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1180,7 +1180,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;
@@ -8021,10 +5520,10 @@ index 96d2fdf..f6d10c8 100644
regs->trap, (void *)regs->nip, (void *)lr);
firstframe = 1;
}
-@@ -1411,58 +1411,3 @@ void notrace __ppc64_runlatch_off(void)
- mtspr(SPRN_CTRLT, ctrl);
+@@ -1255,58 +1255,3 @@ void thread_info_cache_init(void)
}
- #endif /* CONFIG_PPC64 */
+
+ #endif /* THREAD_SHIFT < PAGE_SHIFT */
-
-unsigned long arch_align_stack(unsigned long sp)
-{
@@ -8081,10 +5580,10 @@ index 96d2fdf..f6d10c8 100644
- return ret;
-}
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
-index 9a0d24c..e7fbedf 100644
+index 5de73db..a05f61c 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
-@@ -1761,6 +1761,10 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -1702,6 +1702,10 @@ long arch_ptrace(struct task_struct *child, long request,
return ret;
}
@@ -8095,9 +5594,9 @@ index 9a0d24c..e7fbedf 100644
/*
* We must return the syscall number to actually look up in the table.
* This can be -1L to skip running any syscall at all.
-@@ -1773,6 +1777,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
+@@ -1712,6 +1716,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
- secure_computing_strict(regs->gpr[0]);
+ secure_computing(regs->gpr[0]);
+#ifdef CONFIG_GRKERNSEC_SETXID
+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
@@ -8107,7 +5606,7 @@ index 9a0d24c..e7fbedf 100644
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
/*
-@@ -1807,6 +1816,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
+@@ -1748,6 +1757,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
{
int step;
@@ -8116,28 +5615,28 @@ index 9a0d24c..e7fbedf 100644
+ gr_delayed_cred_worker();
+#endif
+
- audit_syscall_exit(regs);
-
- if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
+ if (unlikely(current->audit_context))
+ audit_syscall_exit((regs->ccr&0x10000000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
+ regs->result);
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
-index bebdf1a..7a9e095 100644
+index 836a5a1..27289a3 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
-@@ -996,7 +996,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
+@@ -859,7 +859,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;
- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
- sigret = 0;
- tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
- } else {
+ if (save_user_regs(regs, frame, 0, 1))
+ goto badframe;
+ regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
-index f93ec28..97e0fbb 100644
+index a50b5ec..547078a 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
-@@ -757,7 +757,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
- #endif
+@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
+ current->thread.fpscr.val = 0;
/* Set up to return from userspace. */
- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
@@ -8145,34 +5644,66 @@ index f93ec28..97e0fbb 100644
regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
+diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
+index f2496f2..4e3cc47 100644
+--- a/arch/powerpc/kernel/syscalls.c
++++ b/arch/powerpc/kernel/syscalls.c
+@@ -107,11 +107,11 @@ long ppc64_personality(unsigned long personality)
+ long ret;
+
+ if (personality(current->personality) == PER_LINUX32
+- && personality == PER_LINUX)
+- personality = PER_LINUX32;
++ && personality(personality) == PER_LINUX)
++ personality = (personality & ~PER_MASK) | PER_LINUX32;
+ ret = sys_personality(personality);
+- if (ret == PER_LINUX32)
+- ret = PER_LINUX;
++ if (personality(ret) == PER_LINUX32)
++ ret = (ret & ~PER_MASK) | PER_LINUX;
+ return ret;
+ }
+ #endif
+diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
+index ca683a1..ab912dd 100644
+--- a/arch/powerpc/kernel/sysfs.c
++++ b/arch/powerpc/kernel/sysfs.c
+@@ -531,7 +531,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
++static struct notifier_block sysfs_cpu_nb = {
+ .notifier_call = sysfs_cpu_notify,
+ };
+
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
-index f783c93..619baf1 100644
+index 9844662..04a2a1e 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
-@@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
- return flags;
- }
+@@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
+ static inline void pmac_backlight_unblank(void) { }
+ #endif
+extern void gr_handle_kernel_exploit(void);
+
- static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
- int signr)
+ int die(const char *str, struct pt_regs *regs, long err)
{
-@@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
- panic("Fatal exception in interrupt");
+ static struct {
+@@ -171,6 +173,8 @@ int die(const char *str, struct pt_regs *regs, long err)
if (panic_on_oops)
panic("Fatal exception");
-+
+
+ gr_handle_kernel_exploit();
+
- do_exit(signr);
- }
+ oops_exit();
+ do_exit(err);
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
-index 1d9c926..25f4741 100644
+index 7d14bb69..1305601 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
#include <asm/vdso_datapage.h>
@@ -8180,7 +5711,7 @@ index 1d9c926..25f4741 100644
#include "setup.h"
-@@ -222,7 +223,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+@@ -219,7 +220,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
vdso_base = VDSO32_MBASE;
#endif
@@ -8189,7 +5720,7 @@ index 1d9c926..25f4741 100644
/* vDSO has a problem and was disabled, just don't "enable" it for the
* process
-@@ -242,7 +243,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+@@ -239,7 +240,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
vdso_base = get_unmapped_area(NULL, vdso_base,
(vdso_pages << PAGE_SHIFT) +
((VDSO_ALIGNMENT - 1) & PAGE_MASK),
@@ -8234,13 +5765,13 @@ index 5eea6f3..5d10396 100644
EXPORT_SYMBOL(copy_in_user);
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
-index 51ab9e7..7d3c78b 100644
+index 5efe8c9..db9ceef 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
-@@ -33,6 +33,10 @@
+@@ -32,6 +32,10 @@
+ #include <linux/perf_event.h>
#include <linux/magic.h>
#include <linux/ratelimit.h>
- #include <linux/context_tracking.h>
+#include <linux/slab.h>
+#include <linux/pagemap.h>
+#include <linux/compiler.h>
@@ -8248,7 +5779,15 @@ index 51ab9e7..7d3c78b 100644
#include <asm/firmware.h>
#include <asm/page.h>
-@@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
+@@ -43,6 +47,7 @@
+ #include <asm/tlbflush.h>
+ #include <asm/siginfo.h>
+ #include <mm/mmu_decl.h>
++#include <asm/ptrace.h>
+
+ #ifdef CONFIG_KPROBES
+ static inline int notify_page_fault(struct pt_regs *regs)
+@@ -66,6 +71,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
}
#endif
@@ -8282,7 +5821,7 @@ index 51ab9e7..7d3c78b 100644
/*
* Check whether the instruction at regs->nip is a store using
* an update addressing form which will update r1.
-@@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
+@@ -136,7 +168,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)
@@ -8291,7 +5830,7 @@ index 51ab9e7..7d3c78b 100644
else
is_write = error_code & DSISR_ISSTORE;
#else
-@@ -378,7 +409,7 @@ good_area:
+@@ -259,7 +291,7 @@ good_area:
* "undefined". Of those that can be set, this is the only
* one which seems bad.
*/
@@ -8300,7 +5839,7 @@ index 51ab9e7..7d3c78b 100644
/* Guarded storage error. */
goto bad_area;
#endif /* CONFIG_8xx */
-@@ -393,7 +424,7 @@ good_area:
+@@ -274,7 +306,7 @@ good_area:
* processors use the same I/D cache coherency mechanism
* as embedded.
*/
@@ -8309,7 +5848,7 @@ index 51ab9e7..7d3c78b 100644
goto bad_area;
#endif /* CONFIG_PPC_STD_MMU */
-@@ -483,6 +514,23 @@ bad_area:
+@@ -343,6 +375,23 @@ bad_area:
bad_area_nosemaphore:
/* User mode accesses cause a SIGSEGV */
if (user_mode(regs)) {
@@ -8331,24 +5870,24 @@ index 51ab9e7..7d3c78b 100644
+#endif
+
_exception(SIGSEGV, regs, code, address);
- goto bail;
+ return 0;
}
-diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
-index cb8bdbe..d770680 100644
---- a/arch/powerpc/mm/mmap.c
-+++ b/arch/powerpc/mm/mmap.c
-@@ -57,6 +57,10 @@ static unsigned long mmap_rnd(void)
+diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
+index 5a783d8..fbe4c8b 100644
+--- a/arch/powerpc/mm/mmap_64.c
++++ b/arch/powerpc/mm/mmap_64.c
+@@ -65,6 +65,10 @@ static unsigned long mmap_rnd(void)
{
unsigned long rnd = 0;
+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_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,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -99,10 +103,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
*/
if (mmap_is_legacy()) {
mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -8359,6 +5898,7 @@ index cb8bdbe..d770680 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area;
+ mm->unmap_area = arch_unmap_area;
} else {
mm->mmap_base = mmap_base();
+
@@ -8368,35 +5908,93 @@ index cb8bdbe..d770680 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
+ mm->unmap_area = arch_unmap_area_topdown;
}
+diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
+index 5b63bd3..248942d 100644
+--- a/arch/powerpc/mm/mmu_context_nohash.c
++++ b/arch/powerpc/mm/mmu_context_nohash.c
+@@ -370,7 +370,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
}
+
+-static struct notifier_block __cpuinitdata mmu_context_cpu_nb = {
++static struct notifier_block mmu_context_cpu_nb = {
+ .notifier_call = mmu_context_cpu_notify,
+ };
+
+diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
+index 24523dc..7205007 100644
+--- a/arch/powerpc/mm/numa.c
++++ b/arch/powerpc/mm/numa.c
+@@ -964,7 +964,7 @@ static void __init *careful_zallocation(int nid, unsigned long size,
+ return ret;
+ }
+
+-static struct notifier_block __cpuinitdata ppc64_numa_nb = {
++static struct notifier_block ppc64_numa_nb = {
+ .notifier_call = cpu_numa_callback,
+ .priority = 1 /* Must run before sched domains notifier. */
+ };
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
-index 3e99c14..f00953c 100644
+index 73709f7..8e825a8 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
-@@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
+@@ -98,7 +98,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, 0);
++ return check_heap_stack_gap(vma, &addr, len, 0);
}
static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
-@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
- info.align_offset = 0;
+@@ -256,7 +256,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, 0)) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
+ }
+ }
- addr = TASK_UNMAPPED_BASE;
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ addr += mm->delta_mmap;
-+#endif
+- addr = mm->mmap_base;
+- while (addr > len) {
++ if (mm->mmap_base < len)
++ addr = -ENOMEM;
++ else
++ addr = mm->mmap_base - len;
+
- while (addr < TASK_SIZE) {
- info.low_limit = addr;
- if (!slice_scan_available(addr, available, 1, &addr))
-@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
++ while (!IS_ERR_VALUE(addr)) {
+ /* Go down by chunk size */
+- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
++ addr = _ALIGN_DOWN(addr, 1ul << pshift);
+
+ /* 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,
+ * return with success:
+ */
+ vma = find_vma(mm, addr);
+- if (!vma || (addr + len) <= vma->vm_start) {
++ 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,
+ 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, 0);
+ }
+
+ /*
+@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
if (fixed && addr > (mm->task_size - len))
return -EINVAL;
@@ -8409,10 +6007,10 @@ index 3e99c14..f00953c 100644
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
-index 9098692..3d54cd1 100644
+index 0cfece4..2f1a0e5 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
-@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -281,9 +281,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return VM_FAULT_NOPAGE;
}
@@ -8424,8 +6022,58 @@ index 9098692..3d54cd1 100644
{
struct spu_context *ctx = vma->vm_file->private_data;
unsigned long offset = address - vma->vm_start;
+diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
+index 70ec4e9..3e7a115 100644
+--- a/arch/powerpc/platforms/cell/spufs/inode.c
++++ b/arch/powerpc/platforms/cell/spufs/inode.c
+@@ -811,6 +811,7 @@ static struct file_system_type spufs_type = {
+ .mount = spufs_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("spufs");
+
+ static int __init spufs_init(void)
+ {
+diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
+index 3394254..8c6825c 100644
+--- a/arch/powerpc/platforms/powermac/smp.c
++++ b/arch/powerpc/platforms/powermac/smp.c
+@@ -886,7 +886,7 @@ static int smp_core99_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata smp_core99_cpu_nb = {
++static struct notifier_block smp_core99_cpu_nb = {
+ .notifier_call = smp_core99_cpu_notify,
+ };
+ #endif /* CONFIG_HOTPLUG_CPU */
+diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
+index 24bff4f..0248123 100644
+--- a/arch/s390/appldata/appldata_base.c
++++ b/arch/s390/appldata/appldata_base.c
+@@ -610,7 +610,7 @@ static int __cpuinit appldata_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata appldata_nb = {
++static struct notifier_block appldata_nb = {
+ .notifier_call = appldata_cpu_notify,
+ };
+
+diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
+index 481f4f7..f16ec59 100644
+--- a/arch/s390/hypfs/inode.c
++++ b/arch/s390/hypfs/inode.c
+@@ -454,6 +454,7 @@ static struct file_system_type hypfs_type = {
+ .mount = hypfs_mount,
+ .kill_sb = hypfs_kill_super
+ };
++MODULE_ALIAS_FS("s390_hypfs");
+
+ static const struct super_operations hypfs_s_ops = {
+ .statfs = simple_statfs,
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
-index c797832..ce575c8 100644
+index 8517d2a..d2738d4 100644
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
@@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
@@ -8446,10 +6094,10 @@ index c797832..ce575c8 100644
#define smp_mb__after_atomic_dec() smp_mb()
#define smp_mb__before_atomic_inc() smp_mb()
diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
-index 4d7ccac..d03d0ad 100644
+index 2a30d5a..5e5586f 100644
--- a/arch/s390/include/asm/cache.h
+++ b/arch/s390/include/asm/cache.h
-@@ -9,8 +9,10 @@
+@@ -11,8 +11,10 @@
#ifndef __ARCH_S390_CACHE_H
#define __ARCH_S390_CACHE_H
@@ -8462,7 +6110,7 @@ index 4d7ccac..d03d0ad 100644
#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 78f4f87..598ce39 100644
+index 547f1a6..3e6d0a0 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
@@ -8482,33 +6130,42 @@ index 78f4f87..598ce39 100644
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. */
-@@ -222,9 +228,6 @@ struct linux_binprm;
+@@ -183,7 +189,8 @@ extern char elf_platform[];
+ #define ELF_PLATFORM (elf_platform)
+
+ #ifndef __s390x__
+-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
++#define SET_PERSONALITY(ex) \
++ set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
+ #else /* __s390x__ */
+ #define SET_PERSONALITY(ex) \
+ do { \
+@@ -211,7 +218,4 @@ 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
---- a/arch/s390/include/asm/exec.h
-+++ b/arch/s390/include/asm/exec.h
-@@ -7,6 +7,6 @@
- #ifndef __ASM_EXEC_H
- #define __ASM_EXEC_H
+diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
+index ef573c1..75a1ce6 100644
+--- a/arch/s390/include/asm/system.h
++++ b/arch/s390/include/asm/system.h
+@@ -262,7 +262,7 @@ extern void (*_machine_restart)(char *command);
+ extern void (*_machine_halt)(void);
+ extern void (*_machine_power_off)(void);
-extern unsigned long arch_align_stack(unsigned long sp);
+#define arch_align_stack(x) ((x) & ~0xfUL)
- #endif /* __ASM_EXEC_H */
+ static inline int tprot(unsigned long addr)
+ {
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
-index 9c33ed4..e40cbef 100644
+index 2b23885..e84d6ac 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
-@@ -252,6 +252,10 @@ static inline unsigned long __must_check
+@@ -235,6 +235,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
might_fault();
@@ -8516,10 +6173,10 @@ index 9c33ed4..e40cbef 100644
+ if ((long)n < 0)
+ return n;
+
- return __copy_to_user(to, from, n);
- }
-
-@@ -275,6 +279,9 @@ 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;
+@@ -260,6 +264,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)
{
@@ -8529,7 +6186,7 @@ index 9c33ed4..e40cbef 100644
if (__builtin_constant_p(n) && (n <= 256))
return uaccess.copy_from_user_small(n, from, to);
else
-@@ -306,10 +313,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
+@@ -291,10 +298,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)
{
@@ -8547,10 +6204,10 @@ index 9c33ed4..e40cbef 100644
return n;
}
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
-index 7845e15..59c4353 100644
+index dfcb343..eda788a 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
-@@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
+@@ -161,11 +161,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. */
@@ -8567,7 +6224,7 @@ index 7845e15..59c4353 100644
return 0;
}
-@@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
if (info->got_initialized == 0) {
Elf_Addr *gotent;
@@ -8576,16 +6233,16 @@ index 7845e15..59c4353 100644
info->got_offset;
*gotent = val;
info->got_initialized = 1;
-@@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
- rc = apply_rela_bits(loc, val, 0, 64, 0);
+@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
else if (r_type == R_390_GOTENT ||
- r_type == R_390_GOTPLTENT) {
-- val += (Elf_Addr) me->module_core - loc;
-+ val += (Elf_Addr) me->module_core_rw - loc;
- rc = apply_rela_bits(loc, val, 1, 32, 1);
- }
- break;
-@@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+ r_type == R_390_GOTPLTENT)
+ *(unsigned int *) loc =
+- (val + (Elf_Addr) me->module_core - loc) >> 1;
++ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
+ else if (r_type == R_390_GOT64 ||
+ r_type == R_390_GOTPLT64)
+ *(unsigned long *) loc = val;
+@@ -280,7 +280,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;
@@ -8594,7 +6251,7 @@ index 7845e15..59c4353 100644
info->plt_offset;
#ifndef CONFIG_64BIT
ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
-@@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -305,7 +305,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)))
@@ -8603,16 +6260,16 @@ index 7845e15..59c4353 100644
me->arch.plt_offset +
info->plt_offset;
val += rela->r_addend - loc;
-@@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -327,7 +327,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 -
- ((Elf_Addr) me->module_core + me->arch.got_offset);
+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
if (r_type == R_390_GOTOFF16)
- rc = apply_rela_bits(loc, val, 0, 16, 0);
+ *(unsigned short *) loc = val;
else if (r_type == R_390_GOTOFF32)
-@@ -382,7 +382,7 @@ static int 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,
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. */
@@ -8620,12 +6277,12 @@ index 7845e15..59c4353 100644
+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
- rc = apply_rela_bits(loc, val, 1, 32, 0);
+ *(unsigned int *) loc = val;
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
-index c5dbb33..b41f4ee 100644
+index 53088e2..9f44a36 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
-@@ -237,39 +237,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -320,39 +320,3 @@ unsigned long get_wchan(struct task_struct *p)
}
return 0;
}
@@ -8665,11 +6322,24 @@ index c5dbb33..b41f4ee 100644
- return base;
- return ret;
-}
+diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
+index 1df64a8..aea2a39 100644
+--- a/arch/s390/kernel/smp.c
++++ b/arch/s390/kernel/smp.c
+@@ -1035,7 +1035,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
+ return notifier_from_errno(err);
+ }
+
+-static struct notifier_block __cpuinitdata smp_cpu_nb = {
++static struct notifier_block smp_cpu_nb = {
+ .notifier_call = smp_cpu_notify,
+ };
+
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
-index 4002329..99b67cb 100644
+index c70b3d8..d01c6b3 100644
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
-@@ -90,9 +90,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -92,10 +92,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
*/
if (mmap_is_legacy()) {
mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -8680,6 +6350,7 @@ index 4002329..99b67cb 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area;
+ mm->unmap_area = arch_unmap_area;
} else {
mm->mmap_base = mmap_base();
+
@@ -8689,9 +6360,9 @@ index 4002329..99b67cb 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
+ mm->unmap_area = arch_unmap_area_topdown;
}
- }
-@@ -173,9 +185,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -175,10 +187,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
*/
if (mmap_is_legacy()) {
mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -8702,6 +6373,7 @@ index 4002329..99b67cb 100644
+#endif
+
mm->get_unmapped_area = s390_get_unmapped_area;
+ mm->unmap_area = arch_unmap_area;
} else {
mm->mmap_base = mmap_base();
+
@@ -8711,8 +6383,8 @@ index 4002329..99b67cb 100644
+#endif
+
mm->get_unmapped_area = s390_get_unmapped_area_topdown;
+ mm->unmap_area = arch_unmap_area_topdown;
}
- }
diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
index ae3d59f..f65f075 100644
--- a/arch/score/include/asm/cache.h
@@ -8728,23 +6400,24 @@ index ae3d59f..f65f075 100644
+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
#endif /* _ASM_SCORE_CACHE_H */
-diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
-index f9f3cd5..58ff438 100644
---- a/arch/score/include/asm/exec.h
-+++ b/arch/score/include/asm/exec.h
-@@ -1,6 +1,6 @@
- #ifndef _ASM_SCORE_EXEC_H
- #define _ASM_SCORE_EXEC_H
-
+diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
+index 589d5c7..669e274 100644
+--- a/arch/score/include/asm/system.h
++++ b/arch/score/include/asm/system.h
+@@ -17,7 +17,7 @@ do { \
+ #define finish_arch_switch(prev) do {} while (0)
+
+ typedef void (*vi_handler_t)(void);
-extern unsigned long arch_align_stack(unsigned long sp);
+#define arch_align_stack(x) (x)
- #endif /* _ASM_SCORE_EXEC_H */
+ #define mb() barrier()
+ #define rmb() barrier()
diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
-index a1519ad3..e8ac1ff 100644
+index 25d0803..d6c8e36 100644
--- a/arch/score/kernel/process.c
+++ b/arch/score/kernel/process.c
-@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
+@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
return task_pt_regs(task)->cp0_epc;
}
@@ -8770,90 +6443,146 @@ index ef9e555..331bd29 100644
#define __read_mostly __attribute__((__section__(".data..read_mostly")))
+diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
+index 03f2b55..b0270327 100644
+--- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
++++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
+@@ -143,7 +143,7 @@ shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata shx3_cpu_notifier = {
++static struct notifier_block shx3_cpu_notifier = {
+ .notifier_call = shx3_cpu_callback,
+ };
+
diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
-index 6777177..cb5e44f 100644
+index afeb710..8da5c79 100644
--- a/arch/sh/mm/mmap.c
+++ b/arch/sh/mm/mmap.c
-@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
- struct mm_struct *mm = current->mm;
+@@ -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);
- struct vm_unmapped_area_info info;
if (flags & MAP_FIXED) {
-@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
- if (filp || (flags & MAP_SHARED))
- do_colour_align = 1;
-
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
-+#endif
-+
- if (addr) {
- if (do_colour_align)
- addr = COLOUR_ALIGN(addr, pgoff);
-@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ /* 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, offset))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, &addr, len, offset))
return addr;
}
- info.flags = 0;
- info.length = len;
-- info.low_limit = TASK_UNMAPPED_BASE;
-+ info.low_limit = mm->mmap_base;
- info.high_limit = TASK_SIZE;
- info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
- info.align_offset = pgoff << PAGE_SHIFT;
-@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -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, offset))) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -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);
- struct vm_unmapped_area_info info;
if (flags & MAP_FIXED) {
-@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- if (filp || (flags & MAP_SHARED))
- do_colour_align = 1;
-
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
-+#endif
-+
- /* requesting a specific address */
- if (addr) {
- if (do_colour_align)
-@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ /* 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, offset))
++ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, &addr, len, offset))
return addr;
}
-@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- VM_BUG_ON(addr != -ENOMEM);
- info.flags = 0;
- info.low_limit = TASK_UNMAPPED_BASE;
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap;
-+#endif
-+
- info.high_limit = TASK_SIZE;
- addr = vm_unmapped_area(&info);
+@@ -178,28 +178,29 @@ 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) {
++ addr -= len;
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, &addr, len, offset)) {
+ /* remember the address as a hint for next time */
+- return (mm->free_area_cache = addr-len);
++ return (mm->free_area_cache = addr);
+ }
}
+
+ if (unlikely(mm->mmap_base < len))
+ goto bottomup;
+
+- addr = mm->mmap_base-len;
+- if (do_colour_align)
+- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
++ addr = mm->mmap_base - len;
+
+ do {
++ if (do_colour_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 (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 +210,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_colour_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:
+ /*
+diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
+index eddcfb3..b117d90 100644
+--- a/arch/sparc/Makefile
++++ b/arch/sparc/Makefile
+@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
+ # Export what is needed by arch/sparc/boot/Makefile
+ export VMLINUX_INIT VMLINUX_MAIN
+ VMLINUX_INIT := $(head-y) $(init-y)
+-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
+ VMLINUX_MAIN += $(drivers-y) $(net-y)
+
+diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
+index 07dd35e..2c6f765 100644
+--- a/arch/sparc/include/asm/atomic_32.h
++++ b/arch/sparc/include/asm/atomic_32.h
+@@ -13,6 +13,8 @@
+
+ #include <linux/types.h>
+
++#include <asm-generic/atomic64.h>
++
+ #ifdef __KERNEL__
+
+ #include <asm-generic/atomic64.h>
diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
-index be56a24..443328f 100644
+index 9f421df..b81fc12 100644
--- a/arch/sparc/include/asm/atomic_64.h
+++ b/arch/sparc/include/asm/atomic_64.h
@@ -14,18 +14,40 @@
@@ -9002,7 +6731,7 @@ index be56a24..443328f 100644
if (likely(old == c))
break;
c = old;
-@@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
#define atomic64_cmpxchg(v, o, n) \
((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
#define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
@@ -9043,7 +6772,7 @@ index be56a24..443328f 100644
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
-index 5bb6991..5c2132e 100644
+index 69358b5..9d0d492 100644
--- a/arch/sparc/include/asm/cache.h
+++ b/arch/sparc/include/asm/cache.h
@@ -7,10 +7,12 @@
@@ -9061,7 +6790,7 @@ index 5bb6991..5c2132e 100644
#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 a24e41f..47677ff 100644
+index 4269ca6..e3da77f 100644
--- a/arch/sparc/include/asm/elf_32.h
+++ b/arch/sparc/include/asm/elf_32.h
@@ -114,6 +114,13 @@ typedef struct {
@@ -9079,10 +6808,10 @@ index a24e41f..47677ff 100644
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 370ca1e..d4f4a98 100644
+index 7df8b7f..4946269 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
-@@ -189,6 +189,13 @@ typedef struct {
+@@ -180,6 +180,13 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -9096,20 +6825,33 @@ index 370ca1e..d4f4a98 100644
extern unsigned long sparc64_elf_hwcap;
#define ELF_HWCAP sparc64_elf_hwcap
+diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
+index 156707b..aefa786 100644
+--- a/arch/sparc/include/asm/page_32.h
++++ b/arch/sparc/include/asm/page_32.h
+@@ -8,6 +8,8 @@
+ #ifndef _SPARC_PAGE_H
+ #define _SPARC_PAGE_H
+
++#include <linux/const.h>
++
+ #define PAGE_SHIFT 12
+
+ #ifndef __ASSEMBLY__
diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
-index 9b1c36d..209298b 100644
+index ca2b344..c6084f89 100644
--- a/arch/sparc/include/asm/pgalloc_32.h
+++ b/arch/sparc/include/asm/pgalloc_32.h
-@@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
- }
-
+@@ -37,6 +37,7 @@ BTFIXUPDEF_CALL(void, free_pgd_fast, pgd_t *)
+ BTFIXUPDEF_CALL(void, pgd_set, pgd_t *, pmd_t *)
+ #define pgd_set(pgdp,pmdp) BTFIXUP_CALL(pgd_set)(pgdp,pmdp)
#define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
- static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
- unsigned long address)
+ BTFIXUPDEF_CALL(pmd_t *, pmd_alloc_one, struct mm_struct *, unsigned long)
+ #define pmd_alloc_one(mm, address) BTFIXUP_CALL(pmd_alloc_one)(mm, address)
diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
-index bcfe063..b333142 100644
+index 40b2d7a..22a665b 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)
@@ -9121,56 +6863,54 @@ index bcfe063..b333142 100644
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
{
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
-index 502f632..da1917f 100644
+index a790cc6..091ed94 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
-@@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
- #define PAGE_SHARED SRMMU_PAGE_SHARED
- #define PAGE_COPY SRMMU_PAGE_COPY
- #define PAGE_READONLY SRMMU_PAGE_RDONLY
-+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
-+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
-+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
- #define PAGE_KERNEL SRMMU_PAGE_KERNEL
-
- /* Top-level page directory - dummy used by init-mm.
-@@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
-
- /* xwr */
- #define __P000 PAGE_NONE
--#define __P001 PAGE_READONLY
--#define __P010 PAGE_COPY
--#define __P011 PAGE_COPY
-+#define __P001 PAGE_READONLY_NOEXEC
-+#define __P010 PAGE_COPY_NOEXEC
-+#define __P011 PAGE_COPY_NOEXEC
- #define __P100 PAGE_READONLY
- #define __P101 PAGE_READONLY
- #define __P110 PAGE_COPY
- #define __P111 PAGE_COPY
-
- #define __S000 PAGE_NONE
--#define __S001 PAGE_READONLY
--#define __S010 PAGE_SHARED
--#define __S011 PAGE_SHARED
-+#define __S001 PAGE_READONLY_NOEXEC
-+#define __S010 PAGE_SHARED_NOEXEC
-+#define __S011 PAGE_SHARED_NOEXEC
- #define __S100 PAGE_READONLY
- #define __S101 PAGE_READONLY
- #define __S110 PAGE_SHARED
+@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
+ BTFIXUPDEF_INT(page_none)
+ BTFIXUPDEF_INT(page_copy)
+ BTFIXUPDEF_INT(page_readonly)
++
++#ifdef CONFIG_PAX_PAGEEXEC
++BTFIXUPDEF_INT(page_shared_noexec)
++BTFIXUPDEF_INT(page_copy_noexec)
++BTFIXUPDEF_INT(page_readonly_noexec)
++#endif
++
+ BTFIXUPDEF_INT(page_kernel)
+
+ #define PMD_SHIFT SUN4C_PMD_SHIFT
+@@ -66,6 +73,16 @@ extern pgprot_t PAGE_SHARED;
+ #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
+ #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
+
++#ifdef CONFIG_PAX_PAGEEXEC
++extern pgprot_t PAGE_SHARED_NOEXEC;
++# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
++# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
++#else
++# define PAGE_SHARED_NOEXEC PAGE_SHARED
++# define PAGE_COPY_NOEXEC PAGE_COPY
++# define PAGE_READONLY_NOEXEC PAGE_READONLY
++#endif
++
+ extern unsigned long page_kernel;
+
+ #ifdef MODULE
diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
-index 79da178..c2eede8 100644
+index f6ae2b2..b03ffc7 100644
--- a/arch/sparc/include/asm/pgtsrmmu.h
+++ b/arch/sparc/include/asm/pgtsrmmu.h
-@@ -115,6 +115,11 @@
+@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
SRMMU_EXEC | SRMMU_REF)
+
++#ifdef CONFIG_PAX_PAGEEXEC
+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
-+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
++#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
++#endif
+
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
@@ -9277,10 +7017,10 @@ index 9689176..63c18ea 100644
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 dd38075..e7cac83 100644
+index fa57532..e1a4c53 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 {
+@@ -50,6 +50,8 @@ struct thread_info {
unsigned long w_saved;
struct restart_block restart_block;
@@ -9290,7 +7030,7 @@ index dd38075..e7cac83 100644
/*
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
-index d5e5042..9bfee76 100644
+index 60d86be..6389ac8 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 {
@@ -9302,7 +7042,7 @@ index d5e5042..9bfee76 100644
unsigned long fpregs[0] __attribute__ ((aligned(64)));
};
-@@ -192,10 +194,11 @@ register struct thread_info *current_thread_info_reg asm("g6");
+@@ -214,10 +216,11 @@ register struct thread_info *current_thread_info_reg asm("g6");
#define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
/* flag bit 6 is available */
#define TIF_32BIT 7 /* 32-bit binary */
@@ -9315,10 +7055,10 @@ index d5e5042..9bfee76 100644
/* NOTE: Thread flags >= 12 should be ones we have no interest
* in using in assembly, else we can't use the mask as
* an immediate value in instructions such as andcc.
-@@ -214,12 +217,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
- #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
+@@ -238,12 +241,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
+ #define _TIF_FREEZE (1<<TIF_FREEZE)
+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
#define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
@@ -9335,7 +7075,7 @@ index d5e5042..9bfee76 100644
* Thread-synchronous status.
*
diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
-index 0167d26..767bb0c 100644
+index e88fbe5..bd0eda7 100644
--- a/arch/sparc/include/asm/uaccess.h
+++ b/arch/sparc/include/asm/uaccess.h
@@ -1,5 +1,6 @@
@@ -9346,10 +7086,10 @@ index 0167d26..767bb0c 100644
#include <asm/uaccess_64.h>
#else
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
-index 53a28dd..50c38c3 100644
+index 8303ac4..07f333d 100644
--- a/arch/sparc/include/asm/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
-@@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
+@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -9401,7 +7141,7 @@ index 53a28dd..50c38c3 100644
}
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
-index e562d3c..191f176 100644
+index 3e1449f..5293a0e 100644
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@ -10,6 +10,7 @@
@@ -9410,9 +7150,9 @@ index e562d3c..191f176 100644
#include <linux/thread_info.h>
+#include <linux/kernel.h>
#include <asm/asi.h>
+ #include <asm/system.h>
#include <asm/spitfire.h>
- #include <asm-generic/uaccess-unaligned.h>
-@@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
+@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
static inline unsigned long __must_check
copy_from_user(void *to, const void __user *from, unsigned long size)
{
@@ -9429,7 +7169,7 @@ index e562d3c..191f176 100644
if (unlikely(ret))
ret = copy_from_user_fixup(to, from, size);
-@@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
+@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long size)
{
@@ -9447,10 +7187,10 @@ index e562d3c..191f176 100644
ret = copy_to_user_fixup(to, from, size);
return ret;
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
-index d15cc17..d0ae796 100644
+index cb85458..e063f17 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
-@@ -4,7 +4,7 @@
+@@ -3,7 +3,7 @@
#
asflags-y := -ansi
@@ -9458,12 +7198,62 @@ index d15cc17..d0ae796 100644
+#ccflags-y := -Werror
extra-y := head_$(BITS).o
-
+ extra-y += init_task.o
+diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
+index 27728e1..0010e923 100644
+--- a/arch/sparc/kernel/ds.c
++++ b/arch/sparc/kernel/ds.c
+@@ -783,6 +783,16 @@ void ldom_set_var(const char *var, const char *value)
+ char *base, *p;
+ int msg_len, loops;
+
++ if (strlen(var) + strlen(value) + 2 >
++ sizeof(pkt) - sizeof(pkt.header)) {
++ printk(KERN_ERR PFX
++ "contents length: %zu, which more than max: %lu,"
++ "so could not set (%s) variable to (%s).\n",
++ strlen(var) + strlen(value) + 2,
++ sizeof(pkt) - sizeof(pkt.header), var, value);
++ return;
++ }
++
+ memset(&pkt, 0, sizeof(pkt));
+ pkt.header.data.tag.type = DS_DATA;
+ pkt.header.data.handle = cp->handle;
+diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
+index a19c8a0..d04a60b 100644
+--- a/arch/sparc/kernel/leon_kernel.c
++++ b/arch/sparc/kernel/leon_kernel.c
+@@ -53,11 +53,13 @@ static inline unsigned int leon_eirq_get(int cpu)
+ static void leon_handle_ext_irq(unsigned int irq, struct irq_desc *desc)
+ {
+ unsigned int eirq;
++ struct irq_bucket *p;
+ int cpu = sparc_leon3_cpuid();
+
+ eirq = leon_eirq_get(cpu);
+- if ((eirq & 0x10) && irq_map[eirq]->irq) /* bit4 tells if IRQ happened */
+- generic_handle_irq(irq_map[eirq]->irq);
++ p = irq_map[eirq];
++ if ((eirq & 0x10) && p && p->irq) /* bit4 tells if IRQ happened */
++ generic_handle_irq(p->irq);
+ }
+
+ /* The extended IRQ controller has been found, this function registers it */
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
-index fdd819d..5af08c8 100644
+index f793742..4d880af 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
-@@ -116,14 +116,14 @@ void show_regs(struct pt_regs *r)
+@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
+ rw->ins[4], rw->ins[5],
+ rw->ins[6],
+ rw->ins[7]);
+- printk("%pS\n", (void *) rw->ins[7]);
++ printk("%pA\n", (void *) rw->ins[7]);
+ rw = (struct reg_window32 *) rw->ins[6];
+ }
+ spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
+@@ -271,14 +271,14 @@ void show_regs(struct pt_regs *r)
printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
r->psr, r->pc, r->npc, r->y, print_tainted());
@@ -9480,7 +7270,7 @@ index fdd819d..5af08c8 100644
printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
-@@ -160,7 +160,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
+@@ -313,7 +313,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
rw = (struct reg_window32 *) fp;
pc = rw->ins[7];
printk("[%08lx : ", pc);
@@ -9490,10 +7280,10 @@ index fdd819d..5af08c8 100644
} while (++count < 16);
printk("\n");
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
-index baebab2..9cd13b1 100644
+index 3739a06..48b2ff0 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
-@@ -158,7 +158,7 @@ static void show_regwindow(struct pt_regs *regs)
+@@ -180,14 +180,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)
@@ -9502,8 +7292,7 @@ index baebab2..9cd13b1 100644
}
void show_regs(struct pt_regs *regs)
-@@ -167,7 +167,7 @@ void show_regs(struct pt_regs *regs)
-
+ {
printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
regs->tpc, regs->tnpc, regs->y, print_tainted());
- printk("TPC: <%pS>\n", (void *) regs->tpc);
@@ -9511,7 +7300,7 @@ index baebab2..9cd13b1 100644
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]);
-@@ -180,7 +180,7 @@ void show_regs(struct pt_regs *regs)
+@@ -200,7 +200,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]);
@@ -9520,7 +7309,7 @@ index baebab2..9cd13b1 100644
show_regwindow(regs);
show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
}
-@@ -269,7 +269,7 @@ void arch_trigger_all_cpu_backtrace(void)
+@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void)
((tp && tp->task) ? tp->task->pid : -1));
if (gp->tstate & TSTATE_PRIV) {
@@ -9530,7 +7319,7 @@ index baebab2..9cd13b1 100644
(void *) gp->o7,
(void *) gp->i7,
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
-index 79cc0d1..ec62734 100644
+index 741df91..97cdf05 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
@@ -9543,10 +7332,10 @@ index 79cc0d1..ec62734 100644
.getproplen = prom_getproplen,
.getproperty = prom_getproperty,
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
-index 773c1f2..a8bdd87 100644
+index 96ee50a..68ce124 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
-@@ -1059,6 +1059,10 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -1058,6 +1058,10 @@ long arch_ptrace(struct task_struct *child, long request,
return ret;
}
@@ -9557,9 +7346,9 @@ index 773c1f2..a8bdd87 100644
asmlinkage int syscall_trace_enter(struct pt_regs *regs)
{
int ret = 0;
-@@ -1066,6 +1070,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
+@@ -1065,6 +1069,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
/* do the secure computing check first */
- secure_computing_strict(regs->u_regs[UREG_G1]);
+ secure_computing(regs->u_regs[UREG_G1]);
+#ifdef CONFIG_GRKERNSEC_SETXID
+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
@@ -9578,14 +7367,14 @@ index 773c1f2..a8bdd87 100644
+ gr_delayed_cred_worker();
+#endif
+
- audit_syscall_exit(regs);
-
- if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
+ #ifdef CONFIG_AUDITSYSCALL
+ if (unlikely(current->audit_context)) {
+ unsigned long tstate = regs->tstate;
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
-index e142545..fd29654 100644
+index e21d3c0d..8f453c1 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
-@@ -869,8 +869,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
+@@ -871,8 +871,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
extern unsigned long xcall_flush_dcache_page_spitfire;
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -9596,7 +7385,7 @@ index e142545..fd29654 100644
#endif
static inline void __local_flush_dcache_page(struct page *page)
-@@ -894,7 +894,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
+@@ -896,7 +896,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
return;
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -9605,7 +7394,7 @@ index e142545..fd29654 100644
#endif
this_cpu = get_cpu();
-@@ -918,7 +918,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
+@@ -920,7 +920,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
xcall_deliver(data0, __pa(pg_addr),
(u64) pg_addr, cpumask_of(cpu));
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -9614,7 +7403,7 @@ index e142545..fd29654 100644
#endif
}
}
-@@ -937,7 +937,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
+@@ -939,7 +939,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
preempt_disable();
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -9623,7 +7412,7 @@ index e142545..fd29654 100644
#endif
data0 = 0;
pg_addr = page_address(page);
-@@ -954,7 +954,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
+@@ -956,7 +956,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
xcall_deliver(data0, __pa(pg_addr),
(u64) pg_addr, cpu_online_mask);
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -9633,28 +7422,44 @@ index e142545..fd29654 100644
}
__local_flush_dcache_page(page);
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
-index 3a8d184..49498a8 100644
+index 42b282f..408977c 100644
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
-@@ -52,7 +52,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
- if (len > TASK_SIZE - PAGE_SIZE)
+@@ -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
+@@ -56,7 +57,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
if (!addr)
- addr = TASK_UNMAPPED_BASE;
+ addr = current->mm->mmap_base;
- info.flags = 0;
- info.length = len;
+ if (flags & MAP_SHARED)
+ addr = COLOUR_ALIGN(addr);
+@@ -71,7 +72,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ }
+ if (TASK_SIZE - PAGE_SIZE - len < addr)
+ return -ENOMEM;
+- if (!vmm || addr + len <= vmm->vm_start)
++ 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 51561b8..8256764 100644
+index 5e4252b..379f84f 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
-@@ -90,13 +90,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
- struct vm_area_struct * vma;
+@@ -119,12 +119,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);
- struct vm_unmapped_area_info info;
if (flags & MAP_FIXED) {
/* We do not accept a shared mapping if it would violate
@@ -9665,7 +7470,7 @@ index 51561b8..8256764 100644
((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
return -EINVAL;
return addr;
-@@ -111,6 +112,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -139,6 +140,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
if (filp || (flags & MAP_SHARED))
do_color_align = 1;
@@ -9675,48 +7480,53 @@ index 51561b8..8256764 100644
+
if (addr) {
if (do_color_align)
- addr = COLOR_ALIGN(addr, pgoff);
-@@ -118,22 +123,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+ addr = COLOUR_ALIGN(addr, pgoff);
+@@ -146,15 +151,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, offset))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, &addr, len, offset))
return addr;
}
- info.flags = 0;
- info.length = len;
-- info.low_limit = TASK_UNMAPPED_BASE;
-+ info.low_limit = mm->mmap_base;
- info.high_limit = min(task_size, VA_EXCLUDE_START);
- info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
- info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
-
- if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
- VM_BUG_ON(addr != -ENOMEM);
- info.low_limit = VA_EXCLUDE_END;
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap;
-+#endif
-+
- info.high_limit = task_size;
- addr = vm_unmapped_area(&info);
+ if (len > mm->cached_hole_size) {
+- start_addr = addr = mm->free_area_cache;
++ start_addr = addr = mm->free_area_cache;
+ } else {
+- start_addr = addr = TASK_UNMAPPED_BASE;
++ start_addr = addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
}
-@@ -151,6 +162,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+
+@@ -174,14 +178,14 @@ full_search:
+ vma = find_vma(mm, VA_EXCLUDE_END);
+ }
+ if (unlikely(task_size < addr)) {
+- if (start_addr != TASK_UNMAPPED_BASE) {
+- start_addr = addr = TASK_UNMAPPED_BASE;
++ if (start_addr != mm->mmap_base) {
++ start_addr = addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
+ goto full_search;
+ }
+ return -ENOMEM;
+ }
+- if (likely(!vma || addr + len <= vma->vm_start)) {
++ if (likely(check_heap_stack_gap(vma, &addr, len, offset))) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -207,6 +211,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);
- struct vm_unmapped_area_info info;
/* This should only ever run for 32-bit processes. */
-@@ -160,7 +172,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ BUG_ON(!test_thread_flag(TIF_32BIT));
+@@ -215,7 +220,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.
*/
@@ -9725,49 +7535,67 @@ index 51561b8..8256764 100644
((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
return -EINVAL;
return addr;
-@@ -173,6 +185,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- if (filp || (flags & MAP_SHARED))
- do_color_align = 1;
-
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
-+#endif
-+
- /* requesting a specific address */
- if (addr) {
- if (do_color_align)
-@@ -181,8 +197,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -236,8 +241,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, offset))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, &addr, len, offset))
return addr;
}
-@@ -192,6 +207,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- info.high_limit = mm->mmap_base;
- info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
- info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
+@@ -257,28 +261,29 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- /*
-@@ -204,6 +220,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- VM_BUG_ON(addr != -ENOMEM);
- info.flags = 0;
- info.low_limit = TASK_UNMAPPED_BASE;
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap;
-+#endif
-+
- info.high_limit = STACK_TOP32;
- addr = vm_unmapped_area(&info);
+ /* 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) {
++ addr -= len;
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, &addr, len, offset)) {
+ /* remember the address as a hint for next time */
+- return (mm->free_area_cache = addr-len);
++ return (mm->free_area_cache = addr);
+ }
}
-@@ -260,10 +282,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
+
+ if (unlikely(mm->mmap_base < len))
+ goto bottomup;
+
+- addr = mm->mmap_base-len;
+- if (do_color_align)
+- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
++ addr = mm->mmap_base - len;
+
+ 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 (likely(check_heap_stack_gap(vma, &addr, len, offset))) {
+ /* remember the address as a hint for next time */
+ return (mm->free_area_cache = addr);
+ }
+@@ -288,10 +293,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_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:
+ /*
+@@ -361,10 +364,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
EXPORT_SYMBOL(get_fb_unmapped_area);
/* Essentially the same as PowerPC. */
@@ -9783,7 +7611,7 @@ index 51561b8..8256764 100644
if (current->flags & PF_RANDOMIZE) {
unsigned long val = get_random_int();
if (test_thread_flag(TIF_32BIT))
-@@ -276,7 +302,7 @@ static unsigned long mmap_rnd(void)
+@@ -377,7 +384,7 @@ static unsigned long mmap_rnd(void)
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -9792,7 +7620,7 @@ index 51561b8..8256764 100644
unsigned long gap;
/*
-@@ -289,6 +315,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -390,6 +397,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;
@@ -9803,9 +7631,9 @@ index 51561b8..8256764 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area;
+ mm->unmap_area = arch_unmap_area;
} else {
- /* We know it's 32-bit */
-@@ -300,6 +332,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -402,6 +415,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);
@@ -9816,13 +7644,13 @@ index 51561b8..8256764 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
+ mm->unmap_area = arch_unmap_area_topdown;
}
- }
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
-index d950197..192f9d8 100644
+index 817187d..1d4541e 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
-@@ -52,7 +52,7 @@ sys32_rt_sigreturn:
+@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
#endif
.align 32
1: ldx [%g6 + TI_FLAGS], %l5
@@ -9831,7 +7659,7 @@ index d950197..192f9d8 100644
be,pt %icc, rtrap
nop
call syscall_trace_leave
-@@ -184,7 +184,7 @@ linux_sparc_syscall32:
+@@ -179,7 +179,7 @@ linux_sparc_syscall32:
srl %i3, 0, %o3 ! IEU0
srl %i2, 0, %o2 ! IEU0 Group
@@ -9840,7 +7668,7 @@ index d950197..192f9d8 100644
bne,pn %icc, linux_syscall_trace32 ! CTI
mov %i0, %l5 ! IEU1
5: call %l7 ! CTI Group brk forced
-@@ -207,7 +207,7 @@ linux_sparc_syscall:
+@@ -202,7 +202,7 @@ linux_sparc_syscall:
mov %i3, %o3 ! IEU1
mov %i4, %o4 ! IEU0 Group
@@ -9849,7 +7677,7 @@ index d950197..192f9d8 100644
bne,pn %icc, linux_syscall_trace ! CTI Group
mov %i0, %l5 ! IEU0
2: call %l7 ! CTI Group brk forced
-@@ -223,7 +223,7 @@ ret_sys_call:
+@@ -218,7 +218,7 @@ ret_sys_call:
cmp %o0, -ERESTART_RESTARTBLOCK
bgeu,pn %xcc, 1f
@@ -9858,11 +7686,24 @@ index d950197..192f9d8 100644
ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
2:
+diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
+index 7408201..b349841 100644
+--- a/arch/sparc/kernel/sysfs.c
++++ b/arch/sparc/kernel/sysfs.c
+@@ -266,7 +266,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
++static struct notifier_block sysfs_cpu_nb = {
+ .notifier_call = sysfs_cpu_notify,
+ };
+
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
-index 6629829..036032d 100644
+index 591f20c..0f1b925 100644
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
-@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
+@@ -45,6 +45,8 @@ static void instruction_dump(unsigned long *pc)
#define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
#define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
@@ -9871,7 +7712,7 @@ index 6629829..036032d 100644
void die_if_kernel(char *str, struct pt_regs *regs)
{
static int die_counter;
-@@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -77,15 +79,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
count++ < 30 &&
(((unsigned long) rw) >= PAGE_OFFSET) &&
!(((unsigned long) rw) & 0x7)) {
@@ -9892,10 +7733,10 @@ index 6629829..036032d 100644
}
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
-index b3f833a..f485f80 100644
+index 0cbdaa4..f37a97c 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
-@@ -76,7 +76,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
+@@ -75,7 +75,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);
@@ -9904,7 +7745,7 @@ index b3f833a..f485f80 100644
}
}
-@@ -96,6 +96,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
+@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
lvl -= 0x100;
if (regs->tstate & TSTATE_PRIV) {
@@ -9917,7 +7758,7 @@ index b3f833a..f485f80 100644
sprintf(buffer, "Kernel bad sw trap %lx", lvl);
die_if_kernel(buffer, regs);
}
-@@ -114,11 +120,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
+@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
void bad_trap_tl1(struct pt_regs *regs, long lvl)
{
char buffer[32];
@@ -9935,7 +7776,7 @@ index b3f833a..f485f80 100644
dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-@@ -1142,7 +1153,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
+@@ -1141,7 +1152,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());
@@ -9944,7 +7785,7 @@ index b3f833a..f485f80 100644
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,
-@@ -1749,7 +1760,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
+@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
smp_processor_id(),
(type & 0x1) ? 'I' : 'D',
regs->tpc);
@@ -9953,7 +7794,7 @@ index b3f833a..f485f80 100644
panic("Irrecoverable Cheetah+ parity error.");
}
-@@ -1757,7 +1768,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
+@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
smp_processor_id(),
(type & 0x1) ? 'I' : 'D',
regs->tpc);
@@ -9962,8 +7803,8 @@ index b3f833a..f485f80 100644
}
struct sun4v_error_entry {
-@@ -1830,8 +1841,8 @@ struct sun4v_error_entry {
- /*0x38*/u64 reserved_5;
+@@ -1786,8 +1797,8 @@ struct sun4v_error_entry {
+ u16 err_pad;
};
-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
@@ -9971,18 +7812,18 @@ index b3f833a..f485f80 100644
+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
- static const char *sun4v_err_type_to_str(u8 type)
+ static const char *sun4v_err_type_to_str(u32 type)
{
-@@ -1923,7 +1934,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
+@@ -1807,7 +1818,7 @@ static const char *sun4v_err_type_to_str(u32 type)
+ }
}
- static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
-- int cpu, const char *pfx, atomic_t *ocnt)
-+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
+-static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent, int cpu, const char *pfx, atomic_t *ocnt)
++static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent, int cpu, const char *pfx, atomic_unchecked_t *ocnt)
{
- u64 *raw_ptr = (u64 *) ent;
- u32 attrs;
-@@ -1981,8 +1992,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
+ int cnt;
+
+@@ -1842,8 +1853,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
show_regs(regs);
@@ -9993,7 +7834,7 @@ index b3f833a..f485f80 100644
wmb();
printk("%s: Queue overflowed %d times.\n",
pfx, cnt);
-@@ -2036,7 +2047,7 @@ void sun4v_resum_error(struct pt_regs *regs, unsigned long offset)
+@@ -1895,7 +1906,7 @@ void sun4v_resum_error(struct pt_regs *regs, unsigned long offset)
*/
void sun4v_resum_overflow(struct pt_regs *regs)
{
@@ -10002,7 +7843,7 @@ index b3f833a..f485f80 100644
}
/* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
-@@ -2089,7 +2100,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
+@@ -1948,7 +1959,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
/* XXX Actually even this can make not that much sense. Perhaps
* XXX we should just pull the plug and panic directly from here?
*/
@@ -10011,7 +7852,7 @@ index b3f833a..f485f80 100644
}
unsigned long sun4v_err_itlb_vaddr;
-@@ -2104,9 +2115,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
+@@ -1963,9 +1974,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);
@@ -10023,7 +7864,7 @@ index b3f833a..f485f80 100644
(void *) regs->u_regs[UREG_I7]);
printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
"pte[%lx] error[%lx]\n",
-@@ -2128,9 +2139,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
+@@ -1987,9 +1998,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);
@@ -10035,7 +7876,7 @@ index b3f833a..f485f80 100644
(void *) regs->u_regs[UREG_I7]);
printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
"pte[%lx] error[%lx]\n",
-@@ -2336,13 +2347,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
+@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
fp = (unsigned long)sf->fp + STACK_BIAS;
}
@@ -10051,7 +7892,7 @@ index b3f833a..f485f80 100644
graph++;
}
}
-@@ -2360,6 +2371,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
+@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
return (struct reg_window *) (fp + STACK_BIAS);
}
@@ -10060,7 +7901,7 @@ index b3f833a..f485f80 100644
void die_if_kernel(char *str, struct pt_regs *regs)
{
static int die_counter;
-@@ -2388,7 +2401,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
while (rw &&
count++ < 30 &&
kstack_valid(tp, (unsigned long) rw)) {
@@ -10069,7 +7910,7 @@ index b3f833a..f485f80 100644
(void *) rw->ins[7]);
rw = kernel_stack_up(rw);
-@@ -2401,8 +2414,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
}
user_instruction_dump ((unsigned int __user *) regs->tpc);
}
@@ -10082,10 +7923,10 @@ index b3f833a..f485f80 100644
}
EXPORT_SYMBOL(die_if_kernel);
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
-index 8201c25e..072a2a7 100644
+index 76e4ac1..78f8bb1 100644
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
-@@ -286,7 +286,7 @@ static void log_unaligned(struct pt_regs *regs)
+@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs *regs)
static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
if (__ratelimit(&ratelimit)) {
@@ -10094,8 +7935,117 @@ index 8201c25e..072a2a7 100644
regs->tpc, (void *) regs->tpc);
}
}
+diff --git a/arch/sparc/kernel/us3_cpufreq.c b/arch/sparc/kernel/us3_cpufreq.c
+index eb1624b..55100de 100644
+--- a/arch/sparc/kernel/us3_cpufreq.c
++++ b/arch/sparc/kernel/us3_cpufreq.c
+@@ -18,14 +18,12 @@
+ #include <asm/head.h>
+ #include <asm/timer.h>
+
+-static struct cpufreq_driver *cpufreq_us3_driver;
+-
+ struct us3_freq_percpu_info {
+ struct cpufreq_frequency_table table[4];
+ };
+
+ /* Indexed by cpu number. */
+-static struct us3_freq_percpu_info *us3_freq_table;
++static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
+
+ /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
+ * in the Safari config register.
+@@ -191,12 +189,25 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
+
+ static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
+ {
+- if (cpufreq_us3_driver)
+- us3_set_cpu_divider_index(policy->cpu, 0);
++ us3_set_cpu_divider_index(policy->cpu, 0);
+
+ return 0;
+ }
+
++static int __init us3_freq_init(void);
++static void __exit us3_freq_exit(void);
++
++static struct cpufreq_driver cpufreq_us3_driver = {
++ .init = us3_freq_cpu_init,
++ .verify = us3_freq_verify,
++ .target = us3_freq_target,
++ .get = us3_freq_get,
++ .exit = us3_freq_cpu_exit,
++ .owner = THIS_MODULE,
++ .name = "UltraSPARC-III",
++
++};
++
+ static int __init us3_freq_init(void)
+ {
+ unsigned long manuf, impl, ver;
+@@ -213,57 +224,15 @@ static int __init us3_freq_init(void)
+ (impl == CHEETAH_IMPL ||
+ impl == CHEETAH_PLUS_IMPL ||
+ impl == JAGUAR_IMPL ||
+- impl == PANTHER_IMPL)) {
+- struct cpufreq_driver *driver;
+-
+- ret = -ENOMEM;
+- driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
+- if (!driver)
+- goto err_out;
+-
+- us3_freq_table = kzalloc(
+- (NR_CPUS * sizeof(struct us3_freq_percpu_info)),
+- GFP_KERNEL);
+- if (!us3_freq_table)
+- goto err_out;
+-
+- driver->init = us3_freq_cpu_init;
+- driver->verify = us3_freq_verify;
+- driver->target = us3_freq_target;
+- driver->get = us3_freq_get;
+- driver->exit = us3_freq_cpu_exit;
+- driver->owner = THIS_MODULE,
+- strcpy(driver->name, "UltraSPARC-III");
+-
+- cpufreq_us3_driver = driver;
+- ret = cpufreq_register_driver(driver);
+- if (ret)
+- goto err_out;
+-
+- return 0;
+-
+-err_out:
+- if (driver) {
+- kfree(driver);
+- cpufreq_us3_driver = NULL;
+- }
+- kfree(us3_freq_table);
+- us3_freq_table = NULL;
+- return ret;
+- }
++ impl == PANTHER_IMPL))
++ return cpufreq_register_driver(&cpufreq_us3_driver);
+
+ return -ENODEV;
+ }
+
+ static void __exit us3_freq_exit(void)
+ {
+- if (cpufreq_us3_driver) {
+- cpufreq_unregister_driver(cpufreq_us3_driver);
+- kfree(cpufreq_us3_driver);
+- cpufreq_us3_driver = NULL;
+- kfree(us3_freq_table);
+- us3_freq_table = NULL;
+- }
++ cpufreq_unregister_driver(&cpufreq_us3_driver);
+ }
+
+ MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
-index dbe119b..089c7c1 100644
+index 4961516..f82ff86 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -2,7 +2,7 @@
@@ -10105,14 +8055,14 @@ index dbe119b..089c7c1 100644
-ccflags-y := -Werror
+#ccflags-y := -Werror
- lib-$(CONFIG_SPARC32) += ashrdi3.o
+ lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o 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 85c233d..68500e0 100644
+index 59186e0..f747d7a 100644
--- a/arch/sparc/lib/atomic_64.S
+++ b/arch/sparc/lib/atomic_64.S
-@@ -17,7 +17,12 @@
- ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
+@@ -18,7 +18,12 @@
+ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: lduw [%o1], %g1
- add %g1, %o0, %g7
@@ -10125,11 +8075,13 @@ index 85c233d..68500e0 100644
cas [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %icc, BACKOFF_LABEL(2f, 1b)
-@@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
+@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic_add)
+ .size atomic_add, .-atomic_add
-+ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
++ .globl atomic_add_unchecked
++ .type atomic_add_unchecked,#function
++atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
+ BACKOFF_SETUP(%o2)
+1: lduw [%o1], %g1
+ add %g1, %o0, %g7
@@ -10140,9 +8092,11 @@ index 85c233d..68500e0 100644
+ retl
+ nop
+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic_add_unchecked)
++ .size atomic_add_unchecked, .-atomic_add_unchecked
+
- ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
+ .globl atomic_sub
+ .type atomic_sub,#function
+ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: lduw [%o1], %g1
- sub %g1, %o0, %g7
@@ -10155,11 +8109,13 @@ index 85c233d..68500e0 100644
cas [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %icc, BACKOFF_LABEL(2f, 1b)
-@@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
+@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic_sub)
+ .size atomic_sub, .-atomic_sub
-+ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
++ .globl atomic_sub_unchecked
++ .type atomic_sub_unchecked,#function
++atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
+ BACKOFF_SETUP(%o2)
+1: lduw [%o1], %g1
+ sub %g1, %o0, %g7
@@ -10170,9 +8126,11 @@ index 85c233d..68500e0 100644
+ retl
+ nop
+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic_sub_unchecked)
++ .size atomic_sub_unchecked, .-atomic_sub_unchecked
+
- ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
+ .globl atomic_add_ret
+ .type atomic_add_ret,#function
+ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: lduw [%o1], %g1
- add %g1, %o0, %g7
@@ -10185,11 +8143,13 @@ index 85c233d..68500e0 100644
cas [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %icc, BACKOFF_LABEL(2f, 1b)
-@@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
+@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic_add_ret)
+ .size atomic_add_ret, .-atomic_add_ret
-+ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
++ .globl atomic_add_ret_unchecked
++ .type atomic_add_ret_unchecked,#function
++atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
+ BACKOFF_SETUP(%o2)
+1: lduw [%o1], %g1
+ addcc %g1, %o0, %g7
@@ -10201,9 +8161,11 @@ index 85c233d..68500e0 100644
+ retl
+ nop
+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic_add_ret_unchecked)
++ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
+
- ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
+ .globl atomic_sub_ret
+ .type atomic_sub_ret,#function
+ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: lduw [%o1], %g1
- sub %g1, %o0, %g7
@@ -10216,8 +8178,8 @@ index 85c233d..68500e0 100644
cas [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %icc, BACKOFF_LABEL(2f, 1b)
-@@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
- ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
+@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
+ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: ldx [%o1], %g1
- add %g1, %o0, %g7
@@ -10230,11 +8192,13 @@ index 85c233d..68500e0 100644
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-@@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
+@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic64_add)
+ .size atomic64_add, .-atomic64_add
-+ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
++ .globl atomic64_add_unchecked
++ .type atomic64_add_unchecked,#function
++atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
+ BACKOFF_SETUP(%o2)
+1: ldx [%o1], %g1
+ addcc %g1, %o0, %g7
@@ -10245,9 +8209,11 @@ index 85c233d..68500e0 100644
+ retl
+ nop
+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic64_add_unchecked)
++ .size atomic64_add_unchecked, .-atomic64_add_unchecked
+
- ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
+ .globl atomic64_sub
+ .type atomic64_sub,#function
+ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: ldx [%o1], %g1
- sub %g1, %o0, %g7
@@ -10260,11 +8226,13 @@ index 85c233d..68500e0 100644
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-@@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
+@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic64_sub)
+ .size atomic64_sub, .-atomic64_sub
-+ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
++ .globl atomic64_sub_unchecked
++ .type atomic64_sub_unchecked,#function
++atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
+ BACKOFF_SETUP(%o2)
+1: ldx [%o1], %g1
+ subcc %g1, %o0, %g7
@@ -10275,9 +8243,11 @@ index 85c233d..68500e0 100644
+ retl
+ nop
+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic64_sub_unchecked)
++ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
+
- ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
+ .globl atomic64_add_ret
+ .type atomic64_add_ret,#function
+ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: ldx [%o1], %g1
- add %g1, %o0, %g7
@@ -10290,11 +8260,13 @@ index 85c233d..68500e0 100644
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
-@@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
+@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
2: BACKOFF_SPIN(%o2, %o3, 1b)
- ENDPROC(atomic64_add_ret)
+ .size atomic64_add_ret, .-atomic64_add_ret
-+ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
++ .globl atomic64_add_ret_unchecked
++ .type atomic64_add_ret_unchecked,#function
++atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
+ BACKOFF_SETUP(%o2)
+1: ldx [%o1], %g1
+ addcc %g1, %o0, %g7
@@ -10306,9 +8278,11 @@ index 85c233d..68500e0 100644
+ retl
+ nop
+2: BACKOFF_SPIN(%o2, %o3, 1b)
-+ENDPROC(atomic64_add_ret_unchecked)
++ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
+
- ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
+ .globl atomic64_sub_ret
+ .type atomic64_sub_ret,#function
+ atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
1: ldx [%o1], %g1
- sub %g1, %o0, %g7
@@ -10322,10 +8296,10 @@ index 85c233d..68500e0 100644
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 323335b..ed85ea2 100644
+index fbb8005..984a269 100644
--- a/arch/sparc/lib/ksyms.c
+++ b/arch/sparc/lib/ksyms.c
-@@ -100,12 +100,18 @@ EXPORT_SYMBOL(__clear_user);
+@@ -133,12 +133,18 @@ EXPORT_SYMBOL(__clear_user);
/* Atomic counter implementation. */
EXPORT_SYMBOL(atomic_add);
@@ -10342,10 +8316,10 @@ index 323335b..ed85ea2 100644
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
+index 301421c..e2535d1 100644
--- a/arch/sparc/mm/Makefile
+++ b/arch/sparc/mm/Makefile
@@ -2,7 +2,7 @@
@@ -10358,7 +8332,7 @@ index 30c3ecc..736f015 100644
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 59dbd46..1dd7f5e 100644
+index 8023fd7..3a6d569 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -21,6 +21,9 @@
@@ -10369,9 +8343,9 @@ index 59dbd46..1dd7f5e 100644
+#include <linux/pagemap.h>
+#include <linux/compiler.h>
+ #include <asm/system.h>
#include <asm/page.h>
- #include <asm/pgtable.h>
-@@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
+@@ -208,6 +211,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
return safe_compute_effective_address(regs, insn);
}
@@ -10649,8 +8623,8 @@ index 59dbd46..1dd7f5e 100644
static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
int text_fault)
{
-@@ -229,6 +503,24 @@ good_area:
- if (!(vma->vm_flags & VM_WRITE))
+@@ -280,6 +554,24 @@ good_area:
+ if(!(vma->vm_flags & VM_WRITE))
goto bad_area;
} else {
+
@@ -10672,10 +8646,10 @@ index 59dbd46..1dd7f5e 100644
+#endif
+
/* Allow reads even for write-only mappings */
- if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+ 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 2ebec26..b212598 100644
+index 504c062..a383267 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -21,6 +21,9 @@
@@ -10697,7 +8671,7 @@ index 2ebec26..b212598 100644
printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
dump_stack();
unhandled_fault(regs->tpc, current, regs);
-@@ -270,6 +273,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
+@@ -272,6 +275,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
show_regs(regs);
}
@@ -11164,7 +9138,7 @@ index 2ebec26..b212598 100644
asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
{
struct mm_struct *mm = current->mm;
-@@ -342,6 +805,29 @@ retry:
+@@ -340,6 +803,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
if (!vma)
goto bad_area;
@@ -11195,7 +9169,7 @@ index 2ebec26..b212598 100644
* 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 9639964..806cd0c 100644
+index 07e1453..ae6e02e 100644
--- a/arch/sparc/mm/hugetlbpage.c
+++ b/arch/sparc/mm/hugetlbpage.c
@@ -28,7 +28,8 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
@@ -11206,33 +9180,18 @@ index 9639964..806cd0c 100644
+ unsigned long flags,
+ unsigned long offset)
{
- unsigned long task_size = TASK_SIZE;
- struct vm_unmapped_area_info info;
-@@ -38,15 +39,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
-
- info.flags = 0;
- info.length = len;
-- info.low_limit = TASK_UNMAPPED_BASE;
-+ info.low_limit = mm->mmap_base;
- info.high_limit = min(task_size, VA_EXCLUDE_START);
- info.align_mask = PAGE_MASK & ~HPAGE_MASK;
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
-
- if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
- VM_BUG_ON(addr != -ENOMEM);
- info.low_limit = VA_EXCLUDE_END;
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap;
-+#endif
-+
- info.high_limit = task_size;
- addr = vm_unmapped_area(&info);
- }
-@@ -58,7 +66,8 @@ static unsigned long
+ struct mm_struct *mm = current->mm;
+ struct vm_area_struct * vma;
+@@ -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, offset))) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -85,7 +86,8 @@ static unsigned long
hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
const unsigned long len,
const unsigned long pgoff,
@@ -11240,30 +9199,54 @@ index 9639964..806cd0c 100644
+ const unsigned long flags,
+ const unsigned long offset)
{
+ struct vm_area_struct *vma;
struct mm_struct *mm = current->mm;
- unsigned long addr = addr0;
-@@ -73,6 +82,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- info.high_limit = mm->mmap_base;
- info.align_mask = PAGE_MASK & ~HPAGE_MASK;
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
+@@ -105,26 +107,28 @@ 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) {
++ addr -= len;
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, &addr, len, offset)) {
+ /* remember the address as a hint for next time */
+- return (mm->free_area_cache = addr-len);
++ return (mm->free_area_cache = addr);
+ }
+ }
+
+ if (unlikely(mm->mmap_base < len))
+ goto bottomup;
+
+- addr = (mm->mmap_base-len) & HPAGE_MASK;
++ addr = mm->mmap_base - len;
+
+ do {
++ addr &= HPAGE_MASK;
+ /*
+ * 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 (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 +138,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, offset);
++ } while (!IS_ERR_VALUE(addr));
+ bottomup:
/*
-@@ -85,6 +95,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- VM_BUG_ON(addr != -ENOMEM);
- info.flags = 0;
- info.low_limit = TASK_UNMAPPED_BASE;
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap;
-+#endif
-+
- info.high_limit = STACK_TOP32;
- addr = vm_unmapped_area(&info);
- }
-@@ -99,6 +115,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -163,6 +167,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;
@@ -11271,20 +9254,13 @@ index 9639964..806cd0c 100644
if (test_thread_flag(TIF_32BIT))
task_size = STACK_TOP32;
-@@ -114,19 +131,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
- return addr;
- }
-
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
-+#endif
-+
+@@ -181,16 +186,15 @@ 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, offset))
++ if (task_size - len >= addr && check_heap_stack_gap(vma, &addr, len, offset))
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
@@ -11298,11 +9274,49 @@ index 9639964..806cd0c 100644
}
pte_t *huge_pte_alloc(struct mm_struct *mm,
+diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
+index 7b00de6..78239f4 100644
+--- a/arch/sparc/mm/init_32.c
++++ b/arch/sparc/mm/init_32.c
+@@ -316,6 +316,9 @@ extern void device_scan(void);
+ pgprot_t PAGE_SHARED __read_mostly;
+ EXPORT_SYMBOL(PAGE_SHARED);
+
++pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
++EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
++
+ void __init paging_init(void)
+ {
+ switch(sparc_cpu_model) {
+@@ -344,17 +347,17 @@ void __init paging_init(void)
+
+ /* Initialize the protection map with non-constant, MMU dependent values. */
+ protection_map[0] = PAGE_NONE;
+- protection_map[1] = PAGE_READONLY;
+- protection_map[2] = PAGE_COPY;
+- protection_map[3] = PAGE_COPY;
++ protection_map[1] = PAGE_READONLY_NOEXEC;
++ protection_map[2] = PAGE_COPY_NOEXEC;
++ protection_map[3] = PAGE_COPY_NOEXEC;
+ protection_map[4] = PAGE_READONLY;
+ protection_map[5] = PAGE_READONLY;
+ protection_map[6] = PAGE_COPY;
+ protection_map[7] = PAGE_COPY;
+ protection_map[8] = PAGE_NONE;
+- protection_map[9] = PAGE_READONLY;
+- protection_map[10] = PAGE_SHARED;
+- protection_map[11] = PAGE_SHARED;
++ protection_map[9] = PAGE_READONLY_NOEXEC;
++ protection_map[10] = PAGE_SHARED_NOEXEC;
++ protection_map[11] = PAGE_SHARED_NOEXEC;
+ protection_map[12] = PAGE_READONLY;
+ protection_map[13] = PAGE_READONLY;
+ protection_map[14] = PAGE_SHARED;
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
-index ed82eda..0d80e77 100644
+index b4989f9..530099e 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
-@@ -188,9 +188,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
+@@ -170,9 +170,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
int num_kernel_image_mappings;
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -11314,7 +9328,7 @@ index ed82eda..0d80e77 100644
#endif
#endif
-@@ -198,7 +198,7 @@ inline void flush_dcache_page_impl(struct page *page)
+@@ -180,7 +180,7 @@ inline void flush_dcache_page_impl(struct page *page)
{
BUG_ON(tlb_type == hypervisor);
#ifdef CONFIG_DEBUG_DCFLUSH
@@ -11323,7 +9337,7 @@ index ed82eda..0d80e77 100644
#endif
#ifdef DCACHE_ALIASING_POSSIBLE
-@@ -466,10 +466,10 @@ void mmu_info(struct seq_file *m)
+@@ -417,10 +417,10 @@ void mmu_info(struct seq_file *m)
#ifdef CONFIG_DEBUG_DCFLUSH
seq_printf(m, "DCPageFlushes\t: %d\n",
@@ -11336,11 +9350,29 @@ index ed82eda..0d80e77 100644
#endif /* CONFIG_SMP */
#endif /* CONFIG_DEBUG_DCFLUSH */
}
+diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
+index cbef74e..c38fead 100644
+--- a/arch/sparc/mm/srmmu.c
++++ b/arch/sparc/mm/srmmu.c
+@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
+ PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
+ BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
+ BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
++
++#ifdef CONFIG_PAX_PAGEEXEC
++ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
++ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
++ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
++#endif
++
+ BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
+ page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
+
diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
-index ad220ee..2f537b3 100644
+index 27fe667..36d474c 100644
--- a/arch/tile/include/asm/atomic_64.h
+++ b/arch/tile/include/asm/atomic_64.h
-@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -142,6 +142,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
@@ -11358,7 +9390,7 @@ index ad220ee..2f537b3 100644
#define smp_mb__before_atomic_dec() smp_mb()
#define smp_mb__after_atomic_dec() smp_mb()
diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
-index 6160761..00cac88 100644
+index 392e533..536b092 100644
--- a/arch/tile/include/asm/cache.h
+++ b/arch/tile/include/asm/cache.h
@@ -15,11 +15,12 @@
@@ -11376,10 +9408,10 @@ index 6160761..00cac88 100644
/* bytes per L2 cache line */
#define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
-index b6cde32..c0cb736 100644
+index ef34d2caa..d6ce60c 100644
--- a/arch/tile/include/asm/uaccess.h
+++ b/arch/tile/include/asm/uaccess.h
-@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
+@@ -361,9 +361,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
const void __user *from,
unsigned long n)
{
@@ -11391,31 +9423,11 @@ index b6cde32..c0cb736 100644
n = _copy_from_user(to, from, n);
else
copy_from_user_overflow();
-diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
-index 0cb3bba..7338b2d 100644
---- a/arch/tile/mm/hugetlbpage.c
-+++ b/arch/tile/mm/hugetlbpage.c
-@@ -212,6 +212,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
- info.high_limit = TASK_SIZE;
- info.align_mask = PAGE_MASK & ~huge_page_mask(h);
- info.align_offset = 0;
-+ info.threadstack_offset = 0;
- return vm_unmapped_area(&info);
- }
-
-@@ -229,6 +230,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
- info.high_limit = current->mm->mmap_base;
- info.align_mask = PAGE_MASK & ~huge_page_mask(h);
- info.align_offset = 0;
-+ info.threadstack_offset = 0;
- addr = vm_unmapped_area(&info);
-
- /*
diff --git a/arch/um/Makefile b/arch/um/Makefile
-index 133f7de..1d6f2f1 100644
+index 7730af6..880804f 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
-@@ -62,6 +62,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
+@@ -61,6 +61,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
@@ -11426,18 +9438,6 @@ index 133f7de..1d6f2f1 100644
#This will adjust *FLAGS accordingly to the platform.
include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
-diff --git a/arch/um/defconfig b/arch/um/defconfig
-index 2665e6b..3e3822b 100644
---- a/arch/um/defconfig
-+++ b/arch/um/defconfig
-@@ -51,7 +51,6 @@ CONFIG_X86_CMPXCHG=y
- CONFIG_X86_L1_CACHE_SHIFT=5
- CONFIG_X86_XADD=y
- CONFIG_X86_PPRO_FENCE=y
--CONFIG_X86_WP_WORKS_OK=y
- CONFIG_X86_INVLPG=y
- CONFIG_X86_BSWAP=y
- CONFIG_X86_POPAD_OK=y
diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
index 19e1bdd..3665b77 100644
--- a/arch/um/include/asm/cache.h
@@ -11459,19 +9459,19 @@ index 19e1bdd..3665b77 100644
#endif
diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
-index 2e0a6b1..a64d0f5 100644
+index 6c03acd..a5e0215 100644
--- a/arch/um/include/asm/kmap_types.h
+++ b/arch/um/include/asm/kmap_types.h
-@@ -8,6 +8,6 @@
-
- /* No more #include "asm/arch/kmap_types.h" ! */
-
--#define KM_TYPE_NR 14
-+#define KM_TYPE_NR 15
+@@ -23,6 +23,7 @@ enum km_type {
+ KM_IRQ1,
+ KM_SOFTIRQ0,
+ KM_SOFTIRQ1,
++ KM_CLEARPAGE,
+ KM_TYPE_NR
+ };
- #endif
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
-index 5ff53d9..5850cdf 100644
+index 7cfc3ce..cbd1a58 100644
--- a/arch/um/include/asm/page.h
+++ b/arch/um/include/asm/page.h
@@ -14,6 +14,9 @@
@@ -11496,11 +9496,28 @@ index 0032f92..cd151e0 100644
#ifdef CONFIG_64BIT
#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
+diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c
+index 829df49..41ebbfe 100644
+--- a/arch/um/kernel/exitcode.c
++++ b/arch/um/kernel/exitcode.c
+@@ -40,9 +40,11 @@ static ssize_t exitcode_proc_write(struct file *file,
+ const char __user *buffer, size_t count, loff_t *pos)
+ {
+ char *end, buf[sizeof("nnnnn\0")];
++ size_t size;
+ int tmp;
+
+- if (copy_from_user(buf, buffer, count))
++ size = min(count, sizeof(buf));
++ if (copy_from_user(buf, buffer, size))
+ return -EFAULT;
+
+ tmp = simple_strtol(buf, &end, 0);
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
-index bbcef52..6a2a483 100644
+index c533835..84db18e 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
-@@ -367,22 +367,6 @@ int singlestepping(void * t)
+@@ -406,22 +406,6 @@ int singlestepping(void * t)
return 2;
}
@@ -11541,10 +9558,18 @@ index ad8f795..2c7eec6 100644
/*
* Memory returned by kmalloc() may be used for DMA, so we must make
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index f67e839..419b5f7 100644
+index fb2e69d..27ff8ca 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -247,7 +247,7 @@ config X86_HT
+@@ -75,6 +75,7 @@ config X86
+ select HAVE_BPF_JIT if (X86_64 && NET)
+ select CLKEVT_I8253
+ select ARCH_HAVE_NMI_SAFE_CMPXCHG
++ select HAVE_ARCH_SECCOMP_FILTER
+
+ config INSTRUCTION_DECODER
+ def_bool (KPROBES || PERF_EVENTS)
+@@ -235,7 +236,7 @@ config X86_HT
config X86_32_LAZY_GS
def_bool y
@@ -11553,7 +9578,7 @@ index f67e839..419b5f7 100644
config ARCH_HWEIGHT_CFLAGS
string
-@@ -1099,6 +1099,7 @@ config MICROCODE_EARLY
+@@ -999,6 +1000,7 @@ config MICROCODE_OLD_INTERFACE
config X86_MSR
tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -11561,7 +9586,7 @@ index f67e839..419b5f7 100644
---help---
This device gives privileged processes access to the x86
Model-Specific Registers (MSRs). It is a character device with
-@@ -1122,7 +1123,7 @@ choice
+@@ -1022,7 +1024,7 @@ choice
config NOHIGHMEM
bool "off"
@@ -11570,7 +9595,7 @@ index f67e839..419b5f7 100644
---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
-@@ -1159,7 +1160,7 @@ config NOHIGHMEM
+@@ -1059,7 +1061,7 @@ config NOHIGHMEM
config HIGHMEM4G
bool "4GB"
@@ -11579,7 +9604,7 @@ index f67e839..419b5f7 100644
---help---
Select this if you have a 32-bit processor and between 1 and 4
gigabytes of physical RAM.
-@@ -1212,7 +1213,7 @@ config PAGE_OFFSET
+@@ -1113,7 +1115,7 @@ config PAGE_OFFSET
hex
default 0xB0000000 if VMSPLIT_3G_OPT
default 0x80000000 if VMSPLIT_2G
@@ -11588,25 +9613,25 @@ index f67e839..419b5f7 100644
default 0x40000000 if VMSPLIT_1G
default 0xC0000000
depends on X86_32
-@@ -1614,6 +1615,7 @@ config SECCOMP
+@@ -1496,6 +1498,7 @@ config SECCOMP
config CC_STACKPROTECTOR
- bool "Enable -fstack-protector buffer overflow detection"
+ bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
+ depends on X86_64 || !PAX_MEMORY_UDEREF
---help---
This option turns on the -fstack-protector GCC feature. This
feature puts, at the beginning of functions, a canary value on
-@@ -1733,6 +1735,8 @@ config X86_NEED_RELOCS
+@@ -1616,6 +1619,8 @@ config X86_NEED_RELOCS
config PHYSICAL_ALIGN
- hex "Alignment value to which kernel should be aligned"
+ hex "Alignment value to which kernel should be aligned" if X86_32
default "0x1000000"
+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
- range 0x2000 0x1000000 if X86_32
- range 0x200000 0x1000000 if X86_64
+ range 0x2000 0x1000000
---help---
-@@ -1812,9 +1816,10 @@ config DEBUG_HOTPLUG_CPU0
- If unsure, say N.
+ This value puts the alignment restrictions on physical address
+@@ -1647,9 +1652,10 @@ config HOTPLUG_CPU
+ Say N if you want to disable CPU hotplug.
config COMPAT_VDSO
- def_bool y
@@ -11618,19 +9643,19 @@ index f67e839..419b5f7 100644
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 c026cca..14657ae 100644
+index e3ca7e0..b30b28a 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
-@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
+@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
def_bool y
-- depends on M586MMX || M586TSC || M586 || M486
-+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
+- depends on M586MMX || M586TSC || M586 || M486 || M386
++ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
config X86_INVD_BUG
def_bool y
-@@ -327,7 +327,7 @@ config X86_INVD_BUG
+@@ -365,7 +365,7 @@ config X86_POPAD_OK
config X86_ALIGNMENT_16
def_bool y
@@ -11639,7 +9664,7 @@ index c026cca..14657ae 100644
config X86_INTEL_USERCOPY
def_bool y
-@@ -373,7 +373,7 @@ config X86_CMPXCHG64
+@@ -411,7 +411,7 @@ config X86_CMPXCHG64
# generates cmov.
config X86_CMOV
def_bool y
@@ -11649,10 +9674,10 @@ index c026cca..14657ae 100644
config X86_MINIMUM_CPU_FAMILY
int
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
-index 78d91af..8ceb94b 100644
+index bf56e17..91465a1 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
-@@ -74,7 +74,7 @@ config X86_PTDUMP
+@@ -81,7 +81,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
default y
@@ -11661,7 +9686,7 @@ index 78d91af..8ceb94b 100644
---help---
Mark the kernel read-only data as write-protected in the pagetables,
in order to catch accidental (and incorrect) writes to such const
-@@ -92,7 +92,7 @@ config DEBUG_RODATA_TEST
+@@ -99,7 +99,7 @@ config DEBUG_RODATA_TEST
config DEBUG_SET_MODULE_RONX
bool "Set loadable kernel module data as NX and text as RO"
@@ -11670,16 +9695,23 @@ index 78d91af..8ceb94b 100644
---help---
This option helps catch unintended modifications to loadable
kernel module's text and read-only data. It also prevents execution
+@@ -272,7 +272,7 @@ config OPTIMIZE_INLINING
+
+ config DEBUG_STRICT_USER_COPY_CHECKS
+ bool "Strict copy size checks"
+- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
++ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
+ ---help---
+ Enabling this option turns a certain set of sanity checks for user
+ copy operations into compile time failures.
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index 41250fb..863762e 100644
+index 03dbc7f5b..e1aa479 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
-@@ -46,14 +46,12 @@ ifeq ($(CONFIG_X86_32),y)
- # CPU-specific tuning. Anything which can be shared with UML should go here.
- include $(srctree)/arch/x86/Makefile_32.cpu
+@@ -40,12 +40,12 @@ ifeq ($(CONFIG_X86_32),y)
KBUILD_CFLAGS += $(cflags-y)
--
-- # temporary until string.h is fixed
+
+ # temporary until string.h is fixed
- KBUILD_CFLAGS += -ffreestanding
else
BITS := 64
@@ -11690,19 +9722,18 @@ index 41250fb..863762e 100644
KBUILD_AFLAGS += -m64
KBUILD_CFLAGS += -m64
-@@ -83,6 +81,9 @@ else
+@@ -72,6 +72,8 @@ else
KBUILD_CFLAGS += -maccumulate-outgoing-args
endif
-+# temporary until string.h is fixed
+KBUILD_CFLAGS += -ffreestanding
+
ifdef CONFIG_CC_STACKPROTECTOR
cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)
-@@ -241,3 +242,12 @@ define archhelp
+@@ -199,3 +201,12 @@ define archhelp
+ echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
- echo ' kvmconfig - Enable additional options for guest kernel support'
endef
+
+define OLD_LD
@@ -11714,10 +9745,10 @@ index 41250fb..863762e 100644
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
-index 379814b..add62ce 100644
+index 95365a8..88aadd2 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
-@@ -65,6 +65,9 @@ KBUILD_CFLAGS := $(USERINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
+@@ -63,6 +63,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -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)
@@ -11750,7 +9781,7 @@ index 878e4b9..20537ab 100644
#endif /* BOOT_BITOPS_H */
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
-index ef72bae..353a184 100644
+index c7093bd..d4247ffe0 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -85,7 +85,7 @@ static inline void io_delay(void)
@@ -11772,10 +9803,10 @@ index ef72bae..353a184 100644
return diff;
}
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index dcd90df..c830d7d 100644
+index 77453c6..6235831 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
-@@ -15,6 +15,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
+@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
KBUILD_CFLAGS += $(cflags-y)
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
@@ -11785,73 +9816,11 @@ index dcd90df..c830d7d 100644
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 b7388a4..03844ec 100644
---- a/arch/x86/boot/compressed/eboot.c
-+++ b/arch/x86/boot/compressed/eboot.c
-@@ -150,7 +150,6 @@ again:
- *addr = max_addr;
- }
-
--free_pool:
- efi_call_phys1(sys_table->boottime->free_pool, map);
-
- fail:
-@@ -214,7 +213,6 @@ static efi_status_t low_alloc(unsigned long size, unsigned long align,
- if (i == map_size / desc_size)
- status = EFI_NOT_FOUND;
-
--free_pool:
- efi_call_phys1(sys_table->boottime->free_pool, map);
- fail:
- return status;
-diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
-index a53440e..c3dbf1e 100644
---- a/arch/x86/boot/compressed/efi_stub_32.S
-+++ b/arch/x86/boot/compressed/efi_stub_32.S
-@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
- * parameter 2, ..., param n. To make things easy, we save the return
- * address of efi_call_phys in a global variable.
- */
-- popl %ecx
-- movl %ecx, saved_return_addr(%edx)
-- /* get the function pointer into ECX*/
-- popl %ecx
-- movl %ecx, efi_rt_function_ptr(%edx)
-+ popl saved_return_addr(%edx)
-+ popl efi_rt_function_ptr(%edx)
-
- /*
- * 3. Call the physical function.
- */
-- call *%ecx
-+ call *efi_rt_function_ptr(%edx)
-
- /*
- * 4. Balance the stack. And because EAX contain the return value,
-@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
- 1: popl %edx
- subl $1b, %edx
-
-- movl efi_rt_function_ptr(%edx), %ecx
-- pushl %ecx
-+ pushl efi_rt_function_ptr(%edx)
-
- /*
- * 10. Push the saved return address onto the stack and return.
- */
-- movl saved_return_addr(%edx), %ecx
-- pushl %ecx
-- ret
-+ jmpl *saved_return_addr(%edx)
- ENDPROC(efi_call_phys)
- .previous
-
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
-index 5d6f689..9d06730 100644
+index 67a655a..b924059 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
-@@ -118,7 +118,7 @@ preferred_addr:
+@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
#else
@@ -11860,11 +9829,30 @@ index 5d6f689..9d06730 100644
#endif
/* Target address to relocate to for decompression */
+@@ -162,7 +162,7 @@ relocated:
+ * and where it was actually loaded.
+ */
+ movl %ebp, %ebx
+- subl $LOAD_PHYSICAL_ADDR, %ebx
++ subl $____LOAD_PHYSICAL_ADDR, %ebx
+ jz 2f /* Nothing to be done if loaded at compiled addr. */
+ /*
+ * Process relocations.
+@@ -170,8 +170,7 @@ relocated:
+
+ 1: subl $4, %edi
+ movl (%edi), %ecx
+- testl %ecx, %ecx
+- jz 2f
++ jecxz 2f
+ addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
+ jmp 1b
+ 2:
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
-index c337422..2c5be72 100644
+index 35af09d..99c9676 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
-@@ -95,7 +95,7 @@ ENTRY(startup_32)
+@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
#else
@@ -11873,7 +9861,7 @@ index c337422..2c5be72 100644
#endif
/* Target address to relocate to for decompression */
-@@ -270,7 +270,7 @@ preferred_addr:
+@@ -233,7 +233,7 @@ ENTRY(startup_64)
notq %rax
andq %rax, %rbp
#else
@@ -11882,31 +9870,11 @@ index c337422..2c5be72 100644
#endif
/* Target address to relocate to for decompression */
-@@ -362,8 +362,8 @@ gdt:
- .long gdt
- .word 0
- .quad 0x0000000000000000 /* NULL descriptor */
-- .quad 0x00af9a000000ffff /* __KERNEL_CS */
-- .quad 0x00cf92000000ffff /* __KERNEL_DS */
-+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
-+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
- .quad 0x0080890000000000 /* TS descriptor */
- .quad 0x0000000000000000 /* TS continued */
- gdt_end:
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
-index 434f077..b6b4b38 100644
+index 3a19d04..7c1d55a 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
-@@ -283,7 +283,7 @@ static void handle_relocations(void *output, unsigned long output_len)
- * Calculate the delta between where vmlinux was linked to load
- * and where it was actually loaded.
- */
-- delta = min_addr - LOAD_PHYSICAL_ADDR;
-+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
- if (!delta) {
- debug_putstr("No relocation needed... ");
- return;
-@@ -380,7 +380,7 @@ static void parse_elf(void *output)
+@@ -310,7 +310,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
dest = output;
@@ -11915,7 +9883,7 @@ index 434f077..b6b4b38 100644
#else
dest = (void *)(phdr->p_paddr);
#endif
-@@ -432,7 +432,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
+@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
error("Destination address too large");
#endif
#ifndef CONFIG_RELOCATABLE
@@ -12024,10 +9992,10 @@ index 4d3ff03..e4972ff 100644
err = check_flags();
}
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
-index 9ec06a1..2c25e79 100644
+index bdb4d45..77703de 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
-@@ -409,10 +409,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
+@@ -224,10 +224,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
# single linked list of
# struct setup_data
@@ -12082,7 +10050,7 @@ index 43eda28..5ab5fdb 100644
unsigned int v;
diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
-index 9105655..5e37f27 100644
+index 5b577d5..3c1fed4 100644
--- a/arch/x86/crypto/aes-x86_64-asm_64.S
+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
@@ -8,6 +8,8 @@
@@ -12094,17 +10062,17 @@ index 9105655..5e37f27 100644
.extern crypto_ft_tab
.extern crypto_it_tab
.extern crypto_fl_tab
-@@ -70,6 +72,8 @@
+@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
je B192; \
leaq 32(r9),r9;
+#define ret pax_force_retaddr 0, 1; ret
+
- #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
+ #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
movq r1,r2; \
movq r3,r4; \
diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
-index 477e9d7..3ab339f 100644
+index 3470624..201259d 100644
--- a/arch/x86/crypto/aesni-intel_asm.S
+++ b/arch/x86/crypto/aesni-intel_asm.S
@@ -31,6 +31,7 @@
@@ -12115,663 +10083,251 @@ index 477e9d7..3ab339f 100644
#ifdef __x86_64__
.data
-@@ -1441,6 +1442,7 @@ _return_T_done_decrypt:
+@@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
pop %r14
pop %r13
pop %r12
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_gcm_dec)
++ENDPROC(aesni_gcm_dec)
+
-@@ -1705,6 +1707,7 @@ _return_T_done_encrypt:
+ /*****************************************************************************
+@@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
pop %r14
pop %r13
pop %r12
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_gcm_enc)
++ENDPROC(aesni_gcm_enc)
+
+ #endif
-@@ -1722,6 +1725,7 @@ _key_expansion_256a:
+@@ -1714,6 +1719,7 @@ _key_expansion_256a:
pxor %xmm1, %xmm0
movaps %xmm0, (TKEYP)
add $0x10, TKEYP
+ pax_force_retaddr_bts
ret
- ENDPROC(_key_expansion_128)
- ENDPROC(_key_expansion_256a)
-@@ -1748,6 +1752,7 @@ _key_expansion_192a:
+
+ .align 4
+@@ -1738,6 +1744,7 @@ _key_expansion_192a:
shufps $0b01001110, %xmm2, %xmm1
movaps %xmm1, 0x10(TKEYP)
add $0x20, TKEYP
+ pax_force_retaddr_bts
ret
- ENDPROC(_key_expansion_192a)
-@@ -1768,6 +1773,7 @@ _key_expansion_192b:
+ .align 4
+@@ -1757,6 +1764,7 @@ _key_expansion_192b:
movaps %xmm0, (TKEYP)
add $0x10, TKEYP
+ pax_force_retaddr_bts
ret
- ENDPROC(_key_expansion_192b)
-@@ -1781,6 +1787,7 @@ _key_expansion_256b:
+ .align 4
+@@ -1769,6 +1777,7 @@ _key_expansion_256b:
pxor %xmm1, %xmm2
movaps %xmm2, (TKEYP)
add $0x10, TKEYP
+ pax_force_retaddr_bts
ret
- ENDPROC(_key_expansion_256b)
-@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
+ /*
+@@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
#ifndef __x86_64__
popl KEYP
#endif
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_set_key)
++ENDPROC(aesni_set_key)
-@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
+ /*
+ * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
+@@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
popl KLEN
popl KEYP
#endif
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_enc)
++ENDPROC(aesni_enc)
-@@ -1974,6 +1983,7 @@ _aesni_enc1:
+ /*
+ * _aesni_enc1: internal ABI
+@@ -1959,6 +1972,7 @@ _aesni_enc1:
AESENC KEY STATE
movaps 0x70(TKEYP), KEY
AESENCLAST KEY STATE
+ pax_force_retaddr_bts
ret
- ENDPROC(_aesni_enc1)
-@@ -2083,6 +2093,7 @@ _aesni_enc4:
+ /*
+@@ -2067,6 +2081,7 @@ _aesni_enc4:
AESENCLAST KEY STATE2
AESENCLAST KEY STATE3
AESENCLAST KEY STATE4
+ pax_force_retaddr_bts
ret
- ENDPROC(_aesni_enc4)
-@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
+ /*
+@@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
popl KLEN
popl KEYP
#endif
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_dec)
++ENDPROC(aesni_dec)
-@@ -2164,6 +2176,7 @@ _aesni_dec1:
+ /*
+ * _aesni_dec1: internal ABI
+@@ -2146,6 +2163,7 @@ _aesni_dec1:
AESDEC KEY STATE
movaps 0x70(TKEYP), KEY
AESDECLAST KEY STATE
+ pax_force_retaddr_bts
ret
- ENDPROC(_aesni_dec1)
-@@ -2273,6 +2286,7 @@ _aesni_dec4:
+ /*
+@@ -2254,6 +2272,7 @@ _aesni_dec4:
AESDECLAST KEY STATE2
AESDECLAST KEY STATE3
AESDECLAST KEY STATE4
+ pax_force_retaddr_bts
ret
- ENDPROC(_aesni_dec4)
-@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
+ /*
+@@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
popl KEYP
popl LEN
#endif
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_ecb_enc)
++ENDPROC(aesni_ecb_enc)
-@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
+ /*
+ * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
+@@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
popl KEYP
popl LEN
#endif
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_ecb_dec)
++ENDPROC(aesni_ecb_dec)
-@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
+ /*
+ * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
+@@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
popl LEN
popl IVP
#endif
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_cbc_enc)
++ENDPROC(aesni_cbc_enc)
-@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
+ /*
+ * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
+@@ -2500,7 +2525,9 @@ ENTRY(aesni_cbc_dec)
popl LEN
popl IVP
#endif
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_cbc_dec)
++ENDPROC(aesni_cbc_dec)
-@@ -2550,6 +2568,7 @@ _aesni_inc_init:
+ #ifdef __x86_64__
+ .align 16
+@@ -2526,6 +2553,7 @@ _aesni_inc_init:
mov $1, TCTR_LOW
MOVQ_R64_XMM TCTR_LOW INC
MOVQ_R64_XMM CTR TCTR_LOW
+ pax_force_retaddr_bts
ret
- ENDPROC(_aesni_inc_init)
-@@ -2579,6 +2598,7 @@ _aesni_inc:
+ /*
+@@ -2554,6 +2582,7 @@ _aesni_inc:
.Linc_low:
movaps CTR, IV
PSHUFB_XMM BSWAP_MASK IV
+ pax_force_retaddr_bts
ret
- ENDPROC(_aesni_inc)
-@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
+ /*
+@@ -2614,5 +2643,7 @@ ENTRY(aesni_ctr_enc)
.Lctr_enc_ret:
movups IV, (IVP)
.Lctr_enc_just_ret:
+ pax_force_retaddr 0, 1
ret
- ENDPROC(aesni_ctr_enc)
-
-@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
- pxor INC, STATE4
- movdqu STATE4, 0x70(OUTP)
-
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(aesni_xts_crypt8)
-
++ENDPROC(aesni_ctr_enc)
+ #endif
diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
-index 246c670..4d1ed00 100644
+index 391d245..67f35c2 100644
--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,8 @@
+ *
*/
- #include <linux/linkage.h>
+#include <asm/alternative-asm.h>
-
++
.file "blowfish-x86_64-asm.S"
.text
-@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
- jnz .L__enc_xor;
+
+@@ -151,9 +153,11 @@ __blowfish_enc_blk:
+ jnz __enc_xor;
write_block();
+ pax_force_retaddr 0, 1
ret;
- .L__enc_xor:
+ __enc_xor:
xor_block();
+ pax_force_retaddr 0, 1
ret;
- ENDPROC(__blowfish_enc_blk)
-@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
+ .align 8
+@@ -188,6 +192,7 @@ blowfish_dec_blk:
movq %r11, %rbp;
+ pax_force_retaddr 0, 1
ret;
- ENDPROC(blowfish_dec_blk)
-@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
+ /**********************************************************************
+@@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
popq %rbx;
popq %rbp;
+ pax_force_retaddr 0, 1
ret;
- .L__enc_xor4:
-@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
-
- popq %rbx;
- popq %rbp;
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(__blowfish_enc_blk_4way)
+ __enc_xor4:
+@@ -349,6 +355,7 @@ __enc_xor4:
-@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
popq %rbx;
popq %rbp;
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(blowfish_dec_blk_4way)
-diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
-index ce71f92..2dd5b1e 100644
---- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
-+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
-@@ -16,6 +16,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- #define CAMELLIA_TABLE_BYTE_LEN 272
-
-@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
- roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
- %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
- %rcx, (%r9));
-+ pax_force_retaddr_bts
- ret;
- ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
-
-@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
- roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
- %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
- %rax, (%r9));
-+ pax_force_retaddr_bts
- ret;
- ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
-
-@@ -780,6 +783,7 @@ __camellia_enc_blk16:
- %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
- %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
-
-+ pax_force_retaddr_bts
- ret;
-
- .align 8
-@@ -865,6 +869,7 @@ __camellia_dec_blk16:
- %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
- %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
-
-+ pax_force_retaddr_bts
- ret;
-
- .align 8
-@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
- %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
- %xmm8, %rsi);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_ecb_enc_16way)
-
-@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
- %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
- %xmm8, %rsi);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_ecb_dec_16way)
-
-@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
- %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
- %xmm8, %rsi);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_cbc_dec_16way)
-
-@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
- %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
- %xmm8, %rsi);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_ctr_16way)
-
-@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
- %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
- %xmm8, %rsi);
-
+ pax_force_retaddr 0, 1
ret;
- ENDPROC(camellia_xts_crypt_16way)
-
-diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
-index 0e0b886..8fc756a 100644
---- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
-+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
-@@ -11,6 +11,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- #define CAMELLIA_TABLE_BYTE_LEN 272
-
-@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
- roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
- %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
- %rcx, (%r9));
-+ pax_force_retaddr_bts
- ret;
- ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
-
-@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
- roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
- %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
- %rax, (%r9));
-+ pax_force_retaddr_bts
- ret;
- ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
-
-@@ -820,6 +823,7 @@ __camellia_enc_blk32:
- %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
- %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
-
-+ pax_force_retaddr_bts
- ret;
-
- .align 8
-@@ -905,6 +909,7 @@ __camellia_dec_blk32:
- %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
- %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
-
-+ pax_force_retaddr_bts
- ret;
.align 8
-@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
-
- vzeroupper;
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_ecb_enc_32way)
-
-@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
-
- vzeroupper;
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_ecb_dec_32way)
-
-@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
-
- vzeroupper;
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_cbc_dec_32way)
-
-@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
-
- vzeroupper;
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_ctr_32way)
-
-@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
-
- vzeroupper;
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_xts_crypt_32way)
-
-diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
-index 310319c..ce174a4 100644
---- a/arch/x86/crypto/camellia-x86_64-asm_64.S
-+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
-@@ -21,6 +21,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- .file "camellia-x86_64-asm_64.S"
- .text
-@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
- enc_outunpack(mov, RT1);
-
- movq RRBP, %rbp;
-+ pax_force_retaddr 0, 1
- ret;
-
- .L__enc_xor:
- enc_outunpack(xor, RT1);
-
- movq RRBP, %rbp;
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(__camellia_enc_blk)
-
-@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
- dec_outunpack();
-
- movq RRBP, %rbp;
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_dec_blk)
-
-@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
-
- movq RRBP, %rbp;
+@@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
popq %rbx;
-+ pax_force_retaddr 0, 1
- ret;
-
- .L__enc2_xor:
-@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
-
- movq RRBP, %rbp;
- popq %rbx;
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(__camellia_enc_blk_2way)
-
-@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
-
- movq RRBP, %rbp;
- movq RXOR, %rbx;
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(camellia_dec_blk_2way)
-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 c35fd5d..c1ee236 100644
---- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
-+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
-@@ -24,6 +24,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- .file "cast5-avx-x86_64-asm_64.S"
-
-@@ -281,6 +282,7 @@ __cast5_enc_blk16:
- outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
- outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(__cast5_enc_blk16)
-
-@@ -352,6 +354,7 @@ __cast5_dec_blk16:
- outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
- outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
-
-+ pax_force_retaddr 0, 1
- ret;
-
- .L__skip_dec:
-@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
- vmovdqu RR4, (6*4*4)(%r11);
- vmovdqu RL4, (7*4*4)(%r11);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast5_ecb_enc_16way)
-
-@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
- vmovdqu RR4, (6*4*4)(%r11);
- vmovdqu RL4, (7*4*4)(%r11);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast5_ecb_dec_16way)
-
-@@ -469,6 +474,7 @@ ENTRY(cast5_cbc_dec_16way)
-
- popq %r12;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast5_cbc_dec_16way)
-
-@@ -542,5 +548,6 @@ ENTRY(cast5_ctr_16way)
-
- popq %r12;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast5_ctr_16way)
-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 e3531f8..18ded3a 100644
---- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
-+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
-@@ -24,6 +24,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
- #include "glue_helper-asm-avx.S"
-
- .file "cast6-avx-x86_64-asm_64.S"
-@@ -295,6 +296,7 @@ __cast6_enc_blk8:
- outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
- outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(__cast6_enc_blk8)
-
-@@ -340,6 +342,7 @@ __cast6_dec_blk8:
- outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
- outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
+ popq %rbp;
+ pax_force_retaddr 0, 1
ret;
- ENDPROC(__cast6_dec_blk8)
-
-@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
-
- store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast6_ecb_enc_8way)
-
-@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
-
- store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast6_ecb_dec_8way)
-
-@@ -399,6 +404,7 @@ ENTRY(cast6_cbc_dec_8way)
-
- popq %r12;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast6_cbc_dec_8way)
-
-@@ -424,6 +430,7 @@ ENTRY(cast6_ctr_8way)
-
- popq %r12;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast6_ctr_8way)
-
-@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
- /* dst <= regs xor IVs(in dst) */
- store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast6_xts_enc_8way)
-
-@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
- /* dst <= regs xor IVs(in dst) */
- store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(cast6_xts_dec_8way)
-diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
-index dbc4339..3d868c5 100644
---- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
-+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
-@@ -45,6 +45,7 @@
-
- #include <asm/inst.h>
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
-
-@@ -312,6 +313,7 @@ do_return:
- popq %rsi
- popq %rdi
- popq %rbx
-+ pax_force_retaddr 0, 1
- ret
-
- ################################################################
-diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
-index 586f41a..d02851e 100644
---- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
-+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
-@@ -18,6 +18,7 @@
-
- #include <linux/linkage.h>
- #include <asm/inst.h>
-+#include <asm/alternative-asm.h>
-
- .data
-
-@@ -93,6 +94,7 @@ __clmul_gf128mul_ble:
- psrlq $1, T2
- pxor T2, T1
- pxor T1, DATA
-+ pax_force_retaddr
- ret
- ENDPROC(__clmul_gf128mul_ble)
-
-@@ -105,6 +107,7 @@ ENTRY(clmul_ghash_mul)
- call __clmul_gf128mul_ble
- PSHUFB_XMM BSWAP DATA
- movups DATA, (%rdi)
-+ pax_force_retaddr
- ret
- ENDPROC(clmul_ghash_mul)
-
-@@ -132,6 +135,7 @@ ENTRY(clmul_ghash_update)
- PSHUFB_XMM BSWAP DATA
- movups DATA, (%rdi)
- .Lupdate_just_ret:
-+ pax_force_retaddr
- ret
- ENDPROC(clmul_ghash_update)
-@@ -157,5 +161,6 @@ ENTRY(clmul_ghash_setkey)
- pand .Lpoly, %xmm1
- pxor %xmm1, %xmm0
- movups %xmm0, (%rdi)
-+ pax_force_retaddr
- ret
- ENDPROC(clmul_ghash_setkey)
diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
-index 9279e0b..9270820 100644
+index 6214a9b..1f4fc9a 100644
--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
-@@ -1,4 +1,5 @@
- #include <linux/linkage.h>
+@@ -1,3 +1,5 @@
+#include <asm/alternative-asm.h>
-
- # enter salsa20_encrypt_bytes
- ENTRY(salsa20_encrypt_bytes)
-@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
++
+ # enter ECRYPT_encrypt_bytes
+ .text
+ .p2align 5
+@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
add %r11,%rsp
mov %rdi,%rax
mov %rsi,%rdx
@@ -12779,487 +10335,108 @@ index 9279e0b..9270820 100644
ret
# bytesatleast65:
._bytesatleast65:
-@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
+@@ -891,6 +894,7 @@ ECRYPT_keysetup:
add %r11,%rsp
mov %rdi,%rax
mov %rsi,%rdx
+ pax_force_retaddr
ret
- ENDPROC(salsa20_keysetup)
-
-@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
+ # enter ECRYPT_ivsetup
+ .text
+@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
add %r11,%rsp
mov %rdi,%rax
mov %rsi,%rdx
+ pax_force_retaddr
ret
- ENDPROC(salsa20_ivsetup)
-diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
-index 2f202f4..d9164d6 100644
---- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
-+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
-@@ -24,6 +24,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
- #include "glue_helper-asm-avx.S"
-
- .file "serpent-avx-x86_64-asm_64.S"
-@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
- write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
- write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(__serpent_enc_blk8_avx)
-
-@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
- write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
- write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(__serpent_dec_blk8_avx)
-
-@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
-
- store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_ecb_enc_8way_avx)
-
-@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
-
- store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_ecb_dec_8way_avx)
-
-@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
-
- store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_cbc_dec_8way_avx)
-
-@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
-
- store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_ctr_8way_avx)
-
-@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
- /* dst <= regs xor IVs(in dst) */
- store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_xts_enc_8way_avx)
-
-@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
- /* dst <= regs xor IVs(in dst) */
- store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_xts_dec_8way_avx)
-diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
-index b222085..abd483c 100644
---- a/arch/x86/crypto/serpent-avx2-asm_64.S
-+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
-@@ -15,6 +15,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
- #include "glue_helper-asm-avx2.S"
-
- .file "serpent-avx2-asm_64.S"
-@@ -610,6 +611,7 @@ __serpent_enc_blk16:
- write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
- write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(__serpent_enc_blk16)
-
-@@ -664,6 +666,7 @@ __serpent_dec_blk16:
- write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
- write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(__serpent_dec_blk16)
-
-@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
-
- vzeroupper;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_ecb_enc_16way)
-
-@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
-
- vzeroupper;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_ecb_dec_16way)
-
-@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
-
- vzeroupper;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_cbc_dec_16way)
-
-@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
-
- vzeroupper;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_ctr_16way)
-
-@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
-
- vzeroupper;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_xts_enc_16way)
-
-@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
-
- vzeroupper;
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_xts_dec_16way)
-diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
-index acc066c..1559cc4 100644
---- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
-+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
-@@ -25,6 +25,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- .file "serpent-sse2-x86_64-asm_64.S"
- .text
-@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
- write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
- write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
-
-+ pax_force_retaddr
- ret;
-
- .L__enc_xor8:
- xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
- xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(__serpent_enc_blk_8way)
-
-@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
- write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
- write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
-
-+ pax_force_retaddr
- ret;
- ENDPROC(serpent_dec_blk_8way)
diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
-index a410950..3356d42 100644
+index b2c2f57..8470cab 100644
--- a/arch/x86/crypto/sha1_ssse3_asm.S
+++ b/arch/x86/crypto/sha1_ssse3_asm.S
-@@ -29,6 +29,7 @@
+@@ -28,6 +28,8 @@
+ * (at your option) any later version.
*/
- #include <linux/linkage.h>
+#include <asm/alternative-asm.h>
-
++
#define CTX %rdi // arg1
#define BUF %rsi // arg2
-@@ -104,6 +105,7 @@
+ #define CNT %rdx // arg3
+@@ -104,6 +106,7 @@
pop %r12
pop %rbp
pop %rbx
+ pax_force_retaddr 0, 1
ret
- ENDPROC(\name)
-diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
-index 642f156..4ab07b9 100644
---- a/arch/x86/crypto/sha256-avx-asm.S
-+++ b/arch/x86/crypto/sha256-avx-asm.S
-@@ -49,6 +49,7 @@
-
- #ifdef CONFIG_AS_AVX
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- ## assume buffers not aligned
- #define VMOVDQ vmovdqu
-@@ -460,6 +461,7 @@ done_hash:
- popq %r13
- popq %rbp
- popq %rbx
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(sha256_transform_avx)
-
-diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
-index 9e86944..2e7f95a 100644
---- a/arch/x86/crypto/sha256-avx2-asm.S
-+++ b/arch/x86/crypto/sha256-avx2-asm.S
-@@ -50,6 +50,7 @@
-
- #ifdef CONFIG_AS_AVX2
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- ## assume buffers not aligned
- #define VMOVDQ vmovdqu
-@@ -720,6 +721,7 @@ done_hash:
- popq %r12
- popq %rbp
- popq %rbx
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(sha256_transform_rorx)
-
-diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
-index f833b74..c36ed14 100644
---- a/arch/x86/crypto/sha256-ssse3-asm.S
-+++ b/arch/x86/crypto/sha256-ssse3-asm.S
-@@ -47,6 +47,7 @@
- ########################################################################
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- ## assume buffers not aligned
- #define MOVDQ movdqu
-@@ -471,6 +472,7 @@ done_hash:
- popq %rbp
- popq %rbx
-
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(sha256_transform_ssse3)
-
-diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
-index 974dde9..4533d34 100644
---- a/arch/x86/crypto/sha512-avx-asm.S
-+++ b/arch/x86/crypto/sha512-avx-asm.S
-@@ -49,6 +49,7 @@
-
- #ifdef CONFIG_AS_AVX
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- .text
-
-@@ -364,6 +365,7 @@ updateblock:
- mov frame_RSPSAVE(%rsp), %rsp
-
- nowork:
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(sha512_transform_avx)
-
-diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
-index 568b961..061ef1d 100644
---- a/arch/x86/crypto/sha512-avx2-asm.S
-+++ b/arch/x86/crypto/sha512-avx2-asm.S
-@@ -51,6 +51,7 @@
-
- #ifdef CONFIG_AS_AVX2
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- .text
-
-@@ -678,6 +679,7 @@ done_hash:
-
- # Restore Stack Pointer
- mov frame_RSPSAVE(%rsp), %rsp
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(sha512_transform_rorx)
-
-diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
-index fb56855..e23914f 100644
---- a/arch/x86/crypto/sha512-ssse3-asm.S
-+++ b/arch/x86/crypto/sha512-ssse3-asm.S
-@@ -48,6 +48,7 @@
- ########################################################################
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
-
- .text
-
-@@ -363,6 +364,7 @@ updateblock:
- mov frame_RSPSAVE(%rsp), %rsp
-
- nowork:
-+ pax_force_retaddr 0, 1
- ret
- ENDPROC(sha512_transform_ssse3)
-
-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 0505813..63b1d00 100644
---- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
-+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
-@@ -24,6 +24,7 @@
- */
-
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
- #include "glue_helper-asm-avx.S"
-
- .file "twofish-avx-x86_64-asm_64.S"
-@@ -284,6 +285,7 @@ __twofish_enc_blk8:
- outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
- outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(__twofish_enc_blk8)
-
-@@ -324,6 +326,7 @@ __twofish_dec_blk8:
- outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
- outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(__twofish_dec_blk8)
-
-@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
-
- store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(twofish_ecb_enc_8way)
-
-@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
-
- store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(twofish_ecb_dec_8way)
-
-@@ -383,6 +388,7 @@ ENTRY(twofish_cbc_dec_8way)
-
- popq %r12;
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(twofish_cbc_dec_8way)
-
-@@ -408,6 +414,7 @@ ENTRY(twofish_ctr_8way)
-
- popq %r12;
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(twofish_ctr_8way)
-
-@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
- /* dst <= regs xor IVs(in dst) */
- store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(twofish_xts_enc_8way)
-
-@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
- /* dst <= regs xor IVs(in dst) */
- store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
-
-+ pax_force_retaddr 0, 1
- ret;
- ENDPROC(twofish_xts_dec_8way)
+ .size \name, .-\name
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 1c3b7ce..b365c5e 100644
+index 5b012a2..36d5364 100644
--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,8 @@
+ *
*/
- #include <linux/linkage.h>
+#include <asm/alternative-asm.h>
-
++
.file "twofish-x86_64-asm-3way.S"
.text
-@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
+
+@@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
popq %r13;
popq %r14;
popq %r15;
+ pax_force_retaddr 0, 1
ret;
- .L__enc_xor3:
-@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
+ __enc_xor3:
+@@ -271,6 +274,7 @@ __enc_xor3:
popq %r13;
popq %r14;
popq %r15;
+ pax_force_retaddr 0, 1
ret;
- ENDPROC(__twofish_enc_blk_3way)
-@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
+ .global twofish_dec_blk_3way
+@@ -312,5 +316,6 @@ twofish_dec_blk_3way:
popq %r13;
popq %r14;
popq %r15;
+ pax_force_retaddr 0, 1
ret;
- ENDPROC(twofish_dec_blk_3way)
+
diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
-index a039d21..29e7615 100644
+index 7bcf3fc..f53832f 100644
--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
-@@ -22,6 +22,7 @@
+@@ -21,6 +21,7 @@
+ .text
- #include <linux/linkage.h>
#include <asm/asm-offsets.h>
+#include <asm/alternative-asm.h>
#define a_offset 0
#define b_offset 4
-@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
+@@ -268,6 +269,7 @@ twofish_enc_blk:
popq R1
movq $1,%rax
+ pax_force_retaddr 0, 1
ret
- ENDPROC(twofish_enc_blk)
-@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
+ twofish_dec_blk:
+@@ -319,4 +321,5 @@ twofish_dec_blk:
popq R1
movq $1,%rax
+ pax_force_retaddr 0, 1
ret
- ENDPROC(twofish_dec_blk)
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
-index bae3aba..c1788c1 100644
+index fd84387..887aa7e 100644
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
-@@ -159,6 +159,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
+@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
unsigned long dump_start, dump_size;
struct user32 dump;
@@ -13268,11 +10445,77 @@ index bae3aba..c1788c1 100644
fs = get_fs();
set_fs(KERNEL_DS);
has_dumped = 1;
+@@ -315,6 +317,13 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+ current->mm->free_area_cache = TASK_UNMAPPED_BASE;
+ current->mm->cached_hole_size = 0;
+
++ retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);
++ if (retval < 0) {
++ /* Someone check-me: is this error path enough? */
++ send_sig(SIGKILL, current, 0);
++ return retval;
++ }
++
+ install_exec_creds(bprm);
+ current->flags &= ~PF_FORKNOEXEC;
+
+@@ -410,13 +419,6 @@ beyond_if:
+
+ set_brk(current->mm->start_brk, current->mm->brk);
+
+- retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);
+- if (retval < 0) {
+- /* Someone check-me: is this error path enough? */
+- send_sig(SIGKILL, current, 0);
+- return retval;
+- }
+-
+ current->mm->start_stack =
+ (unsigned long)create_aout_tables((char __user *)bprm->p, bprm);
+ /* start thread */
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
-index 665a730..8e7a67a 100644
+index 6557769..dfa8ead 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
-@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
+@@ -73,6 +73,10 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
+ switch (from->si_code >> 16) {
+ case __SI_FAULT >> 16:
+ break;
++ case __SI_SYS >> 16:
++ put_user_ex(from->si_syscall, &to->si_syscall);
++ put_user_ex(from->si_arch, &to->si_arch);
++ break;
+ case __SI_CHLD >> 16:
+ put_user_ex(from->si_utime, &to->si_utime);
+ put_user_ex(from->si_stime, &to->si_stime);
+@@ -169,7 +173,7 @@ 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);
+ set_fs(seg);
+ if (ret >= 0 && uoss_ptr) {
+ if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
+@@ -370,7 +374,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;
+
+@@ -391,7 +395,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;
+ }
+@@ -399,7 +403,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. */
@@ -13281,16 +10524,16 @@ index 665a730..8e7a67a 100644
return (void __user *) sp;
}
-@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
+@@ -457,7 +461,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 __user *)frame->retcode);
+- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
} put_user_catch(err);
if (err)
-@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -499,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
0xb8,
__NR_ia32_rt_sigreturn,
0x80cd,
@@ -13298,11 +10541,11 @@ index 665a730..8e7a67a 100644
+ 0
};
- frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
-@@ -461,16 +461,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
+ frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
+@@ -529,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- if (ksig->ka.sa.sa_flags & SA_RESTORER)
- restorer = ksig->ka.sa.sa_restorer;
+ if (ka->sa.sa_flags & SA_RESTORER)
+ restorer = ka->sa.sa_restorer;
+ else if (current->mm->context.vdso)
+ /* Return stub is in 32bit vsyscall page */
+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
@@ -13316,27 +10559,26 @@ index 665a730..8e7a67a 100644
* Not actually used anymore, but left because some gdb
* versions need it.
*/
-- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
+- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
} put_user_catch(err);
- err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
+ if (err)
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index 4299eb0..904b82a 100644
+index 95b4eb3..1b112f5 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
-@@ -15,8 +15,10 @@
+@@ -13,7 +13,9 @@
+ #include <asm/thread_info.h>
+ #include <asm/segment.h>
#include <asm/irqflags.h>
- #include <asm/asm.h>
- #include <asm/smap.h>
+#include <asm/pgtable.h>
#include <linux/linkage.h>
- #include <linux/err.h>
+#include <asm/alternative-asm.h>
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
#include <linux/elf-em.h>
-@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
+@@ -95,6 +97,32 @@ ENTRY(native_irq_enable_sysexit)
ENDPROC(native_irq_enable_sysexit)
#endif
@@ -13360,16 +10602,16 @@ index 4299eb0..904b82a 100644
+#endif
+ .endm
+
-+ .macro pax_erase_kstack
++.macro pax_erase_kstack
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
+ call pax_erase_kstack
+#endif
-+ .endm
++.endm
+
/*
* 32bit SYSENTER instruction entry.
*
-@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
+@@ -121,12 +149,6 @@ ENTRY(ia32_sysenter_target)
CFI_REGISTER rsp,rbp
SWAPGS_UNSAFE_STACK
movq PER_CPU_VAR(kernel_stack), %rsp
@@ -13382,11 +10624,11 @@ index 4299eb0..904b82a 100644
movl %ebp,%ebp /* zero extension */
pushq_cfi $__USER32_DS
/*CFI_REL_OFFSET ss,0*/
-@@ -135,24 +157,49 @@ ENTRY(ia32_sysenter_target)
+@@ -134,25 +156,44 @@ ENTRY(ia32_sysenter_target)
CFI_REL_OFFSET rsp,0
pushfq_cfi
/*CFI_REL_OFFSET rflags,0*/
-- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
+- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
- CFI_REGISTER rip,r10
+ orl $X86_EFLAGS_IF,(%rsp)
+ GET_THREAD_INFO(%r11)
@@ -13416,88 +10658,86 @@ index 4299eb0..904b82a 100644
32bit zero extended */
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ addq pax_user_shadow_base,%rbp
-+ ASM_PAX_OPEN_USERLAND
++ mov pax_user_shadow_base,%r11
++ 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)
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ ASM_PAX_CLOSE_USERLAND
-+#endif
-+
+ .section __ex_table,"a"
+ .quad 1b,ia32_badarg
+ .previous
+- GET_THREAD_INFO(%r10)
+- orl $TS_COMPAT,TI_status(%r10)
+- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
+ GET_THREAD_INFO(%r11)
+ orl $TS_COMPAT,TI_status(%r11)
+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
CFI_REMEMBER_STATE
jnz sysenter_tracesys
cmpq $(IA32_NR_syscalls-1),%rax
-@@ -162,12 +209,15 @@ sysenter_do_call:
+@@ -162,13 +203,15 @@ sysenter_do_call:
sysenter_dispatch:
call *ia32_sys_call_table(,%rax,8)
movq %rax,RAX-ARGOFFSET(%rsp)
+- GET_THREAD_INFO(%r10)
+ GET_THREAD_INFO(%r11)
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
-- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
jnz sysexit_audit
sysexit_from_sys_call:
-- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+- andl $~TS_COMPAT,TI_status(%r10)
+ pax_exit_kernel_user
+ pax_erase_kstack
+ andl $~TS_COMPAT,TI_status(%r11)
/* clear IF, that popfq doesn't enable interrupts early */
andl $~0x200,EFLAGS-R11(%rsp)
movl RIP-R11(%rsp),%edx /* User %eip */
-@@ -193,6 +243,9 @@ sysexit_from_sys_call:
+@@ -194,6 +237,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
+ call audit_syscall_entry
+
+ pax_erase_kstack
+
movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
cmpq $(IA32_NR_syscalls-1),%rax
ja ia32_badsys
-@@ -204,7 +257,7 @@ sysexit_from_sys_call:
+@@ -205,7 +251,7 @@ sysexit_from_sys_call:
.endm
.macro auditsys_exit exit
-- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
jnz ia32_ret_from_sys_call
TRACE_IRQS_ON
ENABLE_INTERRUPTS(CLBR_NONE)
-@@ -215,11 +268,12 @@ sysexit_from_sys_call:
- 1: setbe %al /* 1 if error, 0 if not */
+@@ -215,12 +261,12 @@ sysexit_from_sys_call:
movzbl %al,%edi /* zero-extend that into %edi */
- call __audit_syscall_exit
+ inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
+ call audit_syscall_exit
+- GET_THREAD_INFO(%r10)
+ GET_THREAD_INFO(%r11)
- movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
+ movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */
movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
-- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+- testl %edi,TI_flags(%r10)
+ testl %edi,TI_flags(%r11)
jz \exit
CLEAR_RREGS -ARGOFFSET
jmp int_with_check
-@@ -237,7 +291,7 @@ sysexit_audit:
+@@ -238,7 +284,7 @@ sysexit_audit:
sysenter_tracesys:
#ifdef CONFIG_AUDITSYSCALL
-- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
jz sysenter_auditsys
#endif
SAVE_REST
-@@ -249,6 +303,9 @@ sysenter_tracesys:
+@@ -250,6 +296,9 @@ sysenter_tracesys:
RESTORE_REST
cmpq $(IA32_NR_syscalls-1),%rax
ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
@@ -13507,7 +10747,7 @@ index 4299eb0..904b82a 100644
jmp sysenter_do_call
CFI_ENDPROC
ENDPROC(ia32_sysenter_target)
-@@ -276,19 +333,25 @@ ENDPROC(ia32_sysenter_target)
+@@ -277,19 +326,25 @@ ENDPROC(ia32_sysenter_target)
ENTRY(ia32_cstar_target)
CFI_STARTPROC32 simple
CFI_SIGNAL_FRAME
@@ -13535,62 +10775,58 @@ index 4299eb0..904b82a 100644
movl %eax,%eax /* zero extension */
movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
movq %rcx,RIP-ARGOFFSET(%rsp)
-@@ -304,12 +367,25 @@ ENTRY(ia32_cstar_target)
+@@ -305,13 +360,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 */
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ ASM_PAX_OPEN_USERLAND
-+ movq pax_user_shadow_base,%r8
-+ addq RSP-ARGOFFSET(%rsp),%r8
++ mov pax_user_shadow_base,%r11
++ 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)
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ ASM_PAX_CLOSE_USERLAND
-+#endif
-+
+ .section __ex_table,"a"
+ .quad 1b,ia32_badarg
+ .previous
+- GET_THREAD_INFO(%r10)
+- orl $TS_COMPAT,TI_status(%r10)
+- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
+ GET_THREAD_INFO(%r11)
+ orl $TS_COMPAT,TI_status(%r11)
+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
CFI_REMEMBER_STATE
jnz cstar_tracesys
cmpq $IA32_NR_syscalls-1,%rax
-@@ -319,12 +395,15 @@ cstar_do_call:
+@@ -321,13 +382,15 @@ cstar_do_call:
cstar_dispatch:
call *ia32_sys_call_table(,%rax,8)
movq %rax,RAX-ARGOFFSET(%rsp)
+- GET_THREAD_INFO(%r10)
+ GET_THREAD_INFO(%r11)
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
-- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
jnz sysretl_audit
sysretl_from_sys_call:
-- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+- andl $~TS_COMPAT,TI_status(%r10)
+ pax_exit_kernel_user
+ pax_erase_kstack
+ andl $~TS_COMPAT,TI_status(%r11)
RESTORE_ARGS 0,-ARG_SKIP,0,0,0
movl RIP-ARGOFFSET(%rsp),%ecx
CFI_REGISTER rip,rcx
-@@ -352,7 +431,7 @@ sysretl_audit:
+@@ -355,7 +418,7 @@ sysretl_audit:
cstar_tracesys:
#ifdef CONFIG_AUDITSYSCALL
-- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
jz cstar_auditsys
#endif
xchgl %r9d,%ebp
-@@ -366,11 +445,19 @@ cstar_tracesys:
+@@ -369,6 +432,9 @@ cstar_tracesys:
xchgl %ebp,%r9d
cmpq $(IA32_NR_syscalls-1),%rax
ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
@@ -13600,17 +10836,7 @@ index 4299eb0..904b82a 100644
jmp cstar_do_call
END(ia32_cstar_target)
- ia32_badarg:
- ASM_CLAC
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ ASM_PAX_CLOSE_USERLAND
-+#endif
-+
- movq $-EFAULT,%rax
- jmp ia32_sysret
- CFI_ENDPROC
-@@ -407,19 +494,26 @@ ENTRY(ia32_syscall)
+@@ -409,20 +475,26 @@ ENTRY(ia32_syscall)
CFI_REL_OFFSET rip,RIP-RIP
PARAVIRT_ADJUST_EXCEPTION_FRAME
SWAPGS
@@ -13625,8 +10851,9 @@ index 4299eb0..904b82a 100644
/* note the registers are not zero extended to the sf.
this could be a problem. */
SAVE_ARGS 0,1,0
-- 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(%r10)
+- orl $TS_COMPAT,TI_status(%r10)
+- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
+ pax_enter_kernel_user
+
+#ifdef CONFIG_PAX_RANDKSTACK
@@ -13644,7 +10871,7 @@ index 4299eb0..904b82a 100644
jnz ia32_tracesys
cmpq $(IA32_NR_syscalls-1),%rax
ja ia32_badsys
-@@ -442,6 +536,9 @@ ia32_tracesys:
+@@ -445,6 +517,9 @@ ia32_tracesys:
RESTORE_REST
cmpq $(IA32_NR_syscalls-1),%rax
ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
@@ -13654,8 +10881,16 @@ index 4299eb0..904b82a 100644
jmp ia32_do_call
END(ia32_syscall)
+@@ -455,6 +530,7 @@ ia32_badsys:
+
+ quiet_ni_syscall:
+ movq $-ENOSYS,%rax
++ pax_force_retaddr
+ ret
+ CFI_ENDPROC
+
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
-index 8e0ceec..af13504 100644
+index f6f5c53..8e51d70 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,
@@ -13666,14 +10901,90 @@ index 8e0ceec..af13504 100644
- typeof(ubuf->st_gid) gid = 0;
+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
- SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
- SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
+ SET_UID(uid, stat->uid);
+ SET_GID(gid, stat->gid);
if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
+@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
+ }
+ set_fs(KERNEL_DS);
+ ret = sys_rt_sigprocmask(how,
+- set ? (sigset_t __user *)&s : NULL,
+- oset ? (sigset_t __user *)&s : NULL,
++ set ? (sigset_t __force_user *)&s : NULL,
++ oset ? (sigset_t __force_user *)&s : NULL,
+ sigsetsize);
+ set_fs(old_fs);
+ if (ret)
+@@ -332,7 +332,7 @@ asmlinkage long sys32_alarm(unsigned int seconds)
+ return alarm_setitimer(seconds);
+ }
+
+-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);
+@@ -353,7 +353,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
+ mm_segment_t old_fs = get_fs();
+
+ set_fs(KERNEL_DS);
+- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
++ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
+ set_fs(old_fs);
+ if (put_compat_timespec(&t, interval))
+ return -EFAULT;
+@@ -363,13 +363,13 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
+ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
+ compat_size_t sigsetsize)
+ {
+- sigset_t s;
++ sigset_t s = { };
+ compat_sigset_t s32;
+ int ret;
+ mm_segment_t old_fs = get_fs();
+
+ set_fs(KERNEL_DS);
+- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
++ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
+ set_fs(old_fs);
+ if (!ret) {
+ switch (_NSIG_WORDS) {
+@@ -394,7 +394,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
+ if (copy_siginfo_from_user32(&info, uinfo))
+ return -EFAULT;
+ set_fs(KERNEL_DS);
+- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
++ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
+ set_fs(old_fs);
+ return ret;
+ }
+@@ -439,7 +439,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
+ return -EFAULT;
+
+ set_fs(KERNEL_DS);
+- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
++ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
+ count);
+ set_fs(old_fs);
+
diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
-index 372231c..a5aa1a1 100644
+index 091508b..7692c6f 100644
--- a/arch/x86/include/asm/alternative-asm.h
+++ b/arch/x86/include/asm/alternative-asm.h
-@@ -18,6 +18,45 @@
+@@ -4,10 +4,10 @@
+
+ #ifdef CONFIG_SMP
+ .macro LOCK_PREFIX
+-1: lock
++672: lock
+ .section .smp_locks,"a"
+ .balign 4
+- .long 1b - .
++ .long 672b - .
+ .previous
+ .endm
+ #else
+@@ -15,6 +15,45 @@
.endm
#endif
@@ -13720,29 +11031,20 @@ index 372231c..a5aa1a1 100644
.long \orig - .
.long \alt - .
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
-index 0a3f9c9..c9d081d 100644
+index 37ad100..7d47faa 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
-@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
- ".pushsection .discard,\"aw\",@progbits\n" \
- DISCARD_ENTRY(1) \
- ".popsection\n" \
-- ".pushsection .altinstr_replacement, \"ax\"\n" \
-+ ".pushsection .altinstr_replacement, \"a\"\n" \
- ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
- ".popsection"
-
-@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
- DISCARD_ENTRY(1) \
- DISCARD_ENTRY(2) \
- ".popsection\n" \
-- ".pushsection .altinstr_replacement, \"ax\"\n" \
-+ ".pushsection .altinstr_replacement, \"a\"\n" \
- ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
- ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
- ".popsection"
+@@ -89,7 +89,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
+ ".section .discard,\"aw\",@progbits\n" \
+ " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
+ ".previous\n" \
+- ".section .altinstr_replacement, \"ax\"\n" \
++ ".section .altinstr_replacement, \"a\"\n" \
+ "663:\n\t" newinstr "\n664:\n" /* replacement */ \
+ ".previous"
+
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
-index 1d2091a..f5074c1 100644
+index 1a6c09a..fec2432 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
@@ -13777,7 +11079,7 @@ index 20370c6..a2eb9b0 100644
"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 722aa3b..3a0bb27 100644
+index 58cb6d4..a4b806c 100644
--- a/arch/x86/include/asm/atomic.h
+++ b/arch/x86/include/asm/atomic.h
@@ -22,7 +22,18 @@
@@ -14030,14 +11332,19 @@ index 722aa3b..3a0bb27 100644
: "+m" (v->counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -172,6 +334,18 @@ static inline int atomic_add_negative(int i, atomic_t *v)
- */
- static inline int atomic_add_return(int i, atomic_t *v)
- {
+@@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
+ goto no_xadd;
+ #endif
+ /* Modern 486+ processor */
+- return i + xadd(&v->counter, i);
+ return i + xadd_check_overflow(&v->counter, i);
-+}
-+
-+/**
+
+ #ifdef CONFIG_M386
+ no_xadd: /* Legacy 386 processor */
+@@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
+ }
+
+ /**
+ * atomic_add_return_unchecked - add integer and return
+ * @i: integer value to add
+ * @v: pointer of type atomic_unchecked_t
@@ -14046,10 +11353,30 @@ index 722aa3b..3a0bb27 100644
+ */
+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
+{
- return i + xadd(&v->counter, i);
- }
-
-@@ -188,6 +362,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
++#ifdef CONFIG_M386
++ int __i;
++ unsigned long flags;
++ if (unlikely(boot_cpu_data.x86 <= 3))
++ goto no_xadd;
++#endif
++ /* Modern 486+ processor */
++ return i + xadd(&v->counter, i);
++
++#ifdef CONFIG_M386
++no_xadd: /* Legacy 386 processor */
++ raw_local_irq_save(flags);
++ __i = atomic_read_unchecked(v);
++ atomic_set_unchecked(v, i + __i);
++ raw_local_irq_restore(flags);
++ return i + __i;
++#endif
++}
++
++/**
+ * atomic_sub_return - subtract integer and return
+ * @v: pointer of type atomic_t
+ * @i: integer value to subtract
+@@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
}
#define atomic_inc_return(v) (atomic_add_return(1, v))
@@ -14060,7 +11387,7 @@ index 722aa3b..3a0bb27 100644
#define atomic_dec_return(v) (atomic_sub_return(1, v))
static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
-@@ -195,11 +373,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+@@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
return cmpxchg(&v->counter, old, new);
}
@@ -14082,7 +11409,7 @@ index 722aa3b..3a0bb27 100644
/**
* __atomic_add_unless - add unless the number is already a given value
* @v: pointer of type atomic_t
-@@ -211,12 +399,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
+@@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
*/
static inline int __atomic_add_unless(atomic_t *v, int a, int u)
{
@@ -14111,10 +11438,11 @@ index 722aa3b..3a0bb27 100644
if (likely(old == c))
break;
c = old;
-@@ -225,6 +426,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+ return c;
}
- /**
++/**
+ * atomic_inc_not_zero_hint - increment if not null
+ * @v: pointer of type atomic_t
+ * @hint: probable value of the atomic before the increment
@@ -14156,12 +11484,10 @@ index 722aa3b..3a0bb27 100644
+
+ return 0;
+}
-+
-+/**
- * atomic_inc_short - increment of a short integer
- * @v: pointer to type int
- *
-@@ -253,14 +497,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
+
+ /*
+ * 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)
#endif
/* These are x86-specific, used by some header files */
@@ -14207,7 +11533,7 @@ index 722aa3b..3a0bb27 100644
/* Atomic operations are already serializing on x86 */
#define smp_mb__before_atomic_dec() barrier()
diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
-index b154de7..aadebd8 100644
+index 24098aa..1e37723 100644
--- a/arch/x86/include/asm/atomic64_32.h
+++ b/arch/x86/include/asm/atomic64_32.h
@@ -12,6 +12,14 @@ typedef struct {
@@ -14224,40 +11550,8 @@ index b154de7..aadebd8 100644
+
#define ATOMIC64_INIT(val) { (val) }
- #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
-@@ -37,21 +45,31 @@ typedef struct {
- ATOMIC64_DECL_ONE(sym##_386)
-
- ATOMIC64_DECL_ONE(add_386);
-+ATOMIC64_DECL_ONE(add_unchecked_386);
- ATOMIC64_DECL_ONE(sub_386);
-+ATOMIC64_DECL_ONE(sub_unchecked_386);
- ATOMIC64_DECL_ONE(inc_386);
-+ATOMIC64_DECL_ONE(inc_unchecked_386);
- ATOMIC64_DECL_ONE(dec_386);
-+ATOMIC64_DECL_ONE(dec_unchecked_386);
- #endif
-
- #define alternative_atomic64(f, out, in...) \
- __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
-
- ATOMIC64_DECL(read);
-+ATOMIC64_DECL(read_unchecked);
- ATOMIC64_DECL(set);
-+ATOMIC64_DECL(set_unchecked);
- ATOMIC64_DECL(xchg);
- ATOMIC64_DECL(add_return);
-+ATOMIC64_DECL(add_return_unchecked);
- ATOMIC64_DECL(sub_return);
-+ATOMIC64_DECL(sub_return_unchecked);
- ATOMIC64_DECL(inc_return);
-+ATOMIC64_DECL(inc_return_unchecked);
- ATOMIC64_DECL(dec_return);
-+ATOMIC64_DECL(dec_return_unchecked);
- ATOMIC64_DECL(dec_if_positive);
- ATOMIC64_DECL(inc_not_zero);
- ATOMIC64_DECL(add_unless);
-@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
+ #ifdef CONFIG_X86_CMPXCHG64
+@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
}
/**
@@ -14279,7 +11573,7 @@ index b154de7..aadebd8 100644
* atomic64_xchg - xchg atomic64 variable
* @v: pointer to type atomic64_t
* @n: value to assign
-@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
+@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i)
}
/**
@@ -14293,16 +11587,18 @@ index b154de7..aadebd8 100644
+{
+ unsigned high = (unsigned)(i >> 32);
+ unsigned low = (unsigned)i;
-+ alternative_atomic64(set, /* no output */,
-+ "S" (v), "b" (low), "c" (high)
-+ : "eax", "edx", "memory");
++ asm volatile(ATOMIC64_ALTERNATIVE(set)
++ : "+b" (low), "+c" (high)
++ : "S" (v)
++ : "eax", "edx", "memory"
++ );
+}
+
+/**
* atomic64_read - read atomic64 variable
* @v: pointer to type atomic64_t
*
-@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
+@@ -93,6 +134,22 @@ static inline long long atomic64_read(atomic64_t *v)
}
/**
@@ -14314,7 +11610,10 @@ index b154de7..aadebd8 100644
+static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
+{
+ long long r;
-+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
++ asm volatile(ATOMIC64_ALTERNATIVE(read_unchecked)
++ : "=A" (r), "+c" (v)
++ : : "memory"
++ );
+ return r;
+ }
+
@@ -14322,7 +11621,7 @@ index b154de7..aadebd8 100644
* atomic64_add_return - add and return
* @i: integer value to add
* @v: pointer to type atomic64_t
-@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
+@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
return i;
}
@@ -14335,31 +11634,35 @@ index b154de7..aadebd8 100644
+ */
+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
+{
-+ alternative_atomic64(add_return_unchecked,
-+ ASM_OUTPUT2("+A" (i), "+c" (v)),
-+ ASM_NO_INPUT_CLOBBER("memory"));
++ asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
++ : "+A" (i), "+c" (v)
++ : : "memory"
++ );
+ return i;
+}
+
/*
* Other variants with different arithmetic operators:
*/
-@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
+@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v)
return a;
}
+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
+{
+ long long a;
-+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
-+ "S" (v) : "memory", "ecx");
++ asm volatile(ATOMIC64_ALTERNATIVE(inc_return_unchecked)
++ : "=A" (a)
++ : "S" (v)
++ : "memory", "ecx"
++ );
+ return a;
+}
+
static inline long long atomic64_dec_return(atomic64_t *v)
{
long long a;
-@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
+@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
}
/**
@@ -14371,9 +11674,10 @@ index b154de7..aadebd8 100644
+ */
+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
+{
-+ __alternative_atomic64(add_unchecked, add_return_unchecked,
-+ ASM_OUTPUT2("+A" (i), "+c" (v)),
-+ ASM_NO_INPUT_CLOBBER("memory"));
++ asm volatile(ATOMIC64_ALTERNATIVE_(add_unchecked, add_return_unchecked)
++ : "+A" (i), "+c" (v)
++ : : "memory"
++ );
+ return i;
+}
+
@@ -14693,10 +11997,10 @@ index 0e1cbfc..5623683 100644
#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 41639ce..0bd8c87 100644
+index 1775d6e..c312a36 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
-@@ -48,7 +48,7 @@
+@@ -38,7 +38,7 @@
* a mask operation on a byte.
*/
#define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
@@ -14705,39 +12009,30 @@ index 41639ce..0bd8c87 100644
#define CONST_MASK(nr) (1 << ((nr) & 7))
/**
-@@ -361,7 +361,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
+@@ -344,7 +344,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
*
* Undefined if no bit exists, so code should check against 0 first.
*/
-static inline unsigned long __ffs(unsigned long word)
+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
{
- asm("rep; bsf %1,%0"
+ asm("bsf %1,%0"
: "=r" (word)
-@@ -375,7 +375,7 @@ static inline unsigned long __ffs(unsigned long word)
+@@ -358,7 +358,7 @@ static inline unsigned long __ffs(unsigned long word)
*
* Undefined if no zero exists, so code should check against ~0UL first.
*/
-static inline unsigned long ffz(unsigned long word)
+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
{
- asm("rep; bsf %1,%0"
+ asm("bsf %1,%0"
: "=r" (word)
-@@ -494,7 +494,7 @@ static inline int fls(int x)
- * at position 64.
- */
- #ifdef CONFIG_X86_64
--static __always_inline int fls64(__u64 x)
-+static __always_inline long fls64(__u64 x)
- {
- int bitpos = -1;
- /*
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
-index 4fa687a..60f2d39 100644
+index 5e1a2ee..c9f9533 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
-@@ -6,10 +6,15 @@
- #include <uapi/asm/boot.h>
+@@ -11,10 +11,15 @@
+ #include <asm/pgtable_types.h>
/* Physical address where kernel should be loaded. */
-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
@@ -14774,10 +12069,10 @@ index 48f99f1..d78ebf9 100644
#ifdef CONFIG_X86_VSMP
#ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
-index 9863ee3..4a1f8e1 100644
+index 4e12668..501d239 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
-@@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
+@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
unsigned long pg_flags = pg->flags & _PGMT_MASK;
if (pg_flags == _PGMT_DEFAULT)
@@ -14787,7 +12082,7 @@ index 9863ee3..4a1f8e1 100644
return _PAGE_CACHE_WC;
else if (pg_flags == _PGMT_UC_MINUS)
diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
-index f50de69..2b0a458 100644
+index 46fc474..b02b0f9 100644
--- a/arch/x86/include/asm/checksum_32.h
+++ b/arch/x86/include/asm/checksum_32.h
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
@@ -14805,51 +12100,47 @@ index f50de69..2b0a458 100644
/*
* Note: when you get a NULL pointer exception here this means someone
* passed in an incorrect kernel address to one of these functions.
-@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
-
+@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
+ int *err_ptr)
+ {
might_sleep();
- stac();
-- ret = csum_partial_copy_generic((__force void *)src, dst,
-+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
- len, sum, err_ptr, NULL);
- clac();
+- return csum_partial_copy_generic((__force void *)src, dst,
++ return csum_partial_copy_generic_from_user((__force void *)src, dst,
+ len, sum, err_ptr, NULL);
+ }
-@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
+@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
+ {
might_sleep();
- if (access_ok(VERIFY_WRITE, dst, len)) {
- stac();
-- ret = csum_partial_copy_generic(src, (__force void *)dst,
-+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
- len, sum, NULL, err_ptr);
- clac();
- return ret;
+ if (access_ok(VERIFY_WRITE, dst, len))
+- return csum_partial_copy_generic(src, (__force void *)dst,
++ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
+ len, sum, NULL, err_ptr);
+
+ if (len)
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
-index d47786a..ce1b05d 100644
+index 5d3acdf..6447a02 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)
+@@ -14,6 +14,8 @@ extern void __cmpxchg_wrong_size(void)
__compiletime_error("Bad argument size for cmpxchg");
extern void __xadd_wrong_size(void)
__compiletime_error("Bad argument size for xadd");
+extern void __xadd_check_overflow_wrong_size(void)
+ __compiletime_error("Bad argument size for xadd_check_overflow");
- extern void __add_wrong_size(void)
- __compiletime_error("Bad argument size for add");
-+extern void __add_check_overflow_wrong_size(void)
-+ __compiletime_error("Bad argument size for add_check_overflow");
/*
* Constants for operation sizes. On 32-bit, the 64-bit size it set to
-@@ -67,6 +71,34 @@ extern void __add_wrong_size(void)
+@@ -195,6 +197,34 @@ extern void __xadd_wrong_size(void)
__ret; \
})
-+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
++#define __xadd_check_overflow(ptr, inc, lock) \
+ ({ \
-+ __typeof__ (*(ptr)) __ret = (arg); \
++ __typeof__ (*(ptr)) __ret = (inc); \
+ switch (sizeof(*(ptr))) { \
+ case __X86_CASE_L: \
-+ asm volatile (lock #op "l %0, %1\n" \
++ asm volatile (lock "xaddl %0, %1\n" \
+ "jno 0f\n" \
+ "mov %0,%1\n" \
+ "int $4\n0:\n" \
@@ -14858,7 +12149,7 @@ index d47786a..ce1b05d 100644
+ : : "memory", "cc"); \
+ break; \
+ case __X86_CASE_Q: \
-+ asm volatile (lock #op "q %q0, %1\n" \
++ asm volatile (lock "xaddq %q0, %1\n" \
+ "jno 0f\n" \
+ "mov %0,%1\n" \
+ "int $4\n0:\n" \
@@ -14867,78 +12158,50 @@ index d47786a..ce1b05d 100644
+ : : "memory", "cc"); \
+ break; \
+ default: \
-+ __ ## op ## _check_overflow_wrong_size(); \
++ __xadd_check_overflow_wrong_size(); \
+ } \
+ __ret; \
+ })
+
/*
- * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
- * Since this is generally used to protect other memory information, we
-@@ -167,6 +199,9 @@ extern void __add_wrong_size(void)
+ * xadd() adds "inc" to "*ptr" and atomically returns the previous
+ * value of "*ptr".
+@@ -207,4 +237,6 @@ extern void __xadd_wrong_size(void)
#define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
#define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
-+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
-+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
++#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
+
- #define __add(ptr, inc, lock) \
- ({ \
- __typeof__ (*(ptr)) __ret = (inc); \
+ #endif /* ASM_X86_CMPXCHG_H */
diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
-index 59c6c40..5e0b22c 100644
+index 30d737e..9830a9b 100644
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
-@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
- typedef u32 compat_uint_t;
- typedef u32 compat_ulong_t;
- typedef u64 __attribute__((aligned(4))) compat_u64;
--typedef u32 compat_uptr_t;
+@@ -194,7 +194,7 @@ typedef struct user_regs_struct32 compat_elf_gregset_t;
+ * as pointers because the syscall entry code will have
+ * appropriately converted them already.
+ */
+-typedef u32 compat_uptr_t;
+typedef u32 __user compat_uptr_t;
- struct compat_timespec {
- compat_time_t tv_sec;
+ static inline void __user *compat_ptr(compat_uptr_t uptr)
+ {
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
-index 89270b4..f0abf8e 100644
+index 0c3b775..8cadbc6 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
-@@ -203,7 +203,7 @@
- #define X86_FEATURE_DECODEASSISTS (8*32+12) /* AMD Decode Assists support */
- #define X86_FEATURE_PAUSEFILTER (8*32+13) /* AMD filtered pause intercept */
- #define X86_FEATURE_PFTHRESHOLD (8*32+14) /* AMD pause filter threshold */
--
-+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
+@@ -197,8 +197,9 @@
/* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
#define X86_FEATURE_FSGSBASE (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
-@@ -211,7 +211,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_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
+#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
- #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 */
-@@ -353,6 +353,7 @@ extern const char * const x86_power_flags[32];
- #undef cpu_has_centaur_mcr
- #define cpu_has_centaur_mcr 0
-
-+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
- #endif /* CONFIG_X86_64 */
-
- #if __GNUC__ >= 4
-@@ -405,7 +406,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
++#define X86_FEATURE_SMAP (9*32+20) /* Supervisor Mode Access Prevention */
- #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
- t_warn:
-- warn_pre_alternatives();
-+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
-+ warn_pre_alternatives();
- return false;
- #endif
+ #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
-@@ -425,7 +427,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+@@ -363,7 +364,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"
@@ -14947,35 +12210,8 @@ index 89270b4..f0abf8e 100644
"3: movb $1,%0\n"
"4:\n"
".previous\n"
-@@ -462,7 +464,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
- " .byte 2b - 1b\n" /* src len */
- " .byte 4f - 3f\n" /* repl len */
- ".previous\n"
-- ".section .altinstr_replacement,\"ax\"\n"
-+ ".section .altinstr_replacement,\"a\"\n"
- "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
- "4:\n"
- ".previous\n"
-@@ -495,7 +497,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
- ".section .discard,\"aw\",@progbits\n"
- " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
- ".previous\n"
-- ".section .altinstr_replacement,\"ax\"\n"
-+ ".section .altinstr_replacement,\"a\"\n"
- "3: movb $0,%0\n"
- "4:\n"
- ".previous\n"
-@@ -509,7 +511,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
- ".section .discard,\"aw\",@progbits\n"
- " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
- ".previous\n"
-- ".section .altinstr_replacement,\"ax\"\n"
-+ ".section .altinstr_replacement,\"a\"\n"
- "5: movb $1,%0\n"
- "6:\n"
- ".previous\n"
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index b90e5df..b462c91 100644
+index 41935fa..2be7ac3 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -4,6 +4,7 @@
@@ -14985,8 +12221,8 @@ index b90e5df..b462c91 100644
+#include <asm/pgtable.h>
#include <linux/smp.h>
- #include <linux/percpu.h>
-@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
+
+@@ -16,6 +17,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
desc->type = (info->read_exec_only ^ 1) << 1;
desc->type |= info->contents << 2;
@@ -14994,22 +12230,18 @@ index b90e5df..b462c91 100644
desc->s = 1;
desc->dpl = 0x3;
-@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
+@@ -34,17 +36,12 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
}
extern struct desc_ptr idt_descr;
-extern gate_desc idt_table[];
--extern struct desc_ptr debug_idt_descr;
--extern gate_desc debug_idt_table[];
-
-struct gdt_page {
- struct desc_struct gdt[GDT_ENTRIES];
-} __attribute__((aligned(PAGE_SIZE)));
-
-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
-+extern gate_desc idt_table[IDT_ENTRIES];
-+extern const struct desc_ptr debug_idt_descr;
-+extern gate_desc debug_idt_table[IDT_ENTRIES];
++extern gate_desc idt_table[256];
+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
@@ -15019,7 +12251,7 @@ index b90e5df..b462c91 100644
}
#ifdef CONFIG_X86_64
-@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
+@@ -69,8 +66,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
unsigned long base, unsigned dpl, unsigned flags,
unsigned short seg)
{
@@ -15036,7 +12268,7 @@ index b90e5df..b462c91 100644
}
#endif
-@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
+@@ -115,12 +118,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
{
@@ -15053,7 +12285,7 @@ index b90e5df..b462c91 100644
}
static inline void
-@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
+@@ -134,7 +141,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
default: size = sizeof(*gdt); break;
}
@@ -15063,7 +12295,7 @@ index b90e5df..b462c91 100644
}
static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
-@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
+@@ -207,7 +216,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
static inline void native_load_tr_desc(void)
{
@@ -15073,7 +12305,7 @@ index b90e5df..b462c91 100644
}
static inline void native_load_gdt(const struct desc_ptr *dtr)
-@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
+@@ -244,8 +255,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
struct desc_struct *gdt = get_cpu_gdt_table(cpu);
unsigned int i;
@@ -15084,7 +12316,7 @@ index b90e5df..b462c91 100644
}
#define _LDT_empty(info) \
-@@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
+@@ -284,7 +297,7 @@ static inline void load_LDT(mm_context_t *pc)
preempt_enable();
}
@@ -15093,36 +12325,16 @@ index b90e5df..b462c91 100644
{
return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
}
-@@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
- }
-
- #ifdef CONFIG_X86_64
--static inline void set_nmi_gate(int gate, void *addr)
-+static inline void set_nmi_gate(int gate, const void *addr)
- {
- gate_desc s;
-
-@@ -321,8 +334,8 @@ static inline void set_nmi_gate(int gate, void *addr)
- #endif
-
- #ifdef CONFIG_TRACING
--extern struct desc_ptr trace_idt_descr;
--extern gate_desc trace_idt_table[];
-+extern const struct desc_ptr trace_idt_descr;
-+extern gate_desc trace_idt_table[IDT_ENTRIES];
- static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
- {
- write_idt_entry(trace_idt_table, entry, gate);
-@@ -333,7 +346,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
+@@ -307,7 +320,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
+ desc->limit = (limit >> 16) & 0xf;
}
- #endif
-static inline void _set_gate(int gate, unsigned type, void *addr,
+static inline void _set_gate(int gate, unsigned type, const void *addr,
unsigned dpl, unsigned ist, unsigned seg)
{
gate_desc s;
-@@ -353,7 +366,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
+@@ -326,7 +339,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
* Pentium F0 0F bugfix can have resulted in the mapped
* IDT being write-protected.
*/
@@ -15131,7 +12343,7 @@ index b90e5df..b462c91 100644
{
BUG_ON((unsigned)n > 0xFF);
_set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
-@@ -410,19 +423,19 @@ static inline void __alloc_intr_gate(unsigned int n, void *addr)
+@@ -356,19 +369,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
/*
* This routine sets up an interrupt gate at directory privilege level 3.
*/
@@ -15154,7 +12366,7 @@ index b90e5df..b462c91 100644
{
BUG_ON((unsigned)n > 0xFF);
_set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
-@@ -431,16 +444,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
+@@ -377,19 +390,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
{
BUG_ON((unsigned)n > 0xFF);
@@ -15174,11 +12386,8 @@ index b90e5df..b462c91 100644
{
BUG_ON((unsigned)n > 0xFF);
_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
-@@ -512,4 +525,17 @@ static inline void load_current_idt(void)
- else
- load_idt((const struct desc_ptr *)&idt_descr);
}
-+
+
+#ifdef CONFIG_X86_32
+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
+{
@@ -15210,10 +12419,10 @@ index 278441f..b95a174 100644
} __attribute__((packed));
diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
-index ced283a..ffe04cc 100644
+index 9a2d644..5abb141 100644
--- a/arch/x86/include/asm/div64.h
+++ b/arch/x86/include/asm/div64.h
-@@ -39,7 +39,7 @@
+@@ -33,7 +33,7 @@
__mod; \
})
@@ -15222,11 +12431,24 @@ index ced283a..ffe04cc 100644
{
union {
u64 v64;
+diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
+index 908b969..a1f4eb4 100644
+--- a/arch/x86/include/asm/e820.h
++++ b/arch/x86/include/asm/e820.h
+@@ -69,7 +69,7 @@ struct e820map {
+ #define ISA_START_ADDRESS 0xa0000
+ #define ISA_END_ADDRESS 0x100000
+
+-#define BIOS_BEGIN 0x000a0000
++#define BIOS_BEGIN 0x000c0000
+ #define BIOS_END 0x00100000
+
+ #define BIOS_ROM_BASE 0xffe00000
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
-index 9c999c1..3860cb8 100644
+index 5f962df..7289f09 100644
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
-@@ -243,7 +243,25 @@ extern int force_personality32;
+@@ -238,7 +238,25 @@ extern int force_personality32;
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. */
@@ -15245,14 +12467,14 @@ index 9c999c1..3860cb8 100644
+#else
+#define PAX_ELF_ET_DYN_BASE 0x400000UL
+
-+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
-+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
++#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
++#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
+#endif
+#endif
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
-@@ -296,16 +314,12 @@ do { \
+@@ -291,9 +309,7 @@ do { \
#define ARCH_DLINFO \
do { \
@@ -15262,16 +12484,8 @@ index 9c999c1..3860cb8 100644
+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
} while (0)
- #define ARCH_DLINFO_X32 \
- do { \
-- if (vdso_enabled) \
-- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
-- (unsigned long)current->mm->context.vdso); \
-+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
- } while (0)
-
#define AT_SYSINFO 32
-@@ -320,7 +334,7 @@ else \
+@@ -304,7 +320,7 @@ do { \
#endif /* !CONFIG_X86_32 */
@@ -15280,7 +12494,7 @@ index 9c999c1..3860cb8 100644
#define VDSO_ENTRY \
((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
-@@ -336,9 +350,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
+@@ -318,9 +334,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
#define compat_arch_setup_additional_pages syscall32_setup_pages
@@ -15291,83 +12505,47 @@ index 9c999c1..3860cb8 100644
* True on X86_32 or when emulating IA32 on X86_64
*/
diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
-index 77a99ac..39ff7f5 100644
+index cc70c1c..d96d011 100644
--- a/arch/x86/include/asm/emergency-restart.h
+++ b/arch/x86/include/asm/emergency-restart.h
-@@ -1,6 +1,6 @@
- #ifndef _ASM_X86_EMERGENCY_RESTART_H
- #define _ASM_X86_EMERGENCY_RESTART_H
+@@ -15,6 +15,6 @@ enum reboot_type {
+
+ extern enum reboot_type reboot_type;
-extern void machine_emergency_restart(void);
+extern void machine_emergency_restart(void) __noreturn;
#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 4d0bda7..221da4d 100644
---- a/arch/x86/include/asm/fpu-internal.h
-+++ b/arch/x86/include/asm/fpu-internal.h
-@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
- #define user_insn(insn, output, input...) \
- ({ \
- int err; \
-+ pax_open_userland(); \
- 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" \
-@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
- _ASM_EXTABLE(1b, 3b) \
- : [err] "=r" (err), output \
- : "0"(0), input); \
-+ pax_close_userland(); \
- err; \
- })
-
-@@ -298,7 +302,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[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 be27ba1..04a8801 100644
+index d09bb03..0a3629b 100644
--- a/arch/x86/include/asm/futex.h
+++ b/arch/x86/include/asm/futex.h
-@@ -12,6 +12,7 @@
- #include <asm/smap.h>
+@@ -12,20 +12,22 @@
+ #include <asm/system.h>
#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
+ typecheck(u32 __user *, uaddr); \
- asm volatile("\t" ASM_STAC "\n" \
- "1:\t" insn "\n" \
- "2:\t" ASM_CLAC "\n" \
-@@ -20,15 +21,16 @@
+ asm volatile("1:\t" insn "\n" \
+ "2:\t.section .fixup,\"ax\"\n" \
+ "3:\tmov\t%3, %1\n" \
"\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("\t" ASM_STAC "\n" \
- "1:\tmovl %2, %0\n" \
+ asm volatile("1:\tmovl %2, %0\n" \
"\tmovl\t%0, %3\n" \
"\t" insn "\n" \
- "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 @@
+ "3:\t.section .fixup,\"ax\"\n" \
+ "4:\tmov\t%5, %1\n" \
+@@ -34,7 +36,7 @@
_ASM_EXTABLE(1b, 4b) \
_ASM_EXTABLE(2b, 4b) \
: "=&a" (oldval), "=&r" (ret), \
@@ -15376,11 +12554,8 @@ index be27ba1..04a8801 100644
: "r" (oparg), "i" (-EFAULT), "1" (0))
static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
-@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
-
- pagefault_disable();
+@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
-+ pax_open_userland();
switch (op) {
case FUTEX_OP_SET:
- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
@@ -15392,24 +12567,13 @@ index be27ba1..04a8801 100644
uaddr, oparg);
break;
case FUTEX_OP_OR:
-@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
- default:
- ret = -ENOSYS;
- }
-+ pax_close_userland();
-
- pagefault_enable();
-
-@@ -115,18 +119,20 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
return -EFAULT;
-+ pax_open_userland();
- 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"
+- 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"
"3:\tmov %3, %0\n"
"\tjmp 2b\n"
"\t.previous\n"
@@ -15419,15 +12583,11 @@ index be27ba1..04a8801 100644
: "i" (-EFAULT), "r" (newval), "1" (oldval)
: "memory"
);
-+ pax_close_userland();
-
- *uval = oldval;
- return ret;
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
-index 92b3bae..3866449 100644
+index eb92a6e..b98b2f4 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
-@@ -165,8 +165,8 @@ extern void setup_ioapic_dest(void);
+@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
extern void enable_IO_APIC(void);
/* Statistics */
@@ -15438,6 +12598,77 @@ index 92b3bae..3866449 100644
/* EISA */
extern void eisa_set_level_irq(unsigned int irq);
+diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
+index a850b4d..1d8dfb7 100644
+--- a/arch/x86/include/asm/i387.h
++++ b/arch/x86/include/asm/i387.h
+@@ -88,10 +88,12 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
+ }
+
+ #ifdef CONFIG_X86_64
+-static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
++static inline int fxrstor_checking(struct i387_fxsave_struct __user *fx)
+ {
+ int err;
+
++ fx = (struct i387_fxsave_struct __user *)____m(fx);
++
+ /* See comment in fxsave() below. */
+ #ifdef CONFIG_AS_FXSAVEQ
+ asm volatile("1: fxrstorq %[fx]\n\t"
+@@ -121,6 +123,8 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
+ {
+ int err;
+
++ fx = (struct i387_fxsave_struct __user *)____m(fx);
++
+ /*
+ * Clear the bytes not touched by the fxsave and reserved
+ * for the SW usage.
+@@ -189,15 +193,15 @@ static inline void fpu_fxsave(struct fpu *fpu)
+ #else /* CONFIG_X86_32 */
+
+ /* perform fxrstor iff the processor has extended states, otherwise frstor */
+-static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
++static inline int fxrstor_checking(struct i387_fxsave_struct __user *fx)
+ {
+ /*
+ * The "nop" is needed to make the instructions the same
+ * length.
+ */
+ alternative_input(
+- "nop ; frstor %1",
+- "fxrstor %1",
++ __copyuser_seg" frstor %1; nop",
++ __copyuser_seg" fxrstor %1",
+ X86_FEATURE_FXSR,
+ "m" (*fx));
+
+@@ -256,7 +260,14 @@ static inline int __save_init_fpu(struct task_struct *tsk)
+
+ static inline int fpu_fxrstor_checking(struct fpu *fpu)
+ {
+- return fxrstor_checking(&fpu->state->fxsave);
++ int ret;
++ mm_segment_t fs;
++
++ fs = get_fs();
++ set_fs(KERNEL_DS);
++ ret = fxrstor_checking(&fpu->state->fxsave);
++ set_fs(fs);
++ return ret;
+ }
+
+ static inline int fpu_restore_checking(struct fpu *fpu)
+@@ -424,7 +435,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
+ static inline bool interrupted_user_mode(void)
+ {
+ struct pt_regs *regs = get_irq_regs();
+- return regs && user_mode_vm(regs);
++ return regs && user_mode(regs);
+ }
+
+ /*
diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
index a203659..9889f1c 100644
--- a/arch/x86/include/asm/i8259.h
@@ -15451,8 +12682,25 @@ index a203659..9889f1c 100644
extern struct legacy_pic *legacy_pic;
extern struct legacy_pic null_legacy_pic;
+diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
+index 1f7e625..541485f 100644
+--- a/arch/x86/include/asm/ia32.h
++++ b/arch/x86/include/asm/ia32.h
+@@ -126,6 +126,12 @@ typedef struct compat_siginfo {
+ int _band; /* POLL_IN, POLL_OUT, POLL_MSG */
+ int _fd;
+ } _sigpoll;
++
++ struct {
++ unsigned int _call_addr; /* calling insn */
++ int _syscall; /* triggering system call number */
++ unsigned int _arch; /* AUDIT_ARCH_* of syscall */
++ } _sigsys;
+ } _sifields;
+ } compat_siginfo_t;
+
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
-index 34f69cb..6d95446 100644
+index d8e8eef..1765f78 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -51,12 +51,12 @@ static inline void name(type val, volatile void __iomem *addr) \
@@ -15516,10 +12764,10 @@ index bba3cf8..06bc8da 100644
#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 9454c16..e4100e3 100644
+index 5478825..839e88c 100644
--- a/arch/x86/include/asm/kprobes.h
+++ b/arch/x86/include/asm/kprobes.h
-@@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
+@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
#define RELATIVEJUMP_SIZE 5
#define RELATIVECALL_OPCODE 0xe8
#define RELATIVE_ADDR_SIZE 4
@@ -15535,11 +12783,24 @@ index 9454c16..e4100e3 100644
#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 cfb5a40..fc8880d 100644
+--- a/arch/x86/include/asm/kvm_host.h
++++ b/arch/x86/include/asm/kvm_host.h
+@@ -459,7 +459,7 @@ struct kvm_arch {
+ unsigned int n_requested_mmu_pages;
+ unsigned int n_max_mmu_pages;
+ unsigned int indirect_shadow_pages;
+- atomic_t invlpg_counter;
++ atomic_unchecked_t invlpg_counter;
+ struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
+ /*
+ * Hash table of struct kvm_mmu_page.
diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
-index 2d89e39..baee879 100644
+index 9cdae5d..3534f04 100644
--- a/arch/x86/include/asm/local.h
+++ b/arch/x86/include/asm/local.h
-@@ -10,33 +10,97 @@ typedef struct {
+@@ -11,33 +11,97 @@ typedef struct {
atomic_long_t a;
} local_t;
@@ -15641,7 +12902,7 @@ index 2d89e39..baee879 100644
: "+m" (l->a.counter)
: "ir" (i));
}
-@@ -54,7 +118,16 @@ static inline int local_sub_and_test(long i, local_t *l)
+@@ -55,7 +119,16 @@ static inline int local_sub_and_test(long i, local_t *l)
{
unsigned char c;
@@ -15659,7 +12920,7 @@ index 2d89e39..baee879 100644
: "+m" (l->a.counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -72,7 +145,16 @@ static inline int local_dec_and_test(local_t *l)
+@@ -73,7 +146,16 @@ static inline int local_dec_and_test(local_t *l)
{
unsigned char c;
@@ -15677,7 +12938,7 @@ index 2d89e39..baee879 100644
: "+m" (l->a.counter), "=qm" (c)
: : "memory");
return c != 0;
-@@ -90,7 +172,16 @@ static inline int local_inc_and_test(local_t *l)
+@@ -91,7 +173,16 @@ static inline int local_inc_and_test(local_t *l)
{
unsigned char c;
@@ -15695,7 +12956,7 @@ index 2d89e39..baee879 100644
: "+m" (l->a.counter), "=qm" (c)
: : "memory");
return c != 0;
-@@ -109,7 +200,16 @@ static inline int local_add_negative(long i, local_t *l)
+@@ -110,7 +201,16 @@ static inline int local_add_negative(long i, local_t *l)
{
unsigned char c;
@@ -15713,10 +12974,11 @@ index 2d89e39..baee879 100644
: "+m" (l->a.counter), "=qm" (c)
: "ir" (i) : "memory");
return c;
-@@ -125,6 +225,30 @@ static inline int local_add_negative(long i, local_t *l)
- static inline long local_add_return(long i, local_t *l)
- {
- long __i = i;
+@@ -133,7 +233,15 @@ static inline long local_add_return(long i, local_t *l)
+ #endif
+ /* Modern 486+ processor */
+ __i = i;
+- asm volatile(_ASM_XADD "%0, %1;"
+ asm volatile(_ASM_XADD "%0, %1\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
@@ -15726,11 +12988,13 @@ index 2d89e39..baee879 100644
+ _ASM_EXTABLE(0b, 0b)
+#endif
+
-+ : "+r" (i), "+m" (l->a.counter)
-+ : : "memory");
-+ return i + __i;
-+}
-+
+ : "+r" (i), "+m" (l->a.counter)
+ : : "memory");
+ return i + __i;
+@@ -148,6 +256,38 @@ no_xadd: /* Legacy 386 processor */
+ #endif
+ }
+
+/**
+ * local_add_return_unchecked - add and return
+ * @i: integer value to add
@@ -15740,11 +13004,33 @@ index 2d89e39..baee879 100644
+ */
+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
+{
-+ long __i = i;
- asm volatile(_ASM_XADD "%0, %1;"
- : "+r" (i), "+m" (l->a.counter)
- : : "memory");
-@@ -141,6 +265,8 @@ static inline long local_sub_return(long i, local_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);
+@@ -158,6 +298,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)))
@@ -15754,26 +13040,24 @@ index 2d89e39..baee879 100644
#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
-new file mode 100644
-index 0000000..2bfd3ba
---- /dev/null
+index 593e51d..fa69c9a 100644
+--- a/arch/x86/include/asm/mman.h
+++ b/arch/x86/include/asm/mman.h
-@@ -0,0 +1,15 @@
-+#ifndef _X86_MMAN_H
-+#define _X86_MMAN_H
-+
-+#include <uapi/asm/mman.h>
-+
+@@ -5,4 +5,14 @@
+
+ #include <asm-generic/mman.h>
+
+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
+#ifdef CONFIG_X86_32
+#define arch_mmap_check i386_mmap_check
-+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
++int i386_mmap_check(unsigned long addr, unsigned long len,
++ unsigned long flags);
+#endif
+#endif
+#endif
+
-+#endif /* X86_MMAN_H */
+ #endif /* _ASM_X86_MMAN_H */
diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
index 5f55e69..e20bfb1 100644
--- a/arch/x86/include/asm/mmu.h
@@ -15809,31 +13093,29 @@ index 5f55e69..e20bfb1 100644
#ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
-index be12c53..4d24039 100644
+index 6902152..da4283a 100644
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
-@@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
+@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
-+ unsigned int i;
-+ pgd_t *pgd;
++ unsigned int i;
++ pgd_t *pgd;
+
-+ pax_open_kernel();
-+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
-+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
-+ set_pgd_batched(pgd+i, native_make_pgd(0));
-+ pax_close_kernel();
-+ }
++ pax_open_kernel();
++ pgd = get_cpu_pgd(smp_processor_id());
++ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
++ set_pgd_batched(pgd+i, native_make_pgd(0));
++ pax_close_kernel();
+#endif
+
#ifdef CONFIG_SMP
- if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
- this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
-@@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+ if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
+ percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
+@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
struct task_struct *tsk)
{
unsigned cpu = smp_processor_id();
@@ -15844,59 +13126,31 @@ index be12c53..4d24039 100644
if (likely(prev != next)) {
#ifdef CONFIG_SMP
+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
-+ tlbstate = this_cpu_read(cpu_tlbstate.state);
++ tlbstate = percpu_read(cpu_tlbstate.state);
+#endif
- this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
- this_cpu_write(cpu_tlbstate.active_mm, next);
+ percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
+ percpu_write(cpu_tlbstate.active_mm, next);
#endif
cpumask_set_cpu(cpu, mm_cpumask(next));
/* Re-load page tables */
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ pax_open_kernel();
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (static_cpu_has(X86_FEATURE_PCID))
-+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
-+ else
-+#endif
-+
-+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
-+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
++ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd);
++ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd);
+ pax_close_kernel();
-+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (static_cpu_has(X86_FEATURE_PCID)) {
-+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+ u64 descriptor[2];
-+ descriptor[0] = PCID_USER;
-+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
-+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
-+ descriptor[0] = PCID_KERNEL;
-+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
-+ }
-+ } else {
-+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
-+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
-+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
-+ else
-+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
-+ }
-+ } else
-+#endif
-+
-+ load_cr3(get_cpu_pgd(cpu, kernel));
++ load_cr3(get_cpu_pgd(cpu));
+#else
load_cr3(next->pgd);
+#endif
- /* Stop flush ipis for the previous mm */
+ /* stop flush ipis for the previous mm */
cpumask_clear_cpu(cpu, mm_cpumask(prev));
-@@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
- /* Load the LDT, if the LDT is different: */
+@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+ */
if (unlikely(prev->context.ldt != next->context.ldt))
load_LDT_nolock(&next->context);
+- }
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
+ if (!(__supported_pte_mask & _PAGE_NX)) {
@@ -15911,58 +13165,28 @@ index be12c53..4d24039 100644
+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
+ prev->context.user_cs_limit != next->context.user_cs_limit))
+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
-+#ifdef CONFIG_SMP
+ #ifdef CONFIG_SMP
+ else if (unlikely(tlbstate != TLBSTATE_OK))
+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
+#endif
+#endif
+
- }
-+ else {
++ }
+ else {
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ pax_open_kernel();
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (static_cpu_has(X86_FEATURE_PCID))
-+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
-+ else
-+#endif
-+
-+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
-+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
++ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd);
++ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd);
+ pax_close_kernel();
-+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (static_cpu_has(X86_FEATURE_PCID)) {
-+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+ u64 descriptor[2];
-+ descriptor[0] = PCID_USER;
-+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
-+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
-+ descriptor[0] = PCID_KERNEL;
-+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
-+ }
-+ } else {
-+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
-+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
-+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
-+ else
-+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
-+ }
-+ } else
-+#endif
-+
-+ load_cr3(get_cpu_pgd(cpu, kernel));
++ load_cr3(get_cpu_pgd(cpu));
+#endif
+
- #ifdef CONFIG_SMP
-- else {
- this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
- BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
++#ifdef CONFIG_SMP
+ percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
+ BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
-@@ -70,11 +185,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
* tlb flush IPI delivery. We must reload CR3
* to make sure to use no freed page tables.
*/
@@ -15993,7 +13217,7 @@ index be12c53..4d24039 100644
#define activate_mm(prev, next) \
diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
-index e3b7819..b257c64 100644
+index 9eae775..c914fea 100644
--- a/arch/x86/include/asm/module.h
+++ b/arch/x86/include/asm/module.h
@@ -5,6 +5,7 @@
@@ -16001,10 +13225,10 @@ index e3b7819..b257c64 100644
#ifdef CONFIG_X86_64
/* X86_64 does not define MODULE_PROC_FAMILY */
+#define MODULE_PROC_FAMILY ""
+ #elif defined CONFIG_M386
+ #define MODULE_PROC_FAMILY "386 "
#elif defined CONFIG_M486
- #define MODULE_PROC_FAMILY "486 "
- #elif defined CONFIG_M586
-@@ -57,8 +58,20 @@
+@@ -59,8 +60,20 @@
#error unknown processor family
#endif
@@ -16027,66 +13251,24 @@ index e3b7819..b257c64 100644
+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
+
#endif /* _ASM_X86_MODULE_H */
-diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
-index 86f9301..b365cda 100644
---- a/arch/x86/include/asm/nmi.h
-+++ b/arch/x86/include/asm/nmi.h
-@@ -40,11 +40,11 @@ struct nmiaction {
- nmi_handler_t handler;
- unsigned long flags;
- const char *name;
--};
-+} __do_const;
-
- #define register_nmi_handler(t, fn, fg, n, init...) \
- ({ \
-- static struct nmiaction init fn##_na = { \
-+ static const struct nmiaction init fn##_na = { \
- .handler = (fn), \
- .name = (n), \
- .flags = (fg), \
-@@ -52,7 +52,7 @@ struct nmiaction {
- __register_nmi_handler((t), &fn##_na); \
- })
-
--int __register_nmi_handler(unsigned int, struct nmiaction *);
-+int __register_nmi_handler(unsigned int, const struct nmiaction *);
-
- void unregister_nmi_handler(unsigned int, const char *);
-
-diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
-index c878924..21f4889 100644
---- a/arch/x86/include/asm/page.h
-+++ b/arch/x86/include/asm/page.h
-@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
- __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
-
- #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
-+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
-
- #define __boot_va(x) __va(x)
- #define __boot_pa(x) __pa(x)
-diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
-index 0f1ddee..e2fc3d1 100644
---- a/arch/x86/include/asm/page_64.h
-+++ b/arch/x86/include/asm/page_64.h
-@@ -7,9 +7,9 @@
+diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
+index 7639dbf..e08a58c 100644
+--- a/arch/x86/include/asm/page_64_types.h
++++ b/arch/x86/include/asm/page_64_types.h
+@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
/* duplicated to the one in bootmem.h */
extern unsigned long max_pfn;
-extern unsigned long phys_base;
+extern const unsigned long phys_base;
--static inline unsigned long __phys_addr_nodebug(unsigned long x)
-+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
- {
- unsigned long y = x - __START_KERNEL_map;
-
+ extern unsigned long __phys_addr(unsigned long);
+ #define __phys_reloc_hide(x) (x)
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index 401f350..dee5d13 100644
+index 91e758b..cac1cd6 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
-@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
+@@ -601,7 +601,7 @@ static inline pmd_t __pmd(pmdval_t val)
return (pmd_t) { ret };
}
@@ -16095,7 +13277,7 @@ index 401f350..dee5d13 100644
{
pmdval_t ret;
-@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
+@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
val);
}
@@ -16114,7 +13296,7 @@ index 401f350..dee5d13 100644
static inline void pgd_clear(pgd_t *pgdp)
{
set_pgd(pgdp, __pgd(0));
-@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
+@@ -751,6 +763,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
@@ -16135,8 +13317,8 @@ index 401f350..dee5d13 100644
+
#if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
- static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
-@@ -906,7 +933,7 @@ extern void default_banner(void);
+ static inline int arch_spin_is_locked(struct arch_spinlock *lock)
+@@ -967,7 +994,7 @@ extern void default_banner(void);
#define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
#define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
@@ -16145,7 +13327,7 @@ index 401f350..dee5d13 100644
#endif
#define INTERRUPT_RETURN \
-@@ -981,6 +1008,21 @@ extern void default_banner(void);
+@@ -1044,6 +1071,21 @@ extern void default_banner(void);
PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
CLBR_NONE, \
jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
@@ -16168,7 +13350,7 @@ index 401f350..dee5d13 100644
#endif /* __ASSEMBLY__ */
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
-index aab8f67..2531748 100644
+index faf2c04..5724dcd 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -84,7 +84,7 @@ struct pv_init_ops {
@@ -16189,7 +13371,7 @@ index aab8f67..2531748 100644
struct pv_cpu_ops {
/* hooks for various privileged instructions */
-@@ -192,7 +192,7 @@ struct pv_cpu_ops {
+@@ -194,7 +194,7 @@ struct pv_cpu_ops {
void (*start_context_switch)(struct task_struct *prev);
void (*end_context_switch)(struct task_struct *next);
@@ -16198,7 +13380,7 @@ index aab8f67..2531748 100644
struct pv_irq_ops {
/*
-@@ -223,7 +223,7 @@ struct pv_apic_ops {
+@@ -225,7 +225,7 @@ struct pv_apic_ops {
unsigned long start_eip,
unsigned long start_esp);
#endif
@@ -16207,7 +13389,7 @@ index aab8f67..2531748 100644
struct pv_mmu_ops {
unsigned long (*read_cr2)(void);
-@@ -313,6 +313,7 @@ struct pv_mmu_ops {
+@@ -314,6 +314,7 @@ struct pv_mmu_ops {
struct paravirt_callee_save make_pud;
void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
@@ -16215,7 +13397,7 @@ index aab8f67..2531748 100644
#endif /* PAGETABLE_LEVELS == 4 */
#endif /* PAGETABLE_LEVELS >= 3 */
-@@ -324,6 +325,12 @@ struct pv_mmu_ops {
+@@ -325,6 +326,12 @@ struct pv_mmu_ops {
an mfn. We can tell which is which from the index. */
void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
phys_addr_t phys, pgprot_t flags);
@@ -16228,6 +13410,15 @@ index aab8f67..2531748 100644
};
struct arch_spinlock;
+@@ -335,7 +342,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
@@ -16283,7 +13474,7 @@ index b4389a4..7024269 100644
{
return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
-index 3bf2dd0..23d2a9f 100644
+index 98391db..8f6984e 100644
--- a/arch/x86/include/asm/pgtable-2level.h
+++ b/arch/x86/include/asm/pgtable-2level.h
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
@@ -16297,7 +13488,7 @@ index 3bf2dd0..23d2a9f 100644
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
-index 81bb91b..9392125 100644
+index cb00ccc..17e9054 100644
--- a/arch/x86/include/asm/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
@@ -16318,10 +13509,10 @@ index 81bb91b..9392125 100644
/*
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 3d19994..732a48c 100644
+index 6be9909..ee359f2 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
-@@ -45,6 +45,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
+@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
#ifndef __PAGETABLE_PUD_FOLDED
#define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
@@ -16329,7 +13520,7 @@ index 3d19994..732a48c 100644
#define pgd_clear(pgd) native_pgd_clear(pgd)
#endif
-@@ -82,12 +83,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
+@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
#define arch_end_context_switch(prev) do {} while(0)
@@ -16381,7 +13572,7 @@ index 3d19994..732a48c 100644
static inline int pte_dirty(pte_t pte)
{
return pte_flags(pte) & _PAGE_DIRTY;
-@@ -148,6 +188,11 @@ static inline unsigned long pud_pfn(pud_t pud)
+@@ -147,6 +187,11 @@ static inline unsigned long pud_pfn(pud_t pud)
return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
}
@@ -16393,7 +13584,7 @@ index 3d19994..732a48c 100644
#define pte_page(pte) pfn_to_page(pte_pfn(pte))
static inline int pmd_large(pmd_t pte)
-@@ -201,9 +246,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
+@@ -200,9 +245,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
return pte_clear_flags(pte, _PAGE_RW);
}
@@ -16424,24 +13615,23 @@ index 3d19994..732a48c 100644
}
static inline pte_t pte_mkdirty(pte_t pte)
-@@ -430,6 +495,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
+@@ -394,6 +459,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
#endif
#ifndef __ASSEMBLY__
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
-+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
-+enum cpu_pgd_type {kernel = 0, user = 1};
-+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
++extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
++static inline pgd_t *get_cpu_pgd(unsigned int cpu)
+{
-+ return cpu_pgd[cpu][type];
++ return cpu_pgd[cpu];
+}
+#endif
+
#include <linux/mm_types.h>
- #include <linux/mmdebug.h>
- #include <linux/log2.h>
-@@ -563,7 +638,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
+
+ static inline int pte_none(pte_t pte)
+@@ -515,7 +589,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
* Currently stuck as a macro due to indirect forward reference to
* linux/mmzone.h's __section_mem_map_addr() definition:
*/
@@ -16450,7 +13640,7 @@ index 3d19994..732a48c 100644
/* Find an entry in the second-level page table.. */
static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
-@@ -603,7 +678,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
+@@ -555,7 +629,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
* Currently stuck as a macro due to indirect forward reference to
* linux/mmzone.h's __section_mem_map_addr() definition:
*/
@@ -16459,7 +13649,7 @@ index 3d19994..732a48c 100644
/* to find an entry in a page-table-directory. */
static inline unsigned long pud_index(unsigned long address)
-@@ -618,7 +693,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
+@@ -570,7 +644,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
static inline int pgd_bad(pgd_t pgd)
{
@@ -16468,7 +13658,7 @@ index 3d19994..732a48c 100644
}
static inline int pgd_none(pgd_t pgd)
-@@ -641,7 +716,12 @@ static inline int pgd_none(pgd_t pgd)
+@@ -593,7 +667,12 @@ static inline int pgd_none(pgd_t pgd)
* pgd_offset() returns a (pgd_t *)
* pgd_index() is used get the offset into the pgd page's array of pgd_t's;
*/
@@ -16476,13 +13666,13 @@ index 3d19994..732a48c 100644
+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
-+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
++#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
+#endif
+
/*
* a shortcut which implies the use of the kernel's pgd, instead
* of a process's
-@@ -652,6 +732,23 @@ static inline int pgd_none(pgd_t pgd)
+@@ -604,6 +683,22 @@ static inline int pgd_none(pgd_t pgd)
#define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
#define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
@@ -16497,7 +13687,6 @@ index 3d19994..732a48c 100644
+#define pax_user_shadow_base pax_user_shadow_base(%rip)
+#else
+extern unsigned long pax_user_shadow_base;
-+extern pgdval_t clone_pgd_mask;
+#endif
+#endif
+
@@ -16506,7 +13695,7 @@ index 3d19994..732a48c 100644
#ifndef __ASSEMBLY__
extern int direct_gbpages;
-@@ -818,11 +915,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
+@@ -768,11 +863,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
* dst and src can be on the same page, but the range must not overlap,
* and must not cross a page boundary.
*/
@@ -16529,12 +13718,11 @@ index 3d19994..732a48c 100644
+#else
+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
+#endif
-+
- #define PTE_SHIFT ilog2(PTRS_PER_PTE)
- static inline int page_level_shift(enum pg_level level)
- {
+
+ #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 9ee3221..b979c6b 100644
+index 0c92113..34a77c6 100644
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -25,9 +25,6 @@
@@ -16560,7 +13748,7 @@ index 9ee3221..b979c6b 100644
#if defined(CONFIG_HIGHPTE)
#define pte_offset_map(dir, address) \
((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
-@@ -62,12 +65,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
+@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
/* Clear a kernel PTE and flush it from the TLB */
#define kpte_clear_flush(ptep, vaddr) \
do { \
@@ -16570,6 +13758,8 @@ index 9ee3221..b979c6b 100644
__flush_tlb_one((vaddr)); \
} while (0)
+@@ -74,6 +79,9 @@ do { \
+
#endif /* !__ASSEMBLY__ */
+#define HAVE_ARCH_UNMAPPED_AREA
@@ -16612,7 +13802,7 @@ index ed5903b..c7fe163 100644
#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 e22c1db..23a625a 100644
+index 975f709..9f779c9 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -16,10 +16,14 @@
@@ -16667,10 +13857,10 @@ index e22c1db..23a625a 100644
}
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
-index 2d88344..4679fc3 100644
+index 766ea16..5b96cb3 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
-@@ -61,6 +61,11 @@ typedef struct { pteval_t pte; } pte_t;
+@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
#define MODULES_LEN (MODULES_END - MODULES_VADDR)
@@ -16680,10 +13870,9 @@ index 2d88344..4679fc3 100644
+#define ktla_ktva(addr) (addr)
+#define ktva_ktla(addr) (addr)
- #define EARLY_DYNAMIC_PAGE_TABLES 64
-
+ #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 0ecac25..306c276 100644
+index 013286a..8b42f4f 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -16,13 +16,12 @@
@@ -16711,7 +13900,7 @@ index 0ecac25..306c276 100644
#define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
#define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
#define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
-@@ -87,8 +85,10 @@
+@@ -57,8 +55,10 @@
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
@@ -16723,7 +13912,7 @@ index 0ecac25..306c276 100644
#endif
#define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
-@@ -146,6 +146,9 @@
+@@ -96,6 +96,9 @@
#define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
_PAGE_ACCESSED)
@@ -16733,7 +13922,7 @@ index 0ecac25..306c276 100644
#define __PAGE_KERNEL_EXEC \
(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
#define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
-@@ -156,7 +159,7 @@
+@@ -106,7 +109,7 @@
#define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
#define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
#define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
@@ -16742,7 +13931,7 @@ index 0ecac25..306c276 100644
#define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
#define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
#define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
-@@ -218,8 +221,8 @@
+@@ -168,8 +171,8 @@
* bits are combined, this will alow user to access the high address mapped
* VDSO in the presence of CONFIG_COMPAT_VDSO
*/
@@ -16753,7 +13942,7 @@ index 0ecac25..306c276 100644
#define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
#endif
-@@ -257,7 +260,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
+@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
{
return native_pgd_val(pgd) & PTE_FLAGS_MASK;
}
@@ -16771,7 +13960,7 @@ index 0ecac25..306c276 100644
#if PAGETABLE_LEVELS > 3
typedef struct { pudval_t pud; } pud_t;
-@@ -271,8 +284,6 @@ static inline pudval_t native_pud_val(pud_t pud)
+@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
return pud.pud;
}
#else
@@ -16780,7 +13969,7 @@ index 0ecac25..306c276 100644
static inline pudval_t native_pud_val(pud_t pud)
{
return native_pgd_val(pud.pgd);
-@@ -292,8 +303,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
+@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
return pmd.pmd;
}
#else
@@ -16789,7 +13978,7 @@ index 0ecac25..306c276 100644
static inline pmdval_t native_pmd_val(pmd_t pmd)
{
return native_pgd_val(pmd.pud.pgd);
-@@ -333,7 +342,6 @@ typedef struct page *pgtable_t;
+@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
extern pteval_t __supported_pte_mask;
extern void set_nx(void);
@@ -16797,34 +13986,23 @@ index 0ecac25..306c276 100644
#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 2dddb31..100c638 100644
+--- a/arch/x86/include/asm/processor-flags.h
++++ b/arch/x86/include/asm/processor-flags.h
+@@ -62,6 +62,7 @@
+ #define X86_CR4_RDWRGSFS 0x00010000 /* enable RDWRGSFS 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 987c75e..2723054 100644
+index f7c89e2..9962bae 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
-@@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
- : "memory");
- }
-
-+/* invpcid (%rdx),%rax */
-+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
-+
-+#define INVPCID_SINGLE_ADDRESS 0UL
-+#define INVPCID_SINGLE_CONTEXT 1UL
-+#define INVPCID_ALL_GLOBAL 2UL
-+#define INVPCID_ALL_MONGLOBAL 3UL
-+
-+#define PCID_KERNEL 0UL
-+#define PCID_USER 1UL
-+#define PCID_NOFLUSH (1UL << 63)
-+
- static inline void load_cr3(pgd_t *pgdir)
- {
-- write_cr3(__pa(pgdir));
-+ write_cr3(__pa(pgdir) | PCID_KERNEL);
- }
-
- #ifdef CONFIG_X86_32
-@@ -283,7 +295,7 @@ struct tss_struct {
+@@ -266,7 +266,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -16833,47 +14011,7 @@ index 987c75e..2723054 100644
/*
* Save the original ist values for checking stack pointers during debugging
-@@ -453,6 +465,7 @@ struct thread_struct {
- unsigned short ds;
- unsigned short fsindex;
- unsigned short gsindex;
-+ unsigned short ss;
- #endif
- #ifdef CONFIG_X86_32
- unsigned long ip;
-@@ -553,29 +566,8 @@ static inline void load_sp0(struct tss_struct *tss,
- extern unsigned long mmu_cr4_features;
- extern u32 *trampoline_cr4_features;
-
--static inline void set_in_cr4(unsigned long mask)
--{
-- unsigned long cr4;
--
-- mmu_cr4_features |= mask;
-- if (trampoline_cr4_features)
-- *trampoline_cr4_features = mmu_cr4_features;
-- cr4 = read_cr4();
-- cr4 |= mask;
-- write_cr4(cr4);
--}
--
--static inline void clear_in_cr4(unsigned long mask)
--{
-- unsigned long cr4;
--
-- mmu_cr4_features &= ~mask;
-- if (trampoline_cr4_features)
-- *trampoline_cr4_features = mmu_cr4_features;
-- cr4 = read_cr4();
-- cr4 &= ~mask;
-- write_cr4(cr4);
--}
-+extern void set_in_cr4(unsigned long mask);
-+extern void clear_in_cr4(unsigned long mask);
-
- typedef struct {
- unsigned long seg;
-@@ -824,11 +816,18 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -859,11 +859,18 @@ static inline void spin_lock_prefetch(const void *x)
*/
#define TASK_SIZE PAGE_OFFSET
#define TASK_SIZE_MAX TASK_SIZE
@@ -16894,7 +14032,7 @@ index 987c75e..2723054 100644
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
.io_bitmap_ptr = NULL, \
-@@ -842,7 +841,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -877,7 +884,7 @@ static inline void spin_lock_prefetch(const void *x)
*/
#define INIT_TSS { \
.x86_tss = { \
@@ -16903,7 +14041,7 @@ index 987c75e..2723054 100644
.ss0 = __KERNEL_DS, \
.ss1 = __KERNEL_CS, \
.io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
-@@ -853,11 +852,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -888,11 +895,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))
@@ -16916,7 +14054,7 @@ index 987c75e..2723054 100644
/*
* The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -872,7 +867,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -907,7 +910,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define task_pt_regs(task) \
({ \
struct pt_regs *__regs__; \
@@ -16925,7 +14063,7 @@ index 987c75e..2723054 100644
__regs__ - 1; \
})
-@@ -882,13 +877,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -917,13 +920,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
/*
* User space process size. 47bits minus one guard page.
*/
@@ -16939,9 +14077,9 @@ index 987c75e..2723054 100644
- 0xc0000000 : 0xFFFFe000)
+ 0xc0000000 : 0xFFFFf000)
- #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
+ #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -899,11 +894,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -934,11 +937,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define STACK_TOP_MAX TASK_SIZE_MAX
#define INIT_THREAD { \
@@ -16955,7 +14093,7 @@ index 987c75e..2723054 100644
}
/*
-@@ -931,6 +926,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
+@@ -960,6 +963,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
*/
#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
@@ -16966,28 +14104,21 @@ index 987c75e..2723054 100644
#define KSTK_EIP(task) (task_pt_regs(task)->ip)
/* Get/set a process' ability to use the timestamp counter instruction */
-@@ -957,7 +956,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
- return 0;
- }
+@@ -972,7 +979,8 @@ extern int set_tsc_mode(unsigned int val);
+ extern int amd_get_nb_id(int cpu);
--extern unsigned long arch_align_stack(unsigned long sp);
-+#define arch_align_stack(x) ((x) & ~0xfUL)
- extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
-
- void default_idle(void);
-@@ -967,6 +966,6 @@ bool xen_set_default_idle(void);
- #define xen_set_default_idle 0
- #endif
+ struct aperfmperf {
+- u64 aperf, mperf;
++ u64 aperf __intentional_overflow(-1);
++ u64 mperf __intentional_overflow(-1);
+ };
--void stop_this_cpu(void *dummy);
-+void stop_this_cpu(void *dummy) __noreturn;
- void df_debug(struct pt_regs *regs, long error_code);
- #endif /* _ASM_X86_PROCESSOR_H */
+ static inline void get_aperfmperf(struct aperfmperf *am)
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
-index 942a086..6c26446 100644
+index 3b96fd4..8790004 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
-@@ -85,28 +85,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
+@@ -156,28 +156,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
}
/*
@@ -17023,7 +14154,7 @@ index 942a086..6c26446 100644
#endif
}
-@@ -122,15 +123,16 @@ static inline int v8086_mode(struct pt_regs *regs)
+@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_regs *regs)
#ifdef CONFIG_X86_64
static inline bool user_64bit_mode(struct pt_regs *regs)
{
@@ -17041,49 +14172,12 @@ index 942a086..6c26446 100644
+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
#endif
}
-
-@@ -181,9 +183,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
- * Traps from the kernel do not save sp and ss.
- * Use the helper function to retrieve sp.
- */
-- if (offset == offsetof(struct pt_regs, sp) &&
-- regs->cs == __KERNEL_CS)
-- return kernel_stack_pointer(regs);
-+ if (offset == offsetof(struct pt_regs, sp)) {
-+ unsigned long cs = regs->cs & 0xffff;
-+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
-+ return kernel_stack_pointer(regs);
-+ }
- #endif
- return *(unsigned long *)((unsigned long)regs + offset);
- }
-diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
-index 9c6b890..5305f53 100644
---- a/arch/x86/include/asm/realmode.h
-+++ b/arch/x86/include/asm/realmode.h
-@@ -22,16 +22,14 @@ struct real_mode_header {
#endif
- /* APM/BIOS reboot */
- u32 machine_real_restart_asm;
--#ifdef CONFIG_X86_64
- u32 machine_real_restart_seg;
--#endif
- };
-
- /* This must match data at trampoline_32/64.S */
- struct trampoline_header {
- #ifdef CONFIG_X86_32
- u32 start;
-- u16 gdt_pad;
-+ u16 boot_cs;
- u16 gdt_limit;
- 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 92f29706..d0a1a53 100644
--- a/arch/x86/include/asm/reboot.h
+++ b/arch/x86/include/asm/reboot.h
-@@ -6,13 +6,13 @@
+@@ -6,19 +6,19 @@
struct pt_regs;
struct machine_ops {
@@ -17102,8 +14196,15 @@ index a82c4f1..ac45053 100644
extern struct machine_ops machine_ops;
+ void native_machine_crash_shutdown(struct pt_regs *regs);
+ void native_machine_shutdown(void);
+-void machine_real_restart(unsigned int type);
++void __noreturn machine_real_restart(unsigned int type);
+ /* These must match dispatch_table in reboot_32.S */
+ #define MRR_BIOS 0
+ #define MRR_APM 1
diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
-index cad82c9..2e5c5c1 100644
+index 2dbe4a7..ce1db00 100644
--- a/arch/x86/include/asm/rwsem.h
+++ b/arch/x86/include/asm/rwsem.h
@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
@@ -17149,9 +14250,9 @@ index cad82c9..2e5c5c1 100644
+#endif
+
/* adds 0xffff0001, returns the old value */
- " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
- /* was the active mask 0 before? */
-@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
+ " test %1,%1\n\t"
+ /* was the count 0 before? */
+@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
long tmp;
asm volatile("# beginning __up_read\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
@@ -17166,7 +14267,7 @@ index cad82c9..2e5c5c1 100644
/* subtracts 1, returns the old value */
" jns 1f\n\t"
" call call_rwsem_wake\n" /* expects old value in %edx */
-@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
+@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
long tmp;
asm volatile("# beginning __up_write\n\t"
LOCK_PREFIX " xadd %1,(%2)\n\t"
@@ -17181,7 +14282,7 @@ index cad82c9..2e5c5c1 100644
/* subtracts 0xffff0001, returns the old value */
" jns 1f\n\t"
" call call_rwsem_wake\n" /* expects old value in %edx */
-@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
+@@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
{
asm volatile("# beginning __downgrade_write\n\t"
LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
@@ -17196,7 +14297,7 @@ index cad82c9..2e5c5c1 100644
/*
* transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
* 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
-@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
+@@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
*/
static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
{
@@ -17213,7 +14314,7 @@ index cad82c9..2e5c5c1 100644
: "+m" (sem->count)
: "er" (delta));
}
-@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
+@@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
*/
static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
{
@@ -17223,7 +14324,7 @@ index cad82c9..2e5c5c1 100644
#endif /* __KERNEL__ */
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
-index c48a950..bc40804 100644
+index 5e64171..f58957e 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -64,10 +64,15 @@
@@ -17284,147 +14385,28 @@ index c48a950..bc40804 100644
#define GDT_ENTRY_TSS 8 /* needs two entries */
#define GDT_ENTRY_LDT 10 /* needs two entries */
#define GDT_ENTRY_TLS_MIN 12
-@@ -173,6 +188,8 @@
- #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
- #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
-
-+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
-+
- /* TLS indexes for 64bit - hardcoded in arch_prctl */
- #define FS_TLS 0
- #define GS_TLS 1
-@@ -180,12 +197,14 @@
- #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
- #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
-
--#define GDT_ENTRIES 16
-+#define GDT_ENTRIES 17
-
+@@ -185,6 +200,7 @@
#endif
#define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
-+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
- #ifndef CONFIG_PARAVIRT
-@@ -265,7 +284,7 @@ static inline unsigned long get_limit(unsigned long segment)
- {
- unsigned long __limit;
- asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
-- return __limit + 1;
-+ return __limit;
- }
-
- #endif /* !__ASSEMBLY__ */
-diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
-index 8d3120f..352b440 100644
---- a/arch/x86/include/asm/smap.h
-+++ b/arch/x86/include/asm/smap.h
-@@ -25,11 +25,40 @@
-
- #include <asm/alternative-asm.h>
-
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define ASM_PAX_OPEN_USERLAND \
-+ 661: jmp 663f; \
-+ .pushsection .altinstr_replacement, "a" ; \
-+ 662: pushq %rax; nop; \
-+ .popsection ; \
-+ .pushsection .altinstructions, "a" ; \
-+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
-+ .popsection ; \
-+ call __pax_open_userland; \
-+ popq %rax; \
-+ 663:
-+
-+#define ASM_PAX_CLOSE_USERLAND \
-+ 661: jmp 663f; \
-+ .pushsection .altinstr_replacement, "a" ; \
-+ 662: pushq %rax; nop; \
-+ .popsection; \
-+ .pushsection .altinstructions, "a" ; \
-+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
-+ .popsection; \
-+ call __pax_close_userland; \
-+ popq %rax; \
-+ 663:
-+#else
-+#define ASM_PAX_OPEN_USERLAND
-+#define ASM_PAX_CLOSE_USERLAND
-+#endif
-+
- #ifdef CONFIG_X86_SMAP
-
- #define ASM_CLAC \
- 661: ASM_NOP3 ; \
-- .pushsection .altinstr_replacement, "ax" ; \
-+ .pushsection .altinstr_replacement, "a" ; \
- 662: __ASM_CLAC ; \
- .popsection ; \
- .pushsection .altinstructions, "a" ; \
-@@ -38,7 +67,7 @@
-
- #define ASM_STAC \
- 661: ASM_NOP3 ; \
-- .pushsection .altinstr_replacement, "ax" ; \
-+ .pushsection .altinstr_replacement, "a" ; \
- 662: __ASM_STAC ; \
- .popsection ; \
- .pushsection .altinstructions, "a" ; \
-@@ -56,6 +85,37 @@
-
- #include <asm/alternative.h>
-
-+#define __HAVE_ARCH_PAX_OPEN_USERLAND
-+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
-+
-+extern void __pax_open_userland(void);
-+static __always_inline unsigned long pax_open_userland(void)
-+{
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
-+ :
-+ : [open] "i" (__pax_open_userland)
-+ : "memory", "rax");
-+#endif
-+
-+ return 0;
-+}
-+
-+extern void __pax_close_userland(void);
-+static __always_inline unsigned long pax_close_userland(void)
-+{
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
-+ :
-+ : [close] "i" (__pax_close_userland)
-+ : "memory", "rax");
-+#endif
-+
-+ return 0;
-+}
-+
- #ifdef CONFIG_X86_SMAP
-
- static __always_inline void clac(void)
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
-index 4137890..03fa172 100644
+index 73b11bc..d4a3b63 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);
+@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
/* cpus sharing the last level cache: */
- DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
- DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
--DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
-+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
+ DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
+ DECLARE_PER_CPU(u16, cpu_llc_id);
+-DECLARE_PER_CPU(int, cpu_number);
++DECLARE_PER_CPU(unsigned int, cpu_number);
static inline struct cpumask *cpu_sibling_mask(int cpu)
{
-@@ -79,7 +79,7 @@ struct smp_ops {
+@@ -77,7 +77,7 @@ struct smp_ops {
void (*send_call_func_ipi)(const struct cpumask *mask);
void (*send_call_func_single_ipi)(int cpu);
@@ -17433,11 +14415,11 @@ index 4137890..03fa172 100644
/* Globals due to paravirt */
extern void set_cpu_sibling_map(int cpu);
-@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
+@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitdata;
extern int safe_smp_processor_id(void);
#elif defined(CONFIG_X86_64_SMP)
--#define raw_smp_processor_id() (this_cpu_read(cpu_number))
+-#define raw_smp_processor_id() (percpu_read(cpu_number))
-
-#define stack_smp_processor_id() \
-({ \
@@ -17445,16 +14427,16 @@ index 4137890..03fa172 100644
- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
- ti->cpu; \
-})
-+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
++#define raw_smp_processor_id() (percpu_read(cpu_number))
+#define stack_smp_processor_id() raw_smp_processor_id()
#define safe_smp_processor_id() smp_processor_id()
#endif
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
-index bf156de..1a782ab 100644
+index 972c260..43ab1fd 100644
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
-@@ -223,6 +223,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
+@@ -188,6 +188,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
static inline void arch_read_lock(arch_rwlock_t *rw)
{
asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
@@ -17469,7 +14451,7 @@ index bf156de..1a782ab 100644
"jns 1f\n"
"call __read_lock_failed\n\t"
"1:\n"
-@@ -232,6 +240,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
+@@ -197,6 +205,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
static inline void arch_write_lock(arch_rwlock_t *rw)
{
asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
@@ -17484,7 +14466,7 @@ index bf156de..1a782ab 100644
"jz 1f\n"
"call __write_lock_failed\n\t"
"1:\n"
-@@ -261,13 +277,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
+@@ -226,13 +242,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
static inline void arch_read_unlock(arch_rwlock_t *rw)
{
@@ -17517,10 +14499,10 @@ index bf156de..1a782ab 100644
}
diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
-index 6a99859..03cb807 100644
+index 1575177..cb23f52 100644
--- a/arch/x86/include/asm/stackprotector.h
+++ b/arch/x86/include/asm/stackprotector.h
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
* head_32 for boot CPU and setup_per_cpu_areas() for others.
*/
#define GDT_STACK_CANARY_INIT \
@@ -17529,7 +14511,7 @@ index 6a99859..03cb807 100644
/*
* Initialize the stackprotector canary value.
-@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
+@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
static inline void load_stack_canary_segment(void)
{
@@ -17591,11 +14573,72 @@ index 70bbe39..4ae2bd4 100644
};
void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
-index d7f3b3b..3cc39f1 100644
---- a/arch/x86/include/asm/switch_to.h
-+++ b/arch/x86/include/asm/switch_to.h
-@@ -108,7 +108,7 @@ do { \
+diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
+index cb23852..2dde194 100644
+--- a/arch/x86/include/asm/sys_ia32.h
++++ b/arch/x86/include/asm/sys_ia32.h
+@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int, compat_sigset_t __user *,
+ compat_sigset_t __user *, unsigned int);
+ 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/syscall.h b/arch/x86/include/asm/syscall.h
+index c4a348f..e2ad7ea 100644
+--- a/arch/x86/include/asm/syscall.h
++++ b/arch/x86/include/asm/syscall.h
+@@ -13,6 +13,7 @@
+ #ifndef _ASM_X86_SYSCALL_H
+ #define _ASM_X86_SYSCALL_H
+
++#include <linux/audit.h>
+ #include <linux/sched.h>
+ #include <linux/err.h>
+
+@@ -86,6 +87,12 @@ static inline void syscall_set_arguments(struct task_struct *task,
+ memcpy(®s->bx + i, args, n * sizeof(args[0]));
+ }
+
++static inline int syscall_get_arch(struct task_struct *task,
++ struct pt_regs *regs)
++{
++ return AUDIT_ARCH_I386;
++}
++
+ #else /* CONFIG_X86_64 */
+
+ static inline void syscall_get_arguments(struct task_struct *task,
+@@ -210,6 +217,22 @@ static inline void syscall_set_arguments(struct task_struct *task,
+ }
+ }
+
++static inline int syscall_get_arch(struct task_struct *task,
++ struct pt_regs *regs)
++{
++#ifdef CONFIG_IA32_EMULATION
++ /*
++ * TS_COMPAT is set for 32-bit syscall entries and then
++ * remains set until we return to user mode.
++ *
++ * TIF_IA32 tasks should always have TS_COMPAT set at
++ * system call time.
++ */
++ if (task_thread_info(task)->status & TS_COMPAT)
++ return AUDIT_ARCH_I386;
++#endif
++ return AUDIT_ARCH_X86_64;
++}
+ #endif /* CONFIG_X86_32 */
+
+ #endif /* _ASM_X86_SYSCALL_H */
+diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
+index d75adff..c0cc78b 100644
+--- a/arch/x86/include/asm/system.h
++++ b/arch/x86/include/asm/system.h
+@@ -125,7 +125,7 @@ do { \
"call __switch_to\n\t" \
"movq "__percpu_arg([current_task])",%%rsi\n\t" \
__switch_canary \
@@ -17604,7 +14647,7 @@ index d7f3b3b..3cc39f1 100644
"movq %%rax,%%rdi\n\t" \
"testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
"jnz ret_from_fork\n\t" \
-@@ -119,7 +119,7 @@ do { \
+@@ -136,7 +136,7 @@ do { \
[threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
[ti_flags] "i" (offsetof(struct thread_info, flags)), \
[_tif_fork] "i" (_TIF_FORK), \
@@ -17613,8 +14656,33 @@ index d7f3b3b..3cc39f1 100644
[current_task] "m" (current_task) \
__switch_canary_iparam \
: "memory", "cc" __EXTRA_CLOBBER)
+@@ -196,7 +196,7 @@ static inline unsigned long get_limit(unsigned long segment)
+ {
+ unsigned long __limit;
+ asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
+- return __limit + 1;
++ return __limit;
+ }
+
+ static inline void native_clts(void)
+@@ -390,13 +390,13 @@ static inline void clflush(volatile void *__p)
+
+ void cpu_idle_wait(void);
+
+-extern unsigned long arch_align_stack(unsigned long sp);
++#define arch_align_stack(x) ((x) & ~0xfUL)
+ extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
+
+ void default_idle(void);
+ bool set_pm_idle_to_default(void);
+
+-void stop_this_cpu(void *dummy);
++void stop_this_cpu(void *dummy) __noreturn;
+
+ /*
+ * Force strict CPU ordering.
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
-index 2781119..618b59b 100644
+index d7ef849..b1b009a 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -10,6 +10,7 @@
@@ -17625,7 +14693,7 @@ index 2781119..618b59b 100644
/*
* low level task data that entry.S needs immediate access to
-@@ -23,7 +24,6 @@ struct exec_domain;
+@@ -24,7 +25,6 @@ struct exec_domain;
#include <linux/atomic.h>
struct thread_info {
@@ -17633,7 +14701,7 @@ index 2781119..618b59b 100644
struct exec_domain *exec_domain; /* execution domain */
__u32 flags; /* low level flags */
__u32 status; /* thread synchronous flags */
-@@ -33,19 +33,13 @@ struct thread_info {
+@@ -34,18 +34,12 @@ struct thread_info {
mm_segment_t addr_limit;
struct restart_block restart_block;
void __user *sysenter_return;
@@ -17644,8 +14712,7 @@ index 2781119..618b59b 100644
- __u8 supervisor_stack[0];
-#endif
+ unsigned long lowest_stack;
- unsigned int sig_on_uaccess_error:1;
- unsigned int uaccess_err:1; /* uaccess failed */
+ int uaccess_err;
};
-#define INIT_THREAD_INFO(tsk) \
@@ -17664,47 +14731,47 @@ index 2781119..618b59b 100644
#define init_stack (init_thread_union.stack)
#else /* !__ASSEMBLY__ */
-@@ -96,6 +90,7 @@ struct thread_info {
+@@ -95,6 +89,7 @@ struct thread_info {
+ #define TIF_BLOCKSTEP 25 /* set when we want DEBUGCTLMSR_BTF */
+ #define TIF_LAZY_MMU_UPDATES 27 /* task is updating the mmu lazily */
#define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
- #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
- #define TIF_X32 30 /* 32-bit native x86-64 binary */
-+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
++#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
-@@ -119,17 +114,18 @@ struct thread_info {
+@@ -117,16 +112,17 @@ struct thread_info {
+ #define _TIF_BLOCKSTEP (1 << TIF_BLOCKSTEP)
+ #define _TIF_LAZY_MMU_UPDATES (1 << TIF_LAZY_MMU_UPDATES)
#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
- #define _TIF_ADDR32 (1 << TIF_ADDR32)
- #define _TIF_X32 (1 << TIF_X32)
+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
/* 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_NOHZ)
-+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
+- _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT)
++ _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | _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_NOHZ)
-+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
+- _TIF_SYSCALL_TRACEPOINT)
++ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
/* work to do on interrupt/exception return */
#define _TIF_WORK_MASK \
-@@ -140,7 +136,7 @@ struct thread_info {
+@@ -136,7 +132,8 @@ struct thread_info {
+
/* work to do on any return to user space */
#define _TIF_ALLWORK_MASK \
- ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
-- _TIF_NOHZ)
-+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
+- ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT)
++ ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
++ _TIF_GRSEC_SETXID)
/* Only used for 64 bit */
#define _TIF_DO_NOTIFY_MASK \
-@@ -156,45 +152,40 @@ struct thread_info {
-
- #define PREEMPT_ACTIVE 0x10000000
+@@ -170,45 +167,40 @@ struct thread_info {
+ ret; \
+ })
-#ifdef CONFIG_X86_32
-
@@ -17746,7 +14813,7 @@ index 2781119..618b59b 100644
+
+static __always_inline struct thread_info *current_thread_info(void)
+{
-+ return this_cpu_read_stable(current_tinfo);
++ return percpu_read_stable(current_tinfo);
+}
+#endif
+
@@ -17773,14 +14840,14 @@ index 2781119..618b59b 100644
/*
* macros/functions for gaining access to the thread information structure
* preempt_count needs to be 1 initially, until the scheduler is functional.
-@@ -202,27 +193,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -216,21 +208,8 @@ static inline struct thread_info *current_thread_info(void)
#ifndef __ASSEMBLY__
DECLARE_PER_CPU(unsigned long, kernel_stack);
-static inline struct thread_info *current_thread_info(void)
-{
- struct thread_info *ti;
-- ti = (void *)(this_cpu_read_stable(kernel_stack) +
+- ti = (void *)(percpu_read_stable(kernel_stack) +
- KERNEL_STACK_OFFSET - THREAD_SIZE);
- return ti;
-}
@@ -17792,21 +14859,15 @@ index 2781119..618b59b 100644
- movq PER_CPU_VAR(kernel_stack),reg ; \
- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
-
--/*
-- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
-- * a certain register (to be used in assembler memory operands).
-- */
--#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
--
+/* how to get the current stack pointer from C */
+register unsigned long current_stack_pointer asm("rsp") __used;
#endif
#endif /* !X86_32 */
-@@ -281,5 +253,12 @@ static inline bool is_ia32_task(void)
- extern void arch_task_cache_init(void);
+@@ -264,5 +243,16 @@ extern void arch_task_cache_init(void);
+ extern void free_thread_info(struct thread_info *ti);
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
- extern void arch_release_task_struct(struct task_struct *tsk);
+ #define arch_task_cache_init arch_task_cache_init
+
+#define __HAVE_THREAD_FUNCTIONS
+#define task_thread_info(task) (&(task)->tinfo)
@@ -17814,108 +14875,14 @@ index 2781119..618b59b 100644
+#define setup_thread_stack(p, org) do {} while (0)
+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
+
++#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
++extern struct task_struct *alloc_task_struct_node(int node);
++extern void free_task_struct(struct task_struct *);
++
#endif
#endif /* _ASM_X86_THREAD_INFO_H */
-diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
-index e6d90ba..0897f44 100644
---- a/arch/x86/include/asm/tlbflush.h
-+++ b/arch/x86/include/asm/tlbflush.h
-@@ -17,18 +17,44 @@
-
- static inline void __native_flush_tlb(void)
- {
-+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+ u64 descriptor[2];
-+
-+ descriptor[0] = PCID_KERNEL;
-+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
-+ return;
-+ }
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (static_cpu_has(X86_FEATURE_PCID)) {
-+ unsigned int cpu = raw_get_cpu();
-+
-+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
-+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
-+ raw_put_cpu_no_resched();
-+ return;
-+ }
-+#endif
-+
- native_write_cr3(native_read_cr3());
- }
-
- static inline void __native_flush_tlb_global_irq_disabled(void)
- {
-- unsigned long cr4;
-+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+ u64 descriptor[2];
-
-- cr4 = native_read_cr4();
-- /* clear PGE */
-- native_write_cr4(cr4 & ~X86_CR4_PGE);
-- /* write old PGE again and flush TLBs */
-- native_write_cr4(cr4);
-+ descriptor[0] = PCID_KERNEL;
-+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
-+ } else {
-+ unsigned long cr4;
-+
-+ cr4 = native_read_cr4();
-+ /* clear PGE */
-+ native_write_cr4(cr4 & ~X86_CR4_PGE);
-+ /* write old PGE again and flush TLBs */
-+ native_write_cr4(cr4);
-+ }
- }
-
- static inline void __native_flush_tlb_global(void)
-@@ -49,6 +75,42 @@ static inline void __native_flush_tlb_global(void)
-
- static inline void __native_flush_tlb_single(unsigned long addr)
- {
-+
-+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+ u64 descriptor[2];
-+
-+ descriptor[0] = PCID_KERNEL;
-+ descriptor[1] = addr;
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
-+ if (addr < TASK_SIZE_MAX)
-+ descriptor[1] += pax_user_shadow_base;
-+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
-+ }
-+
-+ descriptor[0] = PCID_USER;
-+ descriptor[1] = addr;
-+#endif
-+
-+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
-+ return;
-+ }
-+
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (static_cpu_has(X86_FEATURE_PCID)) {
-+ unsigned int cpu = raw_get_cpu();
-+
-+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
-+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
-+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
-+ raw_put_cpu_no_resched();
-+
-+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
-+ addr += pax_user_shadow_base;
-+ }
-+#endif
-+
- asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
- }
-
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
-index 5838fa9..f7ae572 100644
+index 36361bf..4252f11 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -7,6 +7,7 @@
@@ -17925,8 +14892,8 @@ index 5838fa9..f7ae572 100644
+#include <linux/sched.h>
#include <asm/asm.h>
#include <asm/page.h>
- #include <asm/smap.h>
-@@ -29,7 +30,12 @@
+
+@@ -28,7 +29,12 @@
#define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit)
@@ -17939,20 +14906,19 @@ index 5838fa9..f7ae572 100644
#define segment_eq(a, b) ((a).seg == (b).seg)
-@@ -77,8 +83,33 @@
+@@ -76,7 +82,33 @@
* checks that the pointer is in the user space range - after calling
* this function, memory access functions may still return -EFAULT.
*/
--#define access_ok(type, addr, size) \
-- (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
-+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
+-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
++#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
+#define access_ok(type, addr, size) \
+({ \
+ long __size = size; \
+ unsigned long __addr = (unsigned long)addr; \
+ unsigned long __addr_ao = __addr & PAGE_MASK; \
+ unsigned long __end_ao = __addr + __size - 1; \
-+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
++ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
+ while(__addr_ao <= __end_ao) { \
+ char __c_ao; \
@@ -17974,21 +14940,8 @@ index 5838fa9..f7ae572 100644
+})
/*
- * The exception table consists of pairs of addresses relative to the
-@@ -168,10 +199,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
- register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
- __chk_user_ptr(ptr); \
- might_fault(); \
-+ pax_open_userland(); \
- asm volatile("call __get_user_%P3" \
- : "=a" (__ret_gu), "=r" (__val_gu) \
- : "0" (ptr), "i" (sizeof(*(ptr)))); \
- (x) = (__typeof__(*(ptr))) __val_gu; \
-+ pax_close_userland(); \
- __ret_gu; \
- })
-
-@@ -179,13 +212,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
+ * The exception table consists of pairs of addresses: the first is the
+@@ -182,12 +214,20 @@ extern int __get_user_bad(void);
asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
: "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
@@ -18005,78 +14958,61 @@ index 5838fa9..f7ae572 100644
#ifdef CONFIG_X86_32
#define __put_user_asm_u64(x, addr, err, errret) \
- asm volatile(ASM_STAC "\n" \
-- "1: movl %%eax,0(%2)\n" \
+- asm volatile("1: movl %%eax,0(%2)\n" \
- "2: movl %%edx,4(%2)\n" \
-+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
++ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
- "3: " ASM_CLAC "\n" \
+ "3:\n" \
".section .fixup,\"ax\"\n" \
"4: movl %3,%0\n" \
-@@ -198,8 +239,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
+@@ -199,8 +239,8 @@ extern int __get_user_bad(void);
+ : "A" (x), "r" (addr), "i" (errret), "0" (err))
#define __put_user_asm_ex_u64(x, addr) \
- asm volatile(ASM_STAC "\n" \
-- "1: movl %%eax,0(%1)\n" \
+- asm volatile("1: movl %%eax,0(%1)\n" \
- "2: movl %%edx,4(%1)\n" \
-+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
++ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
- "3: " ASM_CLAC "\n" \
- _ASM_EXTABLE_EX(1b, 2b) \
- _ASM_EXTABLE_EX(2b, 3b) \
-@@ -249,7 +290,8 @@ extern void __put_user_8(void);
+ "3:\n" \
+ _ASM_EXTABLE(1b, 2b - 1b) \
+ _ASM_EXTABLE(2b, 3b - 2b) \
+@@ -252,7 +292,7 @@ extern void __put_user_8(void);
__typeof__(*(ptr)) __pu_val; \
__chk_user_ptr(ptr); \
might_fault(); \
- __pu_val = x; \
+ __pu_val = (x); \
-+ pax_open_userland(); \
switch (sizeof(*(ptr))) { \
case 1: \
__put_user_x(1, __pu_val, ptr, __ret_pu); \
-@@ -267,6 +309,7 @@ extern void __put_user_8(void);
- __put_user_x(X, __pu_val, ptr, __ret_pu); \
- break; \
- } \
-+ pax_close_userland(); \
- __ret_pu; \
- })
-
-@@ -347,8 +390,10 @@ do { \
+@@ -373,7 +413,7 @@ do { \
} while (0)
#define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
-+do { \
-+ pax_open_userland(); \
- 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" \
+- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
++ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
+ "2:\n" \
".section .fixup,\"ax\"\n" \
"3: mov %3,%0\n" \
-@@ -356,8 +401,10 @@ do { \
+@@ -381,7 +421,7 @@ do { \
" jmp 2b\n" \
".previous\n" \
_ASM_EXTABLE(1b, 3b) \
- : "=r" (err), ltype(x) \
-- : "m" (__m(addr)), "i" (errret), "0" (err))
+ : "=r" (err), ltype (x) \
-+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
-+ pax_close_userland(); \
-+} while (0)
+ : "m" (__m(addr)), "i" (errret), "0" (err))
#define __get_user_size_ex(x, ptr, size) \
- do { \
-@@ -381,7 +428,7 @@ do { \
+@@ -406,7 +446,7 @@ do { \
} while (0)
#define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
"2:\n" \
- _ASM_EXTABLE_EX(1b, 2b) \
+ _ASM_EXTABLE(1b, 2b - 1b) \
: ltype(x) : "m" (__m(addr)))
-@@ -398,13 +445,24 @@ do { \
+@@ -423,13 +463,24 @@ do { \
int __gu_err; \
unsigned long __gu_val; \
__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
@@ -18103,48 +15039,29 @@ index 5838fa9..f7ae572 100644
/*
* Tell gcc we read from memory instead of writing: this is because
-@@ -412,8 +470,10 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -437,7 +488,7 @@ struct __large_struct { unsigned long buf[100]; };
* aliasing issues.
*/
#define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
-+do { \
-+ pax_open_userland(); \
- 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" \
+- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
++ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
+ "2:\n" \
".section .fixup,\"ax\"\n" \
"3: mov %3,%0\n" \
-@@ -421,10 +481,12 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -445,10 +496,10 @@ struct __large_struct { unsigned long buf[100]; };
".previous\n" \
_ASM_EXTABLE(1b, 3b) \
: "=r"(err) \
- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
-+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
-+ pax_close_userland(); \
-+} while (0)
++ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
#define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
"2:\n" \
- _ASM_EXTABLE_EX(1b, 2b) \
+ _ASM_EXTABLE(1b, 2b - 1b) \
: : ltype(x), "m" (__m(addr)))
-@@ -434,11 +496,13 @@ struct __large_struct { unsigned long buf[100]; };
- */
- #define uaccess_try do { \
- current_thread_info()->uaccess_err = 0; \
-+ pax_open_userland(); \
- stac(); \
- barrier();
-
- #define uaccess_catch(err) \
- clac(); \
-+ pax_close_userland(); \
- (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
- } while (0)
-
-@@ -463,8 +527,12 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -487,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
* On error, the variable @x is set to zero.
*/
@@ -18157,7 +15074,7 @@ index 5838fa9..f7ae572 100644
/**
* __put_user: - Write a simple value into user space, with less checking.
-@@ -486,8 +554,12 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -510,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
* Returns zero on success, or -EFAULT on error.
*/
@@ -18170,7 +15087,7 @@ index 5838fa9..f7ae572 100644
#define __get_user_unaligned __get_user
#define __put_user_unaligned __put_user
-@@ -505,7 +577,7 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -529,7 +588,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)))); \
@@ -18178,9 +15095,9 @@ index 5838fa9..f7ae572 100644
+ (x) = (__typeof__(*(ptr)))__gue_val; \
} while (0)
- #define put_user_try uaccess_try
+ #ifdef CONFIG_X86_WP_WORKS_OK
diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
-index 7f760a9..b596b9a 100644
+index 566e803..9540707 100644
--- a/arch/x86/include/asm/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
@@ -18333,7 +15250,7 @@ index 7f760a9..b596b9a 100644
}
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
-index 4f7923d..201b58d 100644
+index 1c66d30..9d90f2c 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -10,6 +10,9 @@
@@ -18346,27 +15263,23 @@ index 4f7923d..201b58d 100644
/*
* Copy To/From Userspace
-@@ -17,14 +20,14 @@
+@@ -17,12 +20,12 @@
/* Handles exceptions in both to and from, but doesn't do access_ok */
__must_check unsigned long
--copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
-+copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
- __must_check unsigned long
-copy_user_generic_string(void *to, const void *from, unsigned len);
-+copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
++copy_user_generic_string(void *to, const void *from, unsigned long len) __size_overflow(3);
__must_check unsigned long
-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
-+copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
++copy_user_generic_unrolled(void *to, const void *from, unsigned long len) __size_overflow(3);
--static __always_inline __must_check unsigned long
+ static __always_inline __must_check unsigned long
-copy_user_generic(void *to, const void *from, unsigned len)
-+static __always_inline __must_check unsigned long
+copy_user_generic(void *to, const void *from, unsigned long len)
{
unsigned ret;
-@@ -45,138 +48,200 @@ copy_user_generic(void *to, const void *from, unsigned len)
+@@ -36,138 +39,200 @@ copy_user_generic(void *to, const void *from, unsigned len)
return ret;
}
@@ -18611,7 +15524,7 @@ index 4f7923d..201b58d 100644
ret, "b", "b", "=q", 1);
if (likely(!ret))
__put_user_asm(tmp, (u8 __user *)dst,
-@@ -185,7 +250,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -176,7 +241,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
}
case 2: {
u16 tmp;
@@ -18620,7 +15533,7 @@ index 4f7923d..201b58d 100644
ret, "w", "w", "=r", 2);
if (likely(!ret))
__put_user_asm(tmp, (u16 __user *)dst,
-@@ -195,7 +260,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -186,7 +251,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
case 4: {
u32 tmp;
@@ -18629,7 +15542,7 @@ index 4f7923d..201b58d 100644
ret, "l", "k", "=r", 4);
if (likely(!ret))
__put_user_asm(tmp, (u32 __user *)dst,
-@@ -204,7 +269,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -195,7 +260,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
}
case 8: {
u64 tmp;
@@ -18638,7 +15551,7 @@ index 4f7923d..201b58d 100644
ret, "q", "", "=r", 8);
if (likely(!ret))
__put_user_asm(tmp, (u64 __user *)dst,
-@@ -212,41 +277,74 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -203,8 +268,8 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
return ret;
}
default:
@@ -18649,6 +15562,10 @@ index 4f7923d..201b58d 100644
}
}
+@@ -218,36 +283,57 @@ __must_check long strlen_user(const char __user *str);
+ __must_check unsigned long clear_user(void __user *mem, unsigned long len);
+ __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
+
-static __must_check __always_inline int
-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
+static __must_check __always_inline unsigned long
@@ -18658,11 +15575,6 @@ index 4f7923d..201b58d 100644
+ if (size > INT_MAX)
+ return size;
+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (!__access_ok(VERIFY_READ, src, size))
-+ return size;
-+#endif
-+
+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
}
@@ -18675,11 +15587,6 @@ index 4f7923d..201b58d 100644
+ if (size > INT_MAX)
+ return size;
+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (!__access_ok(VERIFY_WRITE, dst, size))
-+ return size;
-+#endif
-+
+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
}
@@ -18690,10 +15597,9 @@ index 4f7923d..201b58d 100644
-static inline int
-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
-+static inline unsigned long
-+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
++static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
{
- might_fault();
+ might_sleep();
+
+ if (size > INT_MAX)
+ return size;
@@ -18707,9 +15613,9 @@ index 4f7923d..201b58d 100644
}
-static inline int
-+static inline unsigned long
- __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
+-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
- unsigned size)
++static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
+ unsigned long size)
{
+ if (size > INT_MAX)
@@ -18723,29 +15629,30 @@ index 4f7923d..201b58d 100644
return __copy_user_nocache(dst, src, size, 0);
}
- unsigned long
+-unsigned long
-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
++extern unsigned long
+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/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
-+++ b/arch/x86/include/asm/word-at-a-time.h
-@@ -11,7 +11,7 @@
- * and shift, for example.
- */
- struct word_at_a_time {
-- const unsigned long one_bits, high_bits;
-+ unsigned long one_bits, high_bits;
- };
+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
- #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 828a156..650e625 100644
+index 1971e65..1e07354 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
-@@ -129,7 +129,7 @@ struct x86_init_ops {
+@@ -139,7 +139,7 @@ struct x86_init_ops {
struct x86_init_timers timers;
struct x86_init_iommu iommu;
struct x86_init_pci pci;
@@ -18754,47 +15661,38 @@ index 828a156..650e625 100644
/**
* struct x86_cpuinit_ops - platform specific cpu hotplug setups
-@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
+@@ -147,7 +147,7 @@ struct x86_init_ops {
+ */
+ 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 timespec;
-
-@@ -168,7 +168,7 @@ struct x86_platform_ops {
- void (*save_sched_clock_state)(void);
- void (*restore_sched_clock_state)(void);
- void (*apic_post_init)(void);
+ /**
+ * struct x86_platform_ops - platform specific runtime functions
+@@ -169,7 +169,7 @@ struct x86_platform_ops {
+ void (*nmi_init)(void);
+ unsigned char (*get_nmi_reason)(void);
+ int (*i8042_detect)(void);
-};
+} __no_const;
struct pci_dev;
- struct msi_msg;
-@@ -182,7 +182,7 @@ struct x86_msi_ops {
- void (*teardown_msi_irqs)(struct pci_dev *dev);
- void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
- int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
--};
-+} __no_const;
- struct IO_APIC_route_entry;
- struct io_apic_irq_attr;
-@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
- unsigned int destination, int vector,
- struct io_apic_irq_attr *attr);
- void (*eoi_ioapic_pin)(int apic, int pin, int vector);
+@@ -177,7 +177,7 @@ struct x86_msi_ops {
+ int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
+ void (*teardown_msi_irq)(unsigned int irq);
+ void (*teardown_msi_irqs)(struct pci_dev *dev);
-};
+} __no_const;
extern struct x86_init_ops x86_init;
extern struct x86_cpuinit_ops x86_cpuinit;
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
-index b913915..4f5a581 100644
+index c34f96c..e26f052 100644
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
-@@ -56,7 +56,7 @@ extern int m2p_remove_override(struct page *page,
+@@ -54,7 +54,7 @@ extern int m2p_remove_override(struct page *page, bool clear_pte);
extern struct page *m2p_find_override(unsigned long mfn);
extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
@@ -18804,86 +15702,50 @@ index b913915..4f5a581 100644
unsigned long mfn;
diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
-index 0415cda..3b22adc 100644
+index c6ce245..aab6adb 100644
--- a/arch/x86/include/asm/xsave.h
+++ b/arch/x86/include/asm/xsave.h
-@@ -70,8 +70,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
+@@ -65,6 +65,8 @@ static inline int xsave_user(struct xsave_struct __user *buf)
+ {
+ int err;
+
++ buf = (struct xsave_struct __user *)____m(buf);
++
+ /*
+ * Clear the xsave header first, so that reserved fields are
+ * initialized to zero.
+@@ -74,7 +76,9 @@ static inline int xsave_user(struct xsave_struct __user *buf)
if (unlikely(err))
return -EFAULT;
-+ pax_open_userland();
- __asm__ __volatile__(ASM_STAC "\n"
-- "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
-+ "1:"
+- __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
++ __asm__ __volatile__("1:"
+ __copyuser_seg
+ ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
- "2: " ASM_CLAC "\n"
+ "2:\n"
".section .fixup,\"ax\"\n"
"3: movl $-1,%[err]\n"
-@@ -81,18 +84,22 @@ static inline int xsave_user(struct xsave_struct __user *buf)
- : [err] "=r" (err)
- : "D" (buf), "a" (-1), "d" (-1), "0" (0)
- : "memory");
-+ pax_close_userland();
- return err;
- }
-
+@@ -96,11 +100,13 @@ static inline int xsave_user(struct xsave_struct __user *buf)
static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
{
int err;
- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
-+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
++ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)____m(buf));
u32 lmask = mask;
u32 hmask = mask >> 32;
-+ pax_open_userland();
- __asm__ __volatile__(ASM_STAC "\n"
-- "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
-+ "1:"
+- __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
++ __asm__ __volatile__("1:"
+ __copyuser_seg
+ ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
- "2: " ASM_CLAC "\n"
+ "2:\n"
".section .fixup,\"ax\"\n"
"3: movl $-1,%[err]\n"
-@@ -102,6 +109,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
- : [err] "=r" (err)
- : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
- : "memory"); /* memory required? */
-+ pax_close_userland();
- return err;
- }
-
-diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
-index bbae024..e1528f9 100644
---- a/arch/x86/include/uapi/asm/e820.h
-+++ b/arch/x86/include/uapi/asm/e820.h
-@@ -63,7 +63,7 @@ struct e820map {
- #define ISA_START_ADDRESS 0xa0000
- #define ISA_END_ADDRESS 0x100000
-
--#define BIOS_BEGIN 0x000a0000
-+#define BIOS_BEGIN 0x000c0000
- #define BIOS_END 0x00100000
-
- #define BIOS_ROM_BASE 0xffe00000
-diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
-index a5408b9..5133813 100644
---- a/arch/x86/kernel/Makefile
-+++ b/arch/x86/kernel/Makefile
-@@ -24,7 +24,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 40c7660..f709f4b 100644
+index 479d03c..2450277 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
-@@ -1365,7 +1365,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
+@@ -1345,7 +1345,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
* If your system is blacklisted here, but you find that acpi=force
* works for you, please contact linux-acpi@vger.kernel.org
*/
@@ -18892,7 +15754,7 @@ index 40c7660..f709f4b 100644
/*
* Boxes that need ACPI disabled
*/
-@@ -1440,7 +1440,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
+@@ -1420,7 +1420,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
};
/* second table for DMI checks that should run after early-quirks */
@@ -18901,12 +15763,48 @@ index 40c7660..f709f4b 100644
/*
* HP laptops which use a DSDT reporting as HP/SB400/10000,
* which includes some code which overrides all temperature
+diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
+index 6a564ac..3f3a3d7 100644
+--- a/arch/x86/kernel/acpi/realmode/Makefile
++++ b/arch/x86/kernel/acpi/realmode/Makefile
+@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
+ $(call cc-option, -fno-stack-protector) \
+ $(call cc-option, -mpreferred-stack-boundary=2)
+ KBUILD_CFLAGS += $(call cc-option, -m32)
++ifdef CONSTIFY_PLUGIN
++KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
++endif
+ KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+
+diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
+index b4fd836..4358fe3 100644
+--- a/arch/x86/kernel/acpi/realmode/wakeup.S
++++ b/arch/x86/kernel/acpi/realmode/wakeup.S
+@@ -108,6 +108,9 @@ wakeup_code:
+ /* Do any other stuff... */
+
+ #ifndef CONFIG_64BIT
++ /* Recheck NX bit overrides (64bit path does this in trampoline */
++ call verify_cpu
++
+ /* This could also be done in C code... */
+ movl pmode_cr3, %eax
+ movl %eax, %cr3
+@@ -131,6 +134,7 @@ wakeup_code:
+ movl pmode_cr0, %eax
+ movl %eax, %cr0
+ jmp pmode_return
++# include "../../verify_cpu.S"
+ #else
+ pushw $0
+ pushw trampoline_segment
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
-index 3312010..a65ca7b 100644
+index 103b6ab..2004d0a 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
-@@ -88,8 +88,12 @@ int x86_acpi_suspend_lowlevel(void)
- #else /* CONFIG_64BIT */
+@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
+ header->trampoline_segment = trampoline_address() >> 4;
#ifdef CONFIG_SMP
stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
+
@@ -18919,10 +15817,10 @@ index 3312010..a65ca7b 100644
#endif
initial_code = (unsigned long)wakeup_long64;
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
-index d1daa66..59fecba 100644
+index 13ab720..95d5442 100644
--- a/arch/x86/kernel/acpi/wakeup_32.S
+++ b/arch/x86/kernel/acpi/wakeup_32.S
-@@ -29,13 +29,11 @@ wakeup_pmode_return:
+@@ -30,13 +30,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
@@ -18939,10 +15837,10 @@ index d1daa66..59fecba 100644
bogus_magic:
jmp bogus_magic
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
-index 15e8563..323cbe1 100644
+index bda833c..a9bdd97 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
-@@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
+@@ -276,6 +276,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;
@@ -18956,7 +15854,7 @@ index 15e8563..323cbe1 100644
replacement = (u8 *)&a->repl_offset + a->repl_offset;
BUG_ON(a->replacementlen > a->instrlen);
BUG_ON(a->instrlen > sizeof(insnbuf));
-@@ -300,10 +307,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
+@@ -307,10 +314,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
for (poff = start; poff < end; poff++) {
u8 *ptr = (u8 *)poff + *poff;
@@ -18972,9 +15870,9 @@ index 15e8563..323cbe1 100644
- if (*ptr == 0x3e)
+ if (*ktla_ktva(ptr) == 0x3e)
text_poke(ptr, ((unsigned char []){0xf0}), 1);
- }
+ };
mutex_unlock(&text_mutex);
-@@ -318,10 +331,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
+@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
for (poff = start; poff < end; poff++) {
u8 *ptr = (u8 *)poff + *poff;
@@ -18990,9 +15888,9 @@ index 15e8563..323cbe1 100644
- if (*ptr == 0xf0)
+ if (*ktla_ktva(ptr) == 0xf0)
text_poke(ptr, ((unsigned char []){0x3E}), 1);
- }
+ };
mutex_unlock(&text_mutex);
-@@ -469,7 +488,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
+@@ -500,7 +519,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 */
@@ -19001,16 +15899,16 @@ index 15e8563..323cbe1 100644
used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
(unsigned long)p->instr, p->len);
-@@ -516,7 +535,7 @@ void __init alternative_instructions(void)
- if (!uniproc_patched || num_possible_cpus() == 1)
+@@ -568,7 +587,7 @@ void __init alternative_instructions(void)
+ if (smp_alt_once)
free_init_pages("SMP alternatives",
(unsigned long)__smp_locks,
- (unsigned long)__smp_locks_end);
+ PAGE_ALIGN((unsigned long)__smp_locks_end));
- #endif
- apply_paravirt(__parainstructions, __parainstructions_end);
-@@ -536,13 +555,17 @@ void __init alternative_instructions(void)
+ restart_nmi();
+ }
+@@ -585,13 +604,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.
*/
@@ -19030,7 +15928,7 @@ index 15e8563..323cbe1 100644
local_irq_restore(flags);
/* Could also do a CLFLUSH here to speed up CPU recovery; but
that causes hangs on some VIA CPUs. */
-@@ -564,36 +587,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
+@@ -613,36 +636,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)
{
@@ -19075,29 +15973,11 @@ index 15e8563..323cbe1 100644
return addr;
}
-@@ -613,7 +622,7 @@ int poke_int3_handler(struct pt_regs *regs)
- if (likely(!bp_patching_in_progress))
- return 0;
-
-- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
-+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
- return 0;
-
- /* set up the specified breakpoint handler */
-@@ -647,7 +656,7 @@ int poke_int3_handler(struct pt_regs *regs)
- */
- void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
- {
-- unsigned char int3 = 0xcc;
-+ const unsigned char int3 = 0xcc;
-
- bp_int3_handler = handler;
- bp_int3_addr = (u8 *)addr + sizeof(int3);
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index a7eb82d..f6e52d4 100644
+index c4e3581..7e2f9d0 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
-@@ -190,7 +190,7 @@ int first_system_vector = 0xfe;
+@@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
/*
* Debug level, exported for io_apic.c
*/
@@ -19106,7 +15986,7 @@ index a7eb82d..f6e52d4 100644
int pic_mode;
-@@ -1985,7 +1985,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
+@@ -1857,7 +1857,7 @@ void smp_error_interrupt(struct pt_regs *regs)
apic_write(APIC_ESR, 0);
v1 = apic_read(APIC_ESR);
ack_APIC_irq();
@@ -19116,19 +15996,19 @@ index a7eb82d..f6e52d4 100644
apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
smp_processor_id(), v0 , v1);
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
-index 00c77cf..2dc6a2d 100644
+index f7a41e4..be25d88 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
-@@ -157,7 +157,7 @@ static int flat_probe(void)
- return 1;
+@@ -171,7 +171,7 @@ static int flat_phys_pkg_id(int initial_apic_id, int index_msb)
+ return initial_apic_id >> index_msb;
}
-static struct apic apic_flat = {
+static struct apic apic_flat __read_only = {
.name = "flat",
- .probe = flat_probe,
+ .probe = NULL,
.acpi_madt_oem_check = flat_acpi_madt_oem_check,
-@@ -271,7 +271,7 @@ static int physflat_probe(void)
+@@ -327,7 +327,7 @@ static int physflat_probe(void)
return 0;
}
@@ -19138,7 +16018,7 @@ index 00c77cf..2dc6a2d 100644
.name = "physical flat",
.probe = physflat_probe,
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
-index e145f28..2752888 100644
+index 775b82b..841f78b 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -119,7 +119,7 @@ static void noop_apic_write(u32 reg, u32 v)
@@ -19151,10 +16031,10 @@ index e145f28..2752888 100644
.probe = noop_probe,
.acpi_madt_oem_check = NULL,
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
-index d50e364..543bee3 100644
+index 521bead..a724871 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
-@@ -152,7 +152,7 @@ static int probe_bigsmp(void)
+@@ -193,7 +193,7 @@ static int probe_bigsmp(void)
return dmi_bigsmp;
}
@@ -19164,10 +16044,10 @@ index d50e364..543bee3 100644
.name = "bigsmp",
.probe = probe_bigsmp,
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
-index c552247..587a316 100644
+index 5d513bc..6a51935 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
-@@ -608,8 +608,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
+@@ -619,8 +619,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
return ret && es7000_apic_is_cluster();
}
@@ -19177,7 +16057,7 @@ index c552247..587a316 100644
.name = "es7000",
.probe = probe_es7000,
-@@ -675,7 +674,7 @@ static struct apic __refdata apic_es7000_cluster = {
+@@ -685,7 +684,7 @@ static struct apic __refdata apic_es7000_cluster = {
.x86_32_early_logical_apicid = es7000_early_logical_apicid,
};
@@ -19187,10 +16067,10 @@ index c552247..587a316 100644
.name = "es7000",
.probe = probe_es7000,
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index e63a5bd..c0babf8 100644
+index 6d939d7..75d1260 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -1060,7 +1060,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
+@@ -1096,7 +1096,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
}
EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
@@ -19199,7 +16079,7 @@ index e63a5bd..c0babf8 100644
{
/* Used to the online set of cpus does not change
* during assign_irq_vector.
-@@ -1068,7 +1068,7 @@ void lock_vector_lock(void)
+@@ -1104,7 +1104,7 @@ void lock_vector_lock(void)
raw_spin_lock(&vector_lock);
}
@@ -19208,16 +16088,16 @@ index e63a5bd..c0babf8 100644
{
raw_spin_unlock(&vector_lock);
}
-@@ -2367,7 +2367,7 @@ static void ack_apic_edge(struct irq_data *data)
+@@ -2510,7 +2510,7 @@ static void ack_apic_edge(struct irq_data *data)
ack_APIC_irq();
}
-atomic_t irq_mis_count;
+atomic_unchecked_t irq_mis_count;
- #ifdef CONFIG_GENERIC_PENDING_IRQ
- static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
-@@ -2508,7 +2508,7 @@ static void ack_apic_level(struct irq_data *data)
+ static void ack_apic_level(struct irq_data *data)
+ {
+@@ -2576,7 +2576,7 @@ static void ack_apic_level(struct irq_data *data)
* at the cpu.
*/
if (!(v & (1 << (i & 0x1f)))) {
@@ -19226,11 +16106,32 @@ index e63a5bd..c0babf8 100644
eoi_ioapic_irq(irq, cfg);
}
+@@ -2634,13 +2634,16 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
+
+ static void irq_remap_modify_chip_defaults(struct irq_chip *chip)
+ {
+- chip->irq_print_chip = ir_print_prefix;
+- chip->irq_ack = ir_ack_apic_edge;
+- chip->irq_eoi = ir_ack_apic_level;
++ pax_open_kernel();
++ *(void **)&chip->irq_print_chip = ir_print_prefix;
++ *(void **)&chip->irq_ack = ir_ack_apic_edge;
++ *(void **)&chip->irq_eoi = ir_ack_apic_level;
+
+ #ifdef CONFIG_SMP
+- chip->irq_set_affinity = ir_ioapic_set_affinity;
++ *(void **)&chip->irq_set_affinity = ir_ioapic_set_affinity;
+ #endif
++
++ pax_close_kernel();
+ }
+ #endif /* CONFIG_IRQ_REMAP */
+
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
-index 1e42e8f..daacf44 100644
+index c4a61ca..4c63d32 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
-@@ -455,8 +455,7 @@ static void numaq_setup_portio_remap(void)
+@@ -472,8 +472,7 @@ static void numaq_setup_portio_remap(void)
(u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);
}
@@ -19241,10 +16142,10 @@ index 1e42e8f..daacf44 100644
.name = "NUMAQ",
.probe = probe_numaq,
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
-index eb35ef9..f184a21 100644
+index 0787bb3..e222a80 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
-@@ -72,7 +72,7 @@ static int probe_default(void)
+@@ -87,7 +87,7 @@ static int probe_default(void)
return 1;
}
@@ -19254,10 +16155,10 @@ index eb35ef9..f184a21 100644
.name = "default",
.probe = probe_default,
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
-index 77c95c0..434f8a4 100644
+index 1911442..2424a83 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
-@@ -486,7 +486,7 @@ void setup_summit(void)
+@@ -491,7 +491,7 @@ void setup_summit(void)
}
#endif
@@ -19267,10 +16168,10 @@ index 77c95c0..434f8a4 100644
.name = "summit",
.probe = probe_summit,
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
-index 140e29d..d88bc95 100644
+index 5007958..2eba140 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
-@@ -183,7 +183,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
+@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
return notifier_from_errno(err);
}
@@ -19279,8 +16180,8 @@ index 140e29d..d88bc95 100644
.notifier_call = update_clusterinfo,
};
-@@ -235,7 +235,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
- cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
+@@ -208,7 +208,7 @@ static int x2apic_cluster_probe(void)
+ return 0;
}
-static struct apic apic_x2apic_cluster = {
@@ -19289,10 +16190,10 @@ index 140e29d..d88bc95 100644
.name = "cluster x2apic",
.probe = x2apic_cluster_probe,
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
-index 562a76d..a003c0f 100644
+index db4f704..2d4f409 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
-@@ -89,7 +89,7 @@ static int x2apic_phys_probe(void)
+@@ -121,7 +121,7 @@ static int x2apic_phys_probe(void)
return apic == &apic_x2apic_phys;
}
@@ -19302,10 +16203,10 @@ index 562a76d..a003c0f 100644
.name = "physical x2apic",
.probe = x2apic_phys_probe,
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
-index a419814..1dd34a0 100644
+index 79b05b8..bc1d972 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
-@@ -357,7 +357,7 @@ static int uv_probe(void)
+@@ -346,7 +346,7 @@ static int uv_probe(void)
return apic == &apic_x2apic_uv_x;
}
@@ -19315,10 +16216,10 @@ index a419814..1dd34a0 100644
.name = "UV large system",
.probe = uv_probe,
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
-index 3ab0343..814c4787 100644
+index a46bd38..6b906d7 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
-@@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
+@@ -411,7 +411,7 @@ static DEFINE_MUTEX(apm_mutex);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
*/
@@ -19327,7 +16228,7 @@ index 3ab0343..814c4787 100644
(unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
static const char driver_version[] = "1.16ac"; /* no spaces */
-@@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
+@@ -589,7 +589,10 @@ static long __apm_bios_call(void *_call)
BUG_ON(cpu != 0);
gdt = get_cpu_gdt_table(cpu);
save_desc_40 = gdt[0x40 / 8];
@@ -19338,7 +16239,7 @@ index 3ab0343..814c4787 100644
apm_irq_save(flags);
APM_DO_SAVE_SEGS;
-@@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
+@@ -598,7 +601,11 @@ static long __apm_bios_call(void *_call)
&call->esi);
APM_DO_RESTORE_SEGS;
apm_irq_restore(flags);
@@ -19350,7 +16251,7 @@ index 3ab0343..814c4787 100644
put_cpu();
return call->eax & 0xff;
-@@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
+@@ -665,7 +672,10 @@ static long __apm_bios_call_simple(void *_call)
BUG_ON(cpu != 0);
gdt = get_cpu_gdt_table(cpu);
save_desc_40 = gdt[0x40 / 8];
@@ -19361,7 +16262,7 @@ index 3ab0343..814c4787 100644
apm_irq_save(flags);
APM_DO_SAVE_SEGS;
-@@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
+@@ -673,7 +683,11 @@ static long __apm_bios_call_simple(void *_call)
&call->eax);
APM_DO_RESTORE_SEGS;
apm_irq_restore(flags);
@@ -19373,7 +16274,7 @@ index 3ab0343..814c4787 100644
put_cpu();
return error;
}
-@@ -2362,12 +2376,15 @@ static int __init apm_init(void)
+@@ -2347,12 +2361,15 @@ static int __init apm_init(void)
* code to that CPU.
*/
gdt = get_cpu_gdt_table(0);
@@ -19390,7 +16291,7 @@ index 3ab0343..814c4787 100644
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 2861082..6d4718e 100644
+index 4f13faf..87db5d2 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -33,6 +33,8 @@ void common(void) {
@@ -19430,10 +16331,10 @@ index 2861082..6d4718e 100644
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
-index e7c798b..2b2019b 100644
+index e72a119..6e2955d 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
-@@ -77,6 +77,7 @@ int main(void)
+@@ -69,6 +69,7 @@ int main(void)
BLANK();
#undef ENTRY
@@ -19442,7 +16343,7 @@ index e7c798b..2b2019b 100644
BLANK();
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
-index 47b56a7..efc2bc6 100644
+index 25f24dc..4094a7f 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
@@ -19455,13 +16356,13 @@ index 47b56a7..efc2bc6 100644
-
obj-y := intel_cacheinfo.o scattered.o topology.o
obj-y += proc.o capflags.o powerflags.o common.o
- obj-y += rdrand.o
+ obj-y += vmware.o hypervisor.o sched.o mshyperv.o
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 903a264..fc955f3 100644
+index f07becc..b17b101 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
-@@ -743,7 +743,7 @@ static void init_amd(struct cpuinfo_x86 *c)
- static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
+@@ -694,7 +694,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
+ unsigned int size)
{
/* AMD errata T13 (order #21922) */
- if ((c->x86 == 6)) {
@@ -19470,12 +16371,12 @@ index 903a264..fc955f3 100644
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 2793d1f..5c04a30 100644
+index ca93cc7..def63d0 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
-@@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = {
+@@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
- static const struct cpu_dev *this_cpu = &default_cpu;
+ static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
-#ifdef CONFIG_X86_64
@@ -19534,65 +16435,7 @@ index 2793d1f..5c04a30 100644
static int __init x86_xsave_setup(char *s)
{
setup_clear_cpu_cap(X86_FEATURE_XSAVE);
-@@ -288,6 +234,57 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
- set_in_cr4(X86_CR4_SMAP);
- }
-
-+#ifdef CONFIG_X86_64
-+static __init int setup_disable_pcid(char *arg)
-+{
-+ setup_clear_cpu_cap(X86_FEATURE_PCID);
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (clone_pgd_mask != ~(pgdval_t)0UL)
-+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
-+#endif
-+
-+ return 1;
-+}
-+__setup("nopcid", setup_disable_pcid);
-+
-+static void setup_pcid(struct cpuinfo_x86 *c)
-+{
-+ if (!cpu_has(c, X86_FEATURE_PCID)) {
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
-+ pax_open_kernel();
-+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
-+ pax_close_kernel();
-+ printk("PAX: slow and weak UDEREF enabled\n");
-+ } else
-+ printk("PAX: UDEREF disabled\n");
-+#endif
-+
-+ return;
-+ }
-+
-+ printk("PAX: PCID detected\n");
-+ set_in_cr4(X86_CR4_PCIDE);
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ pax_open_kernel();
-+ clone_pgd_mask = ~(pgdval_t)0UL;
-+ pax_close_kernel();
-+ if (pax_user_shadow_base)
-+ printk("PAX: weak UDEREF enabled\n");
-+ else {
-+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
-+ printk("PAX: strong UDEREF enabled\n");
-+ }
-+#endif
-+
-+ if (cpu_has(c, X86_FEATURE_INVPCID))
-+ printk("PAX: INVPCID detected\n");
-+}
-+#endif
-+
- /*
- * Some CPU features depend on higher CPUID levels, which may not always
- * be available due to CPUID level capping or broken virtualization
-@@ -386,7 +383,7 @@ void switch_to_new_gdt(int cpu)
+@@ -372,7 +318,7 @@ void switch_to_new_gdt(int cpu)
{
struct desc_ptr gdt_descr;
@@ -19601,18 +16444,7 @@ index 2793d1f..5c04a30 100644
gdt_descr.size = GDT_SIZE - 1;
load_gdt(&gdt_descr);
/* Reload the per-cpu base */
-@@ -875,6 +872,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
- setup_smep(c);
- setup_smap(c);
-
-+#ifdef CONFIG_X86_64
-+ setup_pcid(c);
-+#endif
-+
- /*
- * The vendor-specific functions might have changed features.
- * Now we do "generic changes."
-@@ -883,6 +884,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
+@@ -839,6 +785,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);
@@ -19623,7 +16455,7 @@ index 2793d1f..5c04a30 100644
/* If the model name is still unset, do table lookup. */
if (!c->x86_model_id[0]) {
const char *p;
-@@ -1070,10 +1075,12 @@ static __init int setup_disablecpuid(char *arg)
+@@ -1019,6 +969,9 @@ static __init int setup_disablecpuid(char *arg)
}
__setup("clearcpuid=", setup_disablecpuid);
@@ -19631,15 +16463,9 @@ index 2793d1f..5c04a30 100644
+EXPORT_PER_CPU_SYMBOL(current_tinfo);
+
#ifdef CONFIG_X86_64
--struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
--struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
-- (unsigned long) debug_idt_table };
-+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
-+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
-
- DEFINE_PER_CPU_FIRST(union irq_stack_union,
- irq_stack_union) __aligned(PAGE_SIZE) __visible;
-@@ -1087,7 +1094,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
+ struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
+
+@@ -1034,7 +987,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
EXPORT_PER_CPU_SYMBOL(current_task);
DEFINE_PER_CPU(unsigned long, kernel_stack) =
@@ -19648,8 +16474,17 @@ index 2793d1f..5c04a30 100644
EXPORT_PER_CPU_SYMBOL(kernel_stack);
DEFINE_PER_CPU(char *, irq_stack_ptr) =
-@@ -1232,7 +1239,7 @@ void cpu_init(void)
- load_ucode_ap();
+@@ -1099,7 +1052,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
+ {
+ memset(regs, 0, sizeof(struct pt_regs));
+ regs->fs = __KERNEL_PERCPU;
+- regs->gs = __KERNEL_STACK_CANARY;
++ savesegment(gs, regs->gs);
+
+ return regs;
+ }
+@@ -1154,7 +1107,7 @@ void __cpuinit cpu_init(void)
+ int i;
cpu = stack_smp_processor_id();
- t = &per_cpu(init_tss, cpu);
@@ -19657,15 +16492,24 @@ index 2793d1f..5c04a30 100644
oist = &per_cpu(orig_ist, cpu);
#ifdef CONFIG_NUMA
-@@ -1267,7 +1274,6 @@ void cpu_init(void)
+@@ -1180,7 +1133,7 @@ void __cpuinit cpu_init(void)
+ switch_to_new_gdt(cpu);
+ loadsegment(fs, 0);
+
+- load_idt((const struct desc_ptr *)&idt_descr);
++ load_idt(&idt_descr);
+
+ memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
+ syscall_init();
+@@ -1189,7 +1142,6 @@ void __cpuinit cpu_init(void)
wrmsrl(MSR_KERNEL_GS_BASE, 0);
barrier();
- x86_configure_nx();
- enable_x2apic();
+ if (cpu != 0)
+ enable_x2apic();
- /*
-@@ -1319,7 +1325,7 @@ void cpu_init(void)
+@@ -1243,7 +1195,7 @@ void __cpuinit cpu_init(void)
{
int cpu = smp_processor_id();
struct task_struct *curr = current;
@@ -19673,12 +16517,25 @@ index 2793d1f..5c04a30 100644
+ struct tss_struct *t = init_tss + cpu;
struct thread_struct *thread = &curr->thread;
- show_ucode_info_early();
+ 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 3e6ff6c..54b4992 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)
+ * Update the IDT descriptor and reload the IDT so that
+ * it uses the read-only mapped virtual address.
+ */
+- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
++ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
+ load_idt(&idt_descr);
+ }
+ #endif
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
-index 1414c90..1159406 100644
+index 0e89635..f0a7525 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
-@@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = {
+@@ -984,6 +984,22 @@ static struct attribute *default_attrs[] = {
};
#ifdef CONFIG_AMD_NB
@@ -19698,12 +16555,12 @@ index 1414c90..1159406 100644
+ NULL
+};
+
- static struct attribute **amd_l3_attrs(void)
+ static struct attribute ** __cpuinit amd_l3_attrs(void)
{
static struct attribute **attrs;
-@@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void)
+@@ -994,18 +1010,7 @@ static struct attribute ** __cpuinit amd_l3_attrs(void)
- n = ARRAY_SIZE(default_attrs);
+ n = sizeof (default_attrs) / sizeof (struct attribute *);
- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
- n += 2;
@@ -19721,7 +16578,7 @@ index 1414c90..1159406 100644
if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
attrs[n++] = &cache_disable_0.attr;
-@@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = {
+@@ -1056,6 +1061,13 @@ static struct kobj_type ktype_cache = {
.default_attrs = default_attrs,
};
@@ -19735,7 +16592,7 @@ index 1414c90..1159406 100644
static struct kobj_type ktype_percpu_entry = {
.sysfs_ops = &sysfs_ops,
};
-@@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev)
+@@ -1121,20 +1133,26 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
return retval;
}
@@ -19765,11 +16622,20 @@ index 1414c90..1159406 100644
per_cpu(ici_cache_kobject, cpu),
"index%1lu", i);
if (unlikely(retval)) {
+@@ -1189,7 +1207,7 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = {
++static struct notifier_block cacheinfo_cpu_notifier = {
+ .notifier_call = cacheinfo_cpu_callback,
+ };
+
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index b3218cd..99a75de 100644
+index 3b67877..77e760c 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
-@@ -45,6 +45,7 @@
+@@ -42,6 +42,7 @@
#include <asm/processor.h>
#include <asm/mce.h>
#include <asm/msr.h>
@@ -19777,7 +16643,7 @@ index b3218cd..99a75de 100644
#include "mce-internal.h"
-@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
+@@ -200,7 +201,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
@@ -19786,7 +16652,7 @@ index b3218cd..99a75de 100644
print_symbol("{%s}", m->ip);
pr_cont("\n");
}
-@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
+@@ -233,10 +234,10 @@ static void print_mce(struct mce *m)
#define PANIC_TIMEOUT 5 /* 5 seconds */
@@ -19799,7 +16665,7 @@ index b3218cd..99a75de 100644
/* Panic in progress. Enable interrupts and wait for final IPI */
static void wait_for_panic(void)
-@@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -260,7 +261,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
/*
* Make sure only one CPU runs in machine check panic
*/
@@ -19808,7 +16674,7 @@ index b3218cd..99a75de 100644
wait_for_panic();
barrier();
-@@ -326,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -268,7 +269,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
console_verbose();
} else {
/* Don't log too much for fake panic */
@@ -19817,25 +16683,25 @@ index b3218cd..99a75de 100644
return;
}
/* First print corrected ones that are still unlogged */
-@@ -365,7 +366,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -307,7 +308,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
if (!fake_panic) {
if (panic_timeout == 0)
- panic_timeout = mca_cfg.panic_timeout;
+ panic_timeout = mce_panic_timeout;
- panic(msg);
+ panic("%s", msg);
} else
pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
}
-@@ -695,7 +696,7 @@ static int mce_timed_out(u64 *t)
+@@ -616,7 +617,7 @@ static int mce_timed_out(u64 *t)
* might have been modified by someone else.
*/
rmb();
- if (atomic_read(&mce_paniced))
+ if (atomic_read_unchecked(&mce_paniced))
wait_for_panic();
- if (!mca_cfg.monarch_timeout)
+ if (!monarch_timeout)
goto out;
-@@ -1666,7 +1667,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
+@@ -1404,7 +1405,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
}
/* Call the installed machine check handler for this CPU setup. */
@@ -19844,7 +16710,7 @@ index b3218cd..99a75de 100644
unexpected_machine_check;
/*
-@@ -1689,7 +1690,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1427,7 +1428,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
return;
}
@@ -19854,7 +16720,7 @@ index b3218cd..99a75de 100644
__mcheck_cpu_init_generic();
__mcheck_cpu_init_vendor(c);
-@@ -1703,7 +1706,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1441,7 +1444,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
*/
static DEFINE_SPINLOCK(mce_chrdev_state_lock);
@@ -19863,7 +16729,7 @@ index b3218cd..99a75de 100644
static int mce_chrdev_open_exclu; /* already open exclusive? */
static int mce_chrdev_open(struct inode *inode, struct file *file)
-@@ -1711,7 +1714,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1449,7 +1452,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
spin_lock(&mce_chrdev_state_lock);
if (mce_chrdev_open_exclu ||
@@ -19872,7 +16738,7 @@ index b3218cd..99a75de 100644
spin_unlock(&mce_chrdev_state_lock);
return -EBUSY;
-@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1457,7 +1460,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
if (file->f_flags & O_EXCL)
mce_chrdev_open_exclu = 1;
@@ -19881,7 +16747,7 @@ index b3218cd..99a75de 100644
spin_unlock(&mce_chrdev_state_lock);
-@@ -1730,7 +1733,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
+@@ -1468,7 +1471,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
{
spin_lock(&mce_chrdev_state_lock);
@@ -19890,16 +16756,25 @@ index b3218cd..99a75de 100644
mce_chrdev_open_exclu = 0;
spin_unlock(&mce_chrdev_state_lock);
-@@ -2404,7 +2407,7 @@ static __init void mce_init_banks(void)
+@@ -2099,7 +2102,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 = {
+ .notifier_call = mce_cpu_callback,
+ };
- for (i = 0; i < mca_cfg.banks; i++) {
+@@ -2109,7 +2112,7 @@ static __init void mce_init_banks(void)
+
+ for (i = 0; i < banks; i++) {
struct mce_bank *b = &mce_banks[i];
-- struct device_attribute *a = &b->attr;
-+ device_attribute_no_const *a = &b->attr;
+- struct sysdev_attribute *a = &b->attr;
++ sysdev_attribute_no_const *a = &b->attr;
sysfs_attr_init(&a->attr);
a->attr.name = b->attrname;
-@@ -2472,7 +2475,7 @@ struct dentry *mce_get_debugfs_dir(void)
+@@ -2177,7 +2180,7 @@ struct dentry *mce_get_debugfs_dir(void)
static void mce_reset(void)
{
cpu_missing = 0;
@@ -19909,18 +16784,18 @@ index b3218cd..99a75de 100644
atomic_set(&mce_callin, 0);
atomic_set(&global_nwo, 0);
diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
-index 1c044b1..37a2a43 100644
+index 5c0e653..0882b0a 100644
--- a/arch/x86/kernel/cpu/mcheck/p5.c
+++ b/arch/x86/kernel/cpu/mcheck/p5.c
-@@ -11,6 +11,7 @@
- #include <asm/processor.h>
+@@ -12,6 +12,7 @@
+ #include <asm/system.h>
#include <asm/mce.h>
#include <asm/msr.h>
+#include <asm/pgtable.h>
/* By default disabled */
int mce_p5_enabled __read_mostly;
-@@ -49,7 +50,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
+@@ -50,7 +51,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
if (!cpu_has(c, X86_FEATURE_MCE))
return;
@@ -19930,19 +16805,32 @@ index 1c044b1..37a2a43 100644
/* Make sure the vector pointer is visible before we enable MCEs: */
wmb();
+diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
+index ce04b58..b84acbd 100644
+--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
++++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
+@@ -290,7 +290,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,
+ return notifier_from_errno(err);
+ }
+
+-static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata =
++static struct notifier_block thermal_throttle_cpu_notifier =
+ {
+ .notifier_call = thermal_throttle_cpu_callback,
+ };
diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
-index e9a701a..35317d6 100644
+index 54060f5..c1a7577 100644
--- a/arch/x86/kernel/cpu/mcheck/winchip.c
+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
-@@ -10,6 +10,7 @@
- #include <asm/processor.h>
+@@ -11,6 +11,7 @@
+ #include <asm/system.h>
#include <asm/mce.h>
#include <asm/msr.h>
+#include <asm/pgtable.h>
/* Machine check handler for WinChip C6: */
static void winchip_machine_check(struct pt_regs *regs, long error_code)
-@@ -23,7 +24,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
+@@ -24,7 +25,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
{
u32 lo, hi;
@@ -19953,10 +16841,10 @@ index e9a701a..35317d6 100644
wmb();
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
-index f961de9..8a9d332 100644
+index 6b96110..0da73eb 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
-@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
+@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -19979,37 +16867,10 @@ index df5e41f..816c719 100644
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 8a87a32..682a22a 100644
+index 2bda212..78cc605 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
-@@ -1348,7 +1348,7 @@ static void __init pmu_check_apic(void)
- pr_info("no hardware sampling interrupt available.\n");
- }
-
--static struct attribute_group x86_pmu_format_group = {
-+static attribute_group_no_const x86_pmu_format_group = {
- .name = "format",
- .attrs = NULL,
- };
-@@ -1447,7 +1447,7 @@ static struct attribute *events_attr[] = {
- NULL,
- };
-
--static struct attribute_group x86_pmu_events_group = {
-+static attribute_group_no_const x86_pmu_events_group = {
- .name = "events",
- .attrs = events_attr,
- };
-@@ -1958,7 +1958,7 @@ static unsigned long get_segment_base(unsigned int segment)
- if (idx > GDT_ENTRIES)
- return 0;
-
-- desc = __this_cpu_ptr(&gdt_page.gdt[0]);
-+ desc = get_cpu_gdt_table(smp_processor_id());
- }
-
- return get_desc_base(desc + idx);
-@@ -2048,7 +2048,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
+@@ -1529,7 +1529,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
break;
perf_callchain_store(entry, frame.return_address);
@@ -20018,68 +16879,11 @@ index 8a87a32..682a22a 100644
}
}
-diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
-index 639d128..e92d7e5 100644
---- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
-+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
-@@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
- static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
- {
- struct attribute **attrs;
-- struct attribute_group *attr_group;
-+ attribute_group_no_const *attr_group;
- int i = 0, j;
-
- while (amd_iommu_v2_event_descs[i].attr.attr.name)
-diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
-index f31a165..7b46cd8 100644
---- a/arch/x86/kernel/cpu/perf_event_intel.c
-+++ b/arch/x86/kernel/cpu/perf_event_intel.c
-@@ -2247,10 +2247,10 @@ __init int intel_pmu_init(void)
- * v2 and above have a perf capabilities MSR
- */
- if (version > 1) {
-- u64 capabilities;
-+ u64 capabilities = x86_pmu.intel_cap.capabilities;
-
-- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
-- x86_pmu.intel_cap.capabilities = capabilities;
-+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
-+ x86_pmu.intel_cap.capabilities = capabilities;
- }
-
- intel_ds_init();
-diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
-index 4118f9f..f91d0ab 100644
---- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
-+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
-@@ -3204,7 +3204,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
- static int __init uncore_type_init(struct intel_uncore_type *type)
- {
- struct intel_uncore_pmu *pmus;
-- struct attribute_group *attr_group;
-+ attribute_group_no_const *attr_group;
- struct attribute **attrs;
- int i, j;
-
-diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
-index a80ab71..4089da5 100644
---- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
-+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
-@@ -498,7 +498,7 @@ struct intel_uncore_box {
- struct uncore_event_desc {
- struct kobj_attribute attr;
- const char *config;
--};
-+} __do_const;
-
- #define INTEL_UNCORE_EVENT_DESC(_name, _config) \
- { \
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
-index 7d9481c..99c7e4b 100644
+index 212a6a4..322f5d9 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
-@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
+@@ -172,7 +172,7 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
return notifier_from_errno(err);
}
@@ -20089,10 +16893,10 @@ index 7d9481c..99c7e4b 100644
.notifier_call = cpuid_class_cpu_callback,
};
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
-index e0e0841..da37e6f 100644
+index 13ad899..f642b9a 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
-@@ -58,10 +58,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
+@@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
{
#ifdef CONFIG_X86_32
struct pt_regs fixed_regs;
@@ -20117,11 +16921,11 @@ index afa64ad..dce67dd 100644
iounmap(vaddr);
return -EFAULT;
}
-diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
-index 5d3fe8d..02e1429 100644
---- a/arch/x86/kernel/doublefault.c
-+++ b/arch/x86/kernel/doublefault.c
-@@ -13,7 +13,7 @@
+diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
+index 37250fe..bf2ec74 100644
+--- a/arch/x86/kernel/doublefault_32.c
++++ b/arch/x86/kernel/doublefault_32.c
+@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
@@ -20130,16 +16934,16 @@ index 5d3fe8d..02e1429 100644
#define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
-@@ -23,7 +23,7 @@ static void doublefault_fn(void)
+@@ -21,7 +21,7 @@ static void doublefault_fn(void)
unsigned long gdt, tss;
- native_store_gdt(&gdt_desc);
+ store_gdt(&gdt_desc);
- gdt = gdt_desc.address;
+ gdt = (unsigned long)gdt_desc.address;
printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
-@@ -60,10 +60,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
+@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
/* 0x2 bit is always set */
.flags = X86_EFLAGS_SF | 0x2,
.sp = STACK_START,
@@ -20153,7 +16957,7 @@ index 5d3fe8d..02e1429 100644
.__cr3 = __pa_nodebug(swapper_pg_dir),
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
-index deb6421..76bbc12 100644
+index 1aae78f..138ca1b 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -2,6 +2,9 @@
@@ -20166,25 +16970,18 @@ index deb6421..76bbc12 100644
#include <linux/kallsyms.h>
#include <linux/kprobes.h>
#include <linux/uaccess.h>
-@@ -35,16 +38,14 @@ void printk_address(unsigned long address, int reliable)
+@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable)
static void
print_ftrace_graph_addr(unsigned long addr, void *data,
const struct stacktrace_ops *ops,
- struct thread_info *tinfo, int *graph)
+ struct task_struct *task, int *graph)
{
-- struct task_struct *task;
+- struct task_struct *task = tinfo->task;
unsigned long ret_addr;
- int index;
-
- if (addr != (unsigned long)return_to_handler)
- return;
-
-- task = tinfo->task;
- index = task->curr_ret_stack;
+ int index = task->curr_ret_stack;
- if (!task->ret_stack || index < *graph)
-@@ -61,7 +62,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
+@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
static inline void
print_ftrace_graph_addr(unsigned long addr, void *data,
const struct stacktrace_ops *ops,
@@ -20193,7 +16990,7 @@ index deb6421..76bbc12 100644
{ }
#endif
-@@ -72,10 +73,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
+@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
* severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
*/
@@ -20205,7 +17002,7 @@ index deb6421..76bbc12 100644
if (end) {
if (p < end && p >= (end-THREAD_SIZE))
return 1;
-@@ -86,14 +85,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
+@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
}
unsigned long
@@ -20222,7 +17019,7 @@ index deb6421..76bbc12 100644
unsigned long addr;
addr = *stack;
-@@ -105,7 +104,7 @@ print_context_stack(struct thread_info *tinfo,
+@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo,
} else {
ops->address(data, addr, 0);
}
@@ -20231,7 +17028,7 @@ index deb6421..76bbc12 100644
}
stack++;
}
-@@ -114,7 +113,7 @@ print_context_stack(struct thread_info *tinfo,
+@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
EXPORT_SYMBOL_GPL(print_context_stack);
unsigned long
@@ -20240,7 +17037,7 @@ index deb6421..76bbc12 100644
unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data,
unsigned long *end, int *graph)
-@@ -122,7 +121,7 @@ print_context_stack_bp(struct thread_info *tinfo,
+@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo,
struct stack_frame *frame = (struct stack_frame *)bp;
unsigned long *ret_addr = &frame->return_address;
@@ -20249,7 +17046,7 @@ index deb6421..76bbc12 100644
unsigned long addr = *ret_addr;
if (!__kernel_text_address(addr))
-@@ -131,7 +130,7 @@ print_context_stack_bp(struct thread_info *tinfo,
+@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
ops->address(data, addr, 1);
frame = frame->next_frame;
ret_addr = &frame->return_address;
@@ -20258,7 +17055,7 @@ index deb6421..76bbc12 100644
}
return (unsigned long)frame;
-@@ -150,7 +149,7 @@ static int print_trace_stack(void *data, char *name)
+@@ -147,7 +147,7 @@ static int print_trace_stack(void *data, char *name)
static void print_trace_address(void *data, unsigned long addr, int reliable)
{
touch_nmi_watchdog();
@@ -20267,7 +17064,16 @@ index deb6421..76bbc12 100644
printk_address(addr, reliable);
}
-@@ -219,6 +218,8 @@ unsigned __kprobes long oops_begin(void)
+@@ -186,7 +186,7 @@ void dump_stack(void)
+
+ bp = stack_frame(current, NULL);
+ printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+- current->pid, current->comm, print_tainted(),
++ task_pid_nr(current), current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version);
+@@ -222,6 +222,8 @@ unsigned __kprobes long oops_begin(void)
}
EXPORT_SYMBOL_GPL(oops_begin);
@@ -20276,7 +17082,7 @@ index deb6421..76bbc12 100644
void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
{
if (regs && kexec_should_crash(current))
-@@ -240,7 +241,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
+@@ -243,7 +245,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
panic("Fatal exception in interrupt");
if (panic_on_oops)
panic("Fatal exception");
@@ -20288,16 +17094,16 @@ index deb6421..76bbc12 100644
}
int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -268,7 +272,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
- print_modules();
- show_regs(regs);
+@@ -269,7 +274,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
+
+ show_registers(regs);
#ifdef CONFIG_X86_32
- if (user_mode_vm(regs)) {
+ if (user_mode(regs)) {
sp = regs->sp;
ss = regs->ss & 0xffff;
} else {
-@@ -296,7 +300,7 @@ void die(const char *str, struct pt_regs *regs, long err)
+@@ -297,7 +302,7 @@ void die(const char *str, struct pt_regs *regs, long err)
unsigned long flags = oops_begin();
int sig = SIGSEGV;
@@ -20307,7 +17113,7 @@ index deb6421..76bbc12 100644
if (__die(str, regs, err))
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
-index f2a1770..540657f 100644
+index c99f9ed..025ebd3 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,
@@ -20330,14 +17136,7 @@ index f2a1770..540657f 100644
if (ops->stack(data, "IRQ") < 0)
break;
touch_nmi_watchdog();
-@@ -87,27 +85,28 @@ void show_regs(struct pt_regs *regs)
- int i;
-
- show_regs_print_info(KERN_EMERG);
-- __show_regs(regs, !user_mode_vm(regs));
-+ __show_regs(regs, !user_mode(regs));
-
- /*
+@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs)
* When in-kernel, we also print out the stack and code at the
* time of the fault..
*/
@@ -20349,10 +17148,10 @@ index f2a1770..540657f 100644
u8 *ip;
+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
- pr_emerg("Stack:\n");
+ printk(KERN_EMERG "Stack:\n");
show_stack_log_lvl(NULL, regs, ®s->sp, 0, KERN_EMERG);
- pr_emerg("Code:");
+ printk(KERN_EMERG "Code: ");
- ip = (u8 *)regs->ip - code_prologue;
+ ip = (u8 *)regs->ip - code_prologue + cs_base;
@@ -20363,16 +17162,16 @@ index f2a1770..540657f 100644
code_len = code_len - code_prologue + 1;
}
for (i = 0; i < code_len; i++, ip++) {
-@@ -116,7 +115,7 @@ void show_regs(struct pt_regs *regs)
- pr_cont(" Bad EIP value.");
+@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs)
+ printk(KERN_CONT " Bad EIP value.");
break;
}
- if (ip == (u8 *)regs->ip)
+ if (ip == (u8 *)regs->ip + cs_base)
- pr_cont(" <%02x>", c);
+ printk(KERN_CONT "<%02x> ", c);
else
- pr_cont(" %02x", c);
-@@ -129,6 +128,7 @@ int is_valid_bugaddr(unsigned long ip)
+ printk(KERN_CONT "%02x ", c);
+@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
{
unsigned short ud2;
@@ -20380,7 +17179,7 @@ index f2a1770..540657f 100644
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-@@ -136,3 +136,15 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
return ud2 == 0x0b0f;
}
@@ -20397,7 +17196,7 @@ index f2a1770..540657f 100644
+EXPORT_SYMBOL(pax_check_alloca);
+#endif
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
-index addb207..99635fa 100644
+index 6d728d9..80f1867 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,
@@ -20461,7 +17260,16 @@ index addb207..99635fa 100644
put_cpu();
}
EXPORT_SYMBOL(dump_trace);
-@@ -300,3 +304,50 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -249,7 +253,7 @@ void show_registers(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;
+@@ -305,3 +309,50 @@ int is_valid_bugaddr(unsigned long ip)
return ud2 == 0x0b0f;
}
@@ -20513,10 +17321,10 @@ index addb207..99635fa 100644
+EXPORT_SYMBOL(pax_check_alloca);
+#endif
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
-index 174da5f..5e55606 100644
+index 303a0e4..0aad351 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
-@@ -803,8 +803,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
+@@ -829,8 +829,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
static void early_panic(char *msg)
{
@@ -20528,7 +17336,7 @@ index 174da5f..5e55606 100644
static int userdef __initdata;
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
-index d15f575..d692043 100644
+index cd28a35..c72ed9a 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -7,6 +7,7 @@
@@ -20540,10 +17348,10 @@ index d15f575..d692043 100644
#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 f0dcb0c..9f39b80 100644
+index d2d488b8..a4f589f 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
-@@ -177,13 +177,153 @@
+@@ -180,13 +180,153 @@
/*CFI_REL_OFFSET gs, PT_GS*/
.endm
.macro SET_KERNEL_GS reg
@@ -20638,11 +17446,11 @@ index f0dcb0c..9f39b80 100644
+ENDPROC(pax_exit_kernel)
+#endif
+
-+ .macro pax_erase_kstack
++.macro pax_erase_kstack
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
+ call pax_erase_kstack
+#endif
-+ .endm
++.endm
+
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
+/*
@@ -20698,7 +17506,7 @@ index f0dcb0c..9f39b80 100644
cld
PUSH_GS
pushl_cfi %fs
-@@ -206,7 +346,7 @@
+@@ -209,7 +349,7 @@
CFI_REL_OFFSET ecx, 0
pushl_cfi %ebx
CFI_REL_OFFSET ebx, 0
@@ -20707,7 +17515,7 @@ index f0dcb0c..9f39b80 100644
movl %edx, %ds
movl %edx, %es
movl $(__KERNEL_PERCPU), %edx
-@@ -214,6 +354,15 @@
+@@ -217,6 +357,15 @@
SET_KERNEL_GS %edx
.endm
@@ -20723,16 +17531,16 @@ index f0dcb0c..9f39b80 100644
.macro RESTORE_INT_REGS
popl_cfi %ebx
CFI_RESTORE ebx
-@@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
+@@ -302,7 +451,7 @@ ENTRY(ret_from_fork)
popfl_cfi
jmp syscall_exit
CFI_ENDPROC
-END(ret_from_fork)
+ENDPROC(ret_from_fork)
- ENTRY(ret_from_kernel_thread)
- CFI_STARTPROC
-@@ -344,7 +493,15 @@ ret_from_intr:
+ /*
+ * Interrupt exit functions should be protected against kprobes
+@@ -336,7 +485,15 @@ resume_userspace_sig:
andl $SEGMENT_RPL_MASK, %eax
#endif
cmpl $USER_RPL, %eax
@@ -20748,7 +17556,7 @@ index f0dcb0c..9f39b80 100644
ENTRY(resume_userspace)
LOCKDEP_SYS_EXIT
-@@ -356,8 +513,8 @@ ENTRY(resume_userspace)
+@@ -348,8 +505,8 @@ ENTRY(resume_userspace)
andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
# int/exception return?
jne work_pending
@@ -20759,7 +17567,7 @@ index f0dcb0c..9f39b80 100644
#ifdef CONFIG_PREEMPT
ENTRY(resume_kernel)
-@@ -372,7 +529,7 @@ need_resched:
+@@ -364,7 +521,7 @@ need_resched:
jz restore_all
call preempt_schedule_irq
jmp need_resched
@@ -20768,7 +17576,7 @@ index f0dcb0c..9f39b80 100644
#endif
CFI_ENDPROC
/*
-@@ -406,30 +563,45 @@ sysenter_past_esp:
+@@ -398,23 +555,34 @@ sysenter_past_esp:
/*CFI_REL_OFFSET cs, 0*/
/*
* Push current_thread_info()->sysenter_return to the stack.
@@ -20800,13 +17608,13 @@ index f0dcb0c..9f39b80 100644
+#else
cmpl $__PAGE_OFFSET-3,%ebp
jae syscall_fault
- ASM_STAC
1: movl (%ebp),%ebp
- ASM_CLAC
+#endif
+
movl %ebp,PT_EBP(%esp)
- _ASM_EXTABLE(1b,syscall_fault)
+ .section __ex_table,"a"
+ .align 4
+@@ -423,6 +591,10 @@ sysenter_past_esp:
GET_THREAD_INFO(%ebp)
@@ -20817,7 +17625,7 @@ index f0dcb0c..9f39b80 100644
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
jnz sysenter_audit
sysenter_do_call:
-@@ -444,12 +616,24 @@ sysenter_do_call:
+@@ -437,12 +609,24 @@ sysenter_do_call:
testl $_TIF_ALLWORK_MASK, %ecx
jne sysexit_audit
sysenter_exit:
@@ -20842,17 +17650,17 @@ index f0dcb0c..9f39b80 100644
PTGS_TO_GS
ENABLE_INTERRUPTS_SYSEXIT
-@@ -466,6 +650,9 @@ sysenter_audit:
+@@ -459,6 +643,9 @@ sysenter_audit:
movl %eax,%edx /* 2nd arg: syscall number */
movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
- call __audit_syscall_entry
+ call audit_syscall_entry
+
+ pax_erase_kstack
+
pushl_cfi %ebx
movl PT_EAX(%esp),%eax /* reload syscall number */
jmp sysenter_do_call
-@@ -491,10 +678,16 @@ sysexit_audit:
+@@ -485,11 +672,17 @@ sysexit_audit:
CFI_ENDPROC
.pushsection .fixup,"ax"
@@ -20863,15 +17671,16 @@ index f0dcb0c..9f39b80 100644
+ jmp 1b
+6: movl $0,PT_ES(%esp)
jmp 1b
+ .section __ex_table,"a"
+ .align 4
+- .long 1b,2b
++ .long 1b,4b
++ .long 2b,5b
++ .long 3b,6b
.popsection
-- _ASM_EXTABLE(1b,2b)
-+ _ASM_EXTABLE(1b,4b)
-+ _ASM_EXTABLE(2b,5b)
-+ _ASM_EXTABLE(3b,6b)
PTGS_TO_GS_EX
ENDPROC(ia32_sysenter_target)
-
-@@ -509,6 +702,11 @@ ENTRY(system_call)
+@@ -504,6 +697,11 @@ ENTRY(system_call)
pushl_cfi %eax # save orig_eax
SAVE_ALL
GET_THREAD_INFO(%ebp)
@@ -20883,7 +17692,7 @@ index f0dcb0c..9f39b80 100644
# system call tracing in operation / emulation
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
jnz syscall_trace_entry
-@@ -527,6 +725,15 @@ syscall_exit:
+@@ -522,6 +720,15 @@ syscall_exit:
testl $_TIF_ALLWORK_MASK, %ecx # current->work
jne syscall_exit_work
@@ -20899,7 +17708,7 @@ index f0dcb0c..9f39b80 100644
restore_all:
TRACE_IRQS_IRET
restore_all_notrace:
-@@ -583,14 +790,34 @@ ldt_ss:
+@@ -581,14 +788,34 @@ ldt_ss:
* compensating for the offset by changing to the ESPFIX segment with
* a base address that matches for the difference.
*/
@@ -20937,7 +17746,7 @@ index f0dcb0c..9f39b80 100644
pushl_cfi $__ESPFIX_SS
pushl_cfi %eax /* new kernel esp */
/* Disable interrupts, but do not irqtrace this section: we
-@@ -619,20 +846,18 @@ work_resched:
+@@ -617,34 +844,28 @@ work_resched:
movl TI_flags(%ebp), %ecx
andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
# than syscall tracing?
@@ -20952,24 +17761,32 @@ index f0dcb0c..9f39b80 100644
#ifdef CONFIG_VM86
testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
- movl %esp, %eax
- jne work_notifysig_v86 # returning to kernel-space or
+- jne work_notifysig_v86 # returning to kernel-space or
++ jz 1f # returning to kernel-space or
# vm86-space
- 1:
+- xorl %edx, %edx
+- call do_notify_resume
+- jmp resume_userspace_sig
+
+- 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
-#else
- movl %esp, %eax
++1:
#endif
- TRACE_IRQS_ON
- ENABLE_INTERRUPTS(CLBR_NONE)
-@@ -653,7 +878,7 @@ work_notifysig_v86:
- movl %eax, %esp
- jmp 1b
- #endif
+ xorl %edx, %edx
+ call do_notify_resume
+ jmp resume_userspace_sig
-END(work_pending)
+ENDPROC(work_pending)
# perform syscall exit tracing
ALIGN
-@@ -661,11 +886,14 @@ syscall_trace_entry:
+@@ -652,11 +873,14 @@ syscall_trace_entry:
movl $-ENOSYS,PT_EAX(%esp)
movl %esp, %eax
call syscall_trace_enter
@@ -20977,7 +17794,7 @@ index f0dcb0c..9f39b80 100644
+ pax_erase_kstack
+
/* What it returned is what we'll actually use. */
- cmpl $(NR_syscalls), %eax
+ cmpl $(nr_syscalls), %eax
jnae syscall_call
jmp syscall_exit
-END(syscall_trace_entry)
@@ -20985,7 +17802,7 @@ index f0dcb0c..9f39b80 100644
# perform syscall exit tracing
ALIGN
-@@ -678,21 +906,25 @@ syscall_exit_work:
+@@ -669,20 +893,24 @@ syscall_exit_work:
movl %esp, %eax
call syscall_trace_leave
jmp resume_userspace
@@ -20999,7 +17816,6 @@ index f0dcb0c..9f39b80 100644
+ push %ss
+ pop %ds
+#endif
- ASM_CLAC
GET_THREAD_INFO(%ebp)
movl $-EFAULT,PT_EAX(%esp)
jmp resume_userspace
@@ -21014,7 +17830,44 @@ index f0dcb0c..9f39b80 100644
CFI_ENDPROC
/*
* End of kprobes section
-@@ -708,8 +940,15 @@ END(syscall_badsys)
+@@ -756,6 +984,36 @@ 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
+@@ -765,8 +1023,15 @@ ENDPROC(ptregs_clone)
* normal stack and adjusts ESP with the matching offset.
*/
/* fixup the stack */
@@ -21032,7 +17885,7 @@ index f0dcb0c..9f39b80 100644
shl $16, %eax
addl %esp, %eax /* the adjusted stack pointer */
pushl_cfi $__KERNEL_DS
-@@ -762,7 +1001,7 @@ vector=vector+1
+@@ -819,7 +1084,7 @@ vector=vector+1
.endr
2: jmp common_interrupt
.endr
@@ -21041,7 +17894,7 @@ index f0dcb0c..9f39b80 100644
.previous
END(interrupt)
-@@ -823,7 +1062,7 @@ ENTRY(coprocessor_error)
+@@ -867,7 +1132,7 @@ ENTRY(coprocessor_error)
pushl_cfi $do_coprocessor_error
jmp error_code
CFI_ENDPROC
@@ -21050,16 +17903,7 @@ index f0dcb0c..9f39b80 100644
ENTRY(simd_coprocessor_error)
RING0_INT_FRAME
-@@ -836,7 +1075,7 @@ ENTRY(simd_coprocessor_error)
- .section .altinstructions,"a"
- altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
- .previous
--.section .altinstr_replacement,"ax"
-+.section .altinstr_replacement,"a"
- 663: pushl $do_simd_coprocessor_error
- 664:
- .previous
-@@ -845,7 +1084,7 @@ ENTRY(simd_coprocessor_error)
+@@ -888,7 +1153,7 @@ ENTRY(simd_coprocessor_error)
#endif
jmp error_code
CFI_ENDPROC
@@ -21068,7 +17912,7 @@ index f0dcb0c..9f39b80 100644
ENTRY(device_not_available)
RING0_INT_FRAME
-@@ -854,18 +1093,18 @@ ENTRY(device_not_available)
+@@ -896,7 +1161,7 @@ ENTRY(device_not_available)
pushl_cfi $do_device_not_available
jmp error_code
CFI_ENDPROC
@@ -21077,8 +17921,10 @@ index f0dcb0c..9f39b80 100644
#ifdef CONFIG_PARAVIRT
ENTRY(native_iret)
- iret
- _ASM_EXTABLE(native_iret, iret_exc)
+@@ -905,12 +1170,12 @@ ENTRY(native_iret)
+ .align 4
+ .long native_iret, iret_exc
+ .previous
-END(native_iret)
+ENDPROC(native_iret)
@@ -21090,7 +17936,7 @@ index f0dcb0c..9f39b80 100644
#endif
ENTRY(overflow)
-@@ -875,7 +1114,7 @@ ENTRY(overflow)
+@@ -919,7 +1184,7 @@ ENTRY(overflow)
pushl_cfi $do_overflow
jmp error_code
CFI_ENDPROC
@@ -21099,7 +17945,7 @@ index f0dcb0c..9f39b80 100644
ENTRY(bounds)
RING0_INT_FRAME
-@@ -884,7 +1123,7 @@ ENTRY(bounds)
+@@ -927,7 +1192,7 @@ ENTRY(bounds)
pushl_cfi $do_bounds
jmp error_code
CFI_ENDPROC
@@ -21108,7 +17954,7 @@ index f0dcb0c..9f39b80 100644
ENTRY(invalid_op)
RING0_INT_FRAME
-@@ -893,7 +1132,7 @@ ENTRY(invalid_op)
+@@ -935,7 +1200,7 @@ ENTRY(invalid_op)
pushl_cfi $do_invalid_op
jmp error_code
CFI_ENDPROC
@@ -21117,7 +17963,7 @@ index f0dcb0c..9f39b80 100644
ENTRY(coprocessor_segment_overrun)
RING0_INT_FRAME
-@@ -902,7 +1141,7 @@ ENTRY(coprocessor_segment_overrun)
+@@ -943,35 +1208,35 @@ ENTRY(coprocessor_segment_overrun)
pushl_cfi $do_coprocessor_segment_overrun
jmp error_code
CFI_ENDPROC
@@ -21126,7 +17972,6 @@ index f0dcb0c..9f39b80 100644
ENTRY(invalid_TSS)
RING0_EC_FRAME
-@@ -910,7 +1149,7 @@ ENTRY(invalid_TSS)
pushl_cfi $do_invalid_TSS
jmp error_code
CFI_ENDPROC
@@ -21135,7 +17980,6 @@ index f0dcb0c..9f39b80 100644
ENTRY(segment_not_present)
RING0_EC_FRAME
-@@ -918,7 +1157,7 @@ ENTRY(segment_not_present)
pushl_cfi $do_segment_not_present
jmp error_code
CFI_ENDPROC
@@ -21144,7 +17988,6 @@ index f0dcb0c..9f39b80 100644
ENTRY(stack_segment)
RING0_EC_FRAME
-@@ -926,7 +1165,7 @@ ENTRY(stack_segment)
pushl_cfi $do_stack_segment
jmp error_code
CFI_ENDPROC
@@ -21153,7 +17996,6 @@ index f0dcb0c..9f39b80 100644
ENTRY(alignment_check)
RING0_EC_FRAME
-@@ -934,7 +1173,7 @@ ENTRY(alignment_check)
pushl_cfi $do_alignment_check
jmp error_code
CFI_ENDPROC
@@ -21162,7 +18004,7 @@ index f0dcb0c..9f39b80 100644
ENTRY(divide_error)
RING0_INT_FRAME
-@@ -943,7 +1182,7 @@ ENTRY(divide_error)
+@@ -979,7 +1244,7 @@ ENTRY(divide_error)
pushl_cfi $do_divide_error
jmp error_code
CFI_ENDPROC
@@ -21171,7 +18013,7 @@ index f0dcb0c..9f39b80 100644
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
-@@ -953,7 +1192,7 @@ ENTRY(machine_check)
+@@ -988,7 +1253,7 @@ ENTRY(machine_check)
pushl_cfi machine_check_vector
jmp error_code
CFI_ENDPROC
@@ -21180,7 +18022,7 @@ index f0dcb0c..9f39b80 100644
#endif
ENTRY(spurious_interrupt_bug)
-@@ -963,7 +1202,7 @@ ENTRY(spurious_interrupt_bug)
+@@ -997,7 +1262,7 @@ ENTRY(spurious_interrupt_bug)
pushl_cfi $do_spurious_interrupt_bug
jmp error_code
CFI_ENDPROC
@@ -21189,7 +18031,7 @@ index f0dcb0c..9f39b80 100644
/*
* End of kprobes section
*/
-@@ -1073,7 +1312,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
+@@ -1113,7 +1378,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
ENTRY(mcount)
ret
@@ -21198,16 +18040,16 @@ index f0dcb0c..9f39b80 100644
ENTRY(ftrace_caller)
cmpl $0, function_trace_stop
-@@ -1106,7 +1345,7 @@ ftrace_graph_call:
+@@ -1142,7 +1407,7 @@ ftrace_graph_call:
.globl ftrace_stub
ftrace_stub:
ret
-END(ftrace_caller)
+ENDPROC(ftrace_caller)
- ENTRY(ftrace_regs_caller)
- pushf /* push flags before compare (in cs location) */
-@@ -1210,7 +1449,7 @@ trace:
+ #else /* ! CONFIG_DYNAMIC_FTRACE */
+
+@@ -1178,7 +1443,7 @@ trace:
popl %ecx
popl %eax
jmp ftrace_stub
@@ -21216,7 +18058,7 @@ index f0dcb0c..9f39b80 100644
#endif /* CONFIG_DYNAMIC_FTRACE */
#endif /* CONFIG_FUNCTION_TRACER */
-@@ -1228,7 +1467,7 @@ ENTRY(ftrace_graph_caller)
+@@ -1199,7 +1464,7 @@ ENTRY(ftrace_graph_caller)
popl %ecx
popl %eax
ret
@@ -21225,7 +18067,15 @@ index f0dcb0c..9f39b80 100644
.globl return_to_handler
return_to_handler:
-@@ -1284,15 +1523,18 @@ error_code:
+@@ -1213,7 +1478,6 @@ return_to_handler:
+ jmp *%ecx
+ #endif
+
+-.section .rodata,"a"
+ #include "syscall_table_32.S"
+
+ syscall_table_size=(.-sys_call_table)
+@@ -1259,15 +1523,18 @@ error_code:
movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
REG_TO_PTGS %ecx
SET_KERNEL_GS %ecx
@@ -21246,7 +18096,7 @@ index f0dcb0c..9f39b80 100644
/*
* Debug traps and NMI can happen at the one SYSENTER instruction
-@@ -1335,7 +1577,7 @@ debug_stack_correct:
+@@ -1309,7 +1576,7 @@ debug_stack_correct:
call do_debug
jmp ret_from_exception
CFI_ENDPROC
@@ -21255,7 +18105,7 @@ index f0dcb0c..9f39b80 100644
/*
* NMI is doubly nasty. It can happen _while_ we're handling
-@@ -1373,6 +1615,9 @@ nmi_stack_correct:
+@@ -1346,6 +1613,9 @@ nmi_stack_correct:
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
call do_nmi
@@ -21265,7 +18115,7 @@ index f0dcb0c..9f39b80 100644
jmp restore_all_notrace
CFI_ENDPROC
-@@ -1409,12 +1654,15 @@ nmi_espfix_stack:
+@@ -1382,12 +1652,15 @@ nmi_espfix_stack:
FIXUP_ESPFIX_STACK # %eax == %esp
xorl %edx,%edx # zero error code
call do_nmi
@@ -21282,7 +18132,7 @@ index f0dcb0c..9f39b80 100644
ENTRY(int3)
RING0_INT_FRAME
-@@ -1427,14 +1675,14 @@ ENTRY(int3)
+@@ -1399,14 +1672,14 @@ ENTRY(int3)
call do_int3
jmp ret_from_exception
CFI_ENDPROC
@@ -21299,7 +18149,7 @@ index f0dcb0c..9f39b80 100644
#ifdef CONFIG_KVM_GUEST
ENTRY(async_page_fault)
-@@ -1443,7 +1691,7 @@ ENTRY(async_page_fault)
+@@ -1414,7 +1687,7 @@ ENTRY(async_page_fault)
pushl_cfi $do_async_page_fault
jmp error_code
CFI_ENDPROC
@@ -21309,30 +18159,30 @@ index f0dcb0c..9f39b80 100644
/*
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
-index b077f4c..feb26c1 100644
+index 6274f5f..9337430 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
-@@ -59,6 +59,8 @@
- #include <asm/context_tracking.h>
- #include <asm/smap.h>
- #include <linux/err.h>
+@@ -55,6 +55,8 @@
+ #include <asm/paravirt.h>
+ #include <asm/ftrace.h>
+ #include <asm/percpu.h>
+#include <asm/pgtable.h>
+#include <asm/alternative-asm.h>
/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
#include <linux/elf-em.h>
-@@ -80,8 +82,9 @@
+@@ -68,8 +70,9 @@
+ #ifdef CONFIG_FUNCTION_TRACER
#ifdef CONFIG_DYNAMIC_FTRACE
-
- ENTRY(function_hook)
+ ENTRY(mcount)
+ pax_force_retaddr
retq
--END(function_hook)
-+ENDPROC(function_hook)
+-END(mcount)
++ENDPROC(mcount)
- /* skip is set if stack has been adjusted */
- .macro ftrace_caller_setup skip=0
-@@ -122,8 +125,9 @@ GLOBAL(ftrace_graph_call)
+ ENTRY(ftrace_caller)
+ cmpl $0, function_trace_stop
+@@ -92,8 +95,9 @@ GLOBAL(ftrace_graph_call)
#endif
GLOBAL(ftrace_stub)
@@ -21341,18 +18191,9 @@ index b077f4c..feb26c1 100644
-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 */
-@@ -212,6 +216,7 @@ ENTRY(function_hook)
+ ENTRY(mcount)
+@@ -112,6 +116,7 @@ ENTRY(mcount)
#endif
GLOBAL(ftrace_stub)
@@ -21360,8 +18201,8 @@ index b077f4c..feb26c1 100644
retq
trace:
-@@ -225,12 +230,13 @@ trace:
- #endif
+@@ -121,12 +126,13 @@ trace:
+ movq 8(%rbp), %rsi
subq $MCOUNT_INSN_SIZE, %rdi
+ pax_force_fptr ftrace_trace_function
@@ -21370,12 +18211,12 @@ index b077f4c..feb26c1 100644
MCOUNT_RESTORE_FRAME
jmp ftrace_stub
--END(function_hook)
-+ENDPROC(function_hook)
+-END(mcount)
++ENDPROC(mcount)
#endif /* CONFIG_DYNAMIC_FTRACE */
#endif /* CONFIG_FUNCTION_TRACER */
-@@ -252,8 +258,9 @@ ENTRY(ftrace_graph_caller)
+@@ -146,8 +152,9 @@ ENTRY(ftrace_graph_caller)
MCOUNT_RESTORE_FRAME
@@ -21386,17 +18227,15 @@ index b077f4c..feb26c1 100644
GLOBAL(return_to_handler)
subq $24, %rsp
-@@ -269,7 +276,9 @@ GLOBAL(return_to_handler)
+@@ -163,6 +170,7 @@ 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
-
-@@ -284,6 +293,430 @@ ENTRY(native_usergs_sysret64)
+@@ -178,6 +186,285 @@ ENTRY(native_usergs_sysret64)
ENDPROC(native_usergs_sysret64)
#endif /* CONFIG_PARAVIRT */
@@ -21416,19 +18255,18 @@ index b077f4c..feb26c1 100644
+
+ .macro pax_enter_kernel
+ pax_set_fptr_mask
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
++#ifdef CONFIG_PAX_KERNEXEC
+ call pax_enter_kernel
+#endif
+ .endm
+
+ .macro pax_exit_kernel
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
++#ifdef CONFIG_PAX_KERNEXEC
+ call pax_exit_kernel
+#endif
-+
+ .endm
+
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
++#ifdef CONFIG_PAX_KERNEXEC
+ENTRY(pax_enter_kernel)
+ pushq %rdi
+
@@ -21436,7 +18274,6 @@ index b077f4c..feb26c1 100644
+ PV_SAVE_REGS(CLBR_RDI)
+#endif
+
-+#ifdef CONFIG_PAX_KERNEXEC
+ GET_CR0_INTO_RDI
+ bts $16,%rdi
+ jnc 3f
@@ -21444,32 +18281,6 @@ index b077f4c..feb26c1 100644
+ cmp $__KERNEL_CS,%edi
+ jnz 2f
+1:
-+#endif
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ 661: jmp 111f
-+ .pushsection .altinstr_replacement, "a"
-+ 662: ASM_NOP2
-+ .popsection
-+ .pushsection .altinstructions, "a"
-+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
-+ .popsection
-+ GET_CR3_INTO_RDI
-+ cmp $0,%dil
-+ jnz 112f
-+ mov $__KERNEL_DS,%edi
-+ mov %edi,%ss
-+ jmp 111f
-+112: cmp $1,%dil
-+ jz 113f
-+ ud2
-+113: sub $4097,%rdi
-+ bts $63,%rdi
-+ SET_RDI_INTO_CR3
-+ mov $__UDEREF_KERNEL_DS,%edi
-+ mov %edi,%ss
-+111:
-+#endif
+
+#ifdef CONFIG_PARAVIRT
+ PV_RESTORE_REGS(CLBR_RDI)
@@ -21479,12 +18290,10 @@ index b077f4c..feb26c1 100644
+ pax_force_retaddr
+ retq
+
-+#ifdef CONFIG_PAX_KERNEXEC
+2: ljmpq __KERNEL_CS,1b
+3: ljmpq __KERNEXEC_KERNEL_CS,4f
+4: SET_RDI_INTO_CR0
+ jmp 1b
-+#endif
+ENDPROC(pax_enter_kernel)
+
+ENTRY(pax_exit_kernel)
@@ -21494,7 +18303,6 @@ index b077f4c..feb26c1 100644
+ PV_SAVE_REGS(CLBR_RDI)
+#endif
+
-+#ifdef CONFIG_PAX_KERNEXEC
+ mov %cs,%rdi
+ cmp $__KERNEXEC_KERNEL_CS,%edi
+ jz 2f
@@ -21502,30 +18310,6 @@ index b077f4c..feb26c1 100644
+ bts $16,%rdi
+ jnc 4f
+1:
-+#endif
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ 661: jmp 111f
-+ .pushsection .altinstr_replacement, "a"
-+ 662: ASM_NOP2
-+ .popsection
-+ .pushsection .altinstructions, "a"
-+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
-+ .popsection
-+ mov %ss,%edi
-+ cmp $__UDEREF_KERNEL_DS,%edi
-+ jnz 111f
-+ GET_CR3_INTO_RDI
-+ cmp $0,%dil
-+ jz 112f
-+ ud2
-+112: add $4097,%rdi
-+ bts $63,%rdi
-+ SET_RDI_INTO_CR3
-+ mov $__KERNEL_DS,%edi
-+ mov %edi,%ss
-+111:
-+#endif
+
+#ifdef CONFIG_PARAVIRT
+ PV_RESTORE_REGS(CLBR_RDI);
@@ -21535,7 +18319,6 @@ index b077f4c..feb26c1 100644
+ pax_force_retaddr
+ retq
+
-+#ifdef CONFIG_PAX_KERNEXEC
+2: GET_CR0_INTO_RDI
+ btr $16,%rdi
+ jnc 4f
@@ -21544,7 +18327,6 @@ index b077f4c..feb26c1 100644
+ jmp 1b
+4: ud2
+ jmp 4b
-+#endif
+ENDPROC(pax_exit_kernel)
+#endif
+
@@ -21577,22 +18359,6 @@ index b077f4c..feb26c1 100644
+ PV_SAVE_REGS(CLBR_RDI)
+#endif
+
-+ 661: jmp 111f
-+ .pushsection .altinstr_replacement, "a"
-+ 662: ASM_NOP2
-+ .popsection
-+ .pushsection .altinstructions, "a"
-+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
-+ .popsection
-+ GET_CR3_INTO_RDI
-+ cmp $1,%dil
-+ jnz 4f
-+ sub $4097,%rdi
-+ bts $63,%rdi
-+ SET_RDI_INTO_CR3
-+ jmp 3f
-+111:
-+
+ GET_CR3_INTO_RDI
+ mov %rdi,%rbx
+ add $__START_KERNEL_map,%rbx
@@ -21621,7 +18387,10 @@ index b077f4c..feb26c1 100644
+ i = i + 1
+ .endr
+
-+2: SET_RDI_INTO_CR3
++#ifdef CONFIG_PARAVIRT
++2:
++#endif
++ SET_RDI_INTO_CR3
+
+#ifdef CONFIG_PAX_KERNEXEC
+ GET_CR0_INTO_RDI
@@ -21629,8 +18398,6 @@ index b077f4c..feb26c1 100644
+ SET_RDI_INTO_CR0
+#endif
+
-+3:
-+
+#ifdef CONFIG_PARAVIRT
+ PV_RESTORE_REGS(CLBR_RDI)
+#endif
@@ -21639,7 +18406,6 @@ index b077f4c..feb26c1 100644
+ popq %rdi
+ pax_force_retaddr
+ retq
-+4: ud2
+ENDPROC(pax_enter_kernel_user)
+
+ENTRY(pax_exit_kernel_user)
@@ -21650,24 +18416,6 @@ index b077f4c..feb26c1 100644
+ PV_SAVE_REGS(CLBR_RDI)
+#endif
+
-+ GET_CR3_INTO_RDI
-+ 661: jmp 1f
-+ .pushsection .altinstr_replacement, "a"
-+ 662: ASM_NOP2
-+ .popsection
-+ .pushsection .altinstructions, "a"
-+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
-+ .popsection
-+ cmp $0,%dil
-+ jnz 3f
-+ add $4097,%rdi
-+ bts $63,%rdi
-+ SET_RDI_INTO_CR3
-+ jmp 2f
-+1:
-+
-+ mov %rdi,%rbx
-+
+#ifdef CONFIG_PAX_KERNEXEC
+ GET_CR0_INTO_RDI
+ btr $16,%rdi
@@ -21675,6 +18423,8 @@ index b077f4c..feb26c1 100644
+ SET_RDI_INTO_CR0
+#endif
+
++ GET_CR3_INTO_RDI
++ mov %rdi,%rbx
+ add $__START_KERNEL_map,%rbx
+ sub phys_base(%rip),%rbx
+
@@ -21698,10 +18448,9 @@ index b077f4c..feb26c1 100644
+ movb $0x67,i*8(%rbx)
+ i = i + 1
+ .endr
-+2:
+
+#ifdef CONFIG_PARAVIRT
-+ PV_RESTORE_REGS(CLBR_RDI)
++2: PV_RESTORE_REGS(CLBR_RDI)
+#endif
+
+ popq %rbx
@@ -21709,70 +18458,15 @@ index b077f4c..feb26c1 100644
+ pax_force_retaddr
+ retq
+3: ud2
++ jmp 3b
+ENDPROC(pax_exit_kernel_user)
+#endif
+
-+ .macro pax_enter_kernel_nmi
-+ pax_set_fptr_mask
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+ GET_CR0_INTO_RDI
-+ bts $16,%rdi
-+ jc 110f
-+ SET_RDI_INTO_CR0
-+ or $2,%ebx
-+110:
-+#endif
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ 661: jmp 111f
-+ .pushsection .altinstr_replacement, "a"
-+ 662: ASM_NOP2
-+ .popsection
-+ .pushsection .altinstructions, "a"
-+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
-+ .popsection
-+ GET_CR3_INTO_RDI
-+ cmp $0,%dil
-+ jz 111f
-+ sub $4097,%rdi
-+ or $4,%ebx
-+ bts $63,%rdi
-+ SET_RDI_INTO_CR3
-+ mov $__UDEREF_KERNEL_DS,%edi
-+ mov %edi,%ss
-+111:
-+#endif
-+ .endm
-+
-+ .macro pax_exit_kernel_nmi
-+#ifdef CONFIG_PAX_KERNEXEC
-+ btr $1,%ebx
-+ jnc 110f
-+ GET_CR0_INTO_RDI
-+ btr $16,%rdi
-+ SET_RDI_INTO_CR0
-+110:
-+#endif
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ btr $2,%ebx
-+ jnc 111f
-+ GET_CR3_INTO_RDI
-+ add $4097,%rdi
-+ bts $63,%rdi
-+ SET_RDI_INTO_CR3
-+ mov $__KERNEL_DS,%edi
-+ mov %edi,%ss
-+111:
-+#endif
-+ .endm
-+
-+ .macro pax_erase_kstack
++.macro pax_erase_kstack
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
+ call pax_erase_kstack
+#endif
-+ .endm
++.endm
+
+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
+ENTRY(pax_erase_kstack)
@@ -21827,7 +18521,7 @@ index b077f4c..feb26c1 100644
.macro TRACE_IRQS_IRETQ offset=ARGOFFSET
#ifdef CONFIG_TRACE_IRQFLAGS
-@@ -375,8 +808,8 @@ ENDPROC(native_usergs_sysret64)
+@@ -231,8 +518,8 @@ ENDPROC(native_usergs_sysret64)
.endm
.macro UNFAKE_STACK_FRAME
@@ -21838,16 +18532,28 @@ index b077f4c..feb26c1 100644
.endm
/*
-@@ -463,7 +896,7 @@ ENDPROC(native_usergs_sysret64)
+@@ -319,7 +606,7 @@ ENDPROC(native_usergs_sysret64)
movq %rsp, %rsi
leaq -RBP(%rsp),%rdi /* arg1 for handler */
-- testl $3, CS-RBP(%rsi)
-+ testb $3, CS-RBP(%rsi)
+- testl $3, CS(%rdi)
++ testb $3, CS(%rdi)
je 1f
SWAPGS
/*
-@@ -514,9 +947,10 @@ ENTRY(save_paranoid)
+@@ -355,9 +642,10 @@ ENTRY(save_rest)
+ movq_cfi r15, R15+16
+ movq %r11, 8(%rsp) /* return address */
+ FIXUP_TOP_OF_STACK %r11, 16
++ pax_force_retaddr
+ ret
+ CFI_ENDPROC
+-END(save_rest)
++ENDPROC(save_rest)
+
+ /* save complete stack frame */
+ .pushsection .kprobes.text, "ax"
+@@ -386,9 +674,10 @@ ENTRY(save_paranoid)
js 1f /* negative -> in kernel */
SWAPGS
xorl %ebx,%ebx
@@ -21860,25 +18566,25 @@ index b077f4c..feb26c1 100644
.popsection
/*
-@@ -538,7 +972,7 @@ ENTRY(ret_from_fork)
+@@ -410,7 +699,7 @@ ENTRY(ret_from_fork)
RESTORE_REST
- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
- jz 1f
+ je int_ret_from_sys_call
testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
-@@ -556,7 +990,7 @@ ENTRY(ret_from_fork)
- RESTORE_REST
- jmp int_ret_from_sys_call
+@@ -420,7 +709,7 @@ ENTRY(ret_from_fork)
+ jmp ret_from_sys_call # go to the SYSRET fastpath
+
CFI_ENDPROC
-END(ret_from_fork)
+ENDPROC(ret_from_fork)
/*
* System call entry. Up to 6 arguments in registers are supported.
-@@ -593,7 +1027,7 @@ END(ret_from_fork)
+@@ -456,7 +745,7 @@ END(ret_from_fork)
ENTRY(system_call)
CFI_STARTPROC simple
CFI_SIGNAL_FRAME
@@ -21887,7 +18593,7 @@ index b077f4c..feb26c1 100644
CFI_REGISTER rip,rcx
/*CFI_REGISTER rflags,r11*/
SWAPGS_UNSAFE_STACK
-@@ -606,16 +1040,23 @@ GLOBAL(system_call_after_swapgs)
+@@ -469,12 +758,18 @@ ENTRY(system_call_after_swapgs)
movq %rsp,PER_CPU_VAR(old_rsp)
movq PER_CPU_VAR(kernel_stack),%rsp
@@ -21907,28 +18613,16 @@ index b077f4c..feb26c1 100644
movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
movq %rcx,RIP-ARGOFFSET(%rsp)
CFI_REL_OFFSET rip,RIP-ARGOFFSET
-- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
-+ GET_THREAD_INFO(%rcx)
-+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
- jnz tracesys
+@@ -484,7 +779,7 @@ ENTRY(system_call_after_swapgs)
system_call_fastpath:
- #if __SYSCALL_MASK == ~0
-@@ -625,7 +1066,7 @@ system_call_fastpath:
- cmpl $__NR_syscall_max,%eax
- #endif
+ cmpq $__NR_syscall_max,%rax
ja badsys
- movq %r10,%rcx
+ movq R10-ARGOFFSET(%rsp),%rcx
call *sys_call_table(,%rax,8) # XXX: rip relative
movq %rax,RAX-ARGOFFSET(%rsp)
/*
-@@ -639,10 +1080,13 @@ sysret_check:
- LOCKDEP_SYS_EXIT
- DISABLE_INTERRUPTS(CLBR_NONE)
- TRACE_IRQS_OFF
-- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
-+ GET_THREAD_INFO(%rcx)
-+ movl TI_flags(%rcx),%edx
+@@ -503,6 +798,8 @@ sysret_check:
andl %edi,%edx
jnz sysret_careful
CFI_REMEMBER_STATE
@@ -21937,7 +18631,7 @@ index b077f4c..feb26c1 100644
/*
* sysretq will re-enable interrupts:
*/
-@@ -694,14 +1138,18 @@ badsys:
+@@ -554,14 +851,18 @@ badsys:
* jump back to the normal fast path.
*/
auditsys:
@@ -21948,7 +18642,7 @@ index b077f4c..feb26c1 100644
movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
movq %rax,%rsi /* 2nd arg: syscall number */
movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
- call __audit_syscall_entry
+ call audit_syscall_entry
+
+ pax_erase_kstack
+
@@ -21957,16 +18651,7 @@ index b077f4c..feb26c1 100644
jmp system_call_fastpath
/*
-@@ -722,7 +1170,7 @@ sysret_audit:
- /* Do syscall tracing */
- tracesys:
- #ifdef CONFIG_AUDITSYSCALL
-- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
-+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
- jz auditsys
- #endif
- SAVE_REST
-@@ -730,12 +1178,16 @@ tracesys:
+@@ -591,16 +892,20 @@ tracesys:
FIXUP_TOP_OF_STACK %rdi
movq %rsp,%rdi
call syscall_trace_enter
@@ -21981,18 +18666,23 @@ index b077f4c..feb26c1 100644
LOAD_ARGS ARGOFFSET, 1
+ pax_set_fptr_mask
RESTORE_REST
- #if __SYSCALL_MASK == ~0
cmpq $__NR_syscall_max,%rax
-@@ -744,7 +1196,7 @@ tracesys:
- cmpl $__NR_syscall_max,%eax
- #endif
ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
- movq %r10,%rcx /* fixup for C */
+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
call *sys_call_table(,%rax,8)
movq %rax,RAX-ARGOFFSET(%rsp)
/* Use IRET because user could have changed frame */
-@@ -765,7 +1217,9 @@ GLOBAL(int_with_check)
+@@ -612,7 +917,7 @@ tracesys:
+ GLOBAL(int_ret_from_sys_call)
+ DISABLE_INTERRUPTS(CLBR_NONE)
+ TRACE_IRQS_OFF
+- testl $3,CS-ARGOFFSET(%rsp)
++ testb $3,CS-ARGOFFSET(%rsp)
+ je retint_restore_args
+ movl $_TIF_ALLWORK_MASK,%edi
+ /* edi: mask to check */
+@@ -623,7 +928,9 @@ GLOBAL(int_with_check)
andl %edi,%edx
jnz int_careful
andl $~TS_COMPAT,TI_status(%rcx)
@@ -22003,40 +18693,25 @@ index b077f4c..feb26c1 100644
/* Either reschedule or signal or syscall exit tracking needed. */
/* First do a reschedule test. */
-@@ -811,7 +1265,7 @@ int_restore_rest:
+@@ -669,7 +976,7 @@ int_restore_rest:
TRACE_IRQS_OFF
jmp int_with_check
CFI_ENDPROC
-END(system_call)
+ENDPROC(system_call)
- .macro FORK_LIKE func
- ENTRY(stub_\func)
-@@ -824,9 +1278,10 @@ ENTRY(stub_\func)
- DEFAULT_FRAME 0 8 /* offset 8: return address */
- call sys_\func
- RESTORE_TOP_OF_STACK %r11, 8
-+ pax_force_retaddr
- ret $REST_SKIP /* pop extended registers */
- CFI_ENDPROC
--END(stub_\func)
-+ENDPROC(stub_\func)
- .endm
-
- .macro FIXED_FRAME label,func
-@@ -836,9 +1291,10 @@ ENTRY(\label)
- FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
+ /*
+ * Certain special system calls that need to save a complete full stack frame.
+@@ -685,7 +992,7 @@ ENTRY(\label)
call \func
- RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
-+ pax_force_retaddr
- ret
+ jmp ptregscall_common
CFI_ENDPROC
-END(\label)
+ENDPROC(\label)
.endm
- FORK_LIKE clone
-@@ -855,9 +1311,10 @@ ENTRY(ptregscall_common)
+ PTREGSCALL stub_clone, sys_clone, %r8
+@@ -703,9 +1010,10 @@ ENTRY(ptregscall_common)
movq_cfi_restore R12+8, r12
movq_cfi_restore RBP+8, rbp
movq_cfi_restore RBX+8, rbx
@@ -22048,7 +18723,7 @@ index b077f4c..feb26c1 100644
ENTRY(stub_execve)
CFI_STARTPROC
-@@ -870,7 +1327,7 @@ ENTRY(stub_execve)
+@@ -720,7 +1028,7 @@ ENTRY(stub_execve)
RESTORE_REST
jmp int_ret_from_sys_call
CFI_ENDPROC
@@ -22057,34 +18732,16 @@ index b077f4c..feb26c1 100644
/*
* sigreturn is special because it needs to restore all registers on return.
-@@ -887,7 +1344,7 @@ ENTRY(stub_rt_sigreturn)
+@@ -738,7 +1046,7 @@ ENTRY(stub_rt_sigreturn)
RESTORE_REST
jmp int_ret_from_sys_call
CFI_ENDPROC
-END(stub_rt_sigreturn)
+ENDPROC(stub_rt_sigreturn)
- #ifdef CONFIG_X86_X32_ABI
- ENTRY(stub_x32_rt_sigreturn)
-@@ -901,7 +1358,7 @@ ENTRY(stub_x32_rt_sigreturn)
- RESTORE_REST
- jmp int_ret_from_sys_call
- CFI_ENDPROC
--END(stub_x32_rt_sigreturn)
-+ENDPROC(stub_x32_rt_sigreturn)
-
- ENTRY(stub_x32_execve)
- CFI_STARTPROC
-@@ -915,7 +1372,7 @@ ENTRY(stub_x32_execve)
- RESTORE_REST
- jmp int_ret_from_sys_call
- CFI_ENDPROC
--END(stub_x32_execve)
-+ENDPROC(stub_x32_execve)
-
- #endif
-
-@@ -952,7 +1409,7 @@ vector=vector+1
+ /*
+ * Build the entry stubs and pointer table with some assembler magic.
+@@ -773,7 +1081,7 @@ vector=vector+1
2: jmp common_interrupt
.endr
CFI_ENDPROC
@@ -22093,7 +18750,7 @@ index b077f4c..feb26c1 100644
.previous
END(interrupt)
-@@ -972,6 +1429,16 @@ END(interrupt)
+@@ -793,6 +1101,16 @@ END(interrupt)
subq $ORIG_RAX-RBP, %rsp
CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
SAVE_ARGS_IRQ
@@ -22110,7 +18767,7 @@ index b077f4c..feb26c1 100644
call \func
.endm
-@@ -1004,7 +1471,7 @@ ret_from_intr:
+@@ -824,7 +1142,7 @@ ret_from_intr:
exit_intr:
GET_THREAD_INFO(%rcx)
@@ -22119,7 +18776,7 @@ index b077f4c..feb26c1 100644
je retint_kernel
/* Interrupt came from user space */
-@@ -1026,12 +1493,16 @@ retint_swapgs: /* return to user-space */
+@@ -846,12 +1164,16 @@ retint_swapgs: /* return to user-space */
* The iretq could re-enable interrupts:
*/
DISABLE_INTERRUPTS(CLBR_ANY)
@@ -22136,7 +18793,7 @@ index b077f4c..feb26c1 100644
/*
* The iretq could re-enable interrupts:
*/
-@@ -1114,7 +1585,7 @@ ENTRY(retint_kernel)
+@@ -940,7 +1262,7 @@ ENTRY(retint_kernel)
#endif
CFI_ENDPROC
@@ -22145,7 +18802,7 @@ index b077f4c..feb26c1 100644
/*
* End of kprobes section
*/
-@@ -1132,7 +1603,7 @@ ENTRY(\sym)
+@@ -956,7 +1278,7 @@ ENTRY(\sym)
interrupt \do_sym
jmp ret_from_intr
CFI_ENDPROC
@@ -22153,8 +18810,8 @@ index b077f4c..feb26c1 100644
+ENDPROC(\sym)
.endm
- #ifdef CONFIG_TRACING
-@@ -1215,12 +1686,22 @@ ENTRY(\sym)
+ #ifdef CONFIG_SMP
+@@ -1021,12 +1343,22 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
@@ -22178,7 +18835,7 @@ index b077f4c..feb26c1 100644
.endm
.macro paranoidzeroentry sym do_sym
-@@ -1233,15 +1714,25 @@ ENTRY(\sym)
+@@ -1038,15 +1370,25 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
TRACE_IRQS_OFF
@@ -22206,10 +18863,10 @@ index b077f4c..feb26c1 100644
.macro paranoidzeroentry_ist sym do_sym ist
ENTRY(\sym)
INTR_FRAME
-@@ -1252,14 +1743,30 @@ ENTRY(\sym)
+@@ -1056,14 +1398,30 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call save_paranoid
- TRACE_IRQS_OFF_DEBUG
+ TRACE_IRQS_OFF
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ testb $3, CS(%rsp)
+ jnz 1f
@@ -22238,7 +18895,7 @@ index b077f4c..feb26c1 100644
.endm
.macro errorentry sym do_sym
-@@ -1271,13 +1778,23 @@ ENTRY(\sym)
+@@ -1074,13 +1432,23 @@ ENTRY(\sym)
CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
call error_entry
DEFAULT_FRAME 0
@@ -22263,7 +18920,7 @@ index b077f4c..feb26c1 100644
.endm
/* error code is on the stack already */
-@@ -1291,13 +1808,23 @@ ENTRY(\sym)
+@@ -1093,13 +1461,23 @@ ENTRY(\sym)
call save_paranoid
DEFAULT_FRAME 0
TRACE_IRQS_OFF
@@ -22288,7 +18945,7 @@ index b077f4c..feb26c1 100644
.endm
zeroentry divide_error do_divide_error
-@@ -1327,9 +1854,10 @@ gs_change:
+@@ -1129,9 +1507,10 @@ gs_change:
2: mfence /* workaround */
SWAPGS
popfq_cfi
@@ -22298,9 +18955,39 @@ index b077f4c..feb26c1 100644
-END(native_load_gs_index)
+ENDPROC(native_load_gs_index)
- _ASM_EXTABLE(gs_change,bad_gs)
- .section .fixup,"ax"
-@@ -1357,9 +1885,10 @@ ENTRY(call_softirq)
+ .section __ex_table,"a"
+ .align 8
+@@ -1153,13 +1532,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.
+@@ -1186,11 +1566,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)
+@@ -1208,9 +1588,10 @@ ENTRY(call_softirq)
CFI_DEF_CFA_REGISTER rsp
CFI_ADJUST_CFA_OFFSET -8
decl PER_CPU_VAR(irq_count)
@@ -22312,7 +18999,7 @@ index b077f4c..feb26c1 100644
#ifdef CONFIG_XEN
zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
-@@ -1397,7 +1926,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
+@@ -1248,7 +1629,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
decl PER_CPU_VAR(irq_count)
jmp error_exit
CFI_ENDPROC
@@ -22321,21 +19008,18 @@ index b077f4c..feb26c1 100644
/*
* Hypervisor uses this for application faults while it executes.
-@@ -1456,7 +1985,7 @@ ENTRY(xen_failsafe_callback)
+@@ -1307,7 +1688,7 @@ ENTRY(xen_failsafe_callback)
SAVE_ALL
jmp error_exit
CFI_ENDPROC
-END(xen_failsafe_callback)
+ENDPROC(xen_failsafe_callback)
- apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
+ apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
xen_hvm_callback_vector xen_evtchn_do_upcall
-@@ -1508,18 +2037,33 @@ ENTRY(paranoid_exit)
- DEFAULT_FRAME
- DISABLE_INTERRUPTS(CLBR_NONE)
- TRACE_IRQS_OFF_DEBUG
-- testl %ebx,%ebx /* swapgs needed? */
-+ testl $1,%ebx /* swapgs needed? */
+@@ -1356,16 +1737,31 @@ ENTRY(paranoid_exit)
+ TRACE_IRQS_OFF
+ testl %ebx,%ebx /* swapgs needed? */
jnz paranoid_restore
- testl $3,CS(%rsp)
+ testb $3,CS(%rsp)
@@ -22360,13 +19044,13 @@ index b077f4c..feb26c1 100644
jmp irq_return
paranoid_restore:
+ pax_exit_kernel
- TRACE_IRQS_IRETQ_DEBUG 0
+ TRACE_IRQS_IRETQ 0
RESTORE_ALL 8
+ pax_force_retaddr_bts
jmp irq_return
paranoid_userspace:
GET_THREAD_INFO(%rcx)
-@@ -1548,7 +2092,7 @@ paranoid_schedule:
+@@ -1394,7 +1790,7 @@ paranoid_schedule:
TRACE_IRQS_OFF
jmp paranoid_userspace
CFI_ENDPROC
@@ -22375,7 +19059,7 @@ index b077f4c..feb26c1 100644
/*
* Exception entry point. This expects an error code/orig_rax on the stack.
-@@ -1575,12 +2119,13 @@ ENTRY(error_entry)
+@@ -1421,12 +1817,13 @@ ENTRY(error_entry)
movq_cfi r14, R14+8
movq_cfi r15, R15+8
xorl %ebx,%ebx
@@ -22390,7 +19074,7 @@ index b077f4c..feb26c1 100644
ret
/*
-@@ -1607,7 +2152,7 @@ bstep_iret:
+@@ -1453,7 +1850,7 @@ bstep_iret:
movq %rcx,RIP+8(%rsp)
jmp error_swapgs
CFI_ENDPROC
@@ -22399,86 +19083,67 @@ index b077f4c..feb26c1 100644
/* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
-@@ -1618,7 +2163,7 @@ ENTRY(error_exit)
- DISABLE_INTERRUPTS(CLBR_NONE)
- TRACE_IRQS_OFF
- GET_THREAD_INFO(%rcx)
-- testl %eax,%eax
-+ testl $1,%eax
- jne retint_kernel
- LOCKDEP_SYS_EXIT_IRQ
- movl TI_flags(%rcx),%edx
-@@ -1627,7 +2172,7 @@ ENTRY(error_exit)
+@@ -1473,7 +1870,7 @@ ENTRY(error_exit)
jnz retint_careful
jmp retint_swapgs
CFI_ENDPROC
-END(error_exit)
+ENDPROC(error_exit)
- /*
- * Test if a given stack is an NMI stack or not.
-@@ -1685,9 +2230,11 @@ ENTRY(nmi)
- * If %cs was not the kernel segment, then the NMI triggered in user
- * space, which means it is definitely not nested.
- */
-+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
-+ je 1f
- cmpl $__KERNEL_CS, 16(%rsp)
- jne first_nmi
--
-+1:
- /*
- * Check the special variable on the stack to see if NMIs are
- * executing.
-@@ -1721,8 +2268,7 @@ nested_nmi:
-
- 1:
- /* Set up the interrupted NMIs stack to jump to repeat_nmi */
-- leaq -1*8(%rsp), %rdx
-- movq %rdx, %rsp
-+ subq $8, %rsp
- CFI_ADJUST_CFA_OFFSET 1*8
- leaq -10*8(%rsp), %rdx
- pushq_cfi $__KERNEL_DS
-@@ -1740,6 +2286,7 @@ nested_nmi_out:
- CFI_RESTORE rdx
-
- /* No need to check faults here */
-+# pax_force_retaddr_bts
- INTERRUPT_RETURN
-
- CFI_RESTORE_STATE
-@@ -1856,6 +2403,8 @@ end_repeat_nmi:
- */
- movq %cr2, %r12
-+ pax_enter_kernel_nmi
+ /* runs on exception stack */
+@@ -1485,6 +1882,17 @@ ENTRY(nmi)
+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
+ call save_paranoid
+ DEFAULT_FRAME 0
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ testb $3, CS(%rsp)
++ jnz 1f
++ pax_enter_kernel
++ jmp 2f
++1: pax_enter_kernel_user
++2:
++#else
++ pax_enter_kernel
++#endif
+
/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
movq %rsp,%rdi
movq $-1,%rsi
-@@ -1868,26 +2417,31 @@ end_repeat_nmi:
- movq %r12, %cr2
- 1:
-
-- testl %ebx,%ebx /* swapgs needed? */
-+ testl $1,%ebx /* swapgs needed? */
+@@ -1495,12 +1903,28 @@ ENTRY(nmi)
+ DISABLE_INTERRUPTS(CLBR_NONE)
+ testl %ebx,%ebx /* swapgs needed? */
jnz nmi_restore
+- testl $3,CS(%rsp)
++ testb $3,CS(%rsp)
+ jnz nmi_userspace
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ pax_exit_kernel
++ SWAPGS_UNSAFE_STACK
++ RESTORE_ALL 8
++ pax_force_retaddr_bts
++ jmp irq_return
++#endif
nmi_swapgs:
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ pax_exit_kernel_user
++#else
++ pax_exit_kernel
++#endif
SWAPGS_UNSAFE_STACK
++ RESTORE_ALL 8
++ jmp irq_return
nmi_restore:
-+ pax_exit_kernel_nmi
- /* Pop the extra iret frame at once */
- RESTORE_ALL 6*8
-+ testb $3, 8(%rsp)
-+ jnz 1f
++ pax_exit_kernel
+ RESTORE_ALL 8
+ pax_force_retaddr_bts
-+1:
-
- /* Clear the NMI executing stack variable */
- movq $0, 5*8(%rsp)
jmp irq_return
+ nmi_userspace:
+ GET_THREAD_INFO(%rcx)
+@@ -1529,14 +1953,14 @@ nmi_schedule:
+ jmp paranoid_exit
CFI_ENDPROC
+ #endif
-END(nmi)
+ENDPROC(nmi)
@@ -22493,10 +19158,37 @@ index b077f4c..feb26c1 100644
/*
* End of kprobes section
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
-index 42a392a..fbbd930 100644
+index c9a281f..3645760 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,
+@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */
+ static const void *mod_code_newcode; /* holds the text to write to the IP */
+
+ static unsigned nmi_wait_count;
+-static atomic_t nmi_update_count = ATOMIC_INIT(0);
++static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
+
+ int ftrace_arch_read_dyn_info(char *buf, int size)
+ {
+@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
+
+ r = snprintf(buf, size, "%u %u",
+ nmi_wait_count,
+- atomic_read(&nmi_update_count));
++ atomic_read_unchecked(&nmi_update_count));
+ return r;
+ }
+
+@@ -178,7 +178,7 @@ void ftrace_nmi_enter(void)
+ if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
+ smp_rmb();
+ ftrace_mod_code();
+- atomic_inc(&nmi_update_count);
++ atomic_inc_unchecked(&nmi_update_count);
+ }
+ /* Must have previous changes seen before executions */
+ smp_mb();
+@@ -271,6 +271,8 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
{
unsigned char replaced[MCOUNT_INSN_SIZE];
@@ -22505,52 +19197,16 @@ index 42a392a..fbbd930 100644
/*
* Note: Due to modules and __init, code can
* disappear and change, we need to protect against faulting
-@@ -227,7 +229,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
+@@ -327,7 +329,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
unsigned char old[MCOUNT_INSN_SIZE], *new;
int ret;
- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
-+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
++ memcpy(old, ktla_ktva((void *)ftrace_call), MCOUNT_INSN_SIZE);
new = ftrace_call_replace(ip, (unsigned long)func);
+ ret = ftrace_modify_code(ip, old, new);
- /* See comment above by declaration of modifying_ftrace_code */
-@@ -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_symbol(ip));
-+ ip = (unsigned long)__va(__pa_symbol(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,
+@@ -353,6 +355,8 @@ static int ftrace_mod_jmp(unsigned long ip,
{
unsigned char code[MCOUNT_INSN_SIZE];
@@ -22559,64 +19215,32 @@ index 42a392a..fbbd930 100644
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
-index 1be8e43..d9b9ef6 100644
---- a/arch/x86/kernel/head64.c
-+++ b/arch/x86/kernel/head64.c
-@@ -67,12 +67,12 @@ again:
- pgd = *pgd_p;
+diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
+index 3bb0850..55a56f4 100644
+--- a/arch/x86/kernel/head32.c
++++ b/arch/x86/kernel/head32.c
+@@ -19,6 +19,7 @@
+ #include <asm/io_apic.h>
+ #include <asm/bios_ebda.h>
+ #include <asm/tlbflush.h>
++#include <asm/boot.h>
- /*
-- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
-- * critical -- __PAGE_OFFSET would point us back into the dynamic
-+ * The use of __early_va rather than __va here is critical:
-+ * __va would point us back into the dynamic
- * range and we might end up looping forever...
- */
- if (pgd)
-- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
-+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
- else {
- if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
- reset_early_page_tables();
-@@ -82,13 +82,13 @@ again:
- pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
- for (i = 0; i < PTRS_PER_PUD; i++)
- pud_p[i] = 0;
-- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
-+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
- }
- pud_p += pud_index(address);
- pud = *pud_p;
-
- if (pud)
-- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
-+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
- else {
- if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
- reset_early_page_tables();
-@@ -98,7 +98,7 @@ again:
- pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
- for (i = 0; i < PTRS_PER_PMD; i++)
- pmd_p[i] = 0;
-- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
-+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
- }
- pmd = (physaddr & PMD_MASK) + early_pmd_flags;
- pmd_p[pmd_index(address)] = pmd;
-@@ -175,7 +175,6 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data)
- if (console_loglevel == 10)
- early_printk("Kernel alive\n");
-
-- clear_page(init_level4_pgt);
- /* set init_level4_pgt kernel high mapping*/
- init_level4_pgt[511] = early_level4_pgt[511];
+ static void __init i386_default_early_setup(void)
+ {
+@@ -33,7 +34,7 @@ void __init i386_start_kernel(void)
+ {
+ memblock_init();
+- memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
++ memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
+
+ #ifdef CONFIG_BLK_DEV_INITRD
+ /* Reserve INITRD */
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
-index 81ba276..30c5411 100644
+index ce0be7c..1252d68 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
-@@ -26,6 +26,12 @@
+@@ -25,6 +25,12 @@
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
@@ -22629,7 +19253,7 @@ index 81ba276..30c5411 100644
/*
* References to members of the new_cpu_data structure.
*/
-@@ -55,11 +61,7 @@
+@@ -54,11 +60,7 @@
* and small than max_low_pfn, otherwise will waste some page table entries
*/
@@ -22642,7 +19266,7 @@ index 81ba276..30c5411 100644
/* Number of possible pages in the lowmem region */
LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
-@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
+@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
RESERVE_BRK(pagetables, INIT_MAP_SIZE)
/*
@@ -22655,7 +19279,7 @@ index 81ba276..30c5411 100644
* 32-bit kernel entrypoint; only used by the boot CPU. On entry,
* %esi points to the real-mode code as a 32-bit pointer.
* CS and DS must be 4 GB flat segments, but we don't depend on
-@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
+@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
* can.
*/
__HEAD
@@ -22669,7 +19293,7 @@ index 81ba276..30c5411 100644
ENTRY(startup_32)
movl pa(stack_start),%ecx
-@@ -106,6 +121,59 @@ ENTRY(startup_32)
+@@ -105,6 +120,59 @@ ENTRY(startup_32)
2:
leal -__PAGE_OFFSET(%ecx),%esp
@@ -22729,7 +19353,7 @@ index 81ba276..30c5411 100644
/*
* Clear BSS first so that there are no surprises...
*/
-@@ -201,8 +269,11 @@ ENTRY(startup_32)
+@@ -195,8 +263,11 @@ ENTRY(startup_32)
movl %eax, pa(max_pfn_mapped)
/* Do early initialization of the fixmap area */
@@ -22743,7 +19367,7 @@ index 81ba276..30c5411 100644
#else /* Not PAE */
page_pde_offset = (__PAGE_OFFSET >> 20);
-@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
+@@ -226,8 +297,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
movl %eax, pa(max_pfn_mapped)
/* Do early initialization of the fixmap area */
@@ -22757,7 +19381,7 @@ index 81ba276..30c5411 100644
#endif
#ifdef CONFIG_PARAVIRT
-@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
+@@ -241,9 +315,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
cmpl $num_subarch_entries, %eax
jae bad_subarch
@@ -22768,7 +19392,7 @@ index 81ba276..30c5411 100644
bad_subarch:
WEAK(lguest_entry)
-@@ -261,10 +333,10 @@ WEAK(xen_entry)
+@@ -255,10 +327,10 @@ WEAK(xen_entry)
__INITDATA
subarch_entries:
@@ -22783,25 +19407,25 @@ index 81ba276..30c5411 100644
num_subarch_entries = (. - subarch_entries) / 4
.previous
#else
-@@ -354,6 +426,7 @@ default_entry:
- movl pa(mmu_cr4_features),%eax
+@@ -312,6 +384,7 @@ default_entry:
+ orl %edx,%eax
movl %eax,%cr4
+#ifdef CONFIG_X86_PAE
testb $X86_CR4_PAE, %al # check if PAE is enabled
- jz enable_paging
+ jz 6f
-@@ -382,6 +455,9 @@ default_entry:
+@@ -340,6 +413,9 @@ default_entry:
/* Make changes effective */
wrmsr
+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
+#endif
+
- enable_paging:
+ 6:
/*
-@@ -449,14 +525,20 @@ is486:
+@@ -443,7 +519,7 @@ is386: movl $2,%ecx # set MP
1: movl $(__KERNEL_DS),%eax # reload all the segment registers
movl %eax,%ss # after changing gdt.
@@ -22810,23 +19434,10 @@ index 81ba276..30c5411 100644
movl %eax,%ds
movl %eax,%es
- movl $(__KERNEL_PERCPU), %eax
- movl %eax,%fs # set this cpu's percpu
-
-+#ifdef CONFIG_CC_STACKPROTECTOR
- movl $(__KERNEL_STACK_CANARY),%eax
-+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
-+ movl $(__USER_DS),%eax
-+#else
-+ xorl %eax,%eax
-+#endif
- movl %eax,%gs
-
- xorl %eax,%eax # Clear LDT
-@@ -512,8 +594,11 @@ setup_once:
- * relocation. Manually set base address in stack canary
- * segment descriptor.
+@@ -457,15 +533,22 @@ is386: movl $2,%ecx # set MP
*/
+ cmpb $0,ready
+ jne 1f
- movl $gdt_page,%eax
+ movl $cpu_gdt_table,%eax
movl $stack_canary,%ecx
@@ -22836,26 +19447,47 @@ index 81ba276..30c5411 100644
movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
shrl $16, %ecx
movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -544,7 +629,7 @@ ENDPROC(early_idt_handlers)
- /* This is global to keep gas from relaxing the jumps */
- ENTRY(early_idt_handler)
- cld
-- cmpl $2,%ss:early_recursion_flag
-+ cmpl $1,%ss:early_recursion_flag
- je hlt_loop
- incl %ss:early_recursion_flag
+ movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
+ 1:
+-#endif
+ movl $(__KERNEL_STACK_CANARY),%eax
++#elif defined(CONFIG_PAX_MEMORY_UDEREF)
++ movl $(__USER_DS),%eax
++#else
++ xorl %eax,%eax
++#endif
+ movl %eax,%gs
+
+ xorl %eax,%eax # Clear LDT
+@@ -558,22 +641,22 @@ early_page_fault:
+ jmp early_fault
-@@ -582,8 +667,8 @@ ENTRY(early_idt_handler)
- pushl (20+6*4)(%esp) /* trapno */
+ early_fault:
+- cld
+ #ifdef CONFIG_PRINTK
++ cmpl $1,%ss:early_recursion_flag
++ je hlt_loop
++ incl %ss:early_recursion_flag
++ cld
+ pusha
+ movl $(__KERNEL_DS),%eax
+ movl %eax,%ds
+ movl %eax,%es
+- cmpl $2,early_recursion_flag
+- je hlt_loop
+- incl early_recursion_flag
+ movl %cr2,%eax
+ pushl %eax
+ pushl %edx /* trapno */
pushl $fault_msg
call printk
--#endif
- call dump_stack
-+#endif
++; call dump_stack
+ #endif
+- call dump_stack
hlt_loop:
hlt
jmp hlt_loop
-@@ -602,8 +687,11 @@ ENDPROC(early_idt_handler)
+@@ -581,8 +664,11 @@ hlt_loop:
/* This is the default interrupt "handler" :-) */
ALIGN
ignore_int:
@@ -22868,7 +19500,7 @@ index 81ba276..30c5411 100644
pushl %eax
pushl %ecx
pushl %edx
-@@ -612,9 +700,6 @@ ignore_int:
+@@ -591,9 +677,6 @@ ignore_int:
movl $(__KERNEL_DS),%eax
movl %eax,%ds
movl %eax,%es
@@ -22878,7 +19510,7 @@ index 81ba276..30c5411 100644
pushl 16(%esp)
pushl 24(%esp)
pushl 32(%esp)
-@@ -648,29 +733,34 @@ ENTRY(setup_once_ref)
+@@ -622,29 +705,43 @@ ENTRY(initial_code)
/*
* BSS section
*/
@@ -22906,6 +19538,15 @@ index 81ba276..30c5411 100644
+#else
.fill 1024,4,0
+#endif
++
++/*
++ * The IDT has to be page-aligned to simplify the Pentium
++ * F0 0F bug workaround.. We have a special link segment
++ * for this.
++ */
++.section .idt,"a",@progbits
++ENTRY(idt_table)
++ .fill 256,8,0
/*
* This starts the data section.
@@ -22918,14 +19559,14 @@ index 81ba276..30c5411 100644
ENTRY(initial_page_table)
.long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
# if KPMDS == 3
-@@ -689,12 +779,20 @@ ENTRY(initial_page_table)
+@@ -663,18 +760,27 @@ ENTRY(initial_page_table)
# error "Kernel PMDs should be 1, 2 or 3"
# endif
.align PAGE_SIZE /* needs to be page-sized too */
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ENTRY(cpu_pgd)
-+ .rept 2*NR_CPUS
++ .rept NR_CPUS
+ .fill 4,8,0
+ .endr
+#endif
@@ -22938,18 +19579,18 @@ index 81ba276..30c5411 100644
- .long init_thread_union+THREAD_SIZE
+ .long init_thread_union+THREAD_SIZE-8
- __INITRODATA
- int_msg:
-@@ -722,7 +820,7 @@ fault_msg:
- * segment size, and 32-bit linear address value:
- */
-
-- .data
++ready: .byte 0
++
+.section .rodata,"a",@progbits
- .globl boot_gdt_descr
- .globl idt_descr
+ early_recursion_flag:
+ .long 0
+
+-ready: .byte 0
+-
+ int_msg:
+ .asciz "Unknown interrupt or fault at: %p %p %p\n"
-@@ -731,7 +829,7 @@ fault_msg:
+@@ -707,7 +813,7 @@ fault_msg:
.word 0 # 32 bit align gdt_desc.address
boot_gdt_descr:
.word __BOOT_DS+7
@@ -22958,7 +19599,7 @@ index 81ba276..30c5411 100644
.word 0 # 32-bit align idt_desc.address
idt_descr:
-@@ -742,7 +840,7 @@ idt_descr:
+@@ -718,7 +824,7 @@ idt_descr:
.word 0 # 32 bit align gdt_desc.address
ENTRY(early_gdt_descr)
.word GDT_ENTRIES*8-1
@@ -22967,7 +19608,7 @@ index 81ba276..30c5411 100644
/*
* The boot_gdt must mirror the equivalent in setup.S and is
-@@ -751,5 +849,65 @@ ENTRY(early_gdt_descr)
+@@ -727,5 +833,65 @@ ENTRY(early_gdt_descr)
.align L1_CACHE_BYTES
ENTRY(boot_gdt)
.fill GDT_ENTRY_BOOT_CS,8,0
@@ -23036,19 +19677,19 @@ index 81ba276..30c5411 100644
+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
+ .endr
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
-index e1aabdb..fee4fee 100644
+index e11e394..599d09a 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
-@@ -20,6 +20,8 @@
+@@ -19,6 +19,8 @@
+ #include <asm/cache.h>
#include <asm/processor-flags.h>
#include <asm/percpu.h>
- #include <asm/nops.h>
+#include <asm/cpufeature.h>
+#include <asm/alternative-asm.h>
#ifdef CONFIG_PARAVIRT
#include <asm/asm-offsets.h>
-@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
+@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
L4_START_KERNEL = pgd_index(__START_KERNEL_map)
L3_START_KERNEL = pud_index(__START_KERNEL_map)
@@ -23061,45 +19702,64 @@ index e1aabdb..fee4fee 100644
.text
__HEAD
-@@ -89,11 +97,24 @@ startup_64:
- * Fixup the physical addresses in the page table
+@@ -85,35 +93,22 @@ startup_64:
*/
- addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
-+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
+ addq %rbp, init_level4_pgt + 0(%rip)
+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
-+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
-- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
-- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
-+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
+ addq %rbp, level3_ident_pgt + 0(%rip)
+#ifndef CONFIG_XEN
-+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
++ addq %rbp, level3_ident_pgt + 8(%rip)
+#endif
-+
+
+- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
+- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
-+
+
+- addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
-+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
++ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
- addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
+- /* Add an Identity mapping if I am above 1G */
+- leaq _text(%rip), %rdi
+- andq $PMD_PAGE_MASK, %rdi
+-
+- movq %rdi, %rax
+- shrq $PUD_SHIFT, %rax
+- andq $(PTRS_PER_PUD - 1), %rax
+- jz ident_complete
+-
+- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
+- leaq level3_ident_pgt(%rip), %rbx
+- movq %rdx, 0(%rbx, %rax, 8)
+-
+- movq %rdi, %rax
+- shrq $PMD_SHIFT, %rax
+- andq $(PTRS_PER_PMD - 1), %rax
+- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
+- leaq level2_spare_pgt(%rip), %rbx
+- movq %rdx, 0(%rbx, %rax, 8)
+-ident_complete:
+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
/*
- * Set up the identity mapping for the switchover. These
-@@ -177,8 +198,8 @@ ENTRY(secondary_startup_64)
- movq $(init_level4_pgt - __START_KERNEL_map), %rax
- 1:
+ * Fixup the kernel text+data virtual addresses. Note that
+@@ -160,8 +155,8 @@ ENTRY(secondary_startup_64)
+ * after the boot processor executes this code.
+ */
- /* Enable PAE mode and PGE */
-- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
+- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
+ /* Enable PAE mode and PSE/PGE */
-+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
- movq %rcx, %cr4
++ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
+ movq %rax, %cr4
/* Setup early boot stage 4 level pagetables. */
-@@ -199,10 +220,19 @@ ENTRY(secondary_startup_64)
+@@ -183,9 +178,17 @@ ENTRY(secondary_startup_64)
movl $MSR_EFER, %ecx
rdmsr
btsl $_EFER_SCE, %eax /* Enable System Call */
@@ -23107,72 +19767,84 @@ index e1aabdb..fee4fee 100644
+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
jnc 1f
btsl $_EFER_NX, %eax
- btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
++ leaq init_level4_pgt(%rip), %rdi
+#ifndef CONFIG_EFI
-+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
++ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
+#endif
-+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
-+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
-+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
-+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
-+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
++ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
++ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
++ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
1: wrmsr /* Make changes effective */
/* Setup cr0 */
-@@ -282,6 +312,7 @@ ENTRY(secondary_startup_64)
- * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
- * address given in m16:64.
+@@ -247,6 +250,7 @@ ENTRY(secondary_startup_64)
+ * jump. In addition we need to ensure %cs is set so we make this
+ * a far return.
*/
+ pax_set_fptr_mask
movq initial_code(%rip),%rax
pushq $0 # fake return address to stop unwinder
pushq $__KERNEL_CS # set correct cs
-@@ -388,7 +419,7 @@ ENTRY(early_idt_handler)
- call dump_stack
- #ifdef CONFIG_KALLSYMS
- leaq early_idt_ripmsg(%rip),%rdi
-- movq 40(%rsp),%rsi # %rip again
-+ movq 88(%rsp),%rsi # %rip again
- call __print_symbol
- #endif
+@@ -269,7 +273,7 @@ ENTRY(secondary_startup_64)
+ bad_address:
+ jmp bad_address
+
+- .section ".init.text","ax"
++ __INIT
+ #ifdef CONFIG_EARLY_PRINTK
+ .globl early_idt_handlers
+ early_idt_handlers:
+@@ -314,18 +318,23 @@ ENTRY(early_idt_handler)
#endif /* EARLY_PRINTK */
-@@ -416,6 +447,7 @@ ENDPROC(early_idt_handler)
+ 1: hlt
+ jmp 1b
++ .previous
+
+ #ifdef CONFIG_EARLY_PRINTK
++ __INITDATA
early_recursion_flag:
.long 0
++ .previous
+ .section .rodata,"a",@progbits
- #ifdef CONFIG_EARLY_PRINTK
early_idt_msg:
.asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
-@@ -443,29 +475,52 @@ NEXT_PAGE(early_level4_pgt)
- NEXT_PAGE(early_dynamic_pgts)
- .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
+ early_idt_ripmsg:
+ .asciz "RIP %s\n"
++ .previous
+ #endif /* CONFIG_EARLY_PRINTK */
+- .previous
-- .data
+ .section .rodata,"a",@progbits
+ #define NEXT_PAGE(name) \
+ .balign PAGE_SIZE; \
+ ENTRY(name)
+@@ -338,7 +347,6 @@ ENTRY(name)
+ i = i + 1 ; \
+ .endr
--#ifndef CONFIG_XEN
- NEXT_PAGE(init_level4_pgt)
-- .fill 512,8,0
--#else
--NEXT_PAGE(init_level4_pgt)
-- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
- .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
+- .data
+ /*
+ * This default setting generates an ident mapping at address 0x100000
+ * and a mapping for the kernel that precisely maps virtual address
+@@ -349,13 +357,41 @@ NEXT_PAGE(init_level4_pgt)
+ .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
+ .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
+ .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
- .org init_level4_pgt + L4_START_KERNEL*8, 0
+ .org init_level4_pgt + L4_START_KERNEL*8, 0
/* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
- .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
+ .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
+#ifdef CONFIG_PAX_PER_CPU_PGD
+NEXT_PAGE(cpu_pgd)
-+ .rept 2*NR_CPUS
++ .rept NR_CPUS
+ .fill 512,8,0
+ .endr
+#endif
@@ -23180,7 +19852,7 @@ index e1aabdb..fee4fee 100644
NEXT_PAGE(level3_ident_pgt)
.quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
+#ifdef CONFIG_XEN
- .fill 511, 8, 0
+ .fill 511,8,0
+#else
+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
+ .fill 510,8,0
@@ -23195,45 +19867,54 @@ index e1aabdb..fee4fee 100644
+NEXT_PAGE(level3_vmemmap_pgt)
+ .fill L3_VMEMMAP_START,8,0
+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
-+
- NEXT_PAGE(level2_ident_pgt)
-- /* Since I easily can, map the first 1G.
-+ /* Since I easily can, map the first 2G.
- * Don't set NX because code runs from these pages.
- */
-- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
--#endif
-+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
NEXT_PAGE(level3_kernel_pgt)
.fill L3_START_KERNEL,8,0
-@@ -473,6 +528,9 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -363,20 +399,23 @@ NEXT_PAGE(level3_kernel_pgt)
.quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
.quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
+NEXT_PAGE(level2_vmemmap_pgt)
+ .fill 512,8,0
+
- NEXT_PAGE(level2_kernel_pgt)
- /*
- * 512 MB kernel mapping. We spend a full page on this pagetable
-@@ -490,28 +548,64 @@ NEXT_PAGE(level2_kernel_pgt)
NEXT_PAGE(level2_fixmap_pgt)
- .fill 506,8,0
- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
+- .fill 506,8,0
+- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
- .fill 5,8,0
++ .fill 507,8,0
+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
+ .fill 4,8,0
- NEXT_PAGE(level1_fixmap_pgt)
+-NEXT_PAGE(level1_fixmap_pgt)
++NEXT_PAGE(level1_vsyscall_pgt)
.fill 512,8,0
-+NEXT_PAGE(level1_vsyscall_pgt)
-+ .fill 512,8,0
-+
+-NEXT_PAGE(level2_ident_pgt)
+- /* Since I easily can, map the first 1G.
++ /* Since I easily can, map the first 2G.
+ * Don't set NX because code runs from these pages.
+ */
+- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
++NEXT_PAGE(level2_ident_pgt)
++ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
+
+ NEXT_PAGE(level2_kernel_pgt)
+ /*
+@@ -389,35 +428,56 @@ NEXT_PAGE(level2_kernel_pgt)
+ * If you want to increase this then increase MODULES_VADDR
+ * too.)
+ */
+- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
+- KERNEL_IMAGE_SIZE/PMD_SIZE)
+-
+-NEXT_PAGE(level2_spare_pgt)
+- .fill 512, 8, 0
++ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
+
#undef PMDS
+ #undef NEXT_PAGE
- .data
+ .align PAGE_SIZE
@@ -23259,12 +19940,6 @@ index e1aabdb..fee4fee 100644
+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
+ /* asm/segment.h:GDT_ENTRIES must match this */
+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
-+#else
-+ .quad 0x0 /* unused */
-+#endif
-+
+ /* zero the remaining page */
+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
+ .endr
@@ -23283,13 +19958,20 @@ index e1aabdb..fee4fee 100644
#include "../../x86/xen/xen-head.S"
-
-- __PAGE_ALIGNED_BSS
+- .section .bss, "aw", @nobits
+
+ .section .rodata,"a",@progbits
- NEXT_PAGE(empty_zero_page)
+ .align L1_CACHE_BYTES
+ ENTRY(idt_table)
+- .skip IDT_ENTRIES * 16
++ .fill 512,8,0
+
+- __PAGE_ALIGNED_BSS
+ .align PAGE_SIZE
+ ENTRY(empty_zero_page)
.skip PAGE_SIZE
diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
-index 0fa6912..b37438b 100644
+index 9c3bd4a..e1d9b35 100644
--- a/arch/x86/kernel/i386_ksyms_32.c
+++ b/arch/x86/kernel/i386_ksyms_32.c
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
@@ -23305,7 +19987,7 @@ index 0fa6912..b37438b 100644
EXPORT_SYMBOL(__get_user_1);
EXPORT_SYMBOL(__get_user_2);
-@@ -37,3 +41,11 @@ EXPORT_SYMBOL(strstr);
+@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
EXPORT_SYMBOL(csum_partial);
EXPORT_SYMBOL(empty_zero_page);
@@ -23313,28 +19995,11 @@ index 0fa6912..b37438b 100644
+#ifdef CONFIG_PAX_KERNEXEC
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
-+
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+EXPORT_SYMBOL(cpu_pgd);
-+#endif
-diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
-index 5d576ab..1403a03 100644
---- a/arch/x86/kernel/i387.c
-+++ b/arch/x86/kernel/i387.c
-@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
- static inline bool interrupted_user_mode(void)
- {
- struct pt_regs *regs = get_irq_regs();
-- return regs && user_mode_vm(regs);
-+ return regs && user_mode(regs);
- }
-
- /*
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
-index 9a5c460..84868423 100644
+index 6104852..47826ae 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
-@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
+@@ -111,7 +111,7 @@ static int i8259A_irq_pending(unsigned int irq)
static void make_8259A_irq(unsigned int irq)
{
disable_irq_nosync(irq);
@@ -23343,7 +20008,7 @@ index 9a5c460..84868423 100644
irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
i8259A_chip.name);
enable_irq(irq);
-@@ -209,7 +209,7 @@ spurious_8259A_irq:
+@@ -210,7 +210,7 @@ spurious_8259A_irq:
"spurious 8259A interrupt: IRQ%d.\n", irq);
spurious_irq_mask |= irqmask;
}
@@ -23352,7 +20017,7 @@ index 9a5c460..84868423 100644
/*
* Theoretically we do not have to handle this IRQ,
* but in Linux this does not cause problems and is
-@@ -333,14 +333,16 @@ static void init_8259A(int auto_eoi)
+@@ -334,14 +334,16 @@ static void init_8259A(int auto_eoi)
/* (slave's support for AEOI in flat mode is to be investigated) */
outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
@@ -23371,6 +20036,28 @@ index 9a5c460..84868423 100644
udelay(100); /* wait for 8259A to initialize */
+diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
+index 43e9ccf..44ccf6f 100644
+--- a/arch/x86/kernel/init_task.c
++++ b/arch/x86/kernel/init_task.c
+@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+ * way process stacks are handled. This is done by having a special
+ * "init_task" linker map entry..
+ */
+-union thread_union init_thread_union __init_task_data =
+- { INIT_THREAD_INFO(init_task) };
++union thread_union init_thread_union __init_task_data;
+
+ /*
+ * Initial task structure.
+@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
+ * section. Since TSS's are completely CPU-local, we want them
+ * on exact cacheline boundaries, to eliminate cacheline ping-pong.
+ */
+-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
+-
++struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
++EXPORT_SYMBOL(init_tss);
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index a979b5b..1d6db75 100644
--- a/arch/x86/kernel/io_delay.c
@@ -23385,7 +20072,7 @@ index a979b5b..1d6db75 100644
.callback = dmi_io_delay_0xed_port,
.ident = "Compaq Presario V6000",
diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
-index 4ddaf66..6292f4e 100644
+index 8c96897..be66bfa 100644
--- a/arch/x86/kernel/ioport.c
+++ b/arch/x86/kernel/ioport.c
@@ -6,6 +6,7 @@
@@ -23418,7 +20105,7 @@ index 4ddaf66..6292f4e 100644
if (turn_on)
bitmap_clear(t->io_bitmap_ptr, from, num);
-@@ -103,6 +110,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
+@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
return -EINVAL;
/* Trying to gain more privileges? */
if (level > old) {
@@ -23432,19 +20119,19 @@ index 4ddaf66..6292f4e 100644
return -EPERM;
}
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
-index 22d0687..e07b2a5 100644
+index fb2eb32..62793bd 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
-@@ -21,7 +21,7 @@
- #define CREATE_TRACE_POINTS
- #include <asm/trace/irq_vectors.h>
+@@ -18,7 +18,7 @@
+ #include <asm/mce.h>
+ #include <asm/hw_irq.h>
-atomic_t irq_err_count;
+atomic_unchecked_t irq_err_count;
/* Function pointer for generic interrupt vector handling */
void (*x86_platform_ipi_callback)(void) = NULL;
-@@ -125,9 +125,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
+@@ -117,9 +117,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
@@ -23456,7 +20143,7 @@ index 22d0687..e07b2a5 100644
#endif
return 0;
}
-@@ -167,7 +167,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
+@@ -159,7 +159,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
u64 arch_irq_stat(void)
{
@@ -23466,10 +20153,10 @@ index 22d0687..e07b2a5 100644
}
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
-index 4186755..784efa0 100644
+index 7209070..cbcd71a 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
-@@ -39,7 +39,7 @@ static int check_stack_overflow(void)
+@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
__asm__ __volatile__("andl %%esp,%0" :
"=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -23478,7 +20165,7 @@ index 4186755..784efa0 100644
}
static void print_stack_overflow(void)
-@@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
+@@ -54,8 +54,8 @@ static inline void print_stack_overflow(void) { }
* per-CPU IRQ handling contexts (thread information and stack)
*/
union irq_ctx {
@@ -23489,7 +20176,7 @@ index 4186755..784efa0 100644
} __attribute__((aligned(THREAD_SIZE)));
static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
-@@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
+@@ -75,10 +75,9 @@ static void call_on_stack(void *func, void *stack)
static inline int
execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
{
@@ -23501,7 +20188,7 @@ index 4186755..784efa0 100644
irqctx = __this_cpu_read(hardirq_ctx);
/*
-@@ -92,16 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -87,21 +86,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
* handler) we can't do that and just have to keep using the
* current stack (which is the irq stack already after all)
*/
@@ -23516,15 +20203,20 @@ index 4186755..784efa0 100644
+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
+ irqctx->previous_esp = current_stack_pointer;
-- /* Copy the preempt_count so that the [soft]irq checks work. */
-- irqctx->tinfo.preempt_count = curctx->tinfo.preempt_count;
+- /*
+- * Copy the softirq bits in preempt_count so that the
+- * softirq checks work in the hardirq context.
+- */
+- irqctx->tinfo.preempt_count =
+- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
+- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ __set_fs(MAKE_MM_SEG(0));
+#endif
if (unlikely(overflow))
call_on_stack(print_stack_overflow, isp);
-@@ -113,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -113,6 +107,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
: "0" (irq), "1" (desc), "2" (isp),
"D" (desc->handle_irq)
: "memory", "cc", "ecx");
@@ -23536,9 +20228,9 @@ index 4186755..784efa0 100644
return 1;
}
-@@ -121,29 +125,14 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -121,29 +120,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
*/
- void irq_ctx_init(int cpu)
+ void __cpuinit irq_ctx_init(int cpu)
{
- union irq_ctx *irqctx;
-
@@ -23546,31 +20238,29 @@ index 4186755..784efa0 100644
return;
- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
-- THREADINFO_GFP,
-- THREAD_SIZE_ORDER));
+- THREAD_FLAGS,
+- THREAD_ORDER));
- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
- irqctx->tinfo.cpu = cpu;
- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
-+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
-+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
-
+-
- per_cpu(hardirq_ctx, cpu) = irqctx;
-
- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
-- THREADINFO_GFP,
-- THREAD_SIZE_ORDER));
+- THREAD_FLAGS,
+- THREAD_ORDER));
- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
- irqctx->tinfo.cpu = cpu;
- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
-
- per_cpu(softirq_ctx, cpu) = irqctx;
-+ printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
-+ cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
++ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
++ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
-@@ -152,7 +141,6 @@ void irq_ctx_init(int cpu)
+@@ -152,7 +133,6 @@ void __cpuinit irq_ctx_init(int cpu)
asmlinkage void do_softirq(void)
{
unsigned long flags;
@@ -23578,7 +20268,7 @@ index 4186755..784efa0 100644
union irq_ctx *irqctx;
u32 *isp;
-@@ -162,15 +150,22 @@ asmlinkage void do_softirq(void)
+@@ -162,15 +142,22 @@ asmlinkage void do_softirq(void)
local_irq_save(flags);
if (local_softirq_pending()) {
@@ -23605,62 +20295,24 @@ index 4186755..784efa0 100644
/*
* Shouldn't happen, we returned above if in_interrupt():
*/
-@@ -191,7 +186,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
- if (unlikely(!desc))
- return false;
-
-- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
-+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
- if (unlikely(overflow))
- print_stack_overflow();
- desc->handle_irq(irq, desc);
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
-index d04d3ec..ea4b374 100644
+index 69bca46..0bac999 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
-@@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
- u64 estack_top, estack_bottom;
+@@ -38,7 +38,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
+ #ifdef CONFIG_DEBUG_STACKOVERFLOW
u64 curbase = (u64)task_stack_page(current);
- if (user_mode_vm(regs))
+ if (user_mode(regs))
return;
- if (regs->sp >= curbase + sizeof(struct thread_info) +
-diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
-index ee11b7d..4df4d0c 100644
---- a/arch/x86/kernel/jump_label.c
-+++ b/arch/x86/kernel/jump_label.c
-@@ -49,7 +49,7 @@ static void __jump_label_transform(struct jump_entry *entry,
- * We are enabling this jump label. If it is not a nop
- * then something must have gone wrong.
- */
-- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5) != 0))
-+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5) != 0))
- bug_at((void *)entry->code, __LINE__);
-
- code.jump = 0xe9;
-@@ -64,13 +64,13 @@ static void __jump_label_transform(struct jump_entry *entry,
- */
- if (init) {
- const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
-- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
-+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
- bug_at((void *)entry->code, __LINE__);
- } else {
- code.jump = 0xe9;
- code.offset = entry->target -
- (entry->code + JUMP_LABEL_NOP_SIZE);
-- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
-+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
- bug_at((void *)entry->code, __LINE__);
- }
- memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
+ WARN_ONCE(regs->sp >= curbase &&
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
-index 836f832..a8bda67 100644
+index 2f45c4c..3f51a0c 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)
+@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
#ifdef CONFIG_X86_32
switch (regno) {
case GDB_SS:
@@ -23674,7 +20326,7 @@ index 836f832..a8bda67 100644
*(unsigned long *)mem = kernel_stack_pointer(regs);
break;
case GDB_GS:
-@@ -229,7 +229,10 @@ static void kgdb_correct_hw_break(void)
+@@ -228,7 +228,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;
@@ -23686,7 +20338,7 @@ index 836f832..a8bda67 100644
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,
+@@ -475,12 +478,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;
@@ -23701,7 +20353,7 @@ index 836f832..a8bda67 100644
raw_smp_processor_id());
}
-@@ -546,7 +549,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
+@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
switch (cmd) {
case DIE_DEBUG:
@@ -23710,8 +20362,8 @@ index 836f832..a8bda67 100644
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 */
+@@ -748,11 +751,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
+ char opc[BREAK_INSTR_SIZE];
bpt->type = BP_BREAKPOINT;
- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
@@ -23724,7 +20376,7 @@ index 836f832..a8bda67 100644
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)
+@@ -765,7 +768,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);
@@ -23733,7 +20385,7 @@ index 836f832..a8bda67 100644
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)
+@@ -790,13 +793,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);
@@ -23749,13 +20401,13 @@ index 836f832..a8bda67 100644
(char *)bpt->saved_instr, BREAK_INSTR_SIZE);
}
-diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
-index 79a3f96..6ba030a 100644
---- a/arch/x86/kernel/kprobes/core.c
-+++ b/arch/x86/kernel/kprobes/core.c
-@@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
+diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
+index 7da647d..6e9fab5 100644
+--- a/arch/x86/kernel/kprobes.c
++++ b/arch/x86/kernel/kprobes.c
+@@ -117,9 +117,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
s32 raddr;
- } __packed *insn;
+ } __attribute__((packed)) *insn;
- insn = (struct __arch_relative_insn *)from;
+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
@@ -23767,7 +20419,7 @@ index 79a3f96..6ba030a 100644
}
/* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
-@@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
+@@ -156,7 +159,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
kprobe_opcode_t opcode;
kprobe_opcode_t *orig_opcodes = opcodes;
@@ -23776,31 +20428,42 @@ index 79a3f96..6ba030a 100644
return 0; /* Page fault may occur on this address. */
retry:
-@@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
+@@ -228,7 +231,7 @@ static int recover_probed_instruction(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);
+ return 0;
}
-
- /*
-@@ -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)
- return 0;
+@@ -264,7 +267,7 @@ static int __kprobes can_probe(unsigned long paddr)
+ * recover it.
+ */
+ return 0;
+- kernel_insn_init(&insn, buf);
++ kernel_insn_init(&insn, ktva_ktla(buf));
+ }
+ insn_get_length(&insn);
+ addr += insn.length;
+@@ -313,11 +316,13 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
+ (unsigned long)src);
+ if (ret)
+ return 0;
+- kernel_insn_init(&insn, buf);
++ kernel_insn_init(&insn, ktva_ktla(buf));
+ }
+ }
+ insn_get_length(&insn);
+ pax_open_kernel();
memcpy(dest, insn.kaddr, insn.length);
+ pax_close_kernel();
#ifdef CONFIG_X86_64
if (insn_rip_relative(&insn)) {
-@@ -359,7 +364,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
- return 0;
- }
+@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
+ (u8 *) dest;
+ BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
disp = (u8 *) dest + insn_offset_displacement(&insn);
+ pax_open_kernel();
*(s32 *) disp = (s32) newdisp;
@@ -23808,7 +20471,22 @@ index 79a3f96..6ba030a 100644
}
#endif
return insn.length;
-@@ -498,7 +505,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
+@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
+ */
+ __copy_instruction(p->ainsn.insn, p->addr, 0);
+
+- if (can_boost(p->addr))
++ if (can_boost(ktla_ktva(p->addr)))
+ p->ainsn.boostable = 0;
+ else
+ p->ainsn.boostable = -1;
+
+- p->opcode = *p->addr;
++ p->opcode = *(ktla_ktva(p->addr));
+ }
+
+ int __kprobes arch_prepare_kprobe(struct kprobe *p)
+@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
* nor set current_kprobe, because it doesn't use single
* stepping.
*/
@@ -23817,7 +20495,7 @@ index 79a3f96..6ba030a 100644
preempt_enable_no_resched();
return;
}
-@@ -515,9 +522,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
+@@ -494,9 +501,9 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
regs->flags &= ~X86_EFLAGS_IF;
/* single step inline if the instruction is an int3 */
if (p->opcode == BREAKPOINT_INSTRUCTION)
@@ -23829,7 +20507,7 @@ index 79a3f96..6ba030a 100644
}
/*
-@@ -596,7 +603,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
+@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
setup_singlestep(p, regs, kcb, 0);
return 1;
}
@@ -23838,7 +20516,7 @@ index 79a3f96..6ba030a 100644
/*
* The breakpoint instruction was removed right
* after we hit it. Another cpu has removed
-@@ -642,6 +649,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
+@@ -683,6 +690,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
" movq %rax, 152(%rsp)\n"
RESTORE_REGS_STRING
" popfq\n"
@@ -23848,8 +20526,8 @@ index 79a3f96..6ba030a 100644
#else
" pushf\n"
SAVE_REGS_STRING
-@@ -779,7 +789,7 @@ static void __kprobes
- resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
+@@ -820,7 +830,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 copy_ip = (unsigned long)p->ainsn.insn;
@@ -23857,7 +20535,7 @@ index 79a3f96..6ba030a 100644
unsigned long orig_ip = (unsigned long)p->addr;
kprobe_opcode_t *insn = p->ainsn.insn;
-@@ -961,7 +971,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
+@@ -1002,7 +1012,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
struct die_args *args = data;
int ret = NOTIFY_DONE;
@@ -23866,27 +20544,32 @@ index 79a3f96..6ba030a 100644
return ret;
switch (val) {
-diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
-index 898160b..758cde8 100644
---- a/arch/x86/kernel/kprobes/opt.c
-+++ b/arch/x86/kernel/kprobes/opt.c
-@@ -79,6 +79,7 @@ found:
- /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
- static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
+@@ -1120,6 +1130,7 @@ static void __kprobes synthesize_relcall(void *from, void *to)
+ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr,
+ unsigned long val)
{
+ pax_open_kernel();
#ifdef CONFIG_X86_64
*addr++ = 0x48;
*addr++ = 0xbf;
-@@ -86,6 +87,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
+@@ -1127,6 +1138,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr,
*addr++ = 0xb8;
#endif
*(unsigned long *)addr = val;
+ pax_close_kernel();
}
- asm (
-@@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+ static void __used __kprobes kprobes_optinsn_template_holder(void)
+@@ -1307,7 +1319,7 @@ static int __kprobes can_optimize(unsigned long paddr)
+ ret = recover_probed_instruction(buf, addr);
+ if (ret)
+ return 0;
+- kernel_insn_init(&insn, buf);
++ kernel_insn_init(&insn, ktva_ktla(buf));
+ }
+ insn_get_length(&insn);
+ /* Recover address */
+@@ -1384,7 +1396,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
* Verify if the address gap is in 2GB range, because this uses
* a relative jump.
*/
@@ -23895,7 +20578,7 @@ index 898160b..758cde8 100644
if (abs(rel) > 0x7fffffff)
return -ERANGE;
-@@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -1399,16 +1411,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
op->optinsn.size = ret;
/* Copy arch-dep-instance from template */
@@ -23917,16 +20600,16 @@ index 898160b..758cde8 100644
(u8 *)op->kp.addr + op->optinsn.size);
flush_icache_range((unsigned long) buf,
-@@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist)
- WARN_ON(kprobe_disabled(&op->kp));
+@@ -1431,7 +1445,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
+ ((long)op->kp.addr + RELATIVEJUMP_SIZE));
- /* Backup instructions which will be replaced by jump address */
-- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
-+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
- RELATIVE_ADDR_SIZE);
+ /* Backup instructions which will be replaced by jump address */
+- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
++ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
+ RELATIVE_ADDR_SIZE);
- insn_buf[0] = RELATIVEJUMP_OPCODE;
-@@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
+ insn_buf[0] = RELATIVEJUMP_OPCODE;
+@@ -1530,7 +1544,7 @@ static int __kprobes setup_detour_execution(struct kprobe *p,
/* This kprobe is really able to run optimized path. */
op = container_of(p, struct optimized_kprobe, kp);
/* Detour through copied instructions */
@@ -23935,11 +20618,32 @@ index 898160b..758cde8 100644
if (!reenter)
reset_current_kprobe();
preempt_enable_no_resched();
+diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
+index a9c2116..94c1e1a 100644
+--- a/arch/x86/kernel/kvm.c
++++ b/arch/x86/kernel/kvm.c
+@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(void)
+ pv_mmu_ops.set_pud = kvm_set_pud;
+ #if PAGETABLE_LEVELS == 4
+ pv_mmu_ops.set_pgd = kvm_set_pgd;
++ pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
+ #endif
+ #endif
+ pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
+@@ -579,7 +580,7 @@ static int __cpuinit kvm_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata kvm_cpu_notifier = {
++static struct notifier_block kvm_cpu_notifier = {
+ .notifier_call = kvm_cpu_notify,
+ };
+ #endif
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
-index ebc9873..1b9724b 100644
+index ea69726..604d066 100644
--- a/arch/x86/kernel/ldt.c
+++ b/arch/x86/kernel/ldt.c
-@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
+@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
if (reload) {
#ifdef CONFIG_SMP
preempt_disable();
@@ -23955,7 +20659,7 @@ index ebc9873..1b9724b 100644
#endif
}
if (oldsize) {
-@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
+@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
return err;
for (i = 0; i < old->size; i++)
@@ -23964,7 +20668,7 @@ index ebc9873..1b9724b 100644
return 0;
}
-@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
+@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
retval = copy_ldt(&mm->context, &old_mm->context);
mutex_unlock(&old_mm->context.lock);
}
@@ -23989,7 +20693,7 @@ index ebc9873..1b9724b 100644
return retval;
}
-@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
+@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
}
}
@@ -24004,10 +20708,10 @@ index ebc9873..1b9724b 100644
if (oldmode)
ldt.avl = 0;
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
-index 5b19e4d..6476a76 100644
+index a3fa43b..8966f4c 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/debugreg.h>
@@ -24016,7 +20720,7 @@ index 5b19e4d..6476a76 100644
{
struct desc_ptr curidt;
-@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
+@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
}
@@ -24025,7 +20729,7 @@ index 5b19e4d..6476a76 100644
{
struct desc_ptr curgdt;
-@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
+@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
}
control_page = page_address(image->control_code_page);
@@ -24035,10 +20739,10 @@ index 5b19e4d..6476a76 100644
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
-index 15c9876..0a43909 100644
+index 29c95d7..97b7b1b 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
-@@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
+@@ -507,7 +507,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
@@ -24048,10 +20752,10 @@ index 15c9876..0a43909 100644
};
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
-index 5fb2ceb..3ae90bb 100644
+index 3ca42d0..7cff8cc 100644
--- a/arch/x86/kernel/microcode_intel.c
+++ b/arch/x86/kernel/microcode_intel.c
-@@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
+@@ -436,13 +436,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)
{
@@ -24068,14 +20772,15 @@ index 5fb2ceb..3ae90bb 100644
static void microcode_fini_cpu(int cpu)
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
-index 216a4d7..228255a 100644
+index 925179f..b151b74 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
-@@ -43,15 +43,60 @@ do { \
- } while (0)
+@@ -36,15 +36,62 @@
+ #define DEBUGP(fmt...)
#endif
-void *module_alloc(unsigned long size)
++static inline void *__module_alloc(unsigned long size, pgprot_t prot) __size_overflow(1);
+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
{
- if (PAGE_ALIGN(size) > MODULES_LEN)
@@ -24100,6 +20805,7 @@ index 216a4d7..228255a 100644
+
+#ifdef CONFIG_PAX_KERNEXEC
+#ifdef CONFIG_X86_32
++void *module_alloc_exec(unsigned long size) __size_overflow(1);
+void *module_alloc_exec(unsigned long size)
+{
+ struct vm_struct *area;
@@ -24135,15 +20841,15 @@ index 216a4d7..228255a 100644
#ifdef CONFIG_X86_32
int apply_relocate(Elf32_Shdr *sechdrs,
const char *strtab,
-@@ -62,14 +107,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -55,14 +102,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
unsigned int i;
Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
Elf32_Sym *sym;
- uint32_t *location;
+ uint32_t *plocation, location;
- DEBUGP("Applying relocate section %u to %u\n",
- relsec, sechdrs[relsec].sh_info);
+ DEBUGP("Applying relocate section %u to %u\n", relsec,
+ sechdrs[relsec].sh_info);
for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
/* This is where to make the change */
- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
@@ -24155,7 +20861,7 @@ index 216a4d7..228255a 100644
/* This is the symbol it is referring to. Note that all
undefined symbols have been resolved. */
sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-@@ -78,11 +125,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -71,11 +120,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
switch (ELF32_R_TYPE(rel[i].r_info)) {
case R_386_32:
/* We add the value into the location given */
@@ -24165,15 +20871,15 @@ index 216a4d7..228255a 100644
+ pax_close_kernel();
break;
case R_386_PC32:
- /* Add the value, subtract its position */
+ /* Add the value, subtract its postition */
- *location += sym->st_value - (uint32_t)location;
+ pax_open_kernel();
+ *plocation += sym->st_value - location;
+ pax_close_kernel();
break;
default:
- pr_err("%s: Unknown relocation: %u\n",
-@@ -127,21 +178,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
+ printk(KERN_ERR "module %s: Unknown relocation: %u\n",
+@@ -120,21 +173,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
case R_X86_64_NONE:
break;
case R_X86_64_64:
@@ -24205,10 +20911,10 @@ index 216a4d7..228255a 100644
if ((s64)val != *(s32 *)loc)
goto overflow;
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
-index 88458fa..349f7a4 100644
+index f7d1a64..399615a 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
-@@ -233,7 +233,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
+@@ -235,7 +235,7 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
return notifier_from_errno(err);
}
@@ -24218,19 +20924,10 @@ index 88458fa..349f7a4 100644
};
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
-index 6fcb49c..5b3f4ff 100644
+index e88f37b..45bb4ff 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
-@@ -138,7 +138,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
- return handled;
- }
-
--int __register_nmi_handler(unsigned int type, struct nmiaction *action)
-+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
- {
- struct nmi_desc *desc = nmi_to_desc(type);
- unsigned long flags;
-@@ -162,9 +162,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
+@@ -126,9 +126,9 @@ static int __setup_nmi(unsigned int type, struct nmiaction *action)
* event confuses some handlers (kdump uses this flag)
*/
if (action->flags & NMI_FLAG_FIRST)
@@ -24242,7 +20939,7 @@ index 6fcb49c..5b3f4ff 100644
spin_unlock_irqrestore(&desc->lock, flags);
return 0;
-@@ -187,7 +187,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
+@@ -150,7 +150,7 @@ static struct nmiaction *__free_nmi(unsigned int type, const char *name)
if (!strcmp(n->name, name)) {
WARN(in_nmi(),
"Trying to free NMI (%s) from NMI context!\n", n->name);
@@ -24251,7 +20948,7 @@ index 6fcb49c..5b3f4ff 100644
break;
}
}
-@@ -512,6 +512,17 @@ static inline void nmi_nesting_postprocess(void)
+@@ -408,6 +408,17 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
dotraplinkage notrace __kprobes void
do_nmi(struct pt_regs *regs, long error_code)
{
@@ -24266,49 +20963,27 @@ index 6fcb49c..5b3f4ff 100644
+ }
+#endif
+
- nmi_nesting_preprocess(regs);
-
nmi_enter();
-diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
-index 6d9582e..f746287 100644
---- a/arch/x86/kernel/nmi_selftest.c
-+++ b/arch/x86/kernel/nmi_selftest.c
-@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
- {
- /* trap all the unknown NMIs we may generate */
- register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
-- __initdata);
-+ __initconst);
- }
-
- static void __init cleanup_nmi_testsuite(void)
-@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
- unsigned long timeout;
- if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
-- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
-+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
- nmi_fail = FAILURE;
- return;
- }
+ inc_irq_stat(__nmi_count);
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
-index bbb6c73..24a58ef 100644
+index 676b8c7..870ba04 100644
--- a/arch/x86/kernel/paravirt-spinlocks.c
+++ b/arch/x86/kernel/paravirt-spinlocks.c
-@@ -8,7 +8,7 @@
-
- #include <asm/paravirt.h>
+@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
+ arch_spin_lock(lock);
+ }
-struct pv_lock_ops pv_lock_ops = {
+struct pv_lock_ops pv_lock_ops __read_only = {
#ifdef CONFIG_SMP
- .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
- .unlock_kick = paravirt_nop,
+ .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 1b10af8..0b58cbc 100644
+index 84c938f..09fb3e0 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
-@@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
+@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
{
return x;
}
@@ -24318,7 +20993,7 @@ index 1b10af8..0b58cbc 100644
void __init default_banner(void)
{
-@@ -142,15 +145,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
+@@ -145,15 +148,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
if (opfunc == NULL)
/* If there's no function, patch it with a ud2a (BUG) */
ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
@@ -24341,7 +21016,7 @@ index 1b10af8..0b58cbc 100644
else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
-@@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
+@@ -178,7 +185,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
if (insn_len > len || start == NULL)
insn_len = len;
else
@@ -24350,8 +21025,8 @@ index 1b10af8..0b58cbc 100644
return insn_len;
}
-@@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
- return this_cpu_read(paravirt_lazy_mode);
+@@ -302,7 +309,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
+ return percpu_read(paravirt_lazy_mode);
}
-struct pv_info pv_info = {
@@ -24359,7 +21034,7 @@ index 1b10af8..0b58cbc 100644
.name = "bare hardware",
.paravirt_enabled = 0,
.kernel_rpl = 0,
-@@ -310,16 +317,16 @@ struct pv_info pv_info = {
+@@ -313,16 +320,16 @@ struct pv_info pv_info = {
#endif
};
@@ -24374,21 +21049,21 @@ index 1b10af8..0b58cbc 100644
.steal_clock = native_steal_clock,
};
--__visible struct pv_irq_ops pv_irq_ops = {
-+__visible struct pv_irq_ops pv_irq_ops __read_only = {
+-struct pv_irq_ops pv_irq_ops = {
++struct pv_irq_ops pv_irq_ops __read_only = {
.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),
-@@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
+@@ -334,7 +341,7 @@ struct pv_irq_ops pv_irq_ops = {
#endif
};
--__visible struct pv_cpu_ops pv_cpu_ops = {
-+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
+-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,
-@@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = {
+@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
.end_context_switch = paravirt_nop,
};
@@ -24418,7 +21093,7 @@ index 1b10af8..0b58cbc 100644
.read_cr2 = native_read_cr2,
.write_cr2 = native_write_cr2,
-@@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
.make_pud = PTE_IDENT,
.set_pgd = native_set_pgd,
@@ -24426,7 +21101,7 @@ index 1b10af8..0b58cbc 100644
#endif
#endif /* PAGETABLE_LEVELS >= 3 */
-@@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
},
.set_fixmap = native_set_fixmap,
@@ -24440,10 +21115,10 @@ index 1b10af8..0b58cbc 100644
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..2ccb0ee 100644
+index 726494b..5d942a3 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
-@@ -1339,7 +1339,7 @@ static void __init get_tce_space_from_tar(void)
+@@ -1341,7 +1341,7 @@ static void __init get_tce_space_from_tar(void)
tce_space = be64_to_cpu(readq(target));
tce_space = tce_space & TAR_SW_BITS;
@@ -24465,43 +21140,49 @@ index 35ccf75..7a15747 100644
#define DEBUG 1
-diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
-index 6c483ba..d10ce2f 100644
---- a/arch/x86/kernel/pci-swiotlb.c
-+++ b/arch/x86/kernel/pci-swiotlb.c
-@@ -32,7 +32,7 @@ static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_addr,
- struct dma_attrs *attrs)
- {
-- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
-+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
- }
-
- static struct dma_map_ops swiotlb_dma_ops = {
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index c83516b..432ad6d 100644
+index 59b9b37..f02ee42 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
-@@ -36,7 +36,8 @@
- * section. Since TSS's are completely CPU-local, we want them
- * on exact cacheline boundaries, to eliminate cacheline ping-pong.
- */
--__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
-+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
-+EXPORT_SYMBOL(init_tss);
+@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
- #ifdef CONFIG_X86_64
- static DEFINE_PER_CPU(unsigned char, is_idle);
-@@ -92,7 +93,7 @@ void arch_task_cache_init(void)
- task_xstate_cachep =
- kmem_cache_create("task_xstate", xstate_size,
+ void free_thread_info(struct thread_info *ti)
+ {
+- free_thread_xstate(ti->task);
+ free_pages((unsigned long)ti, THREAD_ORDER);
+ }
+
++static struct kmem_cache *task_struct_cachep;
++
+ void arch_task_cache_init(void)
+ {
+- task_xstate_cachep =
+- kmem_cache_create("task_xstate", xstate_size,
++ /* create a slab on which task_structs can be allocated */
++ task_struct_cachep =
++ kmem_cache_create("task_struct", sizeof(struct task_struct),
++ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
++
++ task_xstate_cachep =
++ kmem_cache_create("task_xstate", xstate_size,
__alignof__(union thread_xstate),
- SLAB_PANIC | SLAB_NOTRACK, NULL);
+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
++}
++
++struct task_struct *alloc_task_struct_node(int node)
++{
++ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
++}
++
++void free_task_struct(struct task_struct *task)
++{
++ free_thread_xstate(task);
++ kmem_cache_free(task_struct_cachep, task);
}
/*
-@@ -105,7 +106,7 @@ void exit_thread(void)
+@@ -70,7 +87,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
if (bp) {
@@ -24510,7 +21191,16 @@ index c83516b..432ad6d 100644
t->io_bitmap_ptr = NULL;
clear_thread_flag(TIF_IO_BITMAP);
-@@ -125,6 +126,9 @@ void flush_thread(void)
+@@ -106,7 +123,7 @@ void show_regs_common(void)
+
+ printk(KERN_CONT "\n");
+ printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
+- current->pid, current->comm, print_tainted(),
++ task_pid_nr(current), current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version);
+@@ -120,6 +137,9 @@ void flush_thread(void)
{
struct task_struct *tsk = current;
@@ -24519,26 +21209,31 @@ index c83516b..432ad6d 100644
+#endif
flush_ptrace_hw_breakpoint(tsk);
memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
- drop_init_fpu(tsk);
-@@ -271,7 +275,7 @@ static void __exit_idle(void)
- void exit_idle(void)
- {
- /* idle loop has pid 0 */
-- if (current->pid)
-+ if (task_pid_nr(current))
- return;
- __exit_idle();
- }
-@@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
+ /*
+@@ -282,10 +302,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
+@@ -387,7 +407,7 @@ bool set_pm_idle_to_default(void)
+
return ret;
}
- #endif
-void stop_this_cpu(void *dummy)
+__noreturn void stop_this_cpu(void *dummy)
{
local_irq_disable();
/*
-@@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
+@@ -629,16 +649,37 @@ static int __init idle_setup(char *str)
}
early_param("idle", idle_setup);
@@ -24582,23 +21277,23 @@ index c83516b..432ad6d 100644
+ load_sp0(init_tss + smp_processor_id(), thread);
+
+#ifdef CONFIG_X86_64
-+ this_cpu_write(kernel_stack, thread->sp0);
++ percpu_write(kernel_stack, thread->sp0);
+#endif
+}
+#endif
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 884f98f..ec23e04 100644
+index 8598296..7c1af45 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
-@@ -65,6 +65,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
+@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
unsigned long thread_saved_pc(struct task_struct *tsk)
{
return ((unsigned long *)tsk->thread.sp)[3];
+//XXX return tsk->thread.eip;
}
- void __show_regs(struct pt_regs *regs, int all)
-@@ -74,19 +75,18 @@ void __show_regs(struct pt_regs *regs, int all)
+ #ifndef CONFIG_SMP
+@@ -130,21 +131,20 @@ void __show_regs(struct pt_regs *regs, int all)
unsigned long sp;
unsigned short ss, gs;
@@ -24614,6 +21309,8 @@ index 884f98f..ec23e04 100644
}
+ gs = get_user_gs(regs);
+ show_regs_common();
+
printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
(u16)regs->cs, regs->ip, regs->flags,
- smp_processor_id());
@@ -24621,33 +21318,23 @@ index 884f98f..ec23e04 100644
print_symbol("EIP is at %s\n", regs->ip);
printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
-@@ -133,20 +133,21 @@ void release_thread(struct task_struct *dead_task)
- int copy_thread(unsigned long clone_flags, unsigned long sp,
- unsigned long arg, struct task_struct *p)
- {
-- struct pt_regs *childregs = task_pt_regs(p);
-+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
+@@ -200,13 +200,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
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);
- if (unlikely(p->flags & PF_KTHREAD)) {
- /* 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;
-@@ -253,7 +254,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+ p->thread.ip = (unsigned long) ret_from_fork;
+
+@@ -296,7 +297,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();
@@ -24656,7 +21343,7 @@ index 884f98f..ec23e04 100644
fpu_switch_t fpu;
/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -277,6 +278,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -320,6 +321,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
lazy_save_gs(prev->gs);
@@ -24667,57 +21354,62 @@ index 884f98f..ec23e04 100644
/*
* Load the per-thread Thread-Local Storage descriptor.
*/
-@@ -307,6 +312,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -350,6 +355,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
arch_end_context_switch(next_p);
-+ this_cpu_write(current_task, next_p);
-+ this_cpu_write(current_tinfo, &next_p->tinfo);
++ percpu_write(current_task, next_p);
++ percpu_write(current_tinfo, &next_p->tinfo);
+
/*
* Restore %gs if needed (which is common)
*/
-@@ -315,8 +323,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -358,8 +366,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
switch_fpu_finish(next_p, fpu);
-- this_cpu_write(current_task, next_p);
+- percpu_write(current_task, next_p);
-
return prev_p;
}
-@@ -346,4 +352,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -389,4 +395,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 bb1dc51..08dda7f 100644
+index 6a364a6..b147d11 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
-@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -89,7 +89,7 @@ static void __exit_idle(void)
+ void exit_idle(void)
+ {
+ /* idle loop has pid 0 */
+- if (current->pid)
++ if (task_pid_nr(current))
+ return;
+ __exit_idle();
+ }
+@@ -264,8 +264,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
struct pt_regs *childregs;
struct task_struct *me = current;
-- 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);
+- 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;
+@@ -277,6 +276,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
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);
- p->fpu_counter = 0;
- p->thread.io_bitmap_ptr = NULL;
-@@ -172,6 +173,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
- p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
- savesegment(es, p->thread.es);
- savesegment(ds, p->thread.ds);
-+ savesegment(ss, p->thread.ss);
-+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
- memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
-
- if (unlikely(p->flags & PF_KTHREAD)) {
-@@ -280,7 +283,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+
+@@ -379,7 +379,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();
@@ -24726,30 +21418,20 @@ index bb1dc51..08dda7f 100644
unsigned fsindex, gsindex;
fpu_switch_t fpu;
-@@ -303,6 +306,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
- if (unlikely(next->ds | prev->ds))
- loadsegment(ds, next->ds);
-
-+ savesegment(ss, prev->ss);
-+ if (unlikely(next->ss != prev->ss))
-+ loadsegment(ss, next->ss);
+@@ -461,10 +461,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+ prev->usersp = percpu_read(old_rsp);
+ percpu_write(old_rsp, next->usersp);
+ percpu_write(current_task, next_p);
++ percpu_write(current_tinfo, &next_p->tinfo);
- /* We must save %fs and %gs before load_TLS() because
- * %fs and %gs may be cleared by load_TLS().
-@@ -362,10 +368,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);
-+ this_cpu_write(current_tinfo, &next_p->tinfo);
-
-- this_cpu_write(kernel_stack,
+- percpu_write(kernel_stack,
- (unsigned long)task_stack_page(next_p) +
- THREAD_SIZE - KERNEL_STACK_OFFSET);
-+ this_cpu_write(kernel_stack, next->sp0);
++ percpu_write(kernel_stack, next->sp0);
/*
* Now maybe reload the debug registers and handle I/O bitmaps
-@@ -434,12 +439,11 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -519,12 +518,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);
@@ -24765,10 +21447,10 @@ index bb1dc51..08dda7f 100644
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index 7461f50..1334029 100644
+index 2dc4121..60e1086 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
-@@ -184,14 +184,13 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
+@@ -181,14 +181,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;
@@ -24787,7 +21469,7 @@ index 7461f50..1334029 100644
return (unsigned long)regs;
}
-@@ -588,7 +587,7 @@ static void ptrace_triggered(struct perf_event *bp,
+@@ -585,7 +584,7 @@ static void ptrace_triggered(struct perf_event *bp,
static unsigned long ptrace_get_dr7(struct perf_event *bp[])
{
int i;
@@ -24796,7 +21478,7 @@ index 7461f50..1334029 100644
struct arch_hw_breakpoint *info;
for (i = 0; i < HBP_NUM; i++) {
-@@ -822,7 +821,7 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -852,7 +851,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
int ret;
@@ -24805,7 +21487,7 @@ index 7461f50..1334029 100644
switch (request) {
/* read the word at location addr in the USER area. */
-@@ -907,14 +906,14 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -937,14 +936,14 @@ long arch_ptrace(struct task_struct *child, long request,
if ((int) addr < 0)
return -EIO;
ret = do_get_thread_area(child, addr,
@@ -24822,7 +21504,7 @@ index 7461f50..1334029 100644
break;
#endif
-@@ -1292,7 +1291,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
+@@ -1229,7 +1228,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
#ifdef CONFIG_X86_64
@@ -24831,7 +21513,7 @@ index 7461f50..1334029 100644
[REGSET_GENERAL] = {
.core_note_type = NT_PRSTATUS,
.n = sizeof(struct user_regs_struct) / sizeof(long),
-@@ -1333,7 +1332,7 @@ static const struct user_regset_view user_x86_64_view = {
+@@ -1273,7 +1272,7 @@ static const struct user_regset_view user_x86_64_view = {
#endif /* CONFIG_X86_64 */
#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
@@ -24840,7 +21522,7 @@ index 7461f50..1334029 100644
[REGSET_GENERAL] = {
.core_note_type = NT_PRSTATUS,
.n = sizeof(struct user_regs_struct32) / sizeof(u32),
-@@ -1386,7 +1385,7 @@ static const struct user_regset_view user_x86_32_view = {
+@@ -1326,7 +1325,7 @@ static const struct user_regset_view user_x86_32_view = {
*/
u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
@@ -24849,7 +21531,7 @@ index 7461f50..1334029 100644
{
#ifdef CONFIG_X86_64
x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
-@@ -1421,7 +1420,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
+@@ -1361,7 +1360,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
memset(info, 0, sizeof(*info));
info->si_signo = SIGTRAP;
info->si_code = si_code;
@@ -24858,7 +21540,7 @@ index 7461f50..1334029 100644
}
void user_single_step_siginfo(struct task_struct *tsk,
-@@ -1450,6 +1449,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
+@@ -1390,6 +1389,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
# define IS_IA32 0
#endif
@@ -24869,35 +21551,56 @@ index 7461f50..1334029 100644
/*
* We must return the syscall number to actually look up in the table.
* This can be -1L to skip running any syscall at all.
-@@ -1460,6 +1463,11 @@ long syscall_trace_enter(struct pt_regs *regs)
-
- user_exit();
+@@ -1398,6 +1401,11 @@ long syscall_trace_enter(struct pt_regs *regs)
+ {
+ long ret = 0;
+#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.
-@@ -1515,6 +1523,11 @@ void syscall_trace_leave(struct pt_regs *regs)
- */
- user_exit();
+@@ -1409,7 +1417,11 @@ long syscall_trace_enter(struct pt_regs *regs)
+ regs->flags |= X86_EFLAGS_TF;
+
+ /* do the secure computing check first */
+- secure_computing(regs->orig_ax);
++ if (secure_computing(regs->orig_ax)) {
++ /* seccomp failures shouldn't expose any additional code. */
++ ret = -1L;
++ goto out;
++ }
+
+ if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))
+ ret = -1L;
+@@ -1436,6 +1448,7 @@ long syscall_trace_enter(struct pt_regs *regs)
+ #endif
+ }
+
++out:
+ return ret ?: regs->orig_ax;
+ }
+
+@@ -1443,6 +1456,11 @@ void syscall_trace_leave(struct pt_regs *regs)
+ {
+ bool step;
+#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);
+ if (unlikely(current->audit_context))
+ audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
- if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
-index a16bae3..1f65f25 100644
+index 42eb330..139955c 100644
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
-@@ -43,11 +43,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
+@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
return pv_tsc_khz;
}
@@ -24910,8 +21613,8 @@ index a16bae3..1f65f25 100644
+ atomic64_set_unchecked(&last_value, 0);
}
- u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
-@@ -92,11 +92,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
+ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
+@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
* updating at the same time, and one of them could be slightly behind,
* making the assumption that last_value always go forward fail to hold.
*/
@@ -24926,28 +21629,61 @@ index a16bae3..1f65f25 100644
return ret;
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 7e920bf..cc24446 100644
+index a4e1b4b..0460044 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
-@@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
+@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
+ EXPORT_SYMBOL(pm_power_off);
- void __noreturn machine_real_restart(unsigned int type)
+ static const struct desc_ptr no_idt = {};
+-static int reboot_mode;
++static unsigned short reboot_mode;
+ enum reboot_type reboot_type = BOOT_ACPI;
+ int reboot_force;
+
+@@ -324,13 +324,17 @@ core_initcall(reboot_init);
+ extern const unsigned char machine_real_restart_asm[];
+ extern const u64 machine_real_restart_gdt[3];
+
+-void machine_real_restart(unsigned int type)
++__noreturn void machine_real_restart(unsigned int type)
{
-+
+ void *restart_va;
+ unsigned long restart_pa;
+- void (*restart_lowmem)(unsigned int);
++ void (* __noreturn restart_lowmem)(unsigned int);
+ u64 *lowmem_gdt;
+
+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
+ struct desc_struct *gdt;
+#endif
+
local_irq_disable();
- /*
-@@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type)
+ /* Write zero to CMOS register number 0x0f, which the BIOS POST
+@@ -356,14 +360,14 @@ void machine_real_restart(unsigned int type)
+ boot)". This seems like a fairly standard thing that gets set by
+ REBOOT.COM programs, and the previous reset routine did this
+ too. */
+- *((unsigned short *)0x472) = reboot_mode;
++ *(unsigned short *)(__va(0x472)) = reboot_mode;
+
+ /* Patch the GDT in the low memory trampoline */
+ lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
+
+ restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
+ restart_pa = virt_to_phys(restart_va);
+- restart_lowmem = (void (*)(unsigned int))restart_pa;
++ restart_lowmem = (void *)restart_pa;
+
+ /* GDT[0]: GDT self-pointer */
+ lowmem_gdt[0] =
+@@ -374,7 +378,35 @@ void machine_real_restart(unsigned int type)
+ GDT_ENTRY(0x009b, restart_pa, 0xffff);
/* Jump to the identity-mapped low memory code */
- #ifdef CONFIG_X86_32
-- asm volatile("jmpl *%0" : :
+
-+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
+ gdt = get_cpu_gdt_table(smp_processor_id());
+ pax_open_kernel();
+#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -24968,11 +21704,17 @@ index 7e920bf..cc24446 100644
+ pax_close_kernel();
+#endif
+
-+ asm volatile("ljmpl *%0" : :
- "rm" (real_mode_header->machine_real_restart_asm),
- "a" (type));
- #else
-@@ -466,7 +493,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
++ unreachable();
++#else
+ restart_lowmem(type);
++#endif
++
+ }
+ #ifdef CONFIG_APM_MODULE
+ EXPORT_SYMBOL(machine_real_restart);
+@@ -564,7 +596,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
*/
@@ -24981,12 +21723,12 @@ index 7e920bf..cc24446 100644
{
int i;
int attempt = 0;
-@@ -575,13 +602,13 @@ void native_machine_shutdown(void)
+@@ -688,13 +720,13 @@ void native_machine_shutdown(void)
#endif
}
-static void __machine_emergency_restart(int emergency)
-+static void __noreturn __machine_emergency_restart(int emergency)
++static __noreturn void __machine_emergency_restart(int emergency)
{
reboot_emergency = emergency;
machine_ops.emergency_restart();
@@ -24995,18 +21737,18 @@ index 7e920bf..cc24446 100644
-static void native_machine_restart(char *__unused)
+static void __noreturn native_machine_restart(char *__unused)
{
- pr_notice("machine restart\n");
+ printk("machine restart\n");
-@@ -590,7 +617,7 @@ static void native_machine_restart(char *__unused)
+@@ -703,7 +735,7 @@ static void native_machine_restart(char *__unused)
__machine_emergency_restart(0);
}
-static void native_machine_halt(void)
+static void __noreturn native_machine_halt(void)
{
- /* Stop other cpus and apics */
+ /* stop other cpus and apics */
machine_shutdown();
-@@ -600,7 +627,7 @@ static void native_machine_halt(void)
+@@ -714,7 +746,7 @@ static void native_machine_halt(void)
stop_this_cpu(NULL);
}
@@ -25015,9 +21757,9 @@ index 7e920bf..cc24446 100644
{
if (pm_power_off) {
if (!reboot_force)
-@@ -609,9 +636,10 @@ static void native_machine_power_off(void)
+@@ -723,9 +755,10 @@ static void native_machine_power_off(void)
}
- /* A fallback in case there is no PM info available */
+ /* a fallback in case there is no PM info available */
tboot_shutdown(TB_SHUTDOWN_HALT);
+ unreachable();
}
@@ -25041,7 +21783,7 @@ index c8e41e9..64049ef 100644
/*
* PCI ids solely used for fixups_table go here
diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
-index 3fd2c69..16ef367 100644
+index f2bb9c9..bed145d7 100644
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -11,6 +11,7 @@
@@ -25052,91 +21794,28 @@ index 3fd2c69..16ef367 100644
/*
* Must be relocatable PIC code callable as a C function
-@@ -96,8 +97,7 @@ relocate_kernel:
-
- /* jump to identity mapped page */
- addq $(identity_mapped - relocate_kernel), %r8
-- pushq %r8
-- ret
-+ jmp *%r8
-
- identity_mapped:
- /* set return address to 0 if not preserving context */
-@@ -167,6 +167,7 @@ identity_mapped:
- xorl %r14d, %r14d
- xorl %r15d, %r15d
+@@ -167,6 +168,7 @@ identity_mapped:
+ xorq %r14, %r14
+ xorq %r15, %r15
+ pax_force_retaddr 0, 1
ret
1:
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index f0de629..a4978a8f 100644
+index b506f41..33e9995 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -110,6 +110,7 @@
- #include <asm/mce.h>
- #include <asm/alternative.h>
- #include <asm/prom.h>
-+#include <asm/boot.h>
-
- /*
- * max_low_pfn_mapped: highest direct mapped pfn under 4GB
-@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
- #endif
-
-
--#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
--__visible unsigned long mmu_cr4_features;
-+#ifdef CONFIG_X86_64
-+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
-+#elif defined(CONFIG_X86_PAE)
-+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
- #else
--__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
-+__visible unsigned long mmu_cr4_features __read_only;
- #endif
-
-+void set_in_cr4(unsigned long mask)
-+{
-+ unsigned long cr4 = read_cr4();
-+
-+ if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
-+ return;
-+
-+ pax_open_kernel();
-+ mmu_cr4_features |= mask;
-+ pax_close_kernel();
-+
-+ if (trampoline_cr4_features)
-+ *trampoline_cr4_features = mmu_cr4_features;
-+ cr4 |= mask;
-+ write_cr4(cr4);
-+}
-+EXPORT_SYMBOL(set_in_cr4);
-+
-+void clear_in_cr4(unsigned long mask)
-+{
-+ unsigned long cr4 = read_cr4();
-+
-+ if (!(cr4 & mask) && cr4 == mmu_cr4_features)
-+ return;
-+
-+ pax_open_kernel();
-+ mmu_cr4_features &= ~mask;
-+ pax_close_kernel();
-+
-+ if (trampoline_cr4_features)
-+ *trampoline_cr4_features = mmu_cr4_features;
-+ cr4 &= ~mask;
-+ write_cr4(cr4);
-+}
-+EXPORT_SYMBOL(clear_in_cr4);
-+
- /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
- int bootloader_type, bootloader_version;
+@@ -447,7 +447,7 @@ static void __init parse_setup_data(void)
-@@ -768,7 +807,7 @@ static void __init trim_bios_range(void)
+ switch (data->type) {
+ case SETUP_E820_EXT:
+- parse_e820_ext(data);
++ parse_e820_ext((struct setup_data __force_kernel *)data);
+ break;
+ case SETUP_DTB:
+ add_dtb(pa_data);
+@@ -727,7 +727,7 @@ static void __init trim_bios_range(void)
* area (640->1Mb) as ram even though it is not.
* take them out.
*/
@@ -25145,29 +21824,7 @@ index f0de629..a4978a8f 100644
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
}
-@@ -776,7 +815,7 @@ static void __init trim_bios_range(void)
- /* called before trim_bios_range() to spare extra sanitize */
- static void __init e820_add_kernel_range(void)
- {
-- u64 start = __pa_symbol(_text);
-+ u64 start = __pa_symbol(ktla_ktva(_text));
- u64 size = __pa_symbol(_end) - start;
-
- /*
-@@ -838,8 +877,12 @@ static void __init trim_low_memory_range(void)
-
- void __init setup_arch(char **cmdline_p)
- {
-+#ifdef CONFIG_X86_32
-+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
-+#else
- memblock_reserve(__pa_symbol(_text),
- (unsigned long)__bss_stop - (unsigned long)_text);
-+#endif
-
- early_reserve_initrd();
-
-@@ -931,14 +974,14 @@ void __init setup_arch(char **cmdline_p)
+@@ -852,14 +852,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
root_mountflags &= ~MS_RDONLY;
@@ -25178,26 +21835,26 @@ index f0de629..a4978a8f 100644
init_mm.end_data = (unsigned long) _edata;
init_mm.brk = _brk_end;
-- code_resource.start = __pa_symbol(_text);
-- code_resource.end = __pa_symbol(_etext)-1;
-- data_resource.start = __pa_symbol(_etext);
-+ code_resource.start = __pa_symbol(ktla_ktva(_text));
-+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
-+ data_resource.start = __pa_symbol(_sdata);
- data_resource.end = __pa_symbol(_edata)-1;
- bss_resource.start = __pa_symbol(__bss_start);
- bss_resource.end = __pa_symbol(__bss_stop)-1;
+- code_resource.start = virt_to_phys(_text);
+- code_resource.end = virt_to_phys(_etext)-1;
+- data_resource.start = virt_to_phys(_etext);
++ code_resource.start = virt_to_phys(ktla_ktva(_text));
++ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
++ data_resource.start = virt_to_phys(_sdata);
+ data_resource.end = virt_to_phys(_edata)-1;
+ bss_resource.start = virt_to_phys(&__bss_start);
+ bss_resource.end = virt_to_phys(&__bss_stop)-1;
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
-index 5cdff03..80fa283 100644
+index 5a98aa2..5aa4ffc 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -21,19 +21,17 @@
#include <asm/cpu.h>
#include <asm/stackprotector.h>
--DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
+-DEFINE_PER_CPU(int, cpu_number);
+#ifdef CONFIG_SMP
-+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
++DEFINE_PER_CPU(unsigned int, cpu_number);
EXPORT_PER_CPU_SYMBOL(cpu_number);
+#endif
@@ -25264,10 +21921,10 @@ index 5cdff03..80fa283 100644
* 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 9e5de68..16c53cb 100644
+index 54ddaeb2..158e022 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
-@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
+@@ -198,7 +198,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.
*/
@@ -25276,7 +21933,21 @@ index 9e5de68..16c53cb 100644
#else /* !CONFIG_X86_32 */
sp = round_down(sp, 16) - 8;
#endif
-@@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
+@@ -249,11 +249,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;
+ }
+@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
}
if (current->mm->context.vdso)
@@ -25285,10 +21956,10 @@ index 9e5de68..16c53cb 100644
else
- restorer = &frame->retcode;
+ restorer = (void __user *)&frame->retcode;
- if (ksig->ka.sa.sa_flags & SA_RESTORER)
- restorer = ksig->ka.sa.sa_restorer;
+ if (ka->sa.sa_flags & SA_RESTORER)
+ restorer = ka->sa.sa_restorer;
-@@ -314,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
+@@ -324,7 +324,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.
*/
@@ -25297,57 +21968,69 @@ index 9e5de68..16c53cb 100644
if (err)
return -EFAULT;
-@@ -361,7 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
- save_altstack_ex(&frame->uc.uc_stack, regs->sp);
+@@ -378,7 +378,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));
/* Set up to return from userspace. */
- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
+ if (current->mm->context.vdso)
+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
+ else
-+ restorer = (void __user *)&frame->retcode;
- if (ksig->ka.sa.sa_flags & SA_RESTORER)
- restorer = ksig->ka.sa.sa_restorer;
++ restorer = (void __user *)&frame->retcode;
+ if (ka->sa.sa_flags & SA_RESTORER)
+ restorer = ka->sa.sa_restorer;
put_user_ex(restorer, &frame->pretcode);
-@@ -373,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -390,7 +393,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);
-
- err |= copy_siginfo_to_user(&frame->info, &ksig->info);
-@@ -609,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
+
+ if (err)
+@@ -655,19 +658,22 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
{
- int usig = signr_convert(ksig->sig);
- sigset_t *set = sigmask_to_save();
-- compat_sigset_t *cset = (compat_sigset_t *) set;
+ int usig = signr_convert(sig);
+ sigset_t *set = ¤t->blocked;
+ sigset_t sigcopy;
-+ compat_sigset_t *cset;
-+
+ int ret;
+
+ if (current_thread_info()->status & TS_RESTORE_SIGMASK)
+ set = ¤t->saved_sigmask;
+
+ sigcopy = *set;
+
-+ cset = (compat_sigset_t *) &sigcopy;
-
/* Set up the stack frame */
- if (is_ia32_frame()) {
-@@ -620,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
- } else if (is_x32_frame()) {
- return x32_setup_rt_frame(ksig, cset, regs);
- } else {
-- return __setup_rt_frame(ksig->sig, ksig, set, regs);
-+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
- }
- }
+ if (is_ia32) {
+ if (ka->sa.sa_flags & SA_SIGINFO)
+- ret = ia32_setup_rt_frame(usig, ka, info, set, regs);
++ ret = ia32_setup_rt_frame(usig, ka, info, &sigcopy, regs);
+ else
+- ret = ia32_setup_frame(usig, ka, set, regs);
++ ret = ia32_setup_frame(usig, ka, &sigcopy, regs);
+ } else
+- ret = __setup_rt_frame(sig, ka, info, set, regs);
++ ret = __setup_rt_frame(sig, ka, info, &sigcopy, regs);
+
+ if (ret) {
+ force_sigsegv(sig, current);
+@@ -769,7 +775,7 @@ static void do_signal(struct pt_regs *regs)
+ * X86_32: vm86 regs switched out by assembly code before reaching
+ * here, so testing against kernel CS suffices.
+ */
+- if (!user_mode(regs))
++ if (!user_mode_novm(regs))
+ return;
+ signr = get_signal_to_deliver(&info, &ka, regs, NULL);
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
-index 7c3a5a6..f0a8961 100644
+index 16204dc..0e7d4b7 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
-@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
-
- __setup("nonmi_ipi", nonmi_ipi_setup);
+@@ -225,7 +225,7 @@ void smp_call_function_single_interrupt(struct pt_regs *regs)
+ irq_exit();
+ }
-struct smp_ops smp_ops = {
+struct smp_ops smp_ops __read_only = {
@@ -25355,50 +22038,24 @@ index 7c3a5a6..f0a8961 100644
.smp_prepare_cpus = native_smp_prepare_cpus,
.smp_cpus_done = native_smp_cpus_done,
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
-index 6cacab6..750636a 100644
+index 9f548cb..caf76f7 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
-@@ -251,14 +251,18 @@ static void notrace start_secondary(void *unused)
-
- enable_start_cpu0 = 0;
-
--#ifdef CONFIG_X86_32
-- /* switch away from the initial page table */
-- load_cr3(swapper_pg_dir);
-- __flush_tlb_all();
--#endif
--
- /* otherwise gcc will move up smp_processor_id before the cpu_init */
- barrier();
-+
-+ /* switch away from the initial page table */
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
-+ __flush_tlb_all();
-+#elif defined(CONFIG_X86_32)
-+ load_cr3(swapper_pg_dir);
-+ __flush_tlb_all();
-+#endif
-+
- /*
- * Check TSC synchronization with the BP:
- */
-@@ -749,6 +753,7 @@ static int 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;
-+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
-
+@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
+ set_idle_for_cpu(cpu, c_idle.idle);
+ do_rest:
+ per_cpu(current_task, cpu) = c_idle.idle;
++ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
#ifdef CONFIG_X86_32
/* Stack for startup_32 can be just as for start_secondary onwards */
-@@ -756,11 +761,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+ irq_ctx_init(cpu);
#else
- clear_tsk_thread_flag(idle, TIF_FORK);
+ clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
initial_gs = per_cpu_offset(cpu);
- per_cpu(kernel_stack, cpu) =
-- (unsigned long)task_stack_page(idle) -
+- (unsigned long)task_stack_page(c_idle.idle) -
- KERNEL_STACK_OFFSET + THREAD_SIZE;
-+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
++ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
#endif
+
+ pax_open_kernel();
@@ -25406,26 +22063,23 @@ index 6cacab6..750636a 100644
+ pax_close_kernel();
+
initial_code = (unsigned long)start_secondary;
- stack_start = idle->thread.sp;
+ stack_start = c_idle.idle->thread.sp;
+
+@@ -861,6 +864,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
-@@ -909,6 +916,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
- /* the FPU context is blank, nobody can own it */
- __cpu_disable_lazy_restore(cpu);
+ per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
+#ifdef CONFIG_PAX_PER_CPU_PGD
-+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
-+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-+ KERNEL_PGD_PTRS);
-+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
++ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
+ KERNEL_PGD_PTRS);
+#endif
+
- err = do_boot_cpu(apicid, cpu, tidle);
+ err = do_boot_cpu(apicid, cpu);
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 9b4d51d..5d28b58 100644
+index d4f278e..86c58c0 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
@@ -25462,40 +22116,27 @@ index 9b4d51d..5d28b58 100644
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
-new file mode 100644
-index 0000000..5877189
---- /dev/null
+index 0b0cb5f..560d0df 100644
+--- a/arch/x86/kernel/sys_i386_32.c
+++ b/arch/x86/kernel/sys_i386_32.c
-@@ -0,0 +1,189 @@
-+/*
-+ * 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/elf.h>
-+
-+#include <linux/uaccess.h>
-+#include <linux/unistd.h>
-+
-+#include <asm/syscalls.h>
-+
+@@ -24,17 +24,228 @@
+
+ #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[])
+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
@@ -25510,28 +22151,13 @@ index 0000000..5877189
+ return 0;
+}
+
-+/*
-+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
-+ */
-+static unsigned long get_align_mask(void)
-+{
-+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
-+ return 0;
-+
-+ if (!(current->flags & PF_RANDOMIZE))
-+ return 0;
-+
-+ return va_align.mask;
-+}
-+
+unsigned long
+arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ unsigned long len, unsigned long pgoff, unsigned long flags)
+{
+ struct mm_struct *mm = current->mm;
+ struct vm_area_struct *vma;
-+ unsigned long pax_task_size = TASK_SIZE;
-+ struct vm_unmapped_area_info info;
++ unsigned long start_addr, pax_task_size = TASK_SIZE;
+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
+
+#ifdef CONFIG_PAX_SEGMEXEC
@@ -25555,39 +22181,65 @@ index 0000000..5877189
+ addr = PAGE_ALIGN(addr);
+ if (pax_task_size - len >= addr) {
+ vma = find_vma(mm, addr);
-+ if (check_heap_stack_gap(vma, addr, len, offset))
++ if (check_heap_stack_gap(vma, &addr, len, offset))
+ return addr;
+ }
+ }
-+
-+ info.flags = 0;
-+ info.length = len;
-+ info.align_mask = filp ? get_align_mask() : 0;
-+ info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
++ if (len > mm->cached_hole_size) {
++ start_addr = addr = mm->free_area_cache;
++ } else {
++ start_addr = addr = mm->mmap_base;
++ mm->cached_hole_size = 0;
++ }
+
+#ifdef CONFIG_PAX_PAGEEXEC
-+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
-+ info.low_limit = 0x00110000UL;
-+ info.high_limit = mm->start_code;
++ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
++ start_addr = 0x00110000UL;
+
+#ifdef CONFIG_PAX_RANDMMAP
+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
++ start_addr += mm->delta_mmap & 0x03FFF000UL;
+#endif
+
-+ if (info.low_limit < info.high_limit) {
-+ addr = vm_unmapped_area(&info);
-+ if (!IS_ERR_VALUE(addr))
-+ return addr;
-+ }
-+ } else
++ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
++ start_addr = addr = mm->mmap_base;
++ else
++ addr = start_addr;
++ }
+#endif
+
-+ info.low_limit = mm->mmap_base;
-+ info.high_limit = pax_task_size;
++full_search:
++ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
++ /* At this point: (!vma || addr < vma->vm_end). */
++ if (pax_task_size - len < addr) {
++ /*
++ * Start a new search - just in case we missed
++ * some holes.
++ */
++ if (start_addr != mm->mmap_base) {
++ start_addr = addr = mm->mmap_base;
++ mm->cached_hole_size = 0;
++ goto full_search;
++ }
++ return -ENOMEM;
++ }
++ 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;
++ addr = vma->vm_end;
++ if (mm->start_brk <= addr && addr < mm->mmap_base) {
++ start_addr = addr = mm->mmap_base;
++ mm->cached_hole_size = 0;
++ goto full_search;
++ }
++ }
+
-+ return vm_unmapped_area(&info);
++ /*
++ * Remember the place where we stopped the search:
++ */
++ mm->free_area_cache = addr + len;
++ return addr;
+}
+
+unsigned long
@@ -25597,8 +22249,7 @@ index 0000000..5877189
+{
+ struct vm_area_struct *vma;
+ struct mm_struct *mm = current->mm;
-+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
-+ struct vm_unmapped_area_info info;
++ 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
@@ -25629,23 +22280,52 @@ index 0000000..5877189
+ addr = PAGE_ALIGN(addr);
+ if (pax_task_size - len >= addr) {
+ vma = find_vma(mm, addr);
-+ if (check_heap_stack_gap(vma, addr, len, offset))
++ if (check_heap_stack_gap(vma, &addr, len, offset))
+ return addr;
+ }
+ }
+
-+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
-+ info.length = len;
-+ info.low_limit = PAGE_SIZE;
-+ info.high_limit = mm->mmap_base;
-+ info.align_mask = filp ? get_align_mask() : 0;
-+ info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
++ /* check if free_area_cache is useful for us */
++ if (len <= mm->cached_hole_size) {
++ mm->cached_hole_size = 0;
++ mm->free_area_cache = mm->mmap_base;
++ }
+
-+ addr = vm_unmapped_area(&info);
-+ if (!(addr & ~PAGE_MASK))
-+ return addr;
-+ VM_BUG_ON(addr != -ENOMEM);
++ /* either no address requested or can't fit in requested address hole */
++ addr = mm->free_area_cache;
++
++ /* make sure it can fit in the remaining address space */
++ if (addr > len) {
++ addr -= len;
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, &addr, len, offset))
++ /* remember the address as a hint for next time */
++ return (mm->free_area_cache = addr);
++ }
++
++ if (mm->mmap_base < len)
++ goto bottomup;
++
++ addr = mm->mmap_base-len;
++
++ do {
++ /*
++ * 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 (check_heap_stack_gap(vma, &addr, len, offset))
++ /* remember the address as a hint for next time */
++ return (mm->free_area_cache = addr);
++
++ /* remember the largest hole we saw so far */
++ if (addr + mm->cached_hole_size < vma->vm_start)
++ mm->cached_hole_size = vma->vm_start - addr;
++
++ /* try just below the current vma->vm_start */
++ addr = skip_heap_stack_gap(vma, len, offset);
++ } while (!IS_ERR_VALUE(addr));
+
+bottomup:
+ /*
@@ -25654,13 +22334,37 @@ index 0000000..5877189
+ * can happen with large stack limits and large mmap()
+ * allocations.
+ */
-+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
-+}
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ if (mm->pax_flags & MF_PAX_SEGMEXEC)
++ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
++ else
++#endif
++
++ mm->mmap_base = TASK_UNMAPPED_BASE;
++
++#ifdef CONFIG_PAX_RANDMMAP
++ if (mm->pax_flags & MF_PAX_RANDMMAP)
++ mm->mmap_base += mm->delta_mmap;
++#endif
++
++ mm->free_area_cache = mm->mmap_base;
++ mm->cached_hole_size = ~0UL;
++ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
++ /*
++ * Restore the topdown base:
++ */
++ mm->mmap_base = base;
++ mm->free_area_cache = base;
++ 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 30277e2..5664a29 100644
+index cdb2fc9..a7264e0 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
-@@ -81,8 +81,8 @@ out:
+@@ -95,8 +95,8 @@ out:
return error;
}
@@ -25669,9 +22373,9 @@ index 30277e2..5664a29 100644
+static void find_start_end(struct mm_struct *mm, unsigned long flags,
+ unsigned long *begin, unsigned long *end)
{
- if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
+ if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
unsigned long new_begin;
-@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
+@@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
*begin = new_begin;
}
} else {
@@ -25680,9 +22384,9 @@ index 30277e2..5664a29 100644
*end = TASK_SIZE;
}
}
-@@ -114,20 +114,24 @@ 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;
- struct vm_unmapped_area_info info;
+ unsigned long start_addr;
unsigned long begin, end;
+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
@@ -25704,28 +22408,31 @@ index 30277e2..5664a29 100644
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, offset))
++ if (end - len >= addr && check_heap_stack_gap(vma, &addr, len, offset))
return addr;
}
-
-@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
- info.high_limit = end;
- info.align_mask = filp ? get_align_mask() : 0;
- info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
- }
-
-@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
+@@ -172,7 +176,7 @@ full_search:
+ }
+ return -ENOMEM;
+ }
+- if (!vma || addr + len <= vma->vm_start) {
++ if (check_heap_stack_gap(vma, &addr, len, offset)) {
+ /*
+ * Remember the place where we stopped the search:
+ */
+@@ -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;
- struct vm_unmapped_area_info info;
+- unsigned long addr = addr0;
++ unsigned long base = mm->mmap_base, addr = addr0;
+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
/* requested length too big for entire address space */
if (len > TASK_SIZE)
-@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
+@@ -208,13 +213,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
goto bottomup;
+#ifdef CONFIG_PAX_RANDMMAP
@@ -25735,26 +22442,85 @@ index 30277e2..5664a29 100644
/* requesting a specific address */
if (addr) {
addr = PAGE_ALIGN(addr);
- vma = find_vma(mm, 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;
+- return addr;
++ if (TASK_SIZE - len >= addr) {
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, &addr, len, offset))
++ return addr;
++ }
}
-@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- info.high_limit = mm->mmap_base;
- info.align_mask = filp ? get_align_mask() : 0;
- info.align_offset = pgoff << PAGE_SHIFT;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
- if (!(addr & ~PAGE_MASK))
- return addr;
+ /* check if free_area_cache is useful for us */
+@@ -232,7 +242,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ ALIGN_TOPDOWN);
+
+ vma = find_vma(mm, tmp_addr);
+- if (!vma || tmp_addr + len <= vma->vm_start)
++ if (check_heap_stack_gap(vma, &tmp_addr, len, offset))
+ /* remember the address as a hint for next time */
+ return mm->free_area_cache = tmp_addr;
+ }
+@@ -251,7 +261,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ * 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;
+
+@@ -260,8 +270,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;
+- } while (len < vma->vm_start);
++ addr = skip_heap_stack_gap(vma, len, offset);
++ } while (!IS_ERR_VALUE(addr));
+
+ bottomup:
+ /*
+@@ -270,13 +280,21 @@ bottomup:
+ * can happen with large stack limits and large mmap()
+ * allocations.
+ */
++ mm->mmap_base = TASK_UNMAPPED_BASE;
++
++#ifdef CONFIG_PAX_RANDMMAP
++ if (mm->pax_flags & MF_PAX_RANDMMAP)
++ mm->mmap_base += mm->delta_mmap;
++#endif
++
++ mm->free_area_cache = mm->mmap_base;
+ mm->cached_hole_size = ~0UL;
+- mm->free_area_cache = TASK_UNMAPPED_BASE;
+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
+ /*
+ * Restore the topdown base:
+ */
+- mm->free_area_cache = mm->mmap_base;
++ mm->mmap_base = base;
++ mm->free_area_cache = base;
+ mm->cached_hole_size = ~0UL;
+
+ return addr;
+diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
+index 9a0e312..e6f66f2 100644
+--- a/arch/x86/kernel/syscall_table_32.S
++++ b/arch/x86/kernel/syscall_table_32.S
+@@ -1,3 +1,4 @@
++.section .rodata,"a",@progbits
+ ENTRY(sys_call_table)
+ .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
+ .long sys_exit
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
-index 91a4496..1730bff 100644
+index e2410e2..b98a4fd 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
-@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
+@@ -219,7 +219,7 @@ static int tboot_setup_sleep(void)
void tboot_shutdown(u32 shutdown_type)
{
@@ -25763,7 +22529,7 @@ index 91a4496..1730bff 100644
if (!tboot_enabled())
return;
-@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
+@@ -241,7 +241,7 @@ void tboot_shutdown(u32 shutdown_type)
switch_to_tboot_pt();
@@ -25772,8 +22538,8 @@ index 91a4496..1730bff 100644
shutdown();
/* should not reach here */
-@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
- return -ENODEV;
+@@ -298,7 +298,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
+ tboot_shutdown(acpi_shutdown_map[sleep_state]);
}
-static atomic_t ap_wfs_count;
@@ -25781,7 +22547,7 @@ index 91a4496..1730bff 100644
static int tboot_wait_for_aps(int num_aps)
{
-@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
+@@ -322,16 +322,16 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
{
switch (action) {
case CPU_DYING:
@@ -25793,20 +22559,28 @@ index 91a4496..1730bff 100644
return NOTIFY_BAD;
break;
}
-@@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block tboot_cpu_notifier __cpuinitdata =
++static struct notifier_block tboot_cpu_notifier =
+ {
+ .notifier_call = tboot_cpu_callback,
+ };
+@@ -343,7 +343,7 @@ static __init int tboot_late_init(void)
tboot_create_trampoline();
- atomic_set(&ap_wfs_count, 0);
+ atomic_set_unchecked(&ap_wfs_count, 0);
register_hotcpu_notifier(&tboot_cpu_notifier);
-
- #ifdef CONFIG_DEBUG_FS
+ return 0;
+ }
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
-index 24d3c91..d06b473 100644
+index dd5fbf4..b7f2232 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
-@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
+@@ -31,9 +31,9 @@ unsigned long profile_pc(struct pt_regs *regs)
{
unsigned long pc = instruction_pointer(regs);
@@ -25818,7 +22592,7 @@ index 24d3c91..d06b473 100644
#else
unsigned long *sp =
(unsigned long *)kernel_stack_pointer(regs);
-@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
+@@ -42,11 +42,17 @@ unsigned long profile_pc(struct pt_regs *regs)
* or above a saved flags. Eflags has bits 22-31 zero,
* kernel addresses don't.
*/
@@ -25837,10 +22611,10 @@ index 24d3c91..d06b473 100644
return pc;
}
diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
-index f7fec09..9991981 100644
+index bcfec2d..aeb81c2 100644
--- a/arch/x86/kernel/tls.c
+++ b/arch/x86/kernel/tls.c
-@@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
+@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
return -EINVAL;
@@ -25852,7 +22626,7 @@ index f7fec09..9991981 100644
set_tls_desc(p, idx, &info, 1);
return 0;
-@@ -200,7 +205,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
+@@ -205,7 +210,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
if (kbuf)
info = kbuf;
@@ -25861,138 +22635,139 @@ index f7fec09..9991981 100644
return -EFAULT;
else
info = infobuf;
-diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
-index 1c113db..287b42e 100644
---- a/arch/x86/kernel/tracepoint.c
-+++ b/arch/x86/kernel/tracepoint.c
-@@ -9,11 +9,11 @@
- #include <linux/atomic.h>
+diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
+index 451c0a7..e57f551 100644
+--- a/arch/x86/kernel/trampoline_32.S
++++ b/arch/x86/kernel/trampoline_32.S
+@@ -32,6 +32,12 @@
+ #include <asm/segment.h>
+ #include <asm/page_types.h>
- atomic_t trace_idt_ctr = ATOMIC_INIT(0);
--struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
-+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
- (unsigned long) trace_idt_table };
++#ifdef CONFIG_PAX_KERNEXEC
++#define ta(X) (X)
++#else
++#define ta(X) ((X) - __PAGE_OFFSET)
++#endif
++
+ #ifdef CONFIG_SMP
- /* No need to be aligned, but done to keep all IDTs defined the same way. */
--gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
-+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
+ .section ".x86_trampoline","a"
+@@ -62,7 +68,7 @@ r_base = .
+ inc %ax # protected mode (PE) bit
+ lmsw %ax # into protected mode
+ # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
+- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
++ ljmpl $__BOOT_CS, $ta(startup_32_smp)
+
+ # These need to be in the same 64K segment as the above;
+ # hence we don't use the boot_gdt_descr defined in head.S
+diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
+index 09ff517..df19fbff 100644
+--- a/arch/x86/kernel/trampoline_64.S
++++ b/arch/x86/kernel/trampoline_64.S
+@@ -90,7 +90,7 @@ startup_32:
+ movl $__KERNEL_DS, %eax # Initialize the %ds segment register
+ movl %eax, %ds
+
+- movl $X86_CR4_PAE, %eax
++ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
+ movl %eax, %cr4 # Enable PAE mode
- static int trace_irq_vector_refcount;
- static DEFINE_MUTEX(irq_vector_mutex);
+ # Setup trampoline 4 level pagetables
+@@ -138,7 +138,7 @@ tidt:
+ # so the kernel can live anywhere
+ .balign 4
+ tgdt:
+- .short tgdt_end - tgdt # gdt limit
++ .short tgdt_end - tgdt - 1 # gdt limit
+ .long tgdt - r_base
+ .short 0
+ .quad 0x00cf9b000000ffff # __KERNEL32_CS
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 8c8093b..c93f581 100644
+index e6fbb94..75e9d8c 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
-@@ -66,7 +66,7 @@
- #include <asm/proto.h>
+@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
- /* No need to be aligned, but done to keep all IDTs defined the same way. */
--gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
-+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
- #else
- #include <asm/processor-flags.h>
- #include <asm/setup.h>
-@@ -75,7 +75,7 @@ asmlinkage int system_call(void);
+ /* Do we ignore FPU interrupts ? */
+ char ignore_fpu_irq;
+-
+-/*
+- * The IDT has to be page-aligned to simplify the Pentium
+- * F0 0F bug workaround.
+- */
+-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
#endif
- /* Must be page-aligned because the real IDT is used in a fixmap. */
--gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
-+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
-
DECLARE_BITMAP(used_vectors, NR_VECTORS);
- EXPORT_SYMBOL_GPL(used_vectors);
-@@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
+@@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
}
- 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)
+ 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;
+
#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.
-@@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
- return -1;
+@@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
}
#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 (!user_mode(regs))
++ if (!user_mode_novm(regs))
+ goto kernel_trap;
+
+ #ifdef CONFIG_X86_32
+@@ -148,7 +142,7 @@ trap_signal:
+ printk_ratelimit()) {
+ printk(KERN_INFO
+ "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
+- tsk->comm, tsk->pid, str,
++ tsk->comm, task_pid_nr(tsk), str,
+ regs->ip, regs->sp, error_code);
+ print_vma_addr(" in ", regs->ip);
+ printk("\n");
+@@ -165,8 +159,20 @@ kernel_trap:
+ if (!fixup_exception(regs)) {
+ tsk->thread.error_code = error_code;
+ tsk->thread.trap_no = 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";
++ 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);
- }
+ die(str, regs, error_code);
+ }
+
+#ifdef CONFIG_PAX_REFCOUNT
-+ if (trapnr == 4)
-+ pax_report_refcount_overflow(regs);
++ if (trapnr == 4)
++ pax_report_refcount_overflow(regs);
+#endif
+
- return 0;
- }
-
-@@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
- }
+ return;
- 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;
-@@ -161,7 +173,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",
-- tsk->comm, tsk->pid, str,
-+ tsk->comm, task_pid_nr(tsk), str,
- regs->ip, regs->sp, error_code);
- print_vma_addr(" in ", regs->ip);
- pr_cont("\n");
-@@ -277,7 +289,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
+ #ifdef CONFIG_X86_32
+@@ -259,14 +265,30 @@ 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)) {
- local_irq_enable();
- handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
- goto exit;
-@@ -285,18 +297,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
+- if (regs->flags & X86_VM_MASK)
++ if (v8086_mode(regs))
+ goto gp_in_vm86;
#endif
tsk = current;
-- 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 (!user_mode(regs))
++ if (!user_mode_novm(regs))
+ goto gp_in_kernel;
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
@@ -26011,9 +22786,23 @@ index 8c8093b..c93f581 100644
+#endif
+
tsk->thread.error_code = error_code;
- tsk->thread.trap_nr = X86_TRAP_GP;
+ tsk->thread.trap_no = X86_TRAP_GP;
-@@ -457,7 +493,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -299,6 +321,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);
+ }
+
+@@ -419,7 +448,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);
@@ -26022,7 +22811,7 @@ index 8c8093b..c93f581 100644
handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
X86_TRAP_DB);
preempt_conditional_cli(regs);
-@@ -472,7 +508,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -433,7 +462,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.
*/
@@ -26031,7 +22820,7 @@ index 8c8093b..c93f581 100644
tsk->thread.debugreg6 &= ~DR_STEP;
set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
regs->flags &= ~X86_EFLAGS_TF;
-@@ -504,7 +540,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
+@@ -463,7 +492,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
return;
conditional_sti(regs);
@@ -26040,28 +22829,17 @@ index 8c8093b..c93f581 100644
{
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 2ed8459..7cf329f 100644
---- a/arch/x86/kernel/uprobes.c
-+++ b/arch/x86/kernel/uprobes.c
-@@ -629,7 +629,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
- int ret = NOTIFY_DONE;
-
- /* We are only interested in userspace traps */
-- if (regs && !user_mode_vm(regs))
-+ if (regs && !user_mode(regs))
- return NOTIFY_DONE;
-
- switch (val) {
-@@ -719,7 +719,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
-
- if (ncopied != rasize) {
- pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
-- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
-+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
+@@ -576,8 +605,8 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
+ void __math_state_restore(struct task_struct *tsk)
+ {
+ /* We need a safe address that is cheap to find and that is already
+- in L1. We've just brought in "tsk->thread.has_fpu", so use that */
+-#define safe_address (tsk->thread.has_fpu)
++ in L1. */
++#define safe_address (init_tss[raw_smp_processor_id()].x86_tss.sp0)
- force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
- }
+ /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
+ is pending. Clear the x87 state here by setting it to fixed
diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
index b9242ba..50c5edd 100644
--- a/arch/x86/kernel/verify_cpu.S
@@ -26075,10 +22853,10 @@ index b9242ba..50c5edd 100644
* 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 e8edcf5..27f9344 100644
+index 04b8726..0c35b29 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
-@@ -44,6 +44,7 @@
+@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
#include <linux/stddef.h>
@@ -26086,7 +22864,7 @@ index e8edcf5..27f9344 100644
#include <asm/uaccess.h>
#include <asm/io.h>
-@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
+@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
do_exit(SIGSEGV);
}
@@ -26095,36 +22873,36 @@ index e8edcf5..27f9344 100644
current->thread.sp0 = current->thread.saved_sp0;
current->thread.sysenter_cs = __KERNEL_CS;
load_sp0(tss, ¤t->thread);
-@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
+@@ -210,6 +211,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
+ struct task_struct *tsk;
+ int tmp, ret = -EPERM;
- if (tsk->thread.saved_sp0)
- return -EPERM;
-+
+#ifdef CONFIG_GRKERNSEC_VM86
+ if (!capable(CAP_SYS_RAWIO)) {
+ gr_handle_vm86();
-+ return -EPERM;
++ goto out;
+ }
+#endif
+
- tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
- offsetof(struct kernel_vm86_struct, vm86plus) -
- sizeof(info.regs));
-@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
- int tmp;
+ tsk = current;
+ if (tsk->thread.saved_sp0)
+ goto out;
+@@ -240,6 +248,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
+ int tmp, ret;
struct vm86plus_struct __user *v86;
+#ifdef CONFIG_GRKERNSEC_VM86
+ if (!capable(CAP_SYS_RAWIO)) {
+ gr_handle_vm86();
-+ return -EPERM;
++ ret = -EPERM;
++ goto out;
+ }
+#endif
+
tsk = current;
switch (cmd) {
case VM86_REQUEST_IRQ:
-@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
+@@ -326,7 +342,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
tsk->thread.saved_fs = info->regs32->fs;
tsk->thread.saved_gs = get_user_gs(info->regs32);
@@ -26133,7 +22911,7 @@ index e8edcf5..27f9344 100644
tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
if (cpu_has_sep)
tsk->thread.sysenter_cs = 0;
-@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
+@@ -531,7 +547,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
goto cannot_handle;
if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
goto cannot_handle;
@@ -26143,7 +22921,7 @@ index e8edcf5..27f9344 100644
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
-index 10c4f30..65408b9 100644
+index 0f703f1..cd7e91b 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -26,6 +26,13 @@
@@ -26210,9 +22988,9 @@ index 10c4f30..65408b9 100644
+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
+ _text = .;
HEAD_TEXT
- . = ALIGN(8);
- _stext = .;
-@@ -104,13 +124,47 @@ SECTIONS
+ #ifdef CONFIG_X86_32
+ . = ALIGN(PAGE_SIZE);
+@@ -108,13 +128,48 @@ SECTIONS
IRQENTRY_TEXT
*(.fixup)
*(.gnu.warning)
@@ -26248,6 +23026,7 @@ index 10c4f30..65408b9 100644
+#ifdef CONFIG_X86_32
+ . = ALIGN(PAGE_SIZE);
+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
++ *(.idt)
+ . = ALIGN(PAGE_SIZE);
+ *(.empty_zero_page)
+ *(.initial_pg_fixmap)
@@ -26264,7 +23043,7 @@ index 10c4f30..65408b9 100644
#if defined(CONFIG_DEBUG_RODATA)
/* .text should occupy whole number of pages */
-@@ -122,16 +176,20 @@ SECTIONS
+@@ -126,16 +181,20 @@ SECTIONS
/* Data */
.data : AT(ADDR(.data) - LOAD_OFFSET) {
@@ -26288,7 +23067,7 @@ index 10c4f30..65408b9 100644
PAGE_ALIGNED_DATA(PAGE_SIZE)
-@@ -172,12 +230,19 @@ SECTIONS
+@@ -176,12 +235,19 @@ SECTIONS
#endif /* CONFIG_X86_64 */
/* Init code and data - will be freed after init */
@@ -26311,7 +23090,7 @@ index 10c4f30..65408b9 100644
/*
* percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
* output PHDR, so the next output section - .init.text - should
-@@ -186,12 +251,27 @@ SECTIONS
+@@ -190,12 +256,27 @@ SECTIONS
PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
#endif
@@ -26342,9 +23121,9 @@ index 10c4f30..65408b9 100644
+ . = ALIGN(PAGE_SIZE);
+ INIT_DATA_SECTION(16) :init
- .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
- __x86_cpu_dev_start = .;
-@@ -253,19 +333,12 @@ SECTIONS
+ /*
+ * Code and data for a variety of lowlevel trampolines, to be
+@@ -269,19 +350,12 @@ SECTIONS
}
. = ALIGN(8);
@@ -26365,7 +23144,7 @@ index 10c4f30..65408b9 100644
PERCPU_SECTION(INTERNODE_CACHE_BYTES)
#endif
-@@ -284,16 +357,10 @@ SECTIONS
+@@ -300,16 +374,10 @@ SECTIONS
.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
__smp_locks = .;
*(.smp_locks)
@@ -26383,7 +23162,7 @@ index 10c4f30..65408b9 100644
/* BSS */
. = ALIGN(PAGE_SIZE);
.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -309,6 +376,7 @@ SECTIONS
+@@ -325,6 +393,7 @@ SECTIONS
__brk_base = .;
. += 64 * 1024; /* 64k alignment slop space */
*(.brk_reservation) /* areas brk users have reserved */
@@ -26391,7 +23170,7 @@ index 10c4f30..65408b9 100644
__brk_limit = .;
}
-@@ -335,13 +403,12 @@ SECTIONS
+@@ -351,13 +420,12 @@ SECTIONS
* for the boot processor.
*/
#define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
@@ -26407,14 +23186,14 @@ index 10c4f30..65408b9 100644
#ifdef CONFIG_SMP
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
-index 1f96f93..d5c8f7a 100644
+index e4d4a22..47ee71f 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
-@@ -56,15 +56,13 @@
- DEFINE_VVAR(int, vgetcpu_mode);
- DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
+@@ -57,15 +57,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
+ .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
+ };
--static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
+-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
static int __init vsyscall_setup(char *str)
@@ -26427,7 +23206,16 @@ index 1f96f93..d5c8f7a 100644
else if (!strcmp("none", str))
vsyscall_mode = NONE;
else
-@@ -323,8 +321,7 @@ do_ret:
+@@ -178,7 +176,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
+
+ tsk = current;
+ if (seccomp_mode(&tsk->seccomp))
+- do_exit(SIGKILL);
++ do_group_exit(SIGKILL);
+
+ switch (vsyscall_nr) {
+ case 0:
+@@ -220,8 +218,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
return true;
sigsegv:
@@ -26437,7 +23225,7 @@ index 1f96f93..d5c8f7a 100644
}
/*
-@@ -377,10 +374,7 @@ void __init map_vsyscall(void)
+@@ -274,10 +271,7 @@ void __init map_vsyscall(void)
extern char __vvar_page;
unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
@@ -26450,133 +23238,124 @@ index 1f96f93..d5c8f7a 100644
(unsigned long)VSYSCALL_START);
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
-index b014d94..e775258 100644
+index 9796c2f..f686fbf 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
-@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
+@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
+ 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_from_user);
-EXPORT_SYMBOL(_copy_to_user);
EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(clear_page);
-@@ -66,3 +64,7 @@ EXPORT_SYMBOL(empty_zero_page);
- #ifndef CONFIG_PARAVIRT
- EXPORT_SYMBOL(native_load_gs_index);
- #endif
-+
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+EXPORT_SYMBOL(cpu_pgd);
-+#endif
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
-index 8ce0072..431a0e7 100644
+index c1d6cd5..204ac00 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
-@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
+@@ -90,14 +90,14 @@ struct x86_init_ops x86_init __initdata = {
+ },
+ };
+
+-struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
++struct x86_cpuinit_ops x86_cpuinit __cpuinitconst = {
+ .setup_percpu_clockev = setup_secondary_APIC_clock,
+ };
+
static void default_nmi_init(void) { };
static int default_i8042_detect(void) { return 1; };
-struct x86_platform_ops x86_platform = {
+struct x86_platform_ops x86_platform __read_only = {
.calibrate_tsc = native_calibrate_tsc,
+ .wallclock_init = wallclock_init_noop,
.get_wallclock = mach_get_cmos_time,
- .set_wallclock = mach_set_rtc_mmss,
-@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
- EXPORT_SYMBOL_GPL(x86_platform);
+@@ -110,7 +110,7 @@ struct x86_platform_ops x86_platform = {
+ };
- #if defined(CONFIG_PCI_MSI)
+ EXPORT_SYMBOL_GPL(x86_platform);
-struct x86_msi_ops x86_msi = {
+struct x86_msi_ops x86_msi __read_only = {
- .setup_msi_irqs = native_setup_msi_irqs,
- .compose_msi_msg = native_compose_msi_msg,
- .teardown_msi_irq = native_teardown_msi_irq,
-@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev, int irq)
- }
- #endif
-
--struct x86_io_apic_ops x86_io_apic_ops = {
-+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
- .init = native_io_apic_init_mappings,
- .read = native_io_apic_read,
- .write = native_io_apic_write,
+ .setup_msi_irqs = native_setup_msi_irqs,
+ .teardown_msi_irq = native_teardown_msi_irq,
+ .teardown_msi_irqs = default_teardown_msi_irqs,
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
-index 422fd82..c3687ca 100644
+index 7110911..069da9c 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
-@@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
- {
- int err;
-
-+ buf = (struct xsave_struct __user *)____m(buf);
- if (use_xsave())
- 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 b110fe6..d9c19f2 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,
- struct kvm_cpuid2 *cpuid,
- struct kvm_cpuid_entry2 __user *entries)
- {
-- int r;
-+ int r, i;
+@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
+ fx_sw_user->xstate_size > fx_sw_user->extended_size)
+ return -EINVAL;
- r = -E2BIG;
- if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
- goto out;
- r = -EFAULT;
-- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
-- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
-+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
- goto out;
-+ for (i = 0; i < cpuid->nent; ++i) {
-+ struct kvm_cpuid_entry2 cpuid_entry;
-+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
-+ goto out;
-+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
-+ }
- vcpu->arch.cpuid_nent = cpuid->nent;
- kvm_apic_set_version(vcpu);
- kvm_x86_ops->cpuid_update(vcpu);
-@@ -147,15 +152,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
- struct kvm_cpuid2 *cpuid,
- struct kvm_cpuid_entry2 __user *entries)
- {
-- int r;
-+ int r, i;
+- 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)
+@@ -266,7 +266,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 __user *)buf);
+ }
- r = -E2BIG;
- if (cpuid->nent < vcpu->arch.cpuid_nent)
- goto out;
- r = -EFAULT;
-- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
-- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
-+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
- goto out;
-+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
-+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
-+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
-+ goto out;
-+ }
- return 0;
+ /*
+@@ -295,8 +295,7 @@ int restore_i387_xstate(void __user *buf)
+ if (use_xsave())
+ err = restore_user_xstate(buf);
+ else
+- err = fxrstor_checking((__force struct i387_fxsave_struct *)
+- buf);
++ err = fxrstor_checking((struct i387_fxsave_struct __user *)buf);
+ if (unlikely(err)) {
+ /*
+ * Encountered an error while doing the restore from the
+diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
+index f5302da..6ee193e 100644
+--- a/arch/x86/kvm/emulate.c
++++ b/arch/x86/kvm/emulate.c
+@@ -249,6 +249,7 @@ struct gprefix {
+
+ #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
+ do { \
++ unsigned long _tmp; \
+ __asm__ __volatile__ ( \
+ _PRE_EFLAGS("0", "4", "2") \
+ _op _suffix " %"_x"3,%1; " \
+@@ -263,8 +264,6 @@ struct gprefix {
+ /* Raw emulation: instruction has two explicit operands. */
+ #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
+ do { \
+- unsigned long _tmp; \
+- \
+ switch ((ctxt)->dst.bytes) { \
+ case 2: \
+ ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
+@@ -280,7 +279,6 @@ struct gprefix {
+
+ #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
+ do { \
+- unsigned long _tmp; \
+ switch ((ctxt)->dst.bytes) { \
+ case 1: \
+ ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
+@@ -383,8 +381,7 @@ struct gprefix {
+ _ASM_EXTABLE(1b, 3b) \
+ : "=m" ((ctxt)->eflags), "=&r" (_tmp), \
+ "+a" (*rax), "+d" (*rdx), "+qm"(_ex) \
+- : "i" (EFLAGS_MASK), "m" ((ctxt)->src.val), \
+- "a" (*rax), "d" (*rdx)); \
++ : "i" (EFLAGS_MASK), "m" ((ctxt)->src.val)); \
+ } while (0)
- out:
+ /* instruction has only one source operand, destination is implicit (e.g. mul, div, imul, idiv) */
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index 5439117..d08f3d4 100644
+index 54abb40..a192606 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
-@@ -55,7 +55,7 @@
+@@ -53,7 +53,7 @@
#define APIC_BUS_CYCLE_NS 1
/* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
@@ -26585,11 +23364,33 @@ index 5439117..d08f3d4 100644
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
+diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
+index f1b36cf..af8a124 100644
+--- a/arch/x86/kvm/mmu.c
++++ b/arch/x86/kvm/mmu.c
+@@ -3555,7 +3555,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
+
+ pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
+
+- invlpg_counter = atomic_read(&vcpu->kvm->arch.invlpg_counter);
++ invlpg_counter = atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter);
+
+ /*
+ * Assume that the pte write on a page table of the same type
+@@ -3587,7 +3587,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
+ }
+
+ spin_lock(&vcpu->kvm->mmu_lock);
+- if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
++ if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
+ gentry = 0;
+ kvm_mmu_free_some_pages(vcpu);
+ ++vcpu->kvm->stat.mmu_pte_write;
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
-index ad75d77..a679d32 100644
+index 9299410..ade2f9b 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
-@@ -331,7 +331,7 @@ retry_walk:
+@@ -197,7 +197,7 @@ retry_walk:
if (unlikely(kvm_is_error_hva(host_addr)))
goto error;
@@ -26597,12 +23398,21 @@ index ad75d77..a679d32 100644
+ 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;
+
+@@ -705,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)
+ if (need_flush)
+ kvm_flush_remote_tlbs(vcpu->kvm);
+
+- atomic_inc(&vcpu->kvm->arch.invlpg_counter);
++ atomic_inc_unchecked(&vcpu->kvm->arch.invlpg_counter);
+
+ spin_unlock(&vcpu->kvm->mmu_lock);
+
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
-index c0bc803..6837a50 100644
+index 94a4672..5c6b853 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
-@@ -3501,7 +3501,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
+@@ -3405,7 +3405,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);
@@ -26614,7 +23424,7 @@ index c0bc803..6837a50 100644
load_TR_desc();
}
-@@ -3902,6 +3906,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -3783,6 +3787,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
#endif
#endif
@@ -26626,10 +23436,10 @@ index c0bc803..6837a50 100644
local_irq_disable();
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index 2b2fce1..da76be4 100644
+index aac5ea7..266eda9 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
-@@ -1316,12 +1316,12 @@ static void vmcs_write64(unsigned long field, u64 value)
+@@ -1099,12 +1099,12 @@ static void vmcs_write64(unsigned long field, u64 value)
#endif
}
@@ -26644,7 +23454,7 @@ index 2b2fce1..da76be4 100644
{
vmcs_writel(field, vmcs_readl(field) | mask);
}
-@@ -1522,7 +1522,11 @@ static void reload_tss(void)
+@@ -1305,7 +1305,11 @@ static void reload_tss(void)
struct desc_struct *descs;
descs = (void *)gdt->address;
@@ -26656,7 +23466,7 @@ index 2b2fce1..da76be4 100644
load_TR_desc();
}
-@@ -1746,6 +1750,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
+@@ -1504,6 +1508,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 */
@@ -26667,16 +23477,7 @@ index 2b2fce1..da76be4 100644
rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
vmx->loaded_vmcs->cpu = cpu;
-@@ -2037,7 +2045,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
- * reads and returns guest's timestamp counter "register"
- * guest_tsc = host_tsc + tsc_offset -- 21.3
- */
--static u64 guest_read_tsc(void)
-+static u64 __intentional_overflow(-1) guest_read_tsc(void)
- {
- u64 host_tsc, tsc_offset;
-
-@@ -2982,8 +2990,11 @@ static __init int hardware_setup(void)
+@@ -2634,8 +2642,11 @@ static __init int hardware_setup(void)
if (!cpu_has_vmx_flexpriority())
flexpriority_enabled = 0;
@@ -26690,29 +23491,9 @@ index 2b2fce1..da76be4 100644
if (enable_ept && !cpu_has_vmx_ept_2m_page())
kvm_disable_largepages();
-@@ -2994,13 +3005,15 @@ static __init int hardware_setup(void)
- if (!cpu_has_vmx_apicv())
- enable_apicv = 0;
+@@ -3637,7 +3648,10 @@ static void vmx_set_constant_host_state(void)
-+ pax_open_kernel();
- if (enable_apicv)
-- kvm_x86_ops->update_cr8_intercept = NULL;
-+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
- else {
-- kvm_x86_ops->hwapic_irr_update = NULL;
-- kvm_x86_ops->deliver_posted_interrupt = NULL;
-- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
-+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
-+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
-+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
- }
-+ pax_close_kernel();
-
- if (nested)
- nested_vmx_setup_ctls_msrs();
-@@ -4127,7 +4140,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
-
- 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
@@ -26720,30 +23501,30 @@ index 2b2fce1..da76be4 100644
+#endif
vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
- #ifdef CONFIG_X86_64
-@@ -4149,7 +4165,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
+ vmcs_write16(HOST_DS_SELECTOR, __KERNEL_DS); /* 22.2.4 */
+@@ -3649,7 +3663,7 @@ static void vmx_set_constant_host_state(void)
vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
- vmx->host_idt_base = dt.address;
-- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
-+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
+ 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 */
rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
-@@ -7191,6 +7207,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
- "jmp 2f \n\t"
- "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
- "2: "
+@@ -6178,6 +6192,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: "
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+ "ljmp %[cs],$3f\n\t"
-+ "3: "
++ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
++ ".Lkvm_vmx_return2: "
+#endif
+
/* Save guest registers, load host registers, keep flags */
- "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
+ "mov %0, %c[wordsize](%%"R"sp) \n\t"
"pop %0 \n\t"
-@@ -7243,6 +7265,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -6226,6 +6246,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))
@@ -26753,43 +23534,31 @@ index 2b2fce1..da76be4 100644
+#endif
+
: "cc", "memory"
+ , R"ax", R"bx", R"di", R"si"
#ifdef CONFIG_X86_64
- , "rax", "rbx", "rdi", "rsi"
-@@ -7256,7 +7283,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
- if (debugctlmsr)
- update_debugctlmsr(debugctlmsr);
+@@ -6254,7 +6279,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+ }
+ }
--#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.
-@@ -7265,8 +7292,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.
- */
-- loadsegment(ds, __USER_DS);
-- loadsegment(es, __USER_DS);
-+ loadsegment(ds, __KERNEL_DS);
-+ loadsegment(es, __KERNEL_DS);
-+ loadsegment(ss, __KERNEL_DS);
+- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
++ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
+
-+#ifdef CONFIG_PAX_KERNEXEC
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
+ loadsegment(fs, __KERNEL_PERCPU);
+#endif
+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ __set_fs(current_thread_info()->addr_limit);
+#endif
+
- #endif
+ vmx->loaded_vmcs->launched = 1;
- vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
+ vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index e5ca72a..83d5177 100644
+index 57867e4..1d5ff81 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
-@@ -1779,8 +1779,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
+@@ -1341,8 +1341,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
{
struct kvm *kvm = vcpu->kvm;
int lm = is_long_mode(vcpu);
@@ -26800,7 +23569,7 @@ index e5ca72a..83d5177 100644
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;
-@@ -2663,6 +2663,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
+@@ -2159,6 +2159,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
if (n < msr_list.nmsrs)
goto out;
r = -EFAULT;
@@ -26809,20 +23578,76 @@ index e5ca72a..83d5177 100644
if (copy_to_user(user_msr_list->indices, &msrs_to_save,
num_msrs_to_save * sizeof(u32)))
goto out;
-@@ -5462,7 +5464,7 @@ static struct notifier_block pvclock_gtod_notifier = {
- };
- #endif
+@@ -2334,15 +2336,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
+ struct kvm_cpuid2 *cpuid,
+ struct kvm_cpuid_entry2 __user *entries)
+ {
+- int r;
++ int r, i;
+
+ r = -E2BIG;
+ if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
+ goto out;
+ r = -EFAULT;
+- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
+- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
++ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
+ goto out;
++ for (i = 0; i < cpuid->nent; ++i) {
++ struct kvm_cpuid_entry2 cpuid_entry;
++ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
++ goto out;
++ vcpu->arch.cpuid_entries[i] = cpuid_entry;
++ }
+ vcpu->arch.cpuid_nent = cpuid->nent;
+ kvm_apic_set_version(vcpu);
+ kvm_x86_ops->cpuid_update(vcpu);
+@@ -2357,15 +2364,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
+ struct kvm_cpuid2 *cpuid,
+ struct kvm_cpuid_entry2 __user *entries)
+ {
+- int r;
++ int r, i;
+
+ r = -E2BIG;
+ if (cpuid->nent < vcpu->arch.cpuid_nent)
+ goto out;
+ r = -EFAULT;
+- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
+- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
++ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
+ goto out;
++ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
++ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
++ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
++ goto out;
++ }
+ return 0;
+
+ out:
+@@ -2740,7 +2751,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)
+ return -EINVAL;
+ if (irqchip_in_kernel(vcpu->kvm))
+ return -ENXIO;
+@@ -5182,7 +5193,7 @@ static void kvm_set_mmio_spte_mask(void)
+ kvm_mmu_set_mmio_spte_mask(mask);
+ }
-int kvm_arch_init(void *opaque)
+int kvm_arch_init(const void *opaque)
{
int r;
- struct kvm_x86_ops *ops = opaque;
+ 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 bdf8532..f63c587 100644
+index 8f4fda4..353d5cc 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
-@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
+@@ -1195,9 +1195,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
* Rebooting also tells the Host we're finished, but the RESTART flag tells the
* Launcher to reboot us.
*/
@@ -26834,8 +23659,90 @@ index bdf8532..f63c587 100644
}
/*G:050
+diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
+index 042f682..c92afb6 100644
+--- a/arch/x86/lib/atomic64_32.c
++++ b/arch/x86/lib/atomic64_32.c
+@@ -8,18 +8,30 @@
+
+ long long atomic64_read_cx8(long long, const atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_read_cx8);
++long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
+ long long atomic64_set_cx8(long long, const atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_set_cx8);
++long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
+ long long atomic64_xchg_cx8(long long, unsigned high);
+ EXPORT_SYMBOL(atomic64_xchg_cx8);
+ long long atomic64_add_return_cx8(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_add_return_cx8);
++long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
+ long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_sub_return_cx8);
++long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
+ long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_inc_return_cx8);
++long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
+ long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_dec_return_cx8);
++long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
+ long long atomic64_dec_if_positive_cx8(atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
+ int atomic64_inc_not_zero_cx8(atomic64_t *v);
+@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
+ #ifndef CONFIG_X86_CMPXCHG64
+ long long atomic64_read_386(long long, const atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_read_386);
++long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_read_unchecked_386);
+ long long atomic64_set_386(long long, const atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_set_386);
++long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_set_unchecked_386);
+ long long atomic64_xchg_386(long long, unsigned high);
+ EXPORT_SYMBOL(atomic64_xchg_386);
+ long long atomic64_add_return_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_add_return_386);
++long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
+ long long atomic64_sub_return_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_sub_return_386);
++long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
+ long long atomic64_inc_return_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_inc_return_386);
++long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
+ long long atomic64_dec_return_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_dec_return_386);
++long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
+ long long atomic64_add_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_add_386);
++long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_add_unchecked_386);
+ long long atomic64_sub_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_sub_386);
++long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_sub_unchecked_386);
+ long long atomic64_inc_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_inc_386);
++long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_inc_unchecked_386);
+ long long atomic64_dec_386(long long a, atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_dec_386);
++long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
++EXPORT_SYMBOL(atomic64_dec_unchecked_386);
+ long long atomic64_dec_if_positive_386(atomic64_t *v);
+ EXPORT_SYMBOL(atomic64_dec_if_positive_386);
+ int atomic64_inc_not_zero_386(atomic64_t *v);
diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
-index 00933d5..3a64af9 100644
+index e8e7e0d..56fd1b0 100644
--- a/arch/x86/lib/atomic64_386_32.S
+++ b/arch/x86/lib/atomic64_386_32.S
@@ -48,6 +48,10 @@ BEGIN(read)
@@ -27062,7 +23969,7 @@ index 00933d5..3a64af9 100644
+ _ASM_EXTABLE(1234b, 2f)
+#endif
+
- cmpl %eax, %ecx
+ cmpl %eax, %esi
je 3f
1:
@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
@@ -27094,7 +24001,7 @@ index 00933d5..3a64af9 100644
movl %eax, (v)
movl %edx, 4(v)
diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
-index f5cc9eb..51fa319 100644
+index 391a083..3a2cf39 100644
--- a/arch/x86/lib/atomic64_cx8_32.S
+++ b/arch/x86/lib/atomic64_cx8_32.S
@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
@@ -27144,7 +24051,7 @@ index f5cc9eb..51fa319 100644
ENTRY(atomic64_xchg_cx8)
CFI_STARTPROC
-@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
+@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
cmpxchg8b (%esi)
jne 1b
@@ -27160,7 +24067,7 @@ index f5cc9eb..51fa319 100644
CFI_STARTPROC
SAVE ebp
SAVE ebx
-@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
+@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
movl %edx, %ecx
\ins\()l %esi, %ebx
\insc\()l %edi, %ecx
@@ -27210,7 +24117,7 @@ index f5cc9eb..51fa319 100644
CFI_STARTPROC
SAVE ebx
-@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
+@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
movl %edx, %ecx
\ins\()l $1, %ebx
\insc\()l $0, %ecx
@@ -27252,7 +24159,7 @@ index f5cc9eb..51fa319 100644
ENTRY(atomic64_dec_if_positive_cx8)
CFI_STARTPROC
-@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
+@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
movl %edx, %ecx
subl $1, %ebx
sbb $0, %ecx
@@ -27266,7 +24173,7 @@ index f5cc9eb..51fa319 100644
js 2f
LOCK_PREFIX
cmpxchg8b (%esi)
-@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
+@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
movl %ebx, %eax
movl %ecx, %edx
RESTORE ebx
@@ -27274,9 +24181,9 @@ index f5cc9eb..51fa319 100644
ret
CFI_ENDPROC
ENDPROC(atomic64_dec_if_positive_cx8)
-@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
+@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
movl %edx, %ecx
- addl %ebp, %ebx
+ addl %esi, %ebx
adcl %edi, %ecx
+
+#ifdef CONFIG_PAX_REFCOUNT
@@ -27286,9 +24193,9 @@ index f5cc9eb..51fa319 100644
+#endif
+
LOCK_PREFIX
- cmpxchg8b (%esi)
+ cmpxchg8b (%ebp)
jne 1b
-@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
+@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
CFI_ADJUST_CFA_OFFSET -8
RESTORE ebx
RESTORE ebp
@@ -27296,10 +24203,10 @@ index f5cc9eb..51fa319 100644
ret
4:
cmpl %edx, 4(%esp)
-@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
- xorl %ecx, %ecx
+@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
+ movl %edx, %ecx
addl $1, %ebx
- adcl %edx, %ecx
+ adcl $0, %ecx
+
+#ifdef CONFIG_PAX_REFCOUNT
+ into
@@ -27310,29 +24217,29 @@ index f5cc9eb..51fa319 100644
LOCK_PREFIX
cmpxchg8b (%esi)
jne 1b
-@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
+@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
movl $1, %eax
3:
RESTORE ebx
+ pax_force_retaddr
ret
- CFI_ENDPROC
- ENDPROC(atomic64_inc_not_zero_cx8)
+ 4:
+ testl %edx, %edx
diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
-index e78b8ee..7e173a8 100644
+index 78d16a5..fbcf666 100644
--- a/arch/x86/lib/checksum_32.S
+++ b/arch/x86/lib/checksum_32.S
-@@ -29,7 +29,8 @@
+@@ -28,7 +28,8 @@
+ #include <linux/linkage.h>
#include <asm/dwarf2.h>
#include <asm/errno.h>
- #include <asm/asm.h>
-
+#include <asm/segment.h>
+
/*
* computes a partial checksum, e.g. for TCP/UDP fragments
*/
-@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
+@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
#define ARGBASE 16
#define FP 12
@@ -27359,7 +24266,7 @@ index e78b8ee..7e173a8 100644
subl $4,%esp
CFI_ADJUST_CFA_OFFSET 4
pushl_cfi %edi
-@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
+@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
jmp 4f
SRC(1: movw (%esi), %bx )
addl $2, %esi
@@ -27368,7 +24275,7 @@ index e78b8ee..7e173a8 100644
addl $2, %edi
addw %bx, %ax
adcl $0, %eax
-@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
+@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
SRC(1: movl (%esi), %ebx )
SRC( movl 4(%esi), %edx )
adcl %ebx, %eax
@@ -27407,7 +24314,7 @@ index e78b8ee..7e173a8 100644
lea 32(%esi), %esi
lea 32(%edi), %edi
-@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
+@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
shrl $2, %edx # This clears CF
SRC(3: movl (%esi), %ebx )
adcl %ebx, %eax
@@ -27416,7 +24323,7 @@ index e78b8ee..7e173a8 100644
lea 4(%esi), %esi
lea 4(%edi), %edi
dec %edx
-@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
+@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
jb 5f
SRC( movw (%esi), %cx )
leal 2(%esi), %esi
@@ -27431,7 +24338,7 @@ index e78b8ee..7e173a8 100644
6: addl %ecx, %eax
adcl $0, %eax
7:
-@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
+@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
6001:
movl ARGBASE+20(%esp), %ebx # src_err_ptr
@@ -27440,7 +24347,7 @@ index e78b8ee..7e173a8 100644
# zero the complete destination - computing the rest
# is too much work
-@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
+@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
6002:
movl ARGBASE+24(%esp), %ebx # dst_err_ptr
@@ -27457,7 +24364,7 @@ index e78b8ee..7e173a8 100644
popl_cfi %ebx
CFI_RESTORE ebx
popl_cfi %esi
-@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
+@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
popl_cfi %ecx # equivalent to addl $4,%esp
ret
CFI_ENDPROC
@@ -27506,7 +24413,7 @@ index e78b8ee..7e173a8 100644
pushl_cfi %ebx
CFI_REL_OFFSET ebx, 0
pushl_cfi %edi
-@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
+@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
subl %ebx, %edi
lea -1(%esi),%edx
andl $-32,%edx
@@ -27515,7 +24422,7 @@ index e78b8ee..7e173a8 100644
testl %esi, %esi
jmp *%ebx
1: addl $64,%esi
-@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
+@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
jb 5f
SRC( movw (%esi), %dx )
leal 2(%esi), %esi
@@ -27538,7 +24445,7 @@ index e78b8ee..7e173a8 100644
# zero the complete destination (computing the rest is too much work)
movl ARGBASE+8(%esp),%edi # dst
movl ARGBASE+12(%esp),%ecx # len
-@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
+@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
rep; stosb
jmp 7b
6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
@@ -27557,7 +24464,7 @@ index e78b8ee..7e173a8 100644
popl_cfi %esi
CFI_RESTORE esi
popl_cfi %edi
-@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
+@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
CFI_RESTORE ebx
ret
CFI_ENDPROC
@@ -27622,131 +24529,92 @@ index 1e572c5..2a162cd 100644
CFI_ENDPROC
diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
-index 176cca6..1166c50 100644
+index 01c805b..dccb07f 100644
--- a/arch/x86/lib/copy_page_64.S
+++ b/arch/x86/lib/copy_page_64.S
-@@ -9,6 +9,7 @@ copy_page_rep:
+@@ -9,6 +9,7 @@ copy_page_c:
CFI_STARTPROC
- movl $4096/8, %ecx
- rep movsq
+ movl $4096/8,%ecx
+ rep movsq
+ pax_force_retaddr
ret
CFI_ENDPROC
- ENDPROC(copy_page_rep)
-@@ -20,12 +21,14 @@ ENDPROC(copy_page_rep)
-
- ENTRY(copy_page)
- CFI_STARTPROC
-- subq $2*8, %rsp
-- CFI_ADJUST_CFA_OFFSET 2*8
-+ subq $3*8, %rsp
-+ CFI_ADJUST_CFA_OFFSET 3*8
- movq %rbx, (%rsp)
- CFI_REL_OFFSET rbx, 0
- movq %r12, 1*8(%rsp)
- CFI_REL_OFFSET r12, 1*8
-+ movq %r13, 2*8(%rsp)
-+ CFI_REL_OFFSET r13, 2*8
-
- movl $(4096/64)-5, %ecx
- .p2align 4
-@@ -36,7 +39,7 @@ ENTRY(copy_page)
- movq 0x8*2(%rsi), %rdx
- movq 0x8*3(%rsi), %r8
- movq 0x8*4(%rsi), %r9
-- movq 0x8*5(%rsi), %r10
-+ movq 0x8*5(%rsi), %r13
- movq 0x8*6(%rsi), %r11
- movq 0x8*7(%rsi), %r12
-
-@@ -47,7 +50,7 @@ ENTRY(copy_page)
- movq %rdx, 0x8*2(%rdi)
- movq %r8, 0x8*3(%rdi)
- movq %r9, 0x8*4(%rdi)
-- movq %r10, 0x8*5(%rdi)
-+ movq %r13, 0x8*5(%rdi)
- movq %r11, 0x8*6(%rdi)
- movq %r12, 0x8*7(%rdi)
-
-@@ -66,7 +69,7 @@ ENTRY(copy_page)
- movq 0x8*2(%rsi), %rdx
- movq 0x8*3(%rsi), %r8
- movq 0x8*4(%rsi), %r9
-- movq 0x8*5(%rsi), %r10
-+ movq 0x8*5(%rsi), %r13
- movq 0x8*6(%rsi), %r11
- movq 0x8*7(%rsi), %r12
-
-@@ -75,7 +78,7 @@ ENTRY(copy_page)
- movq %rdx, 0x8*2(%rdi)
- movq %r8, 0x8*3(%rdi)
- movq %r9, 0x8*4(%rdi)
-- movq %r10, 0x8*5(%rdi)
-+ movq %r13, 0x8*5(%rdi)
- movq %r11, 0x8*6(%rdi)
- movq %r12, 0x8*7(%rdi)
-
-@@ -87,8 +90,11 @@ ENTRY(copy_page)
- CFI_RESTORE rbx
- movq 1*8(%rsp), %r12
- CFI_RESTORE r12
-- addq $2*8, %rsp
-- CFI_ADJUST_CFA_OFFSET -2*8
-+ movq 2*8(%rsp), %r13
-+ CFI_RESTORE r13
-+ addq $3*8, %rsp
-+ CFI_ADJUST_CFA_OFFSET -3*8
+ ENDPROC(copy_page_c)
+@@ -39,7 +40,7 @@ ENTRY(copy_page)
+ movq 16 (%rsi), %rdx
+ movq 24 (%rsi), %r8
+ movq 32 (%rsi), %r9
+- movq 40 (%rsi), %r10
++ movq 40 (%rsi), %r13
+ movq 48 (%rsi), %r11
+ movq 56 (%rsi), %r12
+
+@@ -50,7 +51,7 @@ ENTRY(copy_page)
+ movq %rdx, 16 (%rdi)
+ movq %r8, 24 (%rdi)
+ movq %r9, 32 (%rdi)
+- movq %r10, 40 (%rdi)
++ movq %r13, 40 (%rdi)
+ movq %r11, 48 (%rdi)
+ movq %r12, 56 (%rdi)
+
+@@ -69,7 +70,7 @@ ENTRY(copy_page)
+ movq 16 (%rsi), %rdx
+ movq 24 (%rsi), %r8
+ movq 32 (%rsi), %r9
+- movq 40 (%rsi), %r10
++ movq 40 (%rsi), %r13
+ movq 48 (%rsi), %r11
+ movq 56 (%rsi), %r12
+
+@@ -78,7 +79,7 @@ ENTRY(copy_page)
+ movq %rdx, 16 (%rdi)
+ movq %r8, 24 (%rdi)
+ movq %r9, 32 (%rdi)
+- movq %r10, 40 (%rdi)
++ movq %r13, 40 (%rdi)
+ movq %r11, 48 (%rdi)
+ movq %r12, 56 (%rdi)
+
+@@ -95,6 +96,7 @@ ENTRY(copy_page)
+ CFI_RESTORE r13
+ addq $3*8,%rsp
+ CFI_ADJUST_CFA_OFFSET -3*8
+ pax_force_retaddr
ret
.Lcopy_page_end:
CFI_ENDPROC
-@@ -99,7 +105,7 @@ ENDPROC(copy_page)
+@@ -105,7 +107,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
- .section .altinstr_replacement,"ax"
+ .section .altinstr_replacement,"a"
1: .byte 0xeb /* jmp <disp8> */
- .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
+ .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 a30ca15..6b3f4e1 100644
+index 0248402..821c786 100644
--- a/arch/x86/lib/copy_user_64.S
+++ b/arch/x86/lib/copy_user_64.S
-@@ -18,31 +18,7 @@
+@@ -16,6 +16,7 @@
+ #include <asm/thread_info.h>
+ #include <asm/cpufeature.h>
#include <asm/alternative-asm.h>
- #include <asm/asm.h>
- #include <asm/smap.h>
--
--/*
-- * By placing feature2 after feature1 in altinstructions section, we logically
-- * implement:
-- * If CPU has feature2, jmp to alt2 is used
-- * else if CPU has feature1, jmp to alt1 is used
-- * else jmp to orig is used.
-- */
-- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
--0:
-- .byte 0xe9 /* 32bit jump */
-- .long \orig-1f /* by default jump to orig */
--1:
-- .section .altinstr_replacement,"ax"
--2: .byte 0xe9 /* near jump with 32bit immediate */
-- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
--3: .byte 0xe9 /* near jump with 32bit immediate */
-- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
-- .previous
--
-- .section .altinstructions,"a"
-- altinstruction_entry 0b,2b,\feature1,5,5
-- altinstruction_entry 0b,3b,\feature2,5,5
-- .previous
-- .endm
+#include <asm/pgtable.h>
- .macro ALIGN_DESTINATION
- #ifdef FIX_ALIGNMENT
-@@ -70,52 +46,6 @@
+ /*
+ * By placing feature2 after feature1 in altinstructions section, we logically
+@@ -29,7 +30,7 @@
+ .byte 0xe9 /* 32bit jump */
+ .long \orig-1f /* by default jump to orig */
+ 1:
+- .section .altinstr_replacement,"ax"
++ .section .altinstr_replacement,"a"
+ 2: .byte 0xe9 /* near jump with 32bit immediate */
+ .long \alt1-1b /* offset */ /* or alternatively to alt1 */
+ 3: .byte 0xe9 /* near jump with 32bit immediate */
+@@ -71,47 +72,20 @@
#endif
.endm
@@ -27780,34 +24648,24 @@ index a30ca15..6b3f4e1 100644
- CFI_ENDPROC
-ENDPROC(_copy_from_user)
-
-- .section .fixup,"ax"
-- /* must zero dest */
--ENTRY(bad_from_user)
--bad_from_user:
-- CFI_STARTPROC
-- movl %edx,%ecx
-- xorl %eax,%eax
-- rep
-- stosb
--bad_to_user:
-- movl %edx,%eax
-- ret
-- CFI_ENDPROC
--ENDPROC(bad_from_user)
-- .previous
--
- /*
- * copy_user_generic_unrolled - memory copy with exception handling.
- * This version is for CPUs like P4 that don't have efficient micro
-@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
- */
- ENTRY(copy_user_generic_unrolled)
+ .section .fixup,"ax"
+ /* must zero dest */
+ ENTRY(bad_from_user)
+ bad_from_user:
CFI_STARTPROC
-+ ASM_PAX_OPEN_USERLAND
- ASM_STAC
- cmpl $8,%edx
- jb 20f /* less then 8 bytes, go to byte copy loop */
-@@ -141,19 +72,19 @@ ENTRY(copy_user_generic_unrolled)
++ testl %edx,%edx
++ js bad_to_user
+ movl %edx,%ecx
+ xorl %eax,%eax
+ rep
+ stosb
+ bad_to_user:
+ movl %edx,%eax
++ pax_force_retaddr
+ ret
+ CFI_ENDPROC
+ ENDPROC(bad_from_user)
+@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
jz 17f
1: movq (%rsi),%r8
2: movq 1*8(%rsi),%r9
@@ -27831,54 +24689,35 @@ index a30ca15..6b3f4e1 100644
16: movq %r11,7*8(%rdi)
leaq 64(%rsi),%rsi
leaq 64(%rdi),%rdi
-@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
+@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
+ decl %ecx
jnz 21b
23: xor %eax,%eax
- ASM_CLAC
-+ ASM_PAX_CLOSE_USERLAND
+ pax_force_retaddr
ret
.section .fixup,"ax"
-@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
- */
- ENTRY(copy_user_generic_string)
- CFI_STARTPROC
-+ ASM_PAX_OPEN_USERLAND
- ASM_STAC
- andl %edx,%edx
- jz 4f
-@@ -251,6 +185,8 @@ ENTRY(copy_user_generic_string)
+@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
+ 3: rep
movsb
4: xorl %eax,%eax
- ASM_CLAC
-+ ASM_PAX_CLOSE_USERLAND
+ pax_force_retaddr
ret
.section .fixup,"ax"
-@@ -278,6 +214,7 @@ ENDPROC(copy_user_generic_string)
- */
- ENTRY(copy_user_enhanced_fast_string)
- CFI_STARTPROC
-+ ASM_PAX_OPEN_USERLAND
- ASM_STAC
- andl %edx,%edx
- jz 2f
-@@ -286,6 +223,8 @@ ENTRY(copy_user_enhanced_fast_string)
+@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
+ 1: rep
movsb
2: xorl %eax,%eax
- ASM_CLAC
-+ ASM_PAX_CLOSE_USERLAND
+ 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 6a4f43c..55d26f2 100644
+index cb0c112..61e0020 100644
--- a/arch/x86/lib/copy_user_nocache_64.S
+++ b/arch/x86/lib/copy_user_nocache_64.S
-@@ -8,6 +8,7 @@
+@@ -8,12 +8,14 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -27886,15 +24725,14 @@ index 6a4f43c..55d26f2 100644
#define FIX_ALIGNMENT 1
-@@ -16,6 +17,7 @@
+ #include <asm/current.h>
+ #include <asm/asm-offsets.h>
#include <asm/thread_info.h>
- #include <asm/asm.h>
- #include <asm/smap.h>
+#include <asm/pgtable.h>
.macro ALIGN_DESTINATION
#ifdef FIX_ALIGNMENT
-@@ -49,6 +51,16 @@
+@@ -50,6 +52,15 @@
*/
ENTRY(__copy_user_nocache)
CFI_STARTPROC
@@ -27907,11 +24745,10 @@ index 6a4f43c..55d26f2 100644
+1:
+#endif
+
-+ ASM_PAX_OPEN_USERLAND
- ASM_STAC
cmpl $8,%edx
jb 20f /* less then 8 bytes, go to byte copy loop */
-@@ -59,19 +71,19 @@ ENTRY(__copy_user_nocache)
+ ALIGN_DESTINATION
+@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
jz 17f
1: movq (%rsi),%r8
2: movq 1*8(%rsi),%r9
@@ -27935,29 +24772,27 @@ index 6a4f43c..55d26f2 100644
16: movnti %r11,7*8(%rdi)
leaq 64(%rsi),%rsi
leaq 64(%rdi),%rdi
-@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
+@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
jnz 21b
23: xorl %eax,%eax
- ASM_CLAC
-+ ASM_PAX_CLOSE_USERLAND
sfence
+ pax_force_retaddr
ret
.section .fixup,"ax"
diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
-index 2419d5f..953ee51 100644
+index fb903b7..c92b7f7 100644
--- a/arch/x86/lib/csum-copy_64.S
+++ b/arch/x86/lib/csum-copy_64.S
-@@ -9,6 +9,7 @@
+@@ -8,6 +8,7 @@
+ #include <linux/linkage.h>
#include <asm/dwarf2.h>
#include <asm/errno.h>
- #include <asm/asm.h>
+#include <asm/alternative-asm.h>
/*
* Checksum copy with exception handling.
-@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
+@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
CFI_RESTORE rbp
addq $7*8, %rsp
CFI_ADJUST_CFA_OFFSET -7*8
@@ -27966,45 +24801,35 @@ index 2419d5f..953ee51 100644
CFI_RESTORE_STATE
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
-index 7609e0e..b449b98 100644
+index 459b58a..d67737f 100644
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
-@@ -53,10 +53,12 @@ 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;
}
}
-+ pax_open_userland();
- stac();
- isum = csum_partial_copy_generic((__force const void *)src,
+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
dst, len, isum, errp, NULL);
- clac();
-+ pax_close_userland();
if (unlikely(*errp))
goto out_err;
-
-@@ -110,10 +112,12 @@ 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;
-+ pax_open_userland();
- stac();
-- ret = csum_partial_copy_generic(src, (void __force *)dst,
-+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
- len, isum, NULL, errp);
- clac();
-+ pax_close_userland();
- return ret;
+- return csum_partial_copy_generic(src, (void __force *)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 a451235..1daa956 100644
+index 51f1504..144f6bd 100644
--- a/arch/x86/lib/getuser.S
+++ b/arch/x86/lib/getuser.S
-@@ -33,17 +33,40 @@
+@@ -33,15 +33,38 @@
+ #include <asm/asm-offsets.h>
#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>
@@ -28023,8 +24848,7 @@ index a451235..1daa956 100644
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
- ASM_STAC
--1: movzbl (%_ASM_AX),%edx
+-1: movzb (%_ASM_AX),%edx
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ mov pax_user_shadow_base,%_ASM_DX
@@ -28036,14 +24860,13 @@ index a451235..1daa956 100644
+
+#endif
+
-+1: __copyuser_seg movzbl (%_ASM_AX),%edx
++1: __copyuser_seg movzb (%_ASM_AX),%edx
xor %eax,%eax
- ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
ENDPROC(__get_user_1)
-@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
+@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
ENTRY(__get_user_2)
CFI_STARTPROC
add $1,%_ASM_AX
@@ -28053,7 +24876,6 @@ index a451235..1daa956 100644
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)
@@ -28068,12 +24890,11 @@ index a451235..1daa956 100644
+
+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
xor %eax,%eax
- ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
ENDPROC(__get_user_2)
-@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
+@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
ENTRY(__get_user_4)
CFI_STARTPROC
add $3,%_ASM_AX
@@ -28083,8 +24904,7 @@ index a451235..1daa956 100644
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user
- ASM_STAC
--3: movl -3(%_ASM_AX),%edx
+-3: mov -3(%_ASM_AX),%edx
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ mov pax_user_shadow_base,%_ASM_DX
@@ -28096,17 +24916,16 @@ index a451235..1daa956 100644
+
+#endif
+
-+3: __copyuser_seg movl -3(%_ASM_AX),%edx
++3: __copyuser_seg mov -3(%_ASM_AX),%edx
xor %eax,%eax
- ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
ENDPROC(__get_user_4)
-@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
+@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
GET_THREAD_INFO(%_ASM_DX)
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
- jae bad_get_user
+ jae bad_get_user
+
+#ifdef CONFIG_PAX_MEMORY_UDEREF
+ mov pax_user_shadow_base,%_ASM_DX
@@ -28116,60 +24935,37 @@ index a451235..1daa956 100644
+1234:
+#endif
+
- ASM_STAC
- 4: movq -7(%_ASM_AX),%rdx
+ 4: movq -7(%_ASM_AX),%_ASM_DX
xor %eax,%eax
- ASM_CLAC
+ pax_force_retaddr
ret
- #else
- add $7,%_ASM_AX
-@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
- cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
- jae bad_get_user_8
- ASM_STAC
--4: movl -7(%_ASM_AX),%edx
--5: movl -3(%_ASM_AX),%ecx
-+4: __copyuser_seg movl -7(%_ASM_AX),%edx
-+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
- xor %eax,%eax
- ASM_CLAC
-+ pax_force_retaddr
- ret
- #endif
CFI_ENDPROC
-@@ -113,6 +175,7 @@ bad_get_user:
+ ENDPROC(__get_user_8)
+@@ -91,6 +152,7 @@ bad_get_user:
+ CFI_STARTPROC
xor %edx,%edx
mov $(-EFAULT),%_ASM_AX
- ASM_CLAC
+ pax_force_retaddr
ret
CFI_ENDPROC
END(bad_get_user)
-@@ -124,6 +187,7 @@ bad_get_user_8:
- xor %ecx,%ecx
- mov $(-EFAULT),%_ASM_AX
- ASM_CLAC
-+ pax_force_retaddr
- ret
- CFI_ENDPROC
- END(bad_get_user_8)
diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
-index 54fcffe..7be149e 100644
+index 374562e..a75830b 100644
--- a/arch/x86/lib/insn.c
+++ b/arch/x86/lib/insn.c
-@@ -20,8 +20,10 @@
-
- #ifdef __KERNEL__
+@@ -21,6 +21,11 @@
#include <linux/string.h>
-+#include <asm/pgtable_types.h>
- #else
- #include <string.h>
-+#define ktla_ktva(addr) addr
- #endif
#include <asm/inat.h>
#include <asm/insn.h>
-@@ -53,8 +55,8 @@
++#ifdef __KERNEL__
++#include <asm/pgtable_types.h>
++#else
++#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 @@
void insn_init(struct insn *insn, const void *kaddr, int x86_64)
{
memset(insn, 0, sizeof(*insn));
@@ -28201,19 +24997,10 @@ index 05a95e7..326f2fa 100644
CFI_ENDPROC
ENDPROC(__iowrite32_copy)
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
-index 56313a3..9b59269 100644
+index efbf2a0..8893637 100644
--- a/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
-@@ -24,7 +24,7 @@
- * This gets patched over the unrolled variant (below) via the
- * alternative instructions framework:
- */
-- .section .altinstr_replacement, "ax", @progbits
-+ .section .altinstr_replacement, "a", @progbits
- .Lmemcpy_c:
- movq %rdi, %rax
- movq %rdx, %rcx
-@@ -33,6 +33,7 @@
+@@ -34,6 +34,7 @@
rep movsq
movl %edx, %ecx
rep movsb
@@ -28221,21 +25008,15 @@ index 56313a3..9b59269 100644
ret
.Lmemcpy_e:
.previous
-@@ -44,11 +45,12 @@
- * This gets patched over the unrolled variant (below) via the
- * alternative instructions framework:
- */
-- .section .altinstr_replacement, "ax", @progbits
-+ .section .altinstr_replacement, "a", @progbits
- .Lmemcpy_c_e:
- movq %rdi, %rax
- movq %rdx, %rcx
+@@ -51,6 +52,7 @@
+
+ movl %edx, %ecx
rep movsb
+ pax_force_retaddr
ret
.Lmemcpy_e_e:
.previous
-@@ -76,13 +78,13 @@ ENTRY(memcpy)
+@@ -81,13 +83,13 @@ ENTRY(memcpy)
*/
movq 0*8(%rsi), %r8
movq 1*8(%rsi), %r9
@@ -28251,7 +25032,7 @@ index 56313a3..9b59269 100644
movq %r11, 3*8(%rdi)
leaq 4*8(%rdi), %rdi
jae .Lcopy_forward_loop
-@@ -105,12 +107,12 @@ ENTRY(memcpy)
+@@ -110,12 +112,12 @@ ENTRY(memcpy)
subq $0x20, %rdx
movq -1*8(%rsi), %r8
movq -2*8(%rsi), %r9
@@ -28266,7 +25047,7 @@ index 56313a3..9b59269 100644
movq %r11, -4*8(%rdi)
leaq -4*8(%rdi), %rdi
jae .Lcopy_backward_loop
-@@ -130,12 +132,13 @@ ENTRY(memcpy)
+@@ -135,12 +137,13 @@ ENTRY(memcpy)
*/
movq 0*8(%rsi), %r8
movq 1*8(%rsi), %r9
@@ -28282,7 +25063,7 @@ index 56313a3..9b59269 100644
retq
.p2align 4
.Lless_16bytes:
-@@ -148,6 +151,7 @@ ENTRY(memcpy)
+@@ -153,6 +156,7 @@ ENTRY(memcpy)
movq -1*8(%rsi, %rdx), %r9
movq %r8, 0*8(%rdi)
movq %r9, -1*8(%rdi, %rdx)
@@ -28290,7 +25071,7 @@ index 56313a3..9b59269 100644
retq
.p2align 4
.Lless_8bytes:
-@@ -161,6 +165,7 @@ ENTRY(memcpy)
+@@ -166,6 +170,7 @@ ENTRY(memcpy)
movl -4(%rsi, %rdx), %r8d
movl %ecx, (%rdi)
movl %r8d, -4(%rdi, %rdx)
@@ -28298,8 +25079,8 @@ index 56313a3..9b59269 100644
retq
.p2align 4
.Lless_3bytes:
-@@ -179,6 +184,7 @@ ENTRY(memcpy)
- movb %cl, (%rdi)
+@@ -183,6 +188,7 @@ ENTRY(memcpy)
+ jnz .Lloop_1
.Lend:
+ pax_force_retaddr
@@ -28307,7 +25088,7 @@ index 56313a3..9b59269 100644
CFI_ENDPROC
ENDPROC(memcpy)
diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
-index 65268a6..5aa7815 100644
+index ee16461..c39c199 100644
--- a/arch/x86/lib/memmove_64.S
+++ b/arch/x86/lib/memmove_64.S
@@ -61,13 +61,13 @@ ENTRY(memmove)
@@ -28422,7 +25203,7 @@ index 65268a6..5aa7815 100644
jmp 13f
12:
cmp $1, %rdx
-@@ -202,14 +202,16 @@ ENTRY(memmove)
+@@ -202,6 +202,7 @@ ENTRY(memmove)
movb (%rsi), %r11b
movb %r11b, (%rdi)
13:
@@ -28430,9 +25211,7 @@ index 65268a6..5aa7815 100644
retq
CFI_ENDPROC
-- .section .altinstr_replacement,"ax"
-+ .section .altinstr_replacement,"a"
- .Lmemmove_begin_forward_efs:
+@@ -210,6 +211,7 @@ ENTRY(memmove)
/* Forward moving data. */
movq %rdx, %rcx
rep movsb
@@ -28441,57 +25220,46 @@ index 65268a6..5aa7815 100644
.Lmemmove_end_forward_efs:
.previous
diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
-index 2dcb380..50a78bc 100644
+index 79bd454..dff325a 100644
--- a/arch/x86/lib/memset_64.S
+++ b/arch/x86/lib/memset_64.S
-@@ -16,7 +16,7 @@
- *
- * rax original destination
- */
-- .section .altinstr_replacement, "ax", @progbits
-+ .section .altinstr_replacement, "a", @progbits
- .Lmemset_c:
- movq %rdi,%r9
- movq %rdx,%rcx
-@@ -30,6 +30,7 @@
- movl %edx,%ecx
+@@ -31,6 +31,7 @@
+ movl %r8d,%ecx
rep stosb
movq %r9,%rax
+ pax_force_retaddr
ret
.Lmemset_e:
.previous
-@@ -45,13 +46,14 @@
- *
- * rax original destination
- */
-- .section .altinstr_replacement, "ax", @progbits
-+ .section .altinstr_replacement, "a", @progbits
- .Lmemset_c_e:
- movq %rdi,%r9
- movb %sil,%al
- movq %rdx,%rcx
+@@ -53,6 +54,7 @@
+ movl %edx,%ecx
rep stosb
movq %r9,%rax
+ pax_force_retaddr
ret
.Lmemset_e_e:
.previous
-@@ -59,7 +61,7 @@
+@@ -60,13 +62,13 @@
ENTRY(memset)
ENTRY(__memset)
CFI_STARTPROC
- movq %rdi,%r10
-+ movq %rdi,%r11
+ movq %rdx,%r11
/* expand byte value */
movzbl %sil,%ecx
-@@ -117,7 +119,8 @@ ENTRY(__memset)
+ movabs $0x0101010101010101,%rax
+ mul %rcx /* with rax, clobbers rdx */
++ movq %rdi,%rdx
+
+ /* align dst */
+ movl %edi,%r9d
+@@ -120,7 +122,8 @@ ENTRY(__memset)
jnz .Lloop_1
.Lende:
- movq %r10,%rax
-+ movq %r11,%rax
++ movq %rdx,%rax
+ pax_force_retaddr
ret
@@ -28816,7 +25584,7 @@ index c9f2d9b..e7fd2c0 100644
from += 64;
to += 64;
diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
-index f6d13ee..aca5f0b 100644
+index 69fa106..adda88b 100644
--- a/arch/x86/lib/msr-reg.S
+++ b/arch/x86/lib/msr-reg.S
@@ -3,6 +3,7 @@
@@ -28827,7 +25595,7 @@ index f6d13ee..aca5f0b 100644
#ifdef CONFIG_X86_64
/*
-@@ -16,7 +17,7 @@ ENTRY(\op\()_safe_regs)
+@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
CFI_STARTPROC
pushq_cfi %rbx
pushq_cfi %rbp
@@ -28836,7 +25604,7 @@ index f6d13ee..aca5f0b 100644
xorl %r11d, %r11d /* Return value */
movl (%rdi), %eax
movl 4(%rdi), %ecx
-@@ -27,16 +28,17 @@ ENTRY(\op\()_safe_regs)
+@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
movl 28(%rdi), %edi
CFI_REMEMBER_STATE
1: \op
@@ -28862,13 +25630,13 @@ index f6d13ee..aca5f0b 100644
3:
CFI_RESTORE_STATE
diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
-index fc6ba17..d4d989d 100644
+index 36b0d15..3edf573 100644
--- a/arch/x86/lib/putuser.S
+++ b/arch/x86/lib/putuser.S
-@@ -16,7 +16,9 @@
+@@ -15,7 +15,9 @@
+ #include <asm/thread_info.h>
#include <asm/errno.h>
#include <asm/asm.h>
- #include <asm/smap.h>
-
+#include <asm/segment.h>
+#include <asm/pgtable.h>
@@ -28876,18 +25644,15 @@ index fc6ba17..d4d989d 100644
/*
* __put_user_X
-@@ -30,57 +32,125 @@
+@@ -29,52 +31,119 @@
* as they get called from within inline assembly.
*/
-#define ENTER CFI_STARTPROC ; \
- GET_THREAD_INFO(%_ASM_BX)
--#define EXIT ASM_CLAC ; \
-- ret ; \
+-#define EXIT ret ; \
+#define ENTER CFI_STARTPROC
-+#define EXIT ASM_CLAC ; \
-+ pax_force_retaddr ; \
-+ ret ; \
++#define EXIT pax_force_retaddr; ret ; \
CFI_ENDPROC
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -28910,7 +25675,6 @@ index fc6ba17..d4d989d 100644
+ 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)
@@ -28937,7 +25701,6 @@ index fc6ba17..d4d989d 100644
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)
@@ -28964,7 +25727,6 @@ index fc6ba17..d4d989d 100644
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)
@@ -28991,7 +25753,6 @@ index fc6ba17..d4d989d 100644
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)
@@ -29143,24 +25904,48 @@ index a63efd6..ccecad8 100644
ret
CFI_ENDPROC
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
-index 3eb18ac..4b22130 100644
+index e218d5d..3966c85 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
-@@ -42,11 +42,13 @@ do { \
+@@ -43,7 +43,7 @@ do { \
+ __asm__ __volatile__( \
+ " testl %1,%1\n" \
+ " jz 2f\n" \
+- "0: lodsb\n" \
++ "0: "__copyuser_seg"lodsb\n" \
+ " stosb\n" \
+ " testb %%al,%%al\n" \
+ " jz 1f\n" \
+@@ -128,10 +128,12 @@ 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: " ASM_CLAC "\n" \
+ "2:\n" \
+ __COPYUSER_RESTORE_ES \
".section .fixup,\"ax\"\n" \
"3: lea 0(%2,%0,4),%0\n" \
" jmp 2b\n" \
-@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
+@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
+ might_fault();
+
+ __asm__ __volatile__(
++ __COPYUSER_SET_ES
+ " testl %0, %0\n"
+ " jz 3f\n"
+ " andl %0,%%ecx\n"
+@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
+ " subl %%ecx,%0\n"
+ " addl %0,%%eax\n"
+ "1:\n"
++ __COPYUSER_RESTORE_ES
+ ".section .fixup,\"ax\"\n"
+ "2: xorl %%eax,%%eax\n"
+ " jmp 1b\n"
+@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
#ifdef CONFIG_X86_INTEL_USERCOPY
static unsigned long
@@ -29169,7 +25954,7 @@ index 3eb18ac..4b22130 100644
{
int d0, d1;
__asm__ __volatile__(
-@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
+@@ -239,36 +243,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"
@@ -29222,7 +26007,7 @@ index 3eb18ac..4b22130 100644
" addl $-64, %0\n"
" addl $64, %4\n"
" addl $64, %3\n"
-@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
+@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
" shrl $2, %0\n"
" andl $3, %%eax\n"
" cld\n"
@@ -29236,44 +26021,47 @@ index 3eb18ac..4b22130 100644
+ "101: lea 0(%%eax,%0,4),%0\n"
+ " jmp 100b\n"
+ ".previous\n"
-+ _ASM_EXTABLE(1b,100b)
-+ _ASM_EXTABLE(2b,100b)
-+ _ASM_EXTABLE(3b,100b)
-+ _ASM_EXTABLE(4b,100b)
-+ _ASM_EXTABLE(5b,100b)
-+ _ASM_EXTABLE(6b,100b)
-+ _ASM_EXTABLE(7b,100b)
-+ _ASM_EXTABLE(8b,100b)
-+ _ASM_EXTABLE(9b,100b)
-+ _ASM_EXTABLE(10b,100b)
-+ _ASM_EXTABLE(11b,100b)
-+ _ASM_EXTABLE(12b,100b)
-+ _ASM_EXTABLE(13b,100b)
-+ _ASM_EXTABLE(14b,100b)
-+ _ASM_EXTABLE(15b,100b)
-+ _ASM_EXTABLE(16b,100b)
-+ _ASM_EXTABLE(17b,100b)
-+ _ASM_EXTABLE(18b,100b)
-+ _ASM_EXTABLE(19b,100b)
-+ _ASM_EXTABLE(20b,100b)
-+ _ASM_EXTABLE(21b,100b)
-+ _ASM_EXTABLE(22b,100b)
-+ _ASM_EXTABLE(23b,100b)
-+ _ASM_EXTABLE(24b,100b)
-+ _ASM_EXTABLE(25b,100b)
-+ _ASM_EXTABLE(26b,100b)
-+ _ASM_EXTABLE(27b,100b)
-+ _ASM_EXTABLE(28b,100b)
-+ _ASM_EXTABLE(29b,100b)
-+ _ASM_EXTABLE(30b,100b)
-+ _ASM_EXTABLE(31b,100b)
-+ _ASM_EXTABLE(32b,100b)
-+ _ASM_EXTABLE(33b,100b)
-+ _ASM_EXTABLE(34b,100b)
-+ _ASM_EXTABLE(35b,100b)
-+ _ASM_EXTABLE(36b,100b)
-+ _ASM_EXTABLE(37b,100b)
-+ _ASM_EXTABLE(99b,101b)
++ ".section __ex_table,\"a\"\n"
++ " .align 4\n"
++ " .long 1b,100b\n"
++ " .long 2b,100b\n"
++ " .long 3b,100b\n"
++ " .long 4b,100b\n"
++ " .long 5b,100b\n"
++ " .long 6b,100b\n"
++ " .long 7b,100b\n"
++ " .long 8b,100b\n"
++ " .long 9b,100b\n"
++ " .long 10b,100b\n"
++ " .long 11b,100b\n"
++ " .long 12b,100b\n"
++ " .long 13b,100b\n"
++ " .long 14b,100b\n"
++ " .long 15b,100b\n"
++ " .long 16b,100b\n"
++ " .long 17b,100b\n"
++ " .long 18b,100b\n"
++ " .long 19b,100b\n"
++ " .long 20b,100b\n"
++ " .long 21b,100b\n"
++ " .long 22b,100b\n"
++ " .long 23b,100b\n"
++ " .long 24b,100b\n"
++ " .long 25b,100b\n"
++ " .long 26b,100b\n"
++ " .long 27b,100b\n"
++ " .long 28b,100b\n"
++ " .long 29b,100b\n"
++ " .long 30b,100b\n"
++ " .long 31b,100b\n"
++ " .long 32b,100b\n"
++ " .long 33b,100b\n"
++ " .long 34b,100b\n"
++ " .long 35b,100b\n"
++ " .long 36b,100b\n"
++ " .long 37b,100b\n"
++ " .long 99b,101b\n"
++ ".previous"
+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
+ : "1"(to), "2"(from), "0"(size)
+ : "eax", "edx", "memory");
@@ -29339,7 +26127,7 @@ index 3eb18ac..4b22130 100644
".section .fixup,\"ax\"\n"
"101: lea 0(%%eax,%0,4),%0\n"
" jmp 100b\n"
-@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
+@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
int d0, d1;
__asm__ __volatile__(
" .align 2,0x90\n"
@@ -29399,7 +26187,7 @@ index 3eb18ac..4b22130 100644
" movl %%eax, 56(%3)\n"
" movl %%edx, 60(%3)\n"
" addl $-64, %0\n"
-@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
+@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
" shrl $2, %0\n"
" andl $3, %%eax\n"
" cld\n"
@@ -29411,7 +26199,7 @@ index 3eb18ac..4b22130 100644
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
-@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
+@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
__asm__ __volatile__(
" .align 2,0x90\n"
@@ -29471,7 +26259,7 @@ index 3eb18ac..4b22130 100644
" movnti %%eax, 56(%3)\n"
" movnti %%edx, 60(%3)\n"
" addl $-64, %0\n"
-@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
+@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
" shrl $2, %0\n"
" andl $3, %%eax\n"
" cld\n"
@@ -29483,7 +26271,7 @@ index 3eb18ac..4b22130 100644
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
-@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
+@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
__asm__ __volatile__(
" .align 2,0x90\n"
@@ -29543,7 +26331,7 @@ index 3eb18ac..4b22130 100644
" movnti %%eax, 56(%3)\n"
" movnti %%edx, 60(%3)\n"
" addl $-64, %0\n"
-@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
+@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
" shrl $2, %0\n"
" andl $3, %%eax\n"
" cld\n"
@@ -29555,7 +26343,7 @@ index 3eb18ac..4b22130 100644
"8:\n"
".section .fixup,\"ax\"\n"
"9: lea 0(%%eax,%0,4),%0\n"
-@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
+@@ -629,32 +742,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);
@@ -29597,7 +26385,7 @@ index 3eb18ac..4b22130 100644
".section .fixup,\"ax\"\n" \
"5: addl %3,%0\n" \
" jmp 2b\n" \
-@@ -538,14 +650,14 @@ do { \
+@@ -682,14 +799,14 @@ do { \
" negl %0\n" \
" andl $7,%0\n" \
" subl %0,%3\n" \
@@ -29615,21 +26403,21 @@ index 3eb18ac..4b22130 100644
"2:\n" \
".section .fixup,\"ax\"\n" \
"5: addl %3,%0\n" \
-@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
- {
- stac();
+@@ -775,9 +892,9 @@ survive:
+ }
+ #endif
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;
}
-@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
+ EXPORT_SYMBOL(__copy_to_user_ll);
+@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
+ unsigned long n)
{
- stac();
if (movsl_is_ok(to, from, n))
- __copy_user(to, from, n);
+ __copy_user(to, from, n, __copyuser_seg, "", "");
@@ -29637,10 +26425,10 @@ index 3eb18ac..4b22130 100644
- n = __copy_user_intel((void __user *)to,
- (const void *)from, n);
+ n = __generic_copy_from_user_intel(to, from, n);
- clac();
return n;
}
-@@ -632,60 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
+ EXPORT_SYMBOL(__copy_from_user_ll_nozero);
+@@ -827,65 +943,49 @@ 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
@@ -29650,7 +26438,6 @@ index 3eb18ac..4b22130 100644
- __copy_user(to, from, n);
+ __copy_user(to, from, n, __copyuser_seg, "", "");
#endif
- clac();
return n;
}
EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
@@ -29670,29 +26457,13 @@ index 3eb18ac..4b22130 100644
- */
-unsigned long
-copy_to_user(void __user *to, const void *from, unsigned long n)
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+void __set_fs(mm_segment_t x)
- {
+-{
- if (access_ok(VERIFY_WRITE, to, n))
- n = __copy_to_user(to, from, n);
- return n;
-+ switch (x.seg) {
-+ case 0:
-+ loadsegment(gs, 0);
-+ break;
-+ case TASK_SIZE_MAX:
-+ loadsegment(gs, __USER_DS);
-+ break;
-+ case -1UL:
-+ loadsegment(gs, __KERNEL_DS);
-+ break;
-+ default:
-+ BUG();
-+ }
- }
+-}
-EXPORT_SYMBOL(copy_to_user);
-+EXPORT_SYMBOL(__set_fs);
-
+-
-/**
- * copy_from_user: - Copy a block of data from user space.
- * @to: Destination address, in kernel space.
@@ -29711,46 +26482,82 @@ index 3eb18ac..4b22130 100644
- */
-unsigned long
-_copy_from_user(void *to, const void __user *from, unsigned long n)
-+void set_fs(mm_segment_t x)
- {
+-{
- if (access_ok(VERIFY_READ, from, n))
- n = __copy_from_user(to, from, n);
- else
- memset(to, 0, n);
- return n;
+-}
+-EXPORT_SYMBOL(_copy_from_user);
+-
+ void copy_from_user_overflow(void)
+ {
+ WARN(1, "Buffer overflow detected!\n");
+ }
+ EXPORT_SYMBOL(copy_from_user_overflow);
++
++void copy_to_user_overflow(void)
++{
++ WARN(1, "Buffer overflow detected!\n");
++}
++EXPORT_SYMBOL(copy_to_user_overflow);
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++void __set_fs(mm_segment_t x)
++{
++ switch (x.seg) {
++ case 0:
++ loadsegment(gs, 0);
++ break;
++ case TASK_SIZE_MAX:
++ loadsegment(gs, __USER_DS);
++ break;
++ case -1UL:
++ loadsegment(gs, __KERNEL_DS);
++ break;
++ default:
++ BUG();
++ }
++}
++EXPORT_SYMBOL(__set_fs);
++
++void set_fs(mm_segment_t x)
++{
+ current_thread_info()->addr_limit = x;
+ __set_fs(x);
- }
--EXPORT_SYMBOL(_copy_from_user);
++}
+EXPORT_SYMBOL(set_fs);
+#endif
diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
-index c905e89..01ab928 100644
+index 554b7b5..4027e2c 100644
--- a/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
-@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
- might_fault();
- /* no memory constraint because it doesn't change any memory gcc knows
- about */
-+ pax_open_userland();
- stac();
- asm volatile(
- " testq %[size8],%[size8]\n"
-@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
+@@ -42,6 +42,12 @@ long
+ __strncpy_from_user(char *dst, const char __user *src, long count)
+ {
+ long res;
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++ if ((unsigned long)src < pax_user_shadow_base)
++ src += pax_user_shadow_base;
++#endif
++
+ __do_strncpy_from_user(dst, src, count, res);
+ return res;
+ }
+@@ -87,7 +93,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();
-+ pax_close_userland();
return size;
}
- EXPORT_SYMBOL(__clear_user);
-@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
+@@ -149,12 +155,11 @@ long strlen_user(const char __user *s)
}
- EXPORT_SYMBOL(clear_user);
+ EXPORT_SYMBOL(strlen_user);
-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
@@ -29765,73 +26572,37 @@ index c905e89..01ab928 100644
}
EXPORT_SYMBOL(copy_in_user);
-@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
+@@ -164,7 +169,7 @@ EXPORT_SYMBOL(copy_in_user);
* it is not necessary to optimize tail handling.
*/
- __visible unsigned long
+ unsigned long
-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
{
char c;
unsigned zero_len;
-
-+ clac();
-+ pax_close_userland();
- for (; len; --len, to++) {
- if (__get_user_nocheck(c, from++, sizeof(char)))
- break;
-@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
- for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
- if (__put_user_nocheck(c, to++, sizeof(char)))
+@@ -181,3 +186,15 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
break;
-- clac();
return len;
}
-diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
-index 23d8e5f..9ccc13a 100644
---- a/arch/x86/mm/Makefile
-+++ b/arch/x86/mm/Makefile
-@@ -28,3 +28,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
- obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
-
- obj-$(CONFIG_MEMTEST) += memtest.o
+
-+quote:="
-+obj-$(CONFIG_X86_64) += uderef_64.o
-+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
++void copy_from_user_overflow(void)
++{
++ WARN(1, "Buffer overflow detected!\n");
++}
++EXPORT_SYMBOL(copy_from_user_overflow);
++
++void copy_to_user_overflow(void)
++{
++ WARN(1, "Buffer overflow detected!\n");
++}
++EXPORT_SYMBOL(copy_to_user_overflow);
diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
-index 903ec1e..c4166b2 100644
+index d0474ad..36e9257 100644
--- a/arch/x86/mm/extable.c
+++ b/arch/x86/mm/extable.c
-@@ -6,12 +6,24 @@
- static inline unsigned long
- ex_insn_addr(const struct exception_table_entry *x)
- {
-- return (unsigned long)&x->insn + x->insn;
-+ unsigned long reloc = 0;
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
-+#endif
-+
-+ return (unsigned long)&x->insn + x->insn + reloc;
- }
- static inline unsigned long
- ex_fixup_addr(const struct exception_table_entry *x)
- {
-- return (unsigned long)&x->fixup + x->fixup;
-+ unsigned long reloc = 0;
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
-+#endif
-+
-+ return (unsigned long)&x->fixup + x->fixup + reloc;
- }
-
- int fixup_exception(struct pt_regs *regs)
-@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
- unsigned long new_ip;
+@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs)
+ const struct exception_table_entry *fixup;
#ifdef CONFIG_PNPBIOS
- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
@@ -29839,28 +26610,14 @@ index 903ec1e..c4166b2 100644
extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
extern u32 pnp_bios_is_utter_crap;
pnp_bios_is_utter_crap = 1;
-@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
- i += 4;
- p->fixup -= i;
- i += 4;
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
-+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
-+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
-+#endif
-+
- }
- }
-
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index 3aaeffc..42ea9fb 100644
+index 53a7b69..8cc6fea 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
-@@ -14,11 +14,18 @@
+@@ -13,11 +13,18 @@
+ #include <linux/perf_event.h> /* perf_sw_event */
#include <linux/hugetlb.h> /* hstate_index_to_shift */
#include <linux/prefetch.h> /* prefetchw */
- #include <linux/context_tracking.h> /* exception_enter(), ... */
+#include <linux/unistd.h>
+#include <linux/compiler.h>
@@ -29876,7 +26633,7 @@ index 3aaeffc..42ea9fb 100644
/*
* Page fault error code bits:
-@@ -56,7 +63,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
+@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
int ret = 0;
/* kprobe_running() needs smp_processor_id() */
@@ -29885,7 +26642,7 @@ index 3aaeffc..42ea9fb 100644
preempt_disable();
if (kprobe_running() && kprobe_fault_handler(regs, 14))
ret = 1;
-@@ -117,7 +124,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
+@@ -116,7 +123,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 */
@@ -29897,7 +26654,7 @@ index 3aaeffc..42ea9fb 100644
return 0;
*prefetch = (instr_lo == 0xF) &&
-@@ -151,7 +161,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
+@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
while (instr < max_instr) {
unsigned char opcode;
@@ -29909,7 +26666,7 @@ index 3aaeffc..42ea9fb 100644
break;
instr++;
-@@ -182,6 +195,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
+@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
force_sig_info(si_signo, &info, tsk);
}
@@ -29944,7 +26701,7 @@ index 3aaeffc..42ea9fb 100644
DEFINE_SPINLOCK(pgd_lock);
LIST_HEAD(pgd_list);
-@@ -232,10 +273,27 @@ void vmalloc_sync_all(void)
+@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
for (address = VMALLOC_START & PMD_MASK;
address >= TASK_SIZE && address < FIXADDR_TOP;
address += PMD_SIZE) {
@@ -29959,20 +26716,15 @@ index 3aaeffc..42ea9fb 100644
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
-+ pgd_t *pgd = get_cpu_pgd(cpu, user);
++ pgd_t *pgd = get_cpu_pgd(cpu);
+ pmd_t *ret;
-+
-+ ret = vmalloc_sync_one(pgd, address);
-+ if (!ret)
-+ break;
-+ pgd = get_cpu_pgd(cpu, kernel);
+#else
list_for_each_entry(page, &pgd_list, lru) {
+ pgd_t *pgd;
spinlock_t *pgt_lock;
pmd_t *ret;
-@@ -243,8 +301,14 @@ void vmalloc_sync_all(void)
+@@ -242,8 +295,14 @@ void vmalloc_sync_all(void)
pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
spin_lock(pgt_lock);
@@ -29988,47 +26740,34 @@ index 3aaeffc..42ea9fb 100644
if (!ret)
break;
-@@ -278,6 +342,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
+@@ -277,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();
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
-+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
-+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
++ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
+#endif
+
pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
if (!pmd_k)
return -1;
-@@ -373,11 +443,25 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
+@@ -372,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 = pgd_offset(current->active_mm, address);
+
- pgd_ref = pgd_offset_k(address);
- if (pgd_none(*pgd_ref))
- return -1;
-
+#ifdef CONFIG_PAX_PER_CPU_PGD
-+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
-+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
-+ if (pgd_none(*pgd)) {
-+ set_pgd(pgd, *pgd_ref);
-+ arch_flush_lazy_mmu_mode();
-+ } else {
-+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
-+ }
-+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
++ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
++ pgd = pgd_offset_cpu(smp_processor_id(), address);
+#else
-+ pgd = pgd_offset(current->active_mm, address);
+ pgd = pgd_offset(current->active_mm, address);
+#endif
+
- if (pgd_none(*pgd)) {
- set_pgd(pgd, *pgd_ref);
- arch_flush_lazy_mmu_mode();
-@@ -543,7 +627,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
+ pgd_ref = pgd_offset_k(address);
+ if (pgd_none(*pgd_ref))
+ return -1;
+@@ -542,7 +613,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
@@ -30037,7 +26776,7 @@ index 3aaeffc..42ea9fb 100644
return 1;
#endif
return 0;
-@@ -570,7 +654,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
+@@ -569,7 +640,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
}
static const char nx_warning[] = KERN_CRIT
@@ -30046,7 +26785,7 @@ index 3aaeffc..42ea9fb 100644
static void
show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -579,15 +663,27 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
+@@ -578,15 +649,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
if (!oops_may_print())
return;
@@ -30057,26 +26796,25 @@ index 3aaeffc..42ea9fb 100644
pte_t *pte = lookup_address(address, &level);
if (pte && pte_present(*pte) && !pte_exec(*pte))
-- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
-+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
+- printk(nx_warning, current_uid());
++ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
}
+#ifdef CONFIG_PAX_KERNEXEC
+ 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),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
++ ¤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),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
++ 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
+
printk(KERN_ALERT "BUG: unable to handle kernel ");
if (address < PAGE_SIZE)
printk(KERN_CONT "NULL pointer dereference");
-@@ -750,6 +846,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
+@@ -740,6 +822,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
return;
}
#endif
@@ -30099,7 +26837,7 @@ index 3aaeffc..42ea9fb 100644
/* Kernel addresses are always protection faults: */
if (address >= TASK_SIZE)
error_code |= PF_PROT;
-@@ -835,7 +947,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
+@@ -839,7 +937,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",
@@ -30108,7 +26846,7 @@ index 3aaeffc..42ea9fb 100644
code = BUS_MCEERR_AR;
}
#endif
-@@ -889,6 +1001,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
+@@ -894,6 +992,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
return 1;
}
@@ -30208,7 +26946,7 @@ index 3aaeffc..42ea9fb 100644
/*
* Handle a spurious fault caused by a stale TLB entry.
*
-@@ -955,6 +1160,9 @@ int show_unhandled_signals = 1;
+@@ -966,6 +1157,9 @@ int show_unhandled_signals = 1;
static inline int
access_error(unsigned long error_code, struct vm_area_struct *vma)
{
@@ -30218,23 +26956,27 @@ index 3aaeffc..42ea9fb 100644
if (error_code & PF_WRITE) {
/* write, present and write, not present: */
if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -983,7 +1191,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;
+@@ -999,18 +1193,32 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
+ {
+ struct vm_area_struct *vma;
+ struct task_struct *tsk;
+- unsigned long address;
+ struct mm_struct *mm;
+ int fault;
+ int write = error_code & PF_WRITE;
+ unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
+ (write ? FAULT_FLAG_WRITE : 0);
- return true;
-@@ -1010,6 +1218,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
+- tsk = current;
+- mm = tsk->mm;
+-
/* Get the faulting address: */
- address = read_cr2();
-
+- address = read_cr2();
++ unsigned long address = read_cr2();
++
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
+ if (!search_exception_tables(regs->ip)) {
-+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
+ bad_area_nosemaphore(regs, error_code, address);
+ return;
+ }
@@ -30247,10 +26989,12 @@ index 3aaeffc..42ea9fb 100644
+ }
+#endif
+
++ tsk = current;
++ mm = tsk->mm;
+
/*
* Detect and handle instructions that would cause a page fault for
- * both a tracked kernel page and a userspace page.
-@@ -1069,7 +1293,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
+@@ -1071,7 +1279,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:
*/
@@ -30258,8 +27002,8 @@ index 3aaeffc..42ea9fb 100644
+ if (user_mode(regs)) {
local_irq_enable();
error_code |= PF_USER;
- flags |= FAULT_FLAG_USER;
-@@ -1135,6 +1359,11 @@ retry:
+ } else {
+@@ -1126,6 +1334,11 @@ retry:
might_sleep();
}
@@ -30271,7 +27015,7 @@ index 3aaeffc..42ea9fb 100644
vma = find_vma(mm, address);
if (unlikely(!vma)) {
bad_area(regs, error_code, address);
-@@ -1146,18 +1375,24 @@ retry:
+@@ -1137,18 +1350,24 @@ retry:
bad_area(regs, error_code, address);
return;
}
@@ -30307,9 +27051,9 @@ index 3aaeffc..42ea9fb 100644
if (unlikely(expand_stack(vma, address))) {
bad_area(regs, error_code, address);
return;
-@@ -1231,3 +1466,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
- __do_page_fault(regs, error_code);
- exception_exit(prev_state);
+@@ -1203,3 +1422,292 @@ good_area:
+
+ up_read(&mm->mmap_sem);
}
+
+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
@@ -30614,10 +27358,10 @@ index dd74e46..7d26398 100644
return 0;
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
-index 4500142..53a363c 100644
+index f4f29b1..5cac4fb 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
-@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
+@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
BUG_ON(!pte_none(*(kmap_pte-idx)));
@@ -30630,65 +27374,189 @@ index 4500142..53a363c 100644
return (void *)vaddr;
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
-index 9d980d8..6bbfacb 100644
+index df7d12c..93fae8e 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
-@@ -92,23 +92,30 @@ int pmd_huge_support(void)
- #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA
- static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
- unsigned long addr, unsigned long len,
-- unsigned long pgoff, unsigned long flags)
-+ unsigned long pgoff, unsigned long flags, unsigned long offset)
- {
+@@ -277,13 +277,21 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
struct hstate *h = hstate_file(file);
- struct vm_unmapped_area_info info;
--
-+
- info.flags = 0;
- info.length = len;
- info.low_limit = TASK_UNMAPPED_BASE;
+ 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_RANDMMAP
-+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += current->mm->delta_mmap;
++#ifdef CONFIG_PAX_SEGMEXEC
++ if (mm->pax_flags & MF_PAX_SEGMEXEC)
++ pax_task_size = SEGMEXEC_TASK_SIZE;
+#endif
+
- info.high_limit = TASK_SIZE;
- info.align_mask = PAGE_MASK & ~huge_page_mask(h);
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
++ pax_task_size -= PAGE_SIZE;
+
+ if (len > mm->cached_hole_size) {
+- start_addr = mm->free_area_cache;
++ start_addr = mm->free_area_cache;
+ } else {
+- start_addr = TASK_UNMAPPED_BASE;
+- mm->cached_hole_size = 0;
++ start_addr = mm->mmap_base;
++ mm->cached_hole_size = 0;
+ }
+
+ full_search:
+@@ -291,26 +299,27 @@ full_search:
+
+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
+ /* At this point: (!vma || addr < vma->vm_end). */
+- if (TASK_SIZE - len < addr) {
++ if (pax_task_size - len < addr) {
+ /*
+ * 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) {
+- mm->free_area_cache = addr + len;
+- return addr;
+- }
++ 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;
+ addr = ALIGN(vma->vm_end, huge_page_size(h));
+ }
++
++ mm->free_area_cache = addr + len;
++ return addr;
}
static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
- unsigned long addr0, unsigned long len,
-- unsigned long pgoff, unsigned long flags)
-+ unsigned long pgoff, unsigned long flags, unsigned long offset)
+@@ -319,10 +328,10 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
{
struct hstate *h = hstate_file(file);
- struct vm_unmapped_area_info info;
-@@ -120,6 +127,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
- info.high_limit = current->mm->mmap_base;
- info.align_mask = PAGE_MASK & ~huge_page_mask(h);
- info.align_offset = 0;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
+ struct mm_struct *mm = current->mm;
+- struct vm_area_struct *vma, *prev_vma;
+- unsigned long base = mm->mmap_base, addr = addr0;
++ struct vm_area_struct *vma;
++ unsigned long base = mm->mmap_base, addr;
+ unsigned long largest_hole = mm->cached_hole_size;
+- int first_time = 1;
++ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
+
+ /* don't allow allocations above current base */
+ if (mm->free_area_cache > base)
+@@ -332,64 +341,68 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+ largest_hole = 0;
+ mm->free_area_cache = base;
+ }
+-try_again:
++
+ /* make sure it can fit in the remaining address space */
+ if (mm->free_area_cache < len)
+ goto fail;
+
+ /* either no address requested or can't fit in requested address hole */
+- addr = (mm->free_area_cache - len) & huge_page_mask(h);
++ addr = (mm->free_area_cache - len);
+ do {
++ addr &= huge_page_mask(h);
+ /*
+ * Lookup failure means no vma is above this address,
+ * i.e. return with success:
+ */
+- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
++ vma = find_vma(mm, addr);
++ if (!vma)
+ return addr;
+
+ /*
+ * new region fits between prev_vma->vm_end and
+ * vma->vm_start, use it:
+ */
+- if (addr + len <= vma->vm_start &&
+- (!prev_vma || (addr >= prev_vma->vm_end))) {
++ 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 {
+- /* pull free_area_cache down to the first hole */
+- if (mm->free_area_cache == vma->vm_end) {
+- mm->free_area_cache = vma->vm_start;
+- mm->cached_hole_size = largest_hole;
+- }
++ mm->cached_hole_size = largest_hole;
++ return (mm->free_area_cache = addr);
++ }
++ /* pull free_area_cache down to the first hole */
++ if (mm->free_area_cache == vma->vm_end) {
++ mm->free_area_cache = vma->vm_start;
++ mm->cached_hole_size = largest_hole;
+ }
+ /* remember the largest hole we saw so far */
+ if (addr + largest_hole < vma->vm_start)
+- largest_hole = vma->vm_start - addr;
++ largest_hole = vma->vm_start - addr;
+
+ /* 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, offset);
++ } while (!IS_ERR_VALUE(addr));
+
+ fail:
/*
-@@ -132,6 +140,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
- VM_BUG_ON(addr != -ENOMEM);
- info.flags = 0;
- info.low_limit = TASK_UNMAPPED_BASE;
+- * if hint left us with no space for the requested
+- * mapping then try again:
+- */
+- if (first_time) {
+- mm->free_area_cache = base;
+- largest_hole = 0;
+- first_time = 0;
+- goto try_again;
+- }
+- /*
+ * A failed mmap() very likely causes application failure,
+ * so fall back to the bottom-up function here. This scenario
+ * can happen with large stack limits and large mmap()
+ * allocations.
+ */
+- mm->free_area_cache = TASK_UNMAPPED_BASE;
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ if (mm->pax_flags & MF_PAX_SEGMEXEC)
++ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
++ else
++#endif
++
++ mm->mmap_base = TASK_UNMAPPED_BASE;
+
+#ifdef CONFIG_PAX_RANDMMAP
-+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += current->mm->delta_mmap;
++ if (mm->pax_flags & MF_PAX_RANDMMAP)
++ mm->mmap_base += mm->delta_mmap;
+#endif
+
- info.high_limit = TASK_SIZE;
- addr = vm_unmapped_area(&info);
- }
-@@ -146,10 +160,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
++ mm->free_area_cache = mm->mmap_base;
+ mm->cached_hole_size = ~0UL;
+ addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
+ len, pgoff, flags);
+@@ -397,6 +410,7 @@ fail:
+ /*
+ * Restore the topdown base:
+ */
++ mm->mmap_base = base;
+ mm->free_area_cache = base;
+ mm->cached_hole_size = ~0UL;
+
+@@ -410,10 +424,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;
@@ -30710,7 +27578,7 @@ index 9d980d8..6bbfacb 100644
return -ENOMEM;
if (flags & MAP_FIXED) {
-@@ -158,19 +182,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -422,11 +446,14 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
return addr;
}
@@ -30723,61 +27591,56 @@ index 9d980d8..6bbfacb 100644
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, offset))
++ 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)
- return hugetlb_get_unmapped_area_bottomup(file, addr, len,
-- pgoff, flags);
-+ pgoff, flags, offset);
- else
- return hugetlb_get_unmapped_area_topdown(file, addr, len,
-- pgoff, flags);
-+ pgoff, flags, offset);
- }
-
- #endif /*HAVE_ARCH_HUGETLB_UNMAPPED_AREA*/
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 04664cd..dae6e5d 100644
+index a4cca06..9e00106 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
-@@ -4,6 +4,7 @@
+@@ -3,6 +3,7 @@
+ #include <linux/ioport.h>
#include <linux/swap.h>
#include <linux/memblock.h>
- #include <linux/bootmem.h> /* for max_low_pfn */
+#include <linux/tboot.h>
#include <asm/cacheflush.h>
#include <asm/e820.h>
-@@ -17,6 +18,8 @@
+@@ -15,6 +16,8 @@
+ #include <asm/tlbflush.h>
+ #include <asm/tlb.h>
#include <asm/proto.h>
- #include <asm/dma.h> /* for MAX_DMA_PFN */
- #include <asm/microcode.h>
+#include <asm/desc.h>
+#include <asm/bios_ebda.h>
- #include "mm_internal.h"
+ unsigned long __initdata pgt_buf_start;
+ unsigned long __meminitdata pgt_buf_end;
+@@ -43,7 +46,7 @@ static void __init find_early_table_space(struct map_range *mr, int nr_range)
+ {
+ int i;
+ unsigned long puds = 0, pmds = 0, ptes = 0, tables;
+- unsigned long start = 0, good_end;
++ unsigned long start = 0x100000, good_end;
+ unsigned long pgd_extra = 0;
+ phys_addr_t base;
+
+@@ -282,7 +285,14 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
-@@ -465,7 +468,18 @@ void __init init_mem_mapping(void)
+ #ifdef CONFIG_X86_32
early_ioremap_page_table_range_init();
- #endif
++#endif
+#ifdef CONFIG_PAX_PER_CPU_PGD
-+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
-+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-+ KERNEL_PGD_PTRS);
-+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
++ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
+ KERNEL_PGD_PTRS);
-+ load_cr3(get_cpu_pgd(0, kernel));
-+#else
++ load_cr3(get_cpu_pgd(0));
++#elif defined(CONFIG_X86_32)
load_cr3(swapper_pg_dir);
-+#endif
-+
- __flush_tlb_all();
+ #endif
- early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
-@@ -481,10 +495,40 @@ void __init init_mem_mapping(void)
+@@ -324,10 +334,40 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
* Access has to be given to non-kernel-ram areas as well, these contain the PCI
* mmio resources as well as potential bios/acpi data regions.
*/
@@ -30789,11 +27652,10 @@ index 04664cd..dae6e5d 100644
+
int devmem_is_allowed(unsigned long pagenr)
{
-- if (pagenr < 256)
+#ifdef CONFIG_GRKERNSEC_KMEM
+ /* allow BDA */
+ if (!pagenr)
- return 1;
++ return 1;
+ /* allow EBDA */
+ if (pagenr >= ebda_start && pagenr < ebda_end)
+ return 1;
@@ -30813,13 +27675,14 @@ index 04664cd..dae6e5d 100644
+ return 1;
+#ifdef CONFIG_GRKERNSEC_KMEM
+ /* throw out everything else below 1MB */
-+ if (pagenr <= 256)
+ if (pagenr <= 256)
+- return 1;
+ return 0;
+#endif
if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
return 0;
if (!page_is_ram(pagenr))
-@@ -530,8 +574,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
+@@ -384,8 +424,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
#endif
}
@@ -30895,7 +27758,7 @@ index 04664cd..dae6e5d 100644
+ pgd = pgd_offset_k(addr);
+ pud = pud_offset(pgd, addr);
+ pmd = pmd_offset(pud, addr);
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
+ }
+*/
+#endif
@@ -30921,7 +27784,7 @@ index 04664cd..dae6e5d 100644
+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
+ end = addr + KERNEL_IMAGE_SIZE;
+ for (; addr < end; addr += PMD_SIZE) {
-+ pgd = pgd_offset_k(addr);
++ pgd = pgd_offset_k(addr);
+ pud = pud_offset(pgd, addr);
+ pmd = pmd_offset(pud, addr);
+ if (!pmd_present(*pmd))
@@ -30934,15 +27797,15 @@ index 04664cd..dae6e5d 100644
+ flush_tlb_all();
+#endif
+
- free_init_pages("unused kernel",
+ free_init_pages("unused kernel memory",
(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 4287f1f..3b99c71 100644
+index 29f7c6d..7500c2f 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
-@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
- bool __read_mostly __vmalloc_start_set = false;
+@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
+ }
/*
- * Creates a middle page table and puts a pointer to it in the
@@ -30956,7 +27819,10 @@ index 4287f1f..3b99c71 100644
-
-#ifdef CONFIG_X86_PAE
- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
-- pmd_table = (pmd_t *)alloc_low_page();
+- if (after_bootmem)
+- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
+- else
+- pmd_table = (pmd_t *)alloc_low_page();
- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
- pud = pud_offset(pgd, 0);
@@ -30975,8 +27841,8 @@ index 4287f1f..3b99c71 100644
* Create a page table and place a pointer to it in a middle page
* directory entry:
*/
-@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
- pte_t *page_table = (pte_t *)alloc_low_page();
+@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
+ page_table = (pte_t *)alloc_low_page();
paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
@@ -31004,15 +27870,15 @@ index 4287f1f..3b99c71 100644
pmd_t * __init populate_extra_pmd(unsigned long vaddr)
{
int pgd_idx = pgd_index(vaddr);
-@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
+@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
int pgd_idx, pmd_idx;
unsigned long vaddr;
pgd_t *pgd;
+ pud_t *pud;
pmd_t *pmd;
pte_t *pte = NULL;
- unsigned long count = page_table_range_init_count(start, end);
-@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
+
+@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
pgd = pgd_base + pgd_idx;
for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
@@ -31028,7 +27894,7 @@ index 4287f1f..3b99c71 100644
for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
pmd++, pmd_idx++) {
pte = page_table_kmap_check(one_page_table_init(pmd),
-@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
+@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
}
}
@@ -31053,7 +27919,7 @@ index 4287f1f..3b99c71 100644
}
/*
-@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
+@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
unsigned long last_map_addr = end;
unsigned long start_pfn, end_pfn;
pgd_t *pgd_base = swapper_pg_dir;
@@ -31065,7 +27931,7 @@ index 4287f1f..3b99c71 100644
pmd_t *pmd;
pte_t *pte;
unsigned pages_2m, pages_4k;
-@@ -291,8 +295,13 @@ repeat:
+@@ -281,8 +282,13 @@ repeat:
pfn = start_pfn;
pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
pgd = pgd_base + pgd_idx;
@@ -31081,7 +27947,7 @@ index 4287f1f..3b99c71 100644
if (pfn >= end_pfn)
continue;
-@@ -304,14 +313,13 @@ repeat:
+@@ -294,14 +300,13 @@ repeat:
#endif
for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
pmd++, pmd_idx++) {
@@ -31097,10 +27963,10 @@ index 4287f1f..3b99c71 100644
pgprot_t prot = PAGE_KERNEL_LARGE;
/*
* first pass will use the same initial
-@@ -322,11 +330,7 @@ repeat:
+@@ -311,11 +316,7 @@ repeat:
+ __pgprot(PTE_IDENT_ATTR |
_PAGE_PSE);
- pfn &= PMD_MASK >> PAGE_SHIFT;
- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
- PAGE_OFFSET + PAGE_SIZE-1;
-
@@ -31110,7 +27976,7 @@ index 4287f1f..3b99c71 100644
prot = PAGE_KERNEL_LARGE_EXEC;
pages_2m++;
-@@ -343,7 +347,7 @@ repeat:
+@@ -332,7 +333,7 @@ repeat:
pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
pte += pte_ofs;
for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
@@ -31119,7 +27985,7 @@ index 4287f1f..3b99c71 100644
pgprot_t prot = PAGE_KERNEL;
/*
* first pass will use the same initial
-@@ -351,7 +355,7 @@ repeat:
+@@ -340,7 +341,7 @@ repeat:
*/
pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
@@ -31128,16 +27994,16 @@ index 4287f1f..3b99c71 100644
prot = PAGE_KERNEL_EXEC;
pages_4k++;
-@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
+@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
pud = pud_offset(pgd, va);
pmd = pmd_offset(pud, va);
- if (!pmd_present(*pmd))
-+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
++ if (!pmd_present(*pmd) || pmd_huge(*pmd))
break;
- /* should not be large page here */
-@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
+ pte = pte_offset_kernel(pmd, va);
+@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_range_init(void)
static void __init pagetable_init(void)
{
@@ -31152,7 +28018,16 @@ index 4287f1f..3b99c71 100644
EXPORT_SYMBOL_GPL(__supported_pte_mask);
/* user-defined highmem size */
-@@ -787,10 +789,10 @@ void __init mem_init(void)
+@@ -774,7 +773,7 @@ void __init mem_init(void)
+ set_highmem_pages_init();
+
+ codesize = (unsigned long) &_etext - (unsigned long) &_text;
+- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
++ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
+ initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
+
+ printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
+@@ -815,10 +814,10 @@ void __init mem_init(void)
((unsigned long)&__init_end -
(unsigned long)&__init_begin) >> 10,
@@ -31166,7 +28041,7 @@ index 4287f1f..3b99c71 100644
((unsigned long)&_etext - (unsigned long)&_text) >> 10);
/*
-@@ -880,6 +882,7 @@ void set_kernel_text_rw(void)
+@@ -896,6 +895,7 @@ void set_kernel_text_rw(void)
if (!kernel_set_to_readonly)
return;
@@ -31174,7 +28049,7 @@ index 4287f1f..3b99c71 100644
pr_debug("Set kernel text: %lx - %lx for read write\n",
start, start+size);
-@@ -894,6 +897,7 @@ void set_kernel_text_ro(void)
+@@ -910,6 +910,7 @@ void set_kernel_text_ro(void)
if (!kernel_set_to_readonly)
return;
@@ -31182,7 +28057,7 @@ index 4287f1f..3b99c71 100644
pr_debug("Set kernel text: %lx - %lx for read only\n",
start, start+size);
-@@ -922,6 +926,7 @@ void mark_rodata_ro(void)
+@@ -938,6 +939,7 @@ void mark_rodata_ro(void)
unsigned long start = PFN_ALIGN(_text);
unsigned long size = PFN_ALIGN(_etext) - start;
@@ -31191,10 +28066,10 @@ index 4287f1f..3b99c71 100644
printk(KERN_INFO "Write protecting the kernel text: %luk\n",
size >> 10);
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
-index 104d56a..62ba13f1 100644
+index 44b93da..5a0b3ee 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
-@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
+@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpages_on);
* around without checking the pgd every time.
*/
@@ -31203,7 +28078,7 @@ index 104d56a..62ba13f1 100644
EXPORT_SYMBOL_GPL(__supported_pte_mask);
int force_personality32;
-@@ -184,12 +184,29 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
for (address = start; address <= end; address += PGDIR_SIZE) {
const pgd_t *pgd_ref = pgd_offset_k(address);
@@ -31221,19 +28096,12 @@ index 104d56a..62ba13f1 100644
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
-+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
-+
-+ if (pgd_none(*pgd))
-+ set_pgd(pgd, *pgd_ref);
-+ else
-+ BUG_ON(pgd_page_vaddr(*pgd)
-+ != pgd_page_vaddr(*pgd_ref));
-+ pgd = pgd_offset_cpu(cpu, kernel, address);
++ pgd_t *pgd = pgd_offset_cpu(cpu, address);
+#else
list_for_each_entry(page, &pgd_list, lru) {
pgd_t *pgd;
spinlock_t *pgt_lock;
-@@ -198,6 +215,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
/* the pgt_lock only for Xen */
pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
spin_lock(pgt_lock);
@@ -31241,7 +28109,7 @@ index 104d56a..62ba13f1 100644
if (pgd_none(*pgd))
set_pgd(pgd, *pgd_ref);
-@@ -205,7 +223,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
BUG_ON(pgd_page_vaddr(*pgd)
!= pgd_page_vaddr(*pgd_ref));
@@ -31252,7 +28120,7 @@ index 104d56a..62ba13f1 100644
}
spin_unlock(&pgd_lock);
}
-@@ -238,7 +259,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
+@@ -162,7 +176,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
{
if (pgd_none(*pgd)) {
pud_t *pud = (pud_t *)spp_getpage();
@@ -31261,7 +28129,7 @@ index 104d56a..62ba13f1 100644
if (pud != pud_offset(pgd, 0))
printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
pud, pud_offset(pgd, 0));
-@@ -250,7 +271,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
+@@ -174,7 +188,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
{
if (pud_none(*pud)) {
pmd_t *pmd = (pmd_t *) spp_getpage();
@@ -31270,7 +28138,7 @@ index 104d56a..62ba13f1 100644
if (pmd != pmd_offset(pud, 0))
printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
pmd, pmd_offset(pud, 0));
-@@ -279,7 +300,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
+@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
pmd = fill_pmd(pud, vaddr);
pte = fill_pte(pmd, vaddr);
@@ -31280,7 +28148,7 @@ index 104d56a..62ba13f1 100644
/*
* It's enough to flush this one mapping.
-@@ -338,14 +361,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
+@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
pgd = pgd_offset_k((unsigned long)__va(phys));
if (pgd_none(*pgd)) {
pud = (pud_t *) spp_getpage();
@@ -31297,25 +28165,43 @@ index 104d56a..62ba13f1 100644
}
pmd = pmd_offset(pud, phys);
BUG_ON(!pmd_none(*pmd));
-@@ -586,7 +607,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
- prot);
+@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
+ if (pfn >= pgt_buf_top)
+ panic("alloc_low_page: ran out of memory");
+
+- adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
++ adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
+ clear_page(adr);
+ *phys = pfn * PAGE_SIZE;
+ return adr;
+@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *virt)
+
+ phys = __pa(virt);
+ left = phys & (PAGE_SIZE - 1);
+- adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
++ adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
+ adr = (void *)(((unsigned long)adr) | left);
+
+ return adr;
+@@ -546,7 +560,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
+ unmap_low_page(pmd);
spin_lock(&init_mm.page_table_lock);
-- pud_populate(&init_mm, pud, pmd);
-+ pud_populate_kernel(&init_mm, pud, pmd);
+- pud_populate(&init_mm, pud, __va(pmd_phys));
++ pud_populate_kernel(&init_mm, pud, __va(pmd_phys));
spin_unlock(&init_mm.page_table_lock);
}
__flush_tlb_all();
-@@ -627,7 +648,7 @@ kernel_physical_mapping_init(unsigned long start,
- page_size_mask);
+@@ -592,7 +606,7 @@ kernel_physical_mapping_init(unsigned long start,
+ unmap_low_page(pud);
spin_lock(&init_mm.page_table_lock);
-- pgd_populate(&init_mm, pgd, pud);
-+ pgd_populate_kernel(&init_mm, pgd, pud);
+- pgd_populate(&init_mm, pgd, __va(pud_phys));
++ pgd_populate_kernel(&init_mm, pgd, __va(pud_phys));
spin_unlock(&init_mm.page_table_lock);
pgd_changed = true;
}
-@@ -1188,8 +1209,8 @@ int kern_addr_valid(unsigned long addr)
+@@ -856,8 +870,8 @@ int kern_addr_valid(unsigned long addr)
static struct vm_area_struct gate_vma = {
.vm_start = VSYSCALL_START,
.vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
@@ -31326,7 +28212,7 @@ index 104d56a..62ba13f1 100644
};
struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-@@ -1223,7 +1244,7 @@ int in_gate_area_no_mm(unsigned long addr)
+@@ -891,7 +905,7 @@ int in_gate_area_no_mm(unsigned long addr)
const char *arch_vma_name(struct vm_area_struct *vma)
{
@@ -31352,7 +28238,7 @@ index 7b179b4..6bd17777 100644
return (void *)vaddr;
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index 799580c..72f9fe0 100644
+index be1ef57..406f1c2 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,
@@ -31373,7 +28259,7 @@ index 799580c..72f9fe0 100644
{
struct vm_struct *p, *o;
-@@ -310,6 +310,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
+@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
/* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
if (page_is_ram(start >> PAGE_SHIFT))
@@ -31383,7 +28269,7 @@ index 799580c..72f9fe0 100644
return __va(phys);
addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
-@@ -322,6 +325,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
+@@ -327,6 +330,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
{
if (page_is_ram(phys >> PAGE_SHIFT))
@@ -31393,7 +28279,7 @@ index 799580c..72f9fe0 100644
return;
iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
-@@ -339,7 +345,7 @@ static int __init early_ioremap_debug_setup(char *str)
+@@ -344,7 +350,7 @@ static int __init early_ioremap_debug_setup(char *str)
early_param("early_ioremap_debug", early_ioremap_debug_setup);
static __initdata int after_paging_init;
@@ -31402,7 +28288,7 @@ index 799580c..72f9fe0 100644
static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
{
-@@ -376,8 +382,7 @@ void __init early_ioremap_init(void)
+@@ -381,8 +387,7 @@ void __init early_ioremap_init(void)
slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
@@ -31429,7 +28315,7 @@ index d87dd6d..bf3fa66 100644
pte = kmemcheck_pte_lookup(address);
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index 25e7e13..1964579 100644
+index 5c1ae28..45f4ac9 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
@@ -31506,7 +28392,7 @@ index 25e7e13..1964579 100644
if (mmap_is_legacy()) {
mm->mmap_base = mm->mmap_legacy_base;
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
-index 0057a7a..95c7edd 100644
+index de54b9b..935281f 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,
@@ -31555,10 +28441,10 @@ index 0057a7a..95c7edd 100644
might_sleep();
if (is_enabled()) /* recheck and proper locking in *_core() */
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
-index 8bf93ba..dbcd670 100644
+index fbeaaf4..559063f 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
-@@ -474,7 +474,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
+@@ -494,7 +494,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
return true;
}
@@ -31568,7 +28454,7 @@ index 8bf93ba..dbcd670 100644
unsigned long uninitialized_var(pfn_align);
int i, nid;
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
-index d0b1773..4c3327c 100644
+index b008656..773eac2 100644
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -36,7 +36,7 @@ enum {
@@ -31581,7 +28467,7 @@ index d0b1773..4c3327c 100644
struct split_state {
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
-index bb32480..75f2f5e 100644
+index f9e5267..5c194c9 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,
@@ -31607,8 +28493,8 @@ index bb32480..75f2f5e 100644
* The .rodata section needs to be read-only. Using the pfn
* catches all aliases.
@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
- if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
- __pa_symbol(__end_rodata) >> PAGE_SHIFT))
+ if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
+ __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
pgprot_val(forbidden) |= _PAGE_RW;
+#endif
@@ -31628,7 +28514,7 @@ index bb32480..75f2f5e 100644
prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
return prot;
-@@ -400,23 +409,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
+@@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
{
/* change init_mm */
@@ -31646,7 +28532,7 @@ index bb32480..75f2f5e 100644
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
-+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
++ pgd_t *pgd = get_cpu_pgd(cpu);
+#else
list_for_each_entry(page, &pgd_list, lru) {
- pgd_t *pgd;
@@ -31669,61 +28555,61 @@ index bb32480..75f2f5e 100644
static int
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index 6574388..87e9bef 100644
+index f6ff57b..481690f 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
-@@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
+@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
if (!entry) {
- printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
-- current->comm, current->pid, start, end - 1);
-+ current->comm, task_pid_nr(current), start, end - 1);
+ printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
+- current->comm, current->pid, start, end);
++ current->comm, task_pid_nr(current), start, end);
return -EINVAL;
}
-@@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
-
+@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
while (cursor < to) {
if (!devmem_is_allowed(pfn)) {
-- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
-- current->comm, from, to - 1);
-+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
-+ current->comm, from, to - 1, cursor);
+ printk(KERN_INFO
+- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
+- current->comm, from, to);
++ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
++ current->comm, from, to, cursor);
return 0;
}
cursor += PAGE_SIZE;
-@@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
- if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
- printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
- "for [mem %#010Lx-%#010Lx]\n",
+@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
+ printk(KERN_INFO
+ "%s:%d ioremap_change_attr failed %s "
+ "for %Lx-%Lx\n",
- current->comm, current->pid,
+ current->comm, task_pid_nr(current),
cattr_name(flags),
- base, (unsigned long long)(base + size-1));
+ base, (unsigned long long)(base + size));
return -EINVAL;
-@@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
- flags = lookup_memtype(paddr);
+@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
if (want_flags != flags) {
- printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
+ printk(KERN_WARNING
+ "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
- current->comm, current->pid,
+ current->comm, task_pid_nr(current),
cattr_name(want_flags),
(unsigned long long)paddr,
- (unsigned long long)(paddr + size - 1),
-@@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
+ (unsigned long long)(paddr + size),
+@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
free_memtype(paddr, paddr + size);
printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
- " for [mem %#010Lx-%#010Lx], got %s\n",
+ " for %Lx-%Lx, got %s\n",
- current->comm, current->pid,
+ current->comm, task_pid_nr(current),
cattr_name(want_flags),
(unsigned long long)paddr,
- (unsigned long long)(paddr + size - 1),
+ (unsigned long long)(paddr + size),
diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
-index 415f6c4..d319983 100644
+index 8acaddd..4eaa657 100644
--- a/arch/x86/mm/pat_rbtree.c
+++ b/arch/x86/mm/pat_rbtree.c
-@@ -160,7 +160,7 @@ success:
+@@ -165,7 +165,7 @@ success:
failure:
printk(KERN_INFO "%s:%d conflicting memory types "
@@ -31782,10 +28668,10 @@ index 9f0614d..92ae64a 100644
p += get_opcode(p, &opcode);
for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index dfa537a..fd45c64 100644
+index 8573b83..4f3ed7e 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
-@@ -91,10 +91,67 @@ static inline void pgd_list_del(pgd_t *pgd)
+@@ -84,10 +84,64 @@ static inline void pgd_list_del(pgd_t *pgd)
list_del(&page->lru);
}
@@ -31798,9 +28684,6 @@ index dfa537a..fd45c64 100644
+{
+ unsigned int count = USER_PGD_PTRS;
-+ if (!pax_user_shadow_base)
-+ return;
-+
+ while (count--)
+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
+}
@@ -31855,7 +28738,7 @@ index dfa537a..fd45c64 100644
static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
{
BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
-@@ -135,6 +192,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -128,6 +182,7 @@ static void pgd_dtor(pgd_t *pgd)
pgd_list_del(pgd);
spin_unlock(&pgd_lock);
}
@@ -31863,8 +28746,8 @@ index dfa537a..fd45c64 100644
/*
* List of all pgd's needed for non-PAE so it can invalidate entries
-@@ -147,7 +205,7 @@ static void pgd_dtor(pgd_t *pgd)
- * -- nyc
+@@ -140,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
+ * -- wli
*/
-#ifdef CONFIG_X86_PAE
@@ -31872,7 +28755,7 @@ index dfa537a..fd45c64 100644
/*
* In PAE mode, we need to do a cr3 reload (=tlb flush) when
* updating the top-level pagetable entries to guarantee the
-@@ -159,7 +217,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -152,7 +207,7 @@ static void pgd_dtor(pgd_t *pgd)
* not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
* and initialize the kernel pmds here.
*/
@@ -31881,7 +28764,7 @@ index dfa537a..fd45c64 100644
void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
{
-@@ -177,36 +235,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
+@@ -170,36 +225,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
*/
flush_tlb_mm(mm);
}
@@ -31931,7 +28814,7 @@ index dfa537a..fd45c64 100644
return -ENOMEM;
}
-@@ -219,49 +279,52 @@ static int preallocate_pmds(pmd_t *pmds[])
+@@ -212,51 +269,55 @@ static int preallocate_pmds(pmd_t *pmds[])
* preallocate which never got a corresponding vma will need to be
* freed manually.
*/
@@ -31964,6 +28847,7 @@ index dfa537a..fd45c64 100644
{
- pud_t *pud;
+ pyd_t *pyd;
+ unsigned long addr;
int i;
- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
@@ -31971,17 +28855,19 @@ index dfa537a..fd45c64 100644
return;
- pud = pud_offset(pgd, 0);
--
-- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
-- pmd_t *pmd = pmds[i];
+#ifdef CONFIG_X86_64
+ pyd = pyd_offset(mm, 0L);
+#else
+ pyd = pyd_offset(pgd, 0L);
+#endif
-+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
+- for (addr = i = 0; i < PREALLOCATED_PMDS;
+- i++, pud++, addr += PUD_SIZE) {
+- pmd_t *pmd = pmds[i];
++ for (addr = i = 0; i < PREALLOCATED_PXDS;
++ i++, pyd++, addr += PYD_SIZE) {
+ pxd_t *pxd = pxds[i];
+
if (i >= KERNEL_PGD_BOUNDARY)
- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
- sizeof(pmd_t) * PTRS_PER_PMD);
@@ -32001,7 +28887,7 @@ index dfa537a..fd45c64 100644
pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
-@@ -270,11 +333,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -265,11 +326,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
mm->pgd = pgd;
@@ -32015,7 +28901,7 @@ index dfa537a..fd45c64 100644
/*
* Make sure that pre-populating the pmds is atomic with
-@@ -284,14 +347,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -279,14 +340,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
spin_lock(&pgd_lock);
pgd_ctor(mm, pgd);
@@ -32033,7 +28919,7 @@ index dfa537a..fd45c64 100644
out_free_pgd:
free_page((unsigned long)pgd);
out:
-@@ -300,7 +363,7 @@ out:
+@@ -295,7 +356,7 @@ out:
void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{
@@ -32043,10 +28929,10 @@ index dfa537a..fd45c64 100644
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
-index a69bcb8..19068ab 100644
+index cac7184..09a39fa 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
-@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
+@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
return;
}
pte = pte_offset_kernel(pmd, vaddr);
@@ -32061,29 +28947,29 @@ index a69bcb8..19068ab 100644
/*
* It's enough to flush this one mapping.
diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
-index e666cbb..61788c45 100644
+index d2e2735..5c6586f 100644
--- a/arch/x86/mm/physaddr.c
+++ b/arch/x86/mm/physaddr.c
-@@ -10,7 +10,7 @@
+@@ -8,7 +8,7 @@
+
#ifdef CONFIG_X86_64
- #ifdef CONFIG_DEBUG_VIRTUAL
-unsigned long __phys_addr(unsigned long x)
+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
{
- unsigned long y = x - __START_KERNEL_map;
-
-@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
+ if (x >= __START_KERNEL_map) {
+ x -= __START_KERNEL_map;
+@@ -45,7 +45,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
#else
#ifdef CONFIG_DEBUG_VIRTUAL
-unsigned long __phys_addr(unsigned long x)
+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
{
- unsigned long phys_addr = x - PAGE_OFFSET;
/* VMALLOC_* aren't constants */
+ VIRTUAL_BUG_ON(x < PAGE_OFFSET);
diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
-index 90555bf..f5f1828 100644
+index 410531d..0f16030 100644
--- a/arch/x86/mm/setup_nx.c
+++ b/arch/x86/mm/setup_nx.c
@@ -5,8 +5,10 @@
@@ -32091,7 +28977,7 @@ index 90555bf..f5f1828 100644
#include <asm/proto.h>
+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
- static int disable_nx;
+ static int disable_nx __cpuinitdata;
+#ifndef CONFIG_PAX_PAGEEXEC
/*
@@ -32105,7 +28991,7 @@ index 90555bf..f5f1828 100644
+
+#endif
- void x86_configure_nx(void)
+ void __cpuinit x86_configure_nx(void)
{
+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
if (cpu_has_nx && !disable_nx)
@@ -32116,66 +29002,23 @@ index 90555bf..f5f1828 100644
}
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index ae699b3..f1b2ad2 100644
+index d6c0418..06a0ad5 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
-@@ -48,7 +48,11 @@ void leave_mm(int cpu)
+@@ -65,7 +65,11 @@ void leave_mm(int cpu)
BUG();
- if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
- cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
+ cpumask_clear_cpu(cpu,
+ mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
+
+#ifndef CONFIG_PAX_PER_CPU_PGD
- load_cr3(swapper_pg_dir);
+ load_cr3(swapper_pg_dir);
+#endif
+
- }
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
-new file mode 100644
-index 0000000..dace51c
---- /dev/null
-+++ b/arch/x86/mm/uderef_64.c
-@@ -0,0 +1,37 @@
-+#include <linux/mm.h>
-+#include <asm/pgtable.h>
-+#include <asm/uaccess.h>
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+/* PaX: due to the special call convention these functions must
-+ * - remain leaf functions under all configurations,
-+ * - never be called directly, only dereferenced from the wrappers.
-+ */
-+void __pax_open_userland(void)
-+{
-+ unsigned int cpu;
-+
-+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
-+ return;
-+
-+ cpu = raw_get_cpu();
-+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
-+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
-+ raw_put_cpu_no_resched();
-+}
-+EXPORT_SYMBOL(__pax_open_userland);
-+
-+void __pax_close_userland(void)
-+{
-+ unsigned int cpu;
-+
-+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
-+ return;
-+
-+ cpu = raw_get_cpu();
-+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
-+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
-+ raw_put_cpu_no_resched();
-+}
-+EXPORT_SYMBOL(__pax_close_userland);
-+#endif
+
diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
-index 877b9a1..a8ecf42 100644
+index 6687022..ceabcfa 100644
--- a/arch/x86/net/bpf_jit.S
+++ b/arch/x86/net/bpf_jit.S
@@ -9,6 +9,7 @@
@@ -32186,23 +29029,23 @@ index 877b9a1..a8ecf42 100644
/*
* Calling convention :
-@@ -35,6 +36,7 @@ sk_load_word_positive_offset:
+@@ -35,6 +36,7 @@ sk_load_word:
jle bpf_slow_path_word
mov (SKBDATA,%rsi),%eax
bswap %eax /* ntohl() */
+ pax_force_retaddr
ret
- sk_load_half:
-@@ -52,6 +54,7 @@ sk_load_half_positive_offset:
+
+@@ -53,6 +55,7 @@ sk_load_half:
jle bpf_slow_path_half
movzwl (SKBDATA,%rsi),%eax
rol $8,%ax # ntohs()
+ pax_force_retaddr
ret
- sk_load_byte:
-@@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
+ sk_load_byte_ind:
+@@ -66,6 +69,7 @@ sk_load_byte:
cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
jle bpf_slow_path_byte
movzbl (SKBDATA,%rsi),%eax
@@ -32210,15 +29053,23 @@ index 877b9a1..a8ecf42 100644
ret
/**
-@@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
+@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
movzbl (SKBDATA,%rsi),%ebx
and $15,%bl
shl $2,%bl
+ pax_force_retaddr
ret
+ CFI_ENDPROC
+ ENDPROC(sk_load_byte_msh)
+@@ -91,6 +96,7 @@ bpf_error:
+ xor %eax,%eax
+ mov -8(%rbp),%rbx
+ leaveq
++ pax_force_retaddr
+ ret
/* rsi contains offset and can be scratched */
-@@ -109,6 +114,7 @@ bpf_slow_path_word:
+@@ -113,6 +119,7 @@ bpf_slow_path_word:
js bpf_error
mov -12(%rbp),%eax
bswap %eax
@@ -32226,7 +29077,7 @@ index 877b9a1..a8ecf42 100644
ret
bpf_slow_path_half:
-@@ -117,12 +123,14 @@ bpf_slow_path_half:
+@@ -121,12 +128,14 @@ bpf_slow_path_half:
mov -12(%rbp),%ax
rol $8,%ax
movzwl %ax,%eax
@@ -32241,57 +29092,25 @@ index 877b9a1..a8ecf42 100644
ret
bpf_slow_path_byte_msh:
-@@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
- and $15,%al
- shl $2,%al
- xchg %eax,%ebx
-+ pax_force_retaddr
- ret
-
- #define sk_negative_common(SIZE) \
-@@ -157,6 +166,7 @@ sk_load_word_negative_offset:
- sk_negative_common(4)
- mov (%rax), %eax
- bswap %eax
-+ pax_force_retaddr
- ret
-
- bpf_slow_path_half_neg:
-@@ -168,6 +178,7 @@ sk_load_half_negative_offset:
- mov (%rax),%ax
- rol $8,%ax
- movzwl %ax,%eax
-+ pax_force_retaddr
- ret
-
- bpf_slow_path_byte_neg:
-@@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
- .globl sk_load_byte_negative_offset
- sk_negative_common(1)
- movzbl (%rax), %eax
-+ pax_force_retaddr
- ret
-
- bpf_slow_path_byte_msh_neg:
-@@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
+@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
and $15,%al
shl $2,%al
xchg %eax,%ebx
+ pax_force_retaddr
ret
-
- bpf_error:
-@@ -197,4 +210,5 @@ bpf_error:
- xor %eax,%eax
- mov -8(%rbp),%rbx
- leaveq
-+ pax_force_retaddr
- ret
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
-index 516593e..29d3c55 100644
+index 5a5b6e4..37ccbe3 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
-@@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
+@@ -11,6 +11,7 @@
+ #include <asm/cacheflush.h>
+ #include <linux/netdevice.h>
+ #include <linux/filter.h>
++#include <linux/random.h>
+
+ /*
+ * Conventions :
+@@ -45,13 +46,84 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
return ptr + len;
}
@@ -32328,7 +29147,6 @@ index 516593e..29d3c55 100644
+ case 0x25: /* and eax, imm32 */ \
+ case 0x0d: /* or eax, imm32 */ \
+ case 0xb8: /* mov eax, imm32 */ \
-+ case 0x35: /* xor eax, imm32 */ \
+ case 0x3d: /* cmp eax, imm32 */ \
+ case 0xa9: /* test eax, imm32 */ \
+ DILUTE_CONST_SEQUENCE(_off, randkey); \
@@ -32356,23 +29174,18 @@ index 516593e..29d3c55 100644
+ EMIT(0xcccccccc, 4); \
+ break; \
+ default: \
-+ BUILD_BUG(); \
++ BUILD_BUG_ON(1); \
+ } \
+} 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 */\
++ if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */ \
+ DILUTE_CONST_SEQUENCE(_off, randkey); \
+ /* imul eax, ecx */ \
+ EMIT3(0x0f, 0xaf, 0xc1); \
+ } else { \
-+ BUILD_BUG(); \
++ BUILD_BUG_ON(1); \
+ } \
+} while (0)
+#else
@@ -32382,7 +29195,7 @@ index 516593e..29d3c55 100644
#define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
#define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
-@@ -91,6 +168,24 @@ do { \
+@@ -86,6 +158,24 @@ do { \
#define X86_JBE 0x76
#define X86_JA 0x77
@@ -32407,7 +29220,7 @@ index 516593e..29d3c55 100644
#define EMIT_COND_JMP(op, offset) \
do { \
if (is_near(offset)) \
-@@ -98,6 +193,7 @@ do { \
+@@ -93,6 +183,7 @@ do { \
else { \
EMIT2(0x0f, op + 0x10); \
EMIT(offset, 4); /* jxx .+off32 */ \
@@ -32415,53 +29228,14 @@ index 516593e..29d3c55 100644
} \
} while (0)
-@@ -145,55 +241,54 @@ static int pkt_type_offset(void)
- return -1;
+@@ -117,10 +208,14 @@ static inline void bpf_flush_icache(void *start, void *end)
+ set_fs(old_fs);
}
--struct bpf_binary_header {
-- unsigned int pages;
-- /* Note : for security reasons, bpf code will follow a randomly
-- * sized amount of int3 instructions
-- */
-- u8 image[];
--};
--
--static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,
-+/* Note : for security reasons, bpf code will follow a randomly
-+ * sized amount of int3 instructions
-+ */
-+static u8 *bpf_alloc_binary(unsigned int proglen,
- u8 **image_ptr)
- {
- unsigned int sz, hole;
-- struct bpf_binary_header *header;
-+ u8 *header;
-
- /* Most of BPF filters are really small,
- * but if some of them fill a page, allow at least
- * 128 extra bytes to insert a random section of int3
- */
-- sz = round_up(proglen + sizeof(*header) + 128, PAGE_SIZE);
-- header = module_alloc(sz);
-+ sz = round_up(proglen + 128, PAGE_SIZE);
-+ header = module_alloc_exec(sz);
- if (!header)
- return NULL;
-
-+ pax_open_kernel();
- memset(header, 0xcc, sz); /* fill whole space with int3 instructions */
-+ pax_close_kernel();
-
-- header->pages = sz / PAGE_SIZE;
-- hole = sz - (proglen + sizeof(*header));
-+ hole = PAGE_SIZE - (proglen & ~PAGE_MASK);
-
- /* insert a random number of int3 instructions before BPF code */
-- *image_ptr = &header->image[prandom_u32() % hole];
-+ *image_ptr = &header[prandom_u32() % hole];
- return header;
- }
++struct bpf_jit_work {
++ struct work_struct work;
++ void *image;
++};
void bpf_jit_compile(struct sk_filter *fp)
{
@@ -32470,14 +29244,7 @@ index 516593e..29d3c55 100644
u8 *prog;
unsigned int proglen, oldproglen = 0;
int ilen, i;
- int t_offset, f_offset;
- u8 t_op, f_op, seen = 0, pass;
- u8 *image = NULL;
-- struct bpf_binary_header *header = NULL;
-+ u8 *header = NULL;
- u8 *func;
- int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
- unsigned int cleanup_addr; /* epilogue code offset */
+@@ -133,6 +228,9 @@ void bpf_jit_compile(struct sk_filter *fp)
unsigned int *addrs;
const struct sock_filter *filter = fp->insns;
int flen = fp->len;
@@ -32487,10 +29254,14 @@ index 516593e..29d3c55 100644
if (!bpf_jit_enable)
return;
-@@ -202,11 +297,15 @@ void bpf_jit_compile(struct sk_filter *fp)
+@@ -141,11 +239,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
@@ -32505,7 +29276,7 @@ index 516593e..29d3c55 100644
addrs[i] = proglen;
}
cleanup_addr = proglen; /* epilogue address */
-@@ -317,10 +416,8 @@ void bpf_jit_compile(struct sk_filter *fp)
+@@ -253,10 +359,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 */
@@ -32518,17 +29289,8 @@ index 516593e..29d3c55 100644
break;
case BPF_S_ALU_DIV_X: /* A /= X; */
seen |= SEEN_XREG;
-@@ -360,13 +457,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 */
+@@ -276,8 +380,14 @@ void bpf_jit_compile(struct sk_filter *fp)
+ EMIT4(0x31, 0xd2, 0xf7, 0xf3); /* xor %edx,%edx; div %ebx */
break;
case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
@@ -32542,23 +29304,40 @@ index 516593e..29d3c55 100644
EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */
break;
case BPF_S_ALU_AND_X:
-@@ -637,8 +744,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 */
-@@ -728,10 +834,12 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
+@@ -477,7 +587,7 @@ void bpf_jit_compile(struct sk_filter *fp)
+ common_load: seen |= SEEN_DATAREF;
+ if ((int)K < 0) {
+ /* Abort the JIT because __load_pointer() is needed. */
+- goto out;
++ goto error;
+ }
+ t_offset = func - (image + addrs[i]);
+ EMIT1_off32(0xbe, K); /* mov imm32,%esi */
+@@ -492,7 +602,7 @@ common_load: seen |= SEEN_DATAREF;
+ case BPF_S_LDX_B_MSH:
+ if ((int)K < 0) {
+ /* Abort the JIT because __load_pointer() is needed. */
+- goto out;
++ goto error;
+ }
+ seen |= SEEN_DATAREF | SEEN_XREG;
+ t_offset = sk_load_byte_msh - (image + addrs[i]);
+@@ -582,17 +692,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
+ break;
+ default:
+ /* hmm, too complex filter, give up with jit compiler */
+- goto out;
++ goto error;
+ }
+ ilen = prog - temp;
+ if (image) {
if (unlikely(proglen + ilen > oldproglen)) {
pr_err("bpb_jit_compile fatal error\n");
- kfree(addrs);
-- module_free(NULL, header);
+- kfree(addrs);
+- module_free(NULL, image);
+- return;
+ module_free_exec(NULL, image);
- return;
++ goto error;
}
+ pax_open_kernel();
memcpy(image + proglen, temp, ilen);
@@ -32566,29 +29345,58 @@ index 516593e..29d3c55 100644
}
proglen += ilen;
addrs[i] = proglen;
-@@ -764,7 +872,6 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
+@@ -613,11 +724,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
+ break;
+ }
+ if (proglen == oldproglen) {
+- image = module_alloc(max_t(unsigned int,
+- proglen,
+- sizeof(struct work_struct)));
++ image = module_alloc_exec(proglen);
+ if (!image)
+- goto out;
++ goto error;
+ }
+ oldproglen = proglen;
+ }
+@@ -633,7 +742,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
+ bpf_flush_icache(image, image + proglen);
- if (image) {
- bpf_flush_icache(header, image + proglen);
-- set_memory_ro((unsigned long)header, header->pages);
fp->bpf_func = (void *)image;
- }
+- }
++ } else
++error:
++ kfree(fp->work);
++
out:
-@@ -776,10 +883,9 @@ static void bpf_jit_free_deferred(struct work_struct *work)
- {
- struct sk_filter *fp = container_of(work, struct sk_filter, work);
- unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
-- struct bpf_binary_header *header = (void *)addr;
+ kfree(addrs);
+ return;
+@@ -641,18 +753,20 @@ out:
-- set_memory_rw(addr, header->pages);
-- module_free(NULL, header);
-+ set_memory_rw(addr, 1);
-+ module_free_exec(NULL, (void *)addr);
- kfree(fp);
+ static void jit_free_defer(struct work_struct *arg)
+ {
+- module_free(NULL, arg);
++ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
++ kfree(arg);
}
+ /* run from softirq, we must use a work_struct to call
+- * module_free() from process context
++ * module_free_exec() from process context
+ */
+ void bpf_jit_free(struct sk_filter *fp)
+ {
+ if (fp->bpf_func != sk_run_filter) {
+- struct work_struct *work = (struct work_struct *)fp->bpf_func;
++ struct work_struct *work = &fp->work->work;
+
+ INIT_WORK(work, jit_free_defer);
++ fp->work->image = fp->bpf_func;
+ schedule_work(work);
+ }
+ }
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
-index d6aa6e8..266395a 100644
+index bff89df..377758a 100644
--- a/arch/x86/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
@@ -32624,7 +29432,7 @@ index d6aa6e8..266395a 100644
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
-index 6890d84..1dad1f1 100644
+index 6bc0899..13d2579 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -23,6 +23,7 @@
@@ -32635,7 +29443,7 @@ index 6890d84..1dad1f1 100644
#include "op_counter.h"
#include "op_x86_model.h"
-@@ -774,8 +775,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
+@@ -759,8 +760,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
if (ret)
return ret;
@@ -32650,7 +29458,7 @@ index 6890d84..1dad1f1 100644
mux_init(ops);
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
-index 50d86c0..7985318 100644
+index 303f086..d020916 100644
--- a/arch/x86/oprofile/op_model_amd.c
+++ b/arch/x86/oprofile/op_model_amd.c
@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
@@ -32706,6 +29514,19 @@ index 71e8a67..6a313bb 100644
struct op_counter_config;
+diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
+index 385a940..b11662d 100644
+--- a/arch/x86/pci/amd_bus.c
++++ b/arch/x86/pci/amd_bus.c
+@@ -355,7 +355,7 @@ static int __cpuinit amd_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata amd_cpu_notifier = {
++static struct notifier_block amd_cpu_notifier = {
+ .notifier_call = amd_cpu_notify,
+ };
+
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 372e9b8..e775a6c 100644
--- a/arch/x86/pci/irq.c
@@ -32747,25 +29568,25 @@ index 372e9b8..e775a6c 100644
.callback = fix_broken_hp_bios_irq9,
.ident = "HP Pavilion N5400 Series Laptop",
diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
-index 903fded..94b0d88 100644
+index cb29191..036766d 100644
--- a/arch/x86/pci/mrst.c
+++ b/arch/x86/pci/mrst.c
-@@ -241,7 +241,9 @@ int __init pci_mrst_init(void)
- pr_info("Intel MID platform detected, using MID PCI ops\n");
+@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
+ printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
pci_mmcfg_late_init();
pcibios_enable_irq = mrst_pci_irq_enable;
- pci_root_ops = pci_mrst_ops;
+ pax_open_kernel();
+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
+ pax_close_kernel();
- pci_soc_mode = 1;
/* Continue with standard init */
return 1;
+ }
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
-index c77b24a..c979855 100644
+index db0e9a5..0372c14 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
-@@ -79,7 +79,7 @@ union bios32 {
+@@ -79,50 +79,93 @@ union bios32 {
static struct {
unsigned long address;
unsigned short segment;
@@ -32774,7 +29595,13 @@ index c77b24a..c979855 100644
/*
* Returns the entry point for the given service, NULL on error
-@@ -92,37 +92,80 @@ static unsigned long bios32_service(unsigned long service)
+ */
+
+-static unsigned long bios32_service(unsigned long service)
++static unsigned long __devinit bios32_service(unsigned long service)
+ {
+ unsigned char return_code; /* %al */
+ unsigned long address; /* %ebx */
unsigned long length; /* %ecx */
unsigned long entry; /* %edx */
unsigned long flags;
@@ -32865,9 +29692,9 @@ index c77b24a..c979855 100644
-static int pci_bios_present;
+static int pci_bios_present __read_only;
- static int check_pcibios(void)
+ static int __devinit check_pcibios(void)
{
-@@ -131,11 +174,13 @@ static int check_pcibios(void)
+@@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
unsigned long flags, pcibios_entry;
if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
@@ -32884,7 +29711,7 @@ index c77b24a..c979855 100644
"jc 1f\n\t"
"xor %%ah, %%ah\n"
"1:"
-@@ -144,7 +189,8 @@ static int check_pcibios(void)
+@@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
"=b" (ebx),
"=c" (ecx)
: "1" (PCIBIOS_PCI_BIOS_PRESENT),
@@ -33064,7 +29891,7 @@ index c77b24a..c979855 100644
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
-index 40e4469..d915bf9 100644
+index 40e4469..0592924 100644
--- a/arch/x86/platform/efi/efi_32.c
+++ b/arch/x86/platform/efi/efi_32.c
@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
@@ -33107,7 +29934,7 @@ index 40e4469..d915bf9 100644
load_gdt(&gdt_descr);
+#ifdef CONFIG_PAX_PER_CPU_PGD
-+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
++ load_cr3(get_cpu_pgd(smp_processor_id()));
+#else
load_cr3(swapper_pg_dir);
+#endif
@@ -33116,10 +29943,10 @@ index 40e4469..d915bf9 100644
local_irq_restore(efi_rt_eflags);
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
-index 39a0e7f1..872396e 100644
+index 0fba86d..3642981 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
-@@ -76,6 +76,11 @@ void __init efi_call_phys_prelog(void)
+@@ -75,6 +75,11 @@ void __init efi_call_phys_prelog(void)
vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
}
@@ -33131,13 +29958,13 @@ index 39a0e7f1..872396e 100644
__flush_tlb_all();
}
-@@ -89,6 +94,11 @@ void __init efi_call_phys_epilog(void)
+@@ -88,6 +93,11 @@ void __init efi_call_phys_epilog(void)
for (pgd = 0; pgd < n_pgds; pgd++)
set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
kfree(save_pgd);
+
+#ifdef CONFIG_PAX_PER_CPU_PGD
-+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
++ load_cr3(get_cpu_pgd(smp_processor_id()));
+#endif
+
__flush_tlb_all();
@@ -33340,23 +30167,28 @@ index 4c07cca..2c8427d 100644
ret
ENDPROC(efi_call6)
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
-index 3ca5957..7909c18 100644
+index ad4ec1c..686479e 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];
+@@ -76,18 +76,20 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
EXPORT_SYMBOL_GPL(sfi_mrtc_array);
int sfi_mrtc_num;
-static void mrst_power_off(void)
+static __noreturn void mrst_power_off(void)
{
+ if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
+ intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 1);
+ BUG();
}
-static void mrst_reboot(void)
+static __noreturn void mrst_reboot(void)
{
- intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
+ if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
+ intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
+ else
+ intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
+ BUG();
}
@@ -33375,189 +30207,46 @@ index d6ee929..3637cb5 100644
.getproplen = olpc_dt_getproplen,
.getproperty = olpc_dt_getproperty,
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
-index 424f4c9..f2a2988 100644
+index 43c9f6a..2b63a0b 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
-@@ -137,11 +137,8 @@ static void do_fpu_end(void)
+@@ -132,7 +132,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
int cpu = smp_processor_id();
- struct tss_struct *t = &per_cpu(init_tss, cpu);
--#ifdef CONFIG_X86_64
-- struct desc_struct *desc = get_cpu_gdt_table(cpu);
-- tss_desc tss;
--#endif
+ struct tss_struct *t = init_tss + cpu;
-+
+
set_tss_desc(cpu, t); /*
* This just modifies memory; should not be
- * necessary. But... This is necessary, because
-@@ -150,10 +147,6 @@ static void fix_processor_context(void)
+@@ -142,8 +142,6 @@ static void fix_processor_context(void)
*/
#ifdef CONFIG_X86_64
-- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
-- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
-- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
+- 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 a44f457..9140171 100644
---- a/arch/x86/realmode/init.c
-+++ b/arch/x86/realmode/init.c
-@@ -70,7 +70,13 @@ void __init setup_real_mode(void)
- __va(real_mode_header->trampoline_header);
-
- #ifdef CONFIG_X86_32
-- trampoline_header->start = __pa_symbol(startup_32_smp);
-+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
-+#endif
-+
-+ trampoline_header->boot_cs = __BOOT_CS;
- trampoline_header->gdt_limit = __BOOT_DS + 7;
- trampoline_header->gdt_base = __pa_symbol(boot_gdt);
- #else
-@@ -86,7 +92,7 @@ void __init setup_real_mode(void)
- *trampoline_cr4_features = read_cr4();
-
- trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
-- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
-+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
- trampoline_pgd[511] = init_level4_pgt[511].pgd;
- #endif
- }
-diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
-index 8869287..d577672 100644
---- a/arch/x86/realmode/rm/Makefile
-+++ b/arch/x86/realmode/rm/Makefile
-@@ -78,5 +78,8 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
- $(call cc-option, -fno-unit-at-a-time)) \
- $(call cc-option, -fno-stack-protector) \
- $(call cc-option, -mpreferred-stack-boundary=2)
-+ifdef CONSTIFY_PLUGIN
-+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
-+endif
- KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
- GCOV_PROFILE := n
-diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
-index a28221d..93c40f1 100644
---- a/arch/x86/realmode/rm/header.S
-+++ b/arch/x86/realmode/rm/header.S
-@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
- #endif
- /* APM/BIOS reboot */
- .long pa_machine_real_restart_asm
--#ifdef CONFIG_X86_64
-+#ifdef CONFIG_X86_32
-+ .long __KERNEL_CS
-+#else
- .long __KERNEL32_CS
- #endif
- END(real_mode_header)
-diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
-index c1b2791..f9e31c7 100644
---- a/arch/x86/realmode/rm/trampoline_32.S
-+++ b/arch/x86/realmode/rm/trampoline_32.S
-@@ -25,6 +25,12 @@
- #include <asm/page_types.h>
- #include "realmode.h"
-
-+#ifdef CONFIG_PAX_KERNEXEC
-+#define ta(X) (X)
-+#else
-+#define ta(X) (pa_ ## X)
-+#endif
-+
- .text
- .code16
-
-@@ -39,8 +45,6 @@ ENTRY(trampoline_start)
-
- cli # We should be safe anyway
-
-- movl tr_start, %eax # where we need to go
--
- movl $0xA5A5A5A5, trampoline_status
- # write marker for master knows we're running
-
-@@ -56,7 +60,7 @@ ENTRY(trampoline_start)
- movw $1, %dx # protected mode (PE) bit
- lmsw %dx # into protected mode
-
-- ljmpl $__BOOT_CS, $pa_startup_32
-+ ljmpl *(trampoline_header)
-
- .section ".text32","ax"
- .code32
-@@ -67,7 +71,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
- .balign 8
- GLOBAL(trampoline_header)
- tr_start: .space 4
-- tr_gdt_pad: .space 2
-+ tr_boot_cs: .space 2
- tr_gdt: .space 6
- END(trampoline_header)
-
-diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
-index bb360dc..d0fd8f8 100644
---- a/arch/x86/realmode/rm/trampoline_64.S
-+++ b/arch/x86/realmode/rm/trampoline_64.S
-@@ -94,6 +94,7 @@ ENTRY(startup_32)
- movl %edx, %gs
-
- movl pa_tr_cr4, %eax
-+ andl $~X86_CR4_PCIDE, %eax
- movl %eax, %cr4 # Enable PAE mode
-
- # Setup trampoline 4 level pagetables
-@@ -107,7 +108,7 @@ ENTRY(startup_32)
- wrmsr
-
- # Enable paging and in turn activate Long Mode
-- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
-+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
- movl %eax, %cr0
-
- /*
-diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
-index e812034..c747134 100644
---- a/arch/x86/tools/Makefile
-+++ b/arch/x86/tools/Makefile
-@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
-
- $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c
-
--HOST_EXTRACFLAGS += -I$(srctree)/tools/include
-+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
- hostprogs-y += relocs
- relocs-objs := relocs_32.o relocs_64.o relocs_common.o
- relocs: $(obj)/relocs
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
-index f7bab68..b6d9886 100644
+index e529730..8d08690 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
-@@ -1,5 +1,7 @@
- /* This is included from relocs_32/64.c */
+@@ -11,10 +11,13 @@
+ #include <endian.h>
+ #include <regex.h>
+#include "../../../include/generated/autoconf.h"
+
- #define ElfW(type) _ElfW(ELF_BITS, type)
- #define _ElfW(bits, type) __ElfW(bits, type)
- #define __ElfW(bits, type) Elf##bits##_##type
-@@ -11,6 +13,7 @@
- #define Elf_Sym ElfW(Sym)
-
- static Elf_Ehdr ehdr;
-+static Elf_Phdr *phdr;
+ static void die(char *fmt, ...);
- struct relocs {
- uint32_t *offset;
-@@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
+ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+ static Elf32_Ehdr ehdr;
++static Elf32_Phdr *phdr;
+ static unsigned long reloc_count, reloc_idx;
+ static unsigned long *relocs;
+ static unsigned long reloc16_count, reloc16_idx;
+@@ -322,9 +325,39 @@ static void read_ehdr(FILE *fp)
}
}
@@ -33565,7 +30254,7 @@ index f7bab68..b6d9886 100644
+{
+ unsigned int i;
+
-+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
++ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
+ if (!phdr) {
+ die("Unable to allocate %d program headers\n",
+ ehdr.e_phnum);
@@ -33579,14 +30268,14 @@ index f7bab68..b6d9886 100644
+ strerror(errno));
+ }
+ for(i = 0; i < ehdr.e_phnum; i++) {
-+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
-+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
-+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
-+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
-+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
-+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
-+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
-+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
++ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
++ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
++ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
++ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
++ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
++ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
++ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
++ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
+ }
+
+}
@@ -33595,10 +30284,10 @@ index f7bab68..b6d9886 100644
{
- int i;
+ unsigned int i;
- Elf_Shdr shdr;
+ Elf32_Shdr shdr;
secs = calloc(ehdr.e_shnum, sizeof(struct section));
-@@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
+@@ -359,7 +392,7 @@ static void read_shdrs(FILE *fp)
static void read_strtabs(FILE *fp)
{
@@ -33607,7 +30296,7 @@ index f7bab68..b6d9886 100644
for (i = 0; i < ehdr.e_shnum; i++) {
struct section *sec = &secs[i];
if (sec->shdr.sh_type != SHT_STRTAB) {
-@@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
+@@ -384,7 +417,7 @@ static void read_strtabs(FILE *fp)
static void read_symtabs(FILE *fp)
{
@@ -33616,12 +30305,9 @@ index f7bab68..b6d9886 100644
for (i = 0; i < ehdr.e_shnum; i++) {
struct section *sec = &secs[i];
if (sec->shdr.sh_type != SHT_SYMTAB) {
-@@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
- }
-
+@@ -417,7 +450,9 @@ static void read_symtabs(FILE *fp)
--static void read_relocs(FILE *fp)
-+static void read_relocs(FILE *fp, int use_real_mode)
+ static void read_relocs(FILE *fp)
{
- int i,j;
+ unsigned int i,j;
@@ -33629,15 +30315,15 @@ index f7bab68..b6d9886 100644
+
for (i = 0; i < ehdr.e_shnum; i++) {
struct section *sec = &secs[i];
- if (sec->shdr.sh_type != SHT_REL_TYPE) {
-@@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
+ if (sec->shdr.sh_type != SHT_REL) {
+@@ -437,9 +472,22 @@ static void read_relocs(FILE *fp)
die("Cannot read symbol table: %s\n",
strerror(errno));
}
+ base = 0;
+
+#ifdef CONFIG_X86_32
-+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
++ for (j = 0; j < ehdr.e_phnum; j++) {
+ if (phdr[j].p_type != PT_LOAD )
+ continue;
+ if (secs[sec->shdr.sh_info].shdr.sh_offset < phdr[j].p_offset || secs[sec->shdr.sh_info].shdr.sh_offset >= phdr[j].p_offset + phdr[j].p_filesz)
@@ -33647,23 +30333,21 @@ index f7bab68..b6d9886 100644
+ }
+#endif
+
- for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
- Elf_Rel *rel = &sec->reltab[j];
-- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
-+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
- rel->r_info = elf_xword_to_cpu(rel->r_info);
- #if (SHT_REL_TYPE == SHT_RELA)
- rel->r_addend = elf_xword_to_cpu(rel->r_addend);
-@@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
+ for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
+ Elf32_Rel *rel = &sec->reltab[j];
+- rel->r_offset = elf32_to_cpu(rel->r_offset);
++ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
+ rel->r_info = elf32_to_cpu(rel->r_info);
+ }
+ }
+@@ -448,13 +496,13 @@ static void read_relocs(FILE *fp)
static void print_absolute_symbols(void)
{
- int i;
+ unsigned int i;
- const char *format;
-
- if (ELF_BITS == 64)
-@@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
+ printf("Absolute symbols\n");
+ printf(" Num: Value Size Type Bind Visibility Name\n");
for (i = 0; i < ehdr.e_shnum; i++) {
struct section *sec = &secs[i];
char *sym_strtab;
@@ -33672,91 +30356,84 @@ index f7bab68..b6d9886 100644
if (sec->shdr.sh_type != SHT_SYMTAB) {
continue;
-@@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
+@@ -481,14 +529,14 @@ static void print_absolute_symbols(void)
static void print_absolute_relocs(void)
{
- int i, printed = 0;
+ unsigned int i, printed = 0;
- const char *format;
- if (ELF_BITS == 64)
-@@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
+ for (i = 0; i < ehdr.e_shnum; i++) {
+ struct section *sec = &secs[i];
struct section *sec_applies, *sec_symtab;
char *sym_strtab;
- Elf_Sym *sh_symtab;
+ Elf32_Sym *sh_symtab;
- int j;
+ unsigned int j;
- if (sec->shdr.sh_type != SHT_REL_TYPE) {
+ if (sec->shdr.sh_type != SHT_REL) {
continue;
}
-@@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
- static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
- Elf_Sym *sym, const char *symname))
+@@ -550,13 +598,13 @@ static void print_absolute_relocs(void)
+ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym),
+ int use_real_mode)
{
- int i;
+ unsigned int i;
/* Walk through the relocations */
for (i = 0; i < ehdr.e_shnum; i++) {
char *sym_strtab;
- Elf_Sym *sh_symtab;
+ Elf32_Sym *sh_symtab;
struct section *sec_applies, *sec_symtab;
- int j;
+ unsigned int j;
struct section *sec = &secs[i];
- if (sec->shdr.sh_type != SHT_REL_TYPE) {
-@@ -812,6 +860,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
- {
- unsigned r_type = ELF32_R_TYPE(rel->r_info);
- int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
-+ char *sym_strtab = sec->link->link->strtab;
-+
-+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
-+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
-+ return 0;
+ if (sec->shdr.sh_type != SHT_REL) {
+@@ -580,6 +628,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym),
+ sym = &sh_symtab[ELF32_R_SYM(rel->r_info)];
+ r_type = ELF32_R_TYPE(rel->r_info);
+
++ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
++ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
++ continue;
+
-+#ifdef CONFIG_PAX_KERNEXEC
-+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
-+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
-+ return 0;
-+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
-+ return 0;
-+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
-+ return 0;
-+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
-+ return 0;
++#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
++ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
++ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
++ continue;
++ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
++ continue;
++ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
++ continue;
++ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
++ continue;
+#endif
++
+ shn_abs = sym->st_shndx == SHN_ABS;
- switch (r_type) {
- case R_386_NONE:
-@@ -950,7 +1015,7 @@ static int write32_as_text(uint32_t v, FILE *f)
+ switch (r_type) {
+@@ -676,7 +740,7 @@ static int write32(unsigned int v, FILE *f)
static void emit_relocs(int as_text, int use_real_mode)
{
- int i;
+ unsigned int i;
- int (*write_reloc)(uint32_t, FILE *) = write32;
- int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
- const char *symname);
-@@ -1026,10 +1091,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
- {
- regex_init(use_real_mode);
+ /* Count how many relocations I have and allocate space for them. */
+ reloc_count = 0;
+ walk_relocs(count_reloc, use_real_mode);
+@@ -803,6 +867,7 @@ int main(int argc, char **argv)
+ fname, strerror(errno));
+ }
read_ehdr(fp);
+ read_phdrs(fp);
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-- read_relocs(fp);
-+ read_relocs(fp, use_real_mode);
- if (ELF_BITS == 64)
- percpu_init();
- if (show_absolute_syms) {
diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
-index 80ffa5b..a33bd15 100644
+index c6c7131..2851e03 100644
--- a/arch/x86/um/tls_32.c
+++ b/arch/x86/um/tls_32.c
-@@ -260,7 +260,7 @@ out:
+@@ -259,7 +259,7 @@ out:
if (unlikely(task == current &&
!t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
printk(KERN_ERR "get_tls_entry: task with pid %d got here "
@@ -33766,10 +30443,10 @@ index 80ffa5b..a33bd15 100644
return 0;
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index fd14be1..e3c79c0 100644
+index 5d17950..2253fc9 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
-@@ -181,7 +181,7 @@ quiet_cmd_vdso = VDSO $@
+@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
@@ -33779,7 +30456,7 @@ index fd14be1..e3c79c0 100644
#
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index d6bfb87..876ee18 100644
+index 468d591..8e80a0a 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -25,6 +25,7 @@
@@ -33805,10 +30482,10 @@ index d6bfb87..876ee18 100644
gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
- gate_vma.vm_page_prot = __P101;
+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
-
- return 0;
- }
-@@ -330,14 +331,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+ /*
+ * Make sure the vDSO gets into every core dump.
+ * Dumping its contents makes post-mortem fully interpretable later
+@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
if (compat)
addr = VDSO_HIGH_BASE;
else {
@@ -33825,7 +30502,7 @@ index d6bfb87..876ee18 100644
if (compat_uses_vma || !compat) {
/*
-@@ -353,11 +354,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
}
current_thread_info()->sysenter_return =
@@ -33839,7 +30516,7 @@ index d6bfb87..876ee18 100644
up_write(&mm->mmap_sem);
-@@ -404,8 +405,14 @@ __initcall(ia32_binfmt_init);
+@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
const char *arch_vma_name(struct vm_area_struct *vma)
{
@@ -33855,7 +30532,7 @@ index d6bfb87..876ee18 100644
return NULL;
}
-@@ -415,7 +422,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
+@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
* Check to see if the corresponding task was created in compat vdso
* mode.
*/
@@ -33865,7 +30542,7 @@ index d6bfb87..876ee18 100644
return NULL;
}
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
-index 431e875..cbb23f3 100644
+index 153407c..611cba9 100644
--- a/arch/x86/vdso/vma.c
+++ b/arch/x86/vdso/vma.c
@@ -16,8 +16,6 @@
@@ -33877,16 +30554,16 @@ index 431e875..cbb23f3 100644
extern char vdso_start[], vdso_end[];
extern unsigned short vdso_sync_cpuid;
-@@ -141,7 +139,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
+@@ -96,7 +94,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
* unaligned here as a result of stack start randomization.
*/
addr = PAGE_ALIGN(addr);
-- addr = align_vdso_addr(addr);
+- addr = align_addr(addr, NULL, ALIGN_VDSO);
return addr;
}
-@@ -154,30 +151,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
- unsigned size)
+@@ -106,40 +103,35 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
+ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
{
struct mm_struct *mm = current->mm;
- unsigned long addr;
@@ -33902,9 +30579,9 @@ index 431e875..cbb23f3 100644
+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
+#endif
+
- addr = vdso_addr(mm->start_stack, size);
-+ addr = align_vdso_addr(addr);
- addr = get_unmapped_area(NULL, addr, size, 0, 0);
+ addr = vdso_addr(mm->start_stack, vdso_size);
++ addr = align_addr(addr, NULL, ALIGN_VDSO);
+ addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
if (IS_ERR_VALUE(addr)) {
ret = addr;
goto up_fail;
@@ -33913,23 +30590,23 @@ index 431e875..cbb23f3 100644
- current->mm->context.vdso = (void *)addr;
+ mm->context.vdso = addr;
- ret = install_special_mapping(mm, addr, size,
+ ret = install_special_mapping(mm, addr, vdso_size,
VM_READ|VM_EXEC|
- VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
- pages);
+ VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
+ VM_ALWAYSDUMP,
+ vdso_pages);
- if (ret) {
- current->mm->context.vdso = NULL;
- goto up_fail;
- }
++
+ if (ret)
+ mm->context.vdso = 0;
up_fail:
up_write(&mm->mmap_sem);
-@@ -197,10 +195,3 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
- vdsox32_size);
+ return ret;
}
- #endif
-
-static __init int vdso_setup(char *s)
-{
@@ -33938,10 +30615,10 @@ index 431e875..cbb23f3 100644
-}
-__setup("vdso=", vdso_setup);
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index fa6ade7..73da73a5 100644
+index 5189fe8..d937469 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
-@@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
+@@ -86,8 +86,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -33950,7 +30627,7 @@ index fa6ade7..73da73a5 100644
RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
__read_mostly int xen_have_vector_callback;
EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -541,8 +539,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
+@@ -382,8 +380,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
{
unsigned long va = dtr->address;
unsigned int size = dtr->size + 1;
@@ -33960,7 +30637,7 @@ index fa6ade7..73da73a5 100644
int f;
/*
-@@ -590,8 +587,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
+@@ -431,8 +428,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
{
unsigned long va = dtr->address;
unsigned int size = dtr->size + 1;
@@ -33970,7 +30647,7 @@ index fa6ade7..73da73a5 100644
int f;
/*
-@@ -599,7 +595,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
+@@ -440,7 +436,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
* 8-byte entries, or 16 4k pages..
*/
@@ -33979,16 +30656,7 @@ index fa6ade7..73da73a5 100644
BUG_ON(va & ~PAGE_MASK);
for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
-@@ -988,7 +984,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
- return 0;
- }
-
--static void set_xen_basic_apic_ops(void)
-+static void __init set_xen_basic_apic_ops(void)
- {
- apic->read = xen_apic_read;
- apic->write = xen_apic_write;
-@@ -1293,30 +1289,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
+@@ -1072,30 +1068,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
#endif
};
@@ -34022,11 +30690,11 @@ index fa6ade7..73da73a5 100644
}
-static void xen_machine_power_off(void)
-+static __noreturn void xen_machine_power_off(void)
++static void __noreturn xen_machine_power_off(void)
{
if (pm_power_off)
pm_power_off();
-@@ -1467,7 +1463,17 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1196,7 +1192,17 @@ asmlinkage void __init xen_start_kernel(void)
__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
/* Work out if we support NX */
@@ -34045,7 +30713,7 @@ index fa6ade7..73da73a5 100644
xen_setup_features();
-@@ -1498,13 +1504,6 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1227,13 +1233,6 @@ asmlinkage void __init xen_start_kernel(void)
machine_ops = xen_machine_ops;
@@ -34059,11 +30727,20 @@ index fa6ade7..73da73a5 100644
xen_smp_init();
#ifdef CONFIG_ACPI_NUMA
+@@ -1418,7 +1417,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block xen_hvm_cpu_notifier __cpuinitdata = {
++static struct notifier_block xen_hvm_cpu_notifier = {
+ .notifier_call = xen_hvm_cpu_notify,
+ };
+
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index fdc3ba2..23cae00 100644
+index fe00be69..c51170f 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
-@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
+@@ -365,7 +365,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
return val;
}
@@ -34072,17 +30749,17 @@ index fdc3ba2..23cae00 100644
{
if (val & _PAGE_PRESENT) {
unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
-@@ -1894,6 +1894,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 */
+@@ -1757,6 +1757,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
+ convert_pfn_mfn(init_level4_pgt);
+ convert_pfn_mfn(level3_ident_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);
-@@ -1923,8 +1926,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
+ l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
+@@ -1775,7 +1778,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
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);
@@ -34090,12 +30767,11 @@ index fdc3ba2..23cae00 100644
+ 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);
-@@ -2108,6 +2115,7 @@ static void __init xen_post_allocator_init(void)
+@@ -1986,6 +1993,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;
@@ -34103,7 +30779,7 @@ index fdc3ba2..23cae00 100644
#endif
/* This will work as long as patching hasn't happened yet
-@@ -2186,6 +2194,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
+@@ -2067,6 +2075,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,
@@ -34112,30 +30788,29 @@ index fdc3ba2..23cae00 100644
.alloc_pud = xen_alloc_pmd_init,
.release_pud = xen_release_pmd_init,
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
-index 31d0475..51af671 100644
+index 6e4d5dc..78c131b 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
-@@ -274,17 +274,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
+@@ -209,11 +209,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
+ {
+ BUG_ON(smp_processor_id() != 0);
native_smp_prepare_boot_cpu();
-
- if (xen_pv_domain()) {
-- /* We've switched to the "real" per-cpu gdt, so make sure the
-- old memory can be recycled */
-- make_lowmem_page_readwrite(xen_initial_gdt);
-
- #ifdef CONFIG_X86_32
- /*
- * Xen starts us with XEN_FLAT_RING1_DS, but linux code
- * expects __USER_DS
- */
-- loadsegment(ds, __USER_DS);
-- loadsegment(es, __USER_DS);
-+ loadsegment(ds, __KERNEL_DS);
-+ loadsegment(es, __KERNEL_DS);
- #endif
+- /* We've switched to the "real" per-cpu gdt, so make sure the
+- old memory can be recycled */
+- make_lowmem_page_readwrite(xen_initial_gdt);
+-
+ xen_filter_cpu_maps();
+ xen_setup_vcpu_info_placement();
+ }
+@@ -290,12 +285,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+ gdt = get_cpu_gdt_table(cpu);
- xen_filter_cpu_maps();
-@@ -364,7 +360,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+ ctxt->flags = VGCF_IN_KERNEL;
+- ctxt->user_regs.ds = __USER_DS;
+- ctxt->user_regs.es = __USER_DS;
++ ctxt->user_regs.ds = __KERNEL_DS;
++ ctxt->user_regs.es = __KERNEL_DS;
ctxt->user_regs.ss = __KERNEL_DS;
#ifdef CONFIG_X86_32
ctxt->user_regs.fs = __KERNEL_PERCPU;
@@ -34144,18 +30819,7 @@ index 31d0475..51af671 100644
#else
ctxt->gs_base_kernel = per_cpu_offset(cpu);
#endif
-@@ -374,8 +370,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
-
- {
- ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
-- ctxt->user_regs.ds = __USER_DS;
-- ctxt->user_regs.es = __USER_DS;
-+ ctxt->user_regs.ds = __KERNEL_DS;
-+ ctxt->user_regs.es = __KERNEL_DS;
-
- xen_copy_trap_info(ctxt->trap_ctxt);
-
-@@ -420,13 +416,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
+@@ -346,13 +341,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
int rc;
per_cpu(current_task, cpu) = idle;
@@ -34171,20 +30835,20 @@ index 31d0475..51af671 100644
#endif
xen_setup_runstate_info(cpu);
xen_setup_timer(cpu);
-@@ -702,7 +697,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
+@@ -536,7 +530,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();
}
-
diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
-index 33ca6e4..0ded929 100644
+index 7328f71..c457aa7 100644
--- a/arch/x86/xen/xen-asm_32.S
+++ b/arch/x86/xen/xen-asm_32.S
-@@ -84,14 +84,14 @@ ENTRY(xen_iret)
+@@ -83,14 +83,14 @@ ENTRY(xen_iret)
ESP_OFFSET=4 # bytes pushed onto stack
/*
@@ -34206,7 +30870,7 @@ index 33ca6e4..0ded929 100644
movl %ss:xen_vcpu, %eax
#endif
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
-index 7faed58..ba4427c 100644
+index aaa7291..3f77960 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
@@ -34228,7 +30892,7 @@ index 7faed58..ba4427c 100644
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 95f8c61..611d6e8 100644
+index b095739..8c17bcd 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -10,8 +10,6 @@
@@ -34301,30 +30965,8 @@ index af00795..2bb8105 100644
#define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
#define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
-diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
-index 4e491d9..c8e18e4 100644
---- a/block/blk-cgroup.c
-+++ b/block/blk-cgroup.c
-@@ -812,7 +812,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
- static struct cgroup_subsys_state *
- blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
- {
-- static atomic64_t id_seq = ATOMIC64_INIT(0);
-+ static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0);
- struct blkcg *blkcg;
-
- if (!parent_css) {
-@@ -826,7 +826,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
-
- blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
- blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
-- blkcg->id = atomic64_inc_return(&id_seq); /* root is 0, start from 1 */
-+ blkcg->id = atomic64_inc_return_unchecked(&id_seq); /* root is 0, start from 1 */
- done:
- spin_lock_init(&blkcg->lock);
- INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
-index 4b8d9b54..a7178c0 100644
+index 58916af..9b538a6 100644
--- a/block/blk-iopoll.c
+++ b/block/blk-iopoll.c
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
@@ -34336,6 +30978,15 @@ index 4b8d9b54..a7178c0 100644
{
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
int rearm = 0, budget = blk_iopoll_budget;
+@@ -209,7 +209,7 @@ static int __cpuinit blk_iopoll_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata blk_iopoll_cpu_notifier = {
++static struct notifier_block blk_iopoll_cpu_notifier = {
+ .notifier_call = blk_iopoll_cpu_notify,
+ };
+
diff --git a/block/blk-map.c b/block/blk-map.c
index 623e1cd..ca1e109 100644
--- a/block/blk-map.c
@@ -34350,10 +31001,10 @@ index 623e1cd..ca1e109 100644
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
-index ec9e606..3f38839 100644
+index 1366a89..88178fe 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
-@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
+@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
* Softirq action handler - move entries to local list and loop over them
* while passing them to the queue registered handler.
*/
@@ -34362,8 +31013,17 @@ index ec9e606..3f38839 100644
{
struct list_head *cpu_list, local_list;
+@@ -97,7 +97,7 @@ static int __cpuinit blk_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata blk_cpu_notifier = {
++static struct notifier_block blk_cpu_notifier = {
+ .notifier_call = blk_cpu_notify,
+ };
+
diff --git a/block/bsg.c b/block/bsg.c
-index 420a5a9..23834aa 100644
+index c0ab25c..9d49f8f 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
@@ -34394,10 +31054,10 @@ index 420a5a9..23834aa 100644
if (blk_verify_command(rq->cmd, has_write_perm))
return -EPERM;
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
-index fbd5a67..5d631b5 100644
+index 7b72502..646105c 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
-@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
err |= __get_user(f->spec1, &uf->spec1);
err |= __get_user(f->fmt_gap, &uf->fmt_gap);
err |= __get_user(name, &uf->name);
@@ -34407,10 +31067,10 @@ index fbd5a67..5d631b5 100644
err = -EFAULT;
goto out;
diff --git a/block/genhd.c b/block/genhd.c
-index 791f419..89f21c4 100644
+index 8bd4ef2..078f68b9 100644
--- a/block/genhd.c
+++ b/block/genhd.c
-@@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf)
+@@ -474,21 +474,24 @@ static char *bdevt_str(dev_t devt, char *buf)
/*
* Register device numbers dev..(dev+range-1)
@@ -34438,36 +31098,11 @@ index 791f419..89f21c4 100644
}
EXPORT_SYMBOL(blk_unregister_region);
-diff --git a/block/partitions/efi.c b/block/partitions/efi.c
-index a8287b4..241a48e 100644
---- a/block/partitions/efi.c
-+++ b/block/partitions/efi.c
-@@ -292,14 +292,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
- if (!gpt)
- return NULL;
-
-+ if (!le32_to_cpu(gpt->num_partition_entries))
-+ return NULL;
-+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
-+ if (!pte)
-+ return NULL;
-+
- count = le32_to_cpu(gpt->num_partition_entries) *
- le32_to_cpu(gpt->sizeof_partition_entry);
-- if (!count)
-- return NULL;
-- pte = kmalloc(count, GFP_KERNEL);
-- if (!pte)
-- return NULL;
--
- if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
- (u8 *) pte, count) < count) {
- kfree(pte);
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
-index a5ffcc9..e057498 100644
+index 9e76a32..a220c64 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
-@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
+@@ -66,7 +66,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
return put_user(0, p);
}
@@ -34476,7 +31111,7 @@ index a5ffcc9..e057498 100644
{
return jiffies_to_clock_t(q->sg_timeout);
}
-@@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
+@@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
struct sg_io_hdr *hdr, fmode_t mode)
{
@@ -34498,7 +31133,7 @@ index a5ffcc9..e057498 100644
if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
return -EPERM;
-@@ -434,6 +446,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
+@@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
int err;
unsigned int in_len, out_len, bytes, opcode, cmdlen;
char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
@@ -34507,7 +31142,7 @@ index a5ffcc9..e057498 100644
if (!sic)
return -EINVAL;
-@@ -467,9 +481,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
+@@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
*/
err = -EFAULT;
rq->cmd_len = cmdlen;
@@ -34527,6 +31162,19 @@ index a5ffcc9..e057498 100644
if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
goto error;
+diff --git a/crypto/api.c b/crypto/api.c
+index cea3cf6..86a0f6f 100644
+--- a/crypto/api.c
++++ b/crypto/api.c
+@@ -42,6 +42,8 @@ static inline struct crypto_alg *crypto_alg_get(struct crypto_alg *alg)
+ return alg;
+ }
+
++static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
++
+ struct crypto_alg *crypto_mod_get(struct crypto_alg *alg)
+ {
+ return try_module_get(alg->cra_module) ? crypto_alg_get(alg) : NULL;
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 7bdd61b..afec999 100644
--- a/crypto/cryptd.c
@@ -34549,8 +31197,63 @@ index 7bdd61b..afec999 100644
static void cryptd_queue_worker(struct work_struct *work);
+diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
+index 5b63b8d..6f46ba0 100644
+--- a/crypto/crypto_user.c
++++ b/crypto/crypto_user.c
+@@ -26,6 +26,8 @@
+ #include <net/net_namespace.h>
+ #include "internal.h"
+
++#define null_terminated(x) (strnlen(x, sizeof(x)) < sizeof(x))
++
+ DEFINE_MUTEX(crypto_cfg_mutex);
+
+ /* The crypto netlink socket */
+@@ -192,7 +194,10 @@ static int crypto_report(struct sk_buff *in_skb, struct nlmsghdr *in_nlh,
+ struct crypto_dump_info info;
+ int err;
+
+- if (!p->cru_driver_name)
++ if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
++ return -EINVAL;
++
++ if (!p->cru_driver_name[0])
+ return -EINVAL;
+
+ alg = crypto_alg_match(p, 1);
+@@ -256,6 +261,9 @@ static int crypto_update_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
+ struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
+ LIST_HEAD(list);
+
++ if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
++ return -EINVAL;
++
+ if (priority && !strlen(p->cru_driver_name))
+ return -EINVAL;
+
+@@ -283,6 +291,9 @@ static int crypto_del_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
+ struct crypto_alg *alg;
+ struct crypto_user_alg *p = nlmsg_data(nlh);
+
++ if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
++ return -EINVAL;
++
+ alg = crypto_alg_match(p, 1);
+ if (!alg)
+ return -ENOENT;
+@@ -310,6 +321,9 @@ static int crypto_add_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
+ struct crypto_user_alg *p = nlmsg_data(nlh);
+ struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
+
++ if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
++ return -EINVAL;
++
+ if (strlen(p->cru_driver_name))
+ exact = 1;
+
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
-index f8c920c..ab2cb5a 100644
+index 29a89da..7e23990 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
@@ -34563,10 +31266,10 @@ index f8c920c..ab2cb5a 100644
kobject_uevent(&pinst->kobj, KOBJ_ADD);
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
-index f220d64..d359ad6 100644
+index f57050e..7ccfc74 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
-@@ -20,7 +20,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
+@@ -18,7 +18,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
struct apei_exec_ins_type {
u32 flags;
apei_exec_ins_func_t run;
@@ -34576,10 +31279,10 @@ index f220d64..d359ad6 100644
struct apei_exec_context {
u32 ip;
diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
-index 33dc6a0..4b24b47 100644
+index 5d41894..22021e4 100644
--- a/drivers/acpi/apei/cper.c
+++ b/drivers/acpi/apei/cper.c
-@@ -39,12 +39,12 @@
+@@ -38,12 +38,12 @@
*/
u64 cper_next_record_id(void)
{
@@ -34596,47 +31299,8 @@ index 33dc6a0..4b24b47 100644
}
EXPORT_SYMBOL_GPL(cper_next_record_id);
-diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
-index 8ec37bb..b0716e5 100644
---- a/drivers/acpi/apei/ghes.c
-+++ b/drivers/acpi/apei/ghes.c
-@@ -498,7 +498,7 @@ static void __ghes_print_estatus(const char *pfx,
- const struct acpi_hest_generic *generic,
- const struct acpi_hest_generic_status *estatus)
- {
-- static atomic_t seqno;
-+ static atomic_unchecked_t seqno;
- unsigned int curr_seqno;
- char pfx_seq[64];
-
-@@ -509,7 +509,7 @@ static void __ghes_print_estatus(const char *pfx,
- else
- pfx = KERN_ERR;
- }
-- curr_seqno = atomic_inc_return(&seqno);
-+ curr_seqno = atomic_inc_return_unchecked(&seqno);
- snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
- printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
- pfx_seq, generic->header.source_id);
-diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
-index a83e3c6..c3d617f 100644
---- a/drivers/acpi/bgrt.c
-+++ b/drivers/acpi/bgrt.c
-@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
- if (!bgrt_image)
- return -ENODEV;
-
-- bin_attr_image.private = bgrt_image;
-- bin_attr_image.size = bgrt_image_size;
-+ pax_open_kernel();
-+ *(void **)&bin_attr_image.private = bgrt_image;
-+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
-+ pax_close_kernel();
-
- bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
- if (!bgrt_kobj)
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
-index 9515f18..4b149c9 100644
+index cb96296..b81293b 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -52,7 +52,7 @@ struct acpi_blacklist_item {
@@ -34648,7 +31312,7 @@ index 9515f18..4b149c9 100644
/*
* POLICY: If *anything* doesn't work, put it on the blacklist.
-@@ -199,7 +199,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
+@@ -193,7 +193,7 @@ static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)
return 0;
}
@@ -34657,11 +31321,102 @@ index 9515f18..4b149c9 100644
{
.callback = dmi_disable_osi_vista,
.ident = "Fujitsu Siemens",
+diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
+index 6c47ae9..abfdd63 100644
+--- a/drivers/acpi/ec_sys.c
++++ b/drivers/acpi/ec_sys.c
+@@ -12,6 +12,7 @@
+ #include <linux/acpi.h>
+ #include <linux/debugfs.h>
+ #include <linux/module.h>
++#include <linux/uaccess.h>
+ #include "internal.h"
+
+ MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
+@@ -40,7 +41,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
+ * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
+ */
+ unsigned int size = EC_SPACE_SIZE;
+- u8 *data = (u8 *) buf;
++ u8 data;
+ loff_t init_off = *off;
+ int err = 0;
+
+@@ -53,9 +54,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
+ size = count;
+
+ while (size) {
+- err = ec_read(*off, &data[*off - init_off]);
++ err = ec_read(*off, &data);
+ if (err)
+ return err;
++ if (put_user(data, &buf[*off - init_off]))
++ return -EFAULT;
+ *off += 1;
+ size--;
+ }
+@@ -71,7 +74,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
+
+ unsigned int size = count;
+ loff_t init_off = *off;
+- u8 *data = (u8 *) buf;
+ int err = 0;
+
+ if (*off >= EC_SPACE_SIZE)
+@@ -82,7 +84,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
+ }
+
+ while (size) {
+- u8 byte_write = data[*off - init_off];
++ u8 byte_write;
++ if (get_user(byte_write, &buf[*off - init_off]))
++ return -EFAULT;
+ err = ec_write(*off, byte_write);
+ if (err)
+ return err;
+diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
+index 251c7b62..feab1d6 100644
+--- a/drivers/acpi/proc.c
++++ b/drivers/acpi/proc.c
+@@ -345,16 +345,13 @@ acpi_system_write_wakeup_device(struct file *file,
+ struct list_head *node, *next;
+ char strbuf[5];
+ char str[5] = "";
+- unsigned int len = count;
+
+- 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;
+- strbuf[len] = '\0';
++ strbuf[count] = '\0';
+ sscanf(strbuf, "%s", str);
+
+ mutex_lock(&acpi_device_lock);
+diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
+index ac28db3..0848b37 100644
+--- a/drivers/acpi/processor_driver.c
++++ b/drivers/acpi/processor_driver.c
+@@ -474,7 +474,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
+ return 0;
+ #endif
+
+- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
++ BUG_ON(pr->id >= nr_cpu_ids);
+
+ /*
+ * Buggy BIOS check
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
-index f98dd00..7b69865 100644
+index de0791c..d6d4ea3 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
-@@ -992,7 +992,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
+@@ -1036,7 +1036,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
{
int i, count = CPUIDLE_DRIVER_STATE_START;
struct acpi_processor_cx *cx;
@@ -34671,10 +31426,10 @@ index f98dd00..7b69865 100644
if (!pr->flags.power_setup_done)
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
-index 05306a5..733d1f0 100644
+index 240a244..bc6239e 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
-@@ -423,11 +423,11 @@ static u32 num_counters;
+@@ -420,11 +420,11 @@ static u32 num_counters;
static struct attribute **all_attrs;
static u32 acpi_gpe_count;
@@ -34689,10 +31444,10 @@ index 05306a5..733d1f0 100644
static void delete_gpe_attr_array(void)
{
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
-index aaac4fb..e325c00 100644
+index 60def03..dcbb9ac 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
-@@ -1239,7 +1239,7 @@ int ahci_kick_engine(struct ata_port *ap)
+@@ -1211,7 +1211,7 @@ int ahci_kick_engine(struct ata_port *ap)
}
EXPORT_SYMBOL_GPL(ahci_kick_engine);
@@ -34702,19 +31457,10 @@ index aaac4fb..e325c00 100644
unsigned long timeout_msec)
{
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 83b1a9f..005b1ec 100644
+index d54b7d6..33e80e0 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
- static void ata_dev_xfermask(struct ata_device *dev);
- static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
-
--atomic_t ata_print_id = ATOMIC_INIT(0);
-+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
-
- struct ata_force_param {
- const char *name;
-@@ -4808,7 +4808,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+@@ -4745,7 +4745,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
struct ata_port *ap;
unsigned int tag;
@@ -34723,7 +31469,7 @@ index 83b1a9f..005b1ec 100644
ap = qc->ap;
qc->flags = 0;
-@@ -4824,7 +4824,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+@@ -4761,7 +4761,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
struct ata_port *ap;
struct ata_link *link;
@@ -34732,7 +31478,7 @@ index 83b1a9f..005b1ec 100644
WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
ap = qc->ap;
link = qc->dev->link;
-@@ -5943,6 +5943,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5766,6 +5766,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
return;
spin_lock(&lock);
@@ -34740,7 +31486,7 @@ index 83b1a9f..005b1ec 100644
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -5956,8 +5957,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5779,8 +5780,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
if (IS_ERR(*pp))
*pp = NULL;
@@ -34751,56 +31497,21 @@ index 83b1a9f..005b1ec 100644
spin_unlock(&lock);
}
-@@ -6150,7 +6152,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
-
- /* give ports names and add SCSI hosts */
- for (i = 0; i < host->n_ports; i++) {
-- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
-+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
- host->ports[i]->local_port_no = i + 1;
- }
-
-diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
-index db6dfcf..770d1f0 100644
---- a/drivers/ata/libata-scsi.c
-+++ b/drivers/ata/libata-scsi.c
-@@ -4113,7 +4113,7 @@ int ata_sas_port_init(struct ata_port *ap)
-
- if (rc)
- return rc;
-- ap->print_id = atomic_inc_return(&ata_print_id);
-+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
- return 0;
- }
- EXPORT_SYMBOL_GPL(ata_sas_port_init);
-diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
-index 45b5ab3..98446b8 100644
---- a/drivers/ata/libata.h
-+++ b/drivers/ata/libata.h
-@@ -53,7 +53,7 @@ enum {
- ATA_DNXFER_QUIET = (1 << 31),
- };
-
--extern atomic_t ata_print_id;
-+extern atomic_unchecked_t ata_print_id;
- extern int atapi_passthru16;
- extern int libata_fua;
- extern int libata_noacpi;
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
-index 853f610..97d24da 100644
+index e8574bb..f9f6a72 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
-@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
+@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
/* Handle platform specific quirks */
- if (quirk) {
- if (quirk & CF_BROKEN_PIO) {
+ if (pdata->quirk) {
+ if (pdata->quirk & CF_BROKEN_PIO) {
- ap->ops->set_piomode = NULL;
+ pax_open_kernel();
+ *(void **)&ap->ops->set_piomode = NULL;
+ pax_close_kernel();
ap->pio_mask = 0;
}
- if (quirk & CF_BROKEN_MWDMA)
+ if (pdata->quirk & CF_BROKEN_MWDMA)
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index f9b983a..887b9d8 100644
--- a/drivers/atm/adummy.c
@@ -34815,7 +31526,7 @@ index f9b983a..887b9d8 100644
return 0;
}
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
-index 62a7607..cc4be104 100644
+index f8f41e0..1f987dd 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) {
@@ -34855,10 +31566,10 @@ index 62a7607..cc4be104 100644
}
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
-index 0e3f8f9..765a7a5 100644
+index b22d71c..d6e1049 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
-@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
if (dev_data) return 0;
@@ -34867,7 +31578,7 @@ index 0e3f8f9..765a7a5 100644
return -ENOLINK;
}
size = skb->len+sizeof(struct atmtcp_hdr);
-@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
if (!new_skb) {
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
@@ -34876,7 +31587,7 @@ index 0e3f8f9..765a7a5 100644
return -ENOBUFS;
}
hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
-@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
out_vcc->push(out_vcc,new_skb);
@@ -34887,7 +31598,7 @@ index 0e3f8f9..765a7a5 100644
return 0;
}
-@@ -299,7 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
read_unlock(&vcc_sklist_lock);
if (!out_vcc) {
@@ -34896,7 +31607,7 @@ index 0e3f8f9..765a7a5 100644
goto done;
}
skb_pull(skb,sizeof(struct atmtcp_hdr));
-@@ -311,8 +311,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
__net_timestamp(new_skb);
skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
out_vcc->push(out_vcc,new_skb);
@@ -34908,10 +31619,10 @@ index 0e3f8f9..765a7a5 100644
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 b1955ba..b179940 100644
+index 956e9ac..133516d 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
-@@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
+@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
vcc->dev->number);
length = 0;
@@ -34920,7 +31631,7 @@ index b1955ba..b179940 100644
}
else {
length = ATM_CELL_SIZE-1; /* no HEC */
-@@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
+@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
size);
}
eff = length = 0;
@@ -34929,7 +31640,7 @@ index b1955ba..b179940 100644
}
else {
size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
-@@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
+@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
"(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
vcc->dev->number,vcc->vci,length,size << 2,descr);
length = eff = 0;
@@ -34938,7 +31649,7 @@ index b1955ba..b179940 100644
}
}
skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
-@@ -767,7 +767,7 @@ rx_dequeued++;
+@@ -771,7 +771,7 @@ rx_dequeued++;
vcc->push(vcc,skb);
pushed++;
}
@@ -34947,7 +31658,7 @@ index b1955ba..b179940 100644
}
wake_up(&eni_dev->rx_wait);
}
-@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
+@@ -1229,7 +1229,7 @@ static void dequeue_tx(struct atm_dev *dev)
PCI_DMA_TODEVICE);
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb_irq(skb);
@@ -34956,11 +31667,20 @@ index b1955ba..b179940 100644
wake_up(&eni_dev->tx_wait);
dma_complete++;
}
+@@ -1569,7 +1569,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 b41c948..a002b17 100644
+index 5072f8a..fa52520d 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
-@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
+@@ -750,7 +750,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
}
}
@@ -34969,7 +31689,7 @@ index b41c948..a002b17 100644
fs_dprintk (FS_DEBUG_TXMEM, "i");
fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
-@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
+@@ -817,7 +817,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
#endif
skb_put (skb, qe->p1 & 0xffff);
ATM_SKB(skb)->vcc = atm_vcc;
@@ -34978,7 +31698,7 @@ index b41c948..a002b17 100644
__net_timestamp(skb);
fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
atm_vcc->push (atm_vcc, skb);
-@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
+@@ -838,12 +838,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
kfree (pe);
}
if (atm_vcc)
@@ -34994,10 +31714,10 @@ index b41c948..a002b17 100644
default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
-index 204814e..cede831 100644
+index 361f5ae..7fc552d 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
-@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
+@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
#endif
/* check error condition */
if (*entry->status & STATUS_ERROR)
@@ -35009,7 +31729,7 @@ index 204814e..cede831 100644
}
}
-@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
+@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
if (skb == NULL) {
DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
@@ -35018,7 +31738,7 @@ index 204814e..cede831 100644
return -ENOMEM;
}
-@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
+@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
dev_kfree_skb_any(skb);
@@ -35035,7 +31755,7 @@ index 204814e..cede831 100644
ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
-@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
+@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
DPRINTK(2, "damaged PDU on %d.%d.%d\n",
fore200e->atm_dev->number,
entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
@@ -35044,7 +31764,7 @@ index 204814e..cede831 100644
}
}
-@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
goto retry_here;
}
@@ -35054,10 +31774,10 @@ index 204814e..cede831 100644
fore200e->tx_sat++;
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
-index 8557adc..3fb5d55 100644
+index 9a51df4..f3bb5f8 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
-@@ -1691,7 +1691,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
@@ -35066,7 +31786,7 @@ index 8557adc..3fb5d55 100644
goto return_host_buffers;
}
-@@ -1718,7 +1718,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
RBRQ_LEN_ERR(he_dev->rbrq_head)
? "LEN_ERR" : "",
vcc->vpi, vcc->vci);
@@ -35075,7 +31795,7 @@ index 8557adc..3fb5d55 100644
goto return_host_buffers;
}
-@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
vcc->push(vcc, skb);
spin_lock(&he_dev->global_lock);
@@ -35084,7 +31804,7 @@ index 8557adc..3fb5d55 100644
return_host_buffers:
++pdus_assembled;
-@@ -2096,7 +2096,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
+@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
tpd->vcc->pop(tpd->vcc, tpd->skb);
else
dev_kfree_skb_any(tpd->skb);
@@ -35093,7 +31813,7 @@ index 8557adc..3fb5d55 100644
}
pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
return;
-@@ -2508,7 +2508,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
@@ -35102,7 +31822,7 @@ index 8557adc..3fb5d55 100644
return -EINVAL;
}
-@@ -2519,7 +2519,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
@@ -35111,7 +31831,7 @@ index 8557adc..3fb5d55 100644
return -EINVAL;
}
#endif
-@@ -2531,7 +2531,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
@@ -35120,7 +31840,7 @@ index 8557adc..3fb5d55 100644
spin_unlock_irqrestore(&he_dev->global_lock, flags);
return -ENOMEM;
}
-@@ -2573,7 +2573,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
vcc->pop(vcc, skb);
else
dev_kfree_skb_any(skb);
@@ -35129,7 +31849,7 @@ index 8557adc..3fb5d55 100644
spin_unlock_irqrestore(&he_dev->global_lock, flags);
return -ENOMEM;
}
-@@ -2604,7 +2604,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
__enqueue_tpd(he_dev, tpd, cid);
spin_unlock_irqrestore(&he_dev->global_lock, flags);
@@ -35139,10 +31859,10 @@ index 8557adc..3fb5d55 100644
return 0;
}
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
-index 1dc0519..1aadaf7 100644
+index b812103..e391a49 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
-@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
+@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
// VC layer stats
@@ -35151,7 +31871,7 @@ index 1dc0519..1aadaf7 100644
__net_timestamp(skb);
// end of our responsibility
vcc->push (vcc, skb);
-@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
+@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
dev->tx_iovec = NULL;
// VC layer stats
@@ -35161,7 +31881,7 @@ index 1dc0519..1aadaf7 100644
// free the skb
hrz_kfree_skb (skb);
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
-index 272f009..a18ba55 100644
+index 1c05212..c28e200 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
@@ -35319,10 +32039,10 @@ index 272f009..a18ba55 100644
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
-index 4217f29..88f547a 100644
+index 3d0c2b0..45441fa 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
-@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
+@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
status = (u_short) (buf_desc_ptr->desc_mode);
if (status & (RX_CER | RX_PTE | RX_OFL))
{
@@ -35331,7 +32051,7 @@ index 4217f29..88f547a 100644
IF_ERR(printk("IA: bad packet, dropping it");)
if (status & RX_CER) {
IF_ERR(printk(" cause: packet CRC error\n");)
-@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
+@@ -1169,7 +1169,7 @@ static int rx_pkt(struct atm_dev *dev)
len = dma_addr - buf_addr;
if (len > iadev->rx_buf_sz) {
printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
@@ -35340,16 +32060,16 @@ index 4217f29..88f547a 100644
goto out_free_desc;
}
-@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
+@@ -1319,7 +1319,7 @@ static void rx_dle_intr(struct atm_dev *dev)
ia_vcc = INPH_IA_VCC(vcc);
if (ia_vcc == NULL)
{
- atomic_inc(&vcc->stats->rx_err);
+ atomic_inc_unchecked(&vcc->stats->rx_err);
- atm_return(vcc, skb->truesize);
dev_kfree_skb_any(skb);
+ atm_return(vcc, atm_guess_pdu2truesize(len));
goto INCR_DLE;
-@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
+@@ -1331,7 +1331,7 @@ static void rx_dle_intr(struct atm_dev *dev)
if ((length > iadev->rx_buf_sz) || (length >
(skb->len - sizeof(struct cpcs_trailer))))
{
@@ -35357,8 +32077,8 @@ index 4217f29..88f547a 100644
+ atomic_inc_unchecked(&vcc->stats->rx_err);
IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
length, skb->len);)
- atm_return(vcc, skb->truesize);
-@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
+ dev_kfree_skb_any(skb);
+@@ -1347,7 +1347,7 @@ static void rx_dle_intr(struct atm_dev *dev)
IF_RX(printk("rx_dle_intr: skb push");)
vcc->push(vcc,skb);
@@ -35367,7 +32087,7 @@ index 4217f29..88f547a 100644
iadev->rx_pkt_cnt++;
}
INCR_DLE:
-@@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
+@@ -2827,15 +2827,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
{
struct k_sonet_stats *stats;
stats = &PRIV(_ia_dev[board])->sonet_stats;
@@ -35392,7 +32112,7 @@ index 4217f29..88f547a 100644
}
ia_cmds.status = 0;
break;
-@@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
+@@ -2940,7 +2940,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
if ((desc == 0) || (desc > iadev->num_tx_desc))
{
IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
@@ -35401,7 +32121,7 @@ index 4217f29..88f547a 100644
if (vcc->pop)
vcc->pop(vcc, skb);
else
-@@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
+@@ -3045,14 +3045,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
ATM_DESC(skb) = vcc->vci;
skb_queue_tail(&iadev->tx_dma_q, skb);
@@ -35419,7 +32139,7 @@ index 4217f29..88f547a 100644
vcc->tx_quota = vcc->tx_quota * 3 / 4;
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
-index fa7d701..1e404c7 100644
+index f5569699..0da15eb 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
@@ -35477,10 +32197,10 @@ index fa7d701..1e404c7 100644
lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
-index 5aca5f4..ce3a6b0 100644
+index 1c70c45..300718d 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
-@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
if ((vc = (vc_map *) vcc->dev_data) == NULL) {
printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
card->index);
@@ -35489,7 +32209,7 @@ index 5aca5f4..ce3a6b0 100644
dev_kfree_skb_any(skb);
return -EINVAL;
}
-@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
if (!vc->tx) {
printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
card->index);
@@ -35498,7 +32218,7 @@ index 5aca5f4..ce3a6b0 100644
dev_kfree_skb_any(skb);
return -EINVAL;
}
-@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
card->index);
@@ -35515,7 +32235,7 @@ index 5aca5f4..ce3a6b0 100644
dev_kfree_skb_any(skb);
return -EINVAL;
}
-@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
}
if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
@@ -35529,7 +32249,7 @@ index 5aca5f4..ce3a6b0 100644
return 0;
}
-@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
printk
("nicstar%d: Can't allocate buffers for aal0.\n",
card->index);
@@ -35546,7 +32266,7 @@ index 5aca5f4..ce3a6b0 100644
dev_kfree_skb_any(sb);
break;
}
-@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
ATM_SKB(sb)->vcc = vcc;
__net_timestamp(sb);
vcc->push(vcc, sb);
@@ -35555,7 +32275,7 @@ index 5aca5f4..ce3a6b0 100644
cell += ATM_CELL_PAYLOAD;
}
-@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
if (iovb == NULL) {
printk("nicstar%d: Out of iovec buffers.\n",
card->index);
@@ -35564,7 +32284,7 @@ index 5aca5f4..ce3a6b0 100644
recycle_rx_buf(card, skb);
return;
}
-@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
small or large buffer itself. */
} else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
@@ -35573,7 +32293,7 @@ index 5aca5f4..ce3a6b0 100644
recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
NS_MAX_IOVECS);
NS_PRV_IOVCNT(iovb) = 0;
-@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
("nicstar%d: Expected a small buffer, and this is not one.\n",
card->index);
which_list(card, skb);
@@ -35582,7 +32302,7 @@ index 5aca5f4..ce3a6b0 100644
recycle_rx_buf(card, skb);
vc->rx_iov = NULL;
recycle_iov_buf(card, iovb);
-@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
("nicstar%d: Expected a large buffer, and this is not one.\n",
card->index);
which_list(card, skb);
@@ -35591,7 +32311,7 @@ index 5aca5f4..ce3a6b0 100644
recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
NS_PRV_IOVCNT(iovb));
vc->rx_iov = NULL;
-@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
printk(" - PDU size mismatch.\n");
else
printk(".\n");
@@ -35600,7 +32320,7 @@ index 5aca5f4..ce3a6b0 100644
recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
NS_PRV_IOVCNT(iovb));
vc->rx_iov = NULL;
-@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
/* skb points to a small buffer */
if (!atm_charge(vcc, skb->truesize)) {
push_rxbufs(card, skb);
@@ -35609,7 +32329,7 @@ index 5aca5f4..ce3a6b0 100644
} else {
skb_put(skb, len);
dequeue_sm_buf(card, skb);
-@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
ATM_SKB(skb)->vcc = vcc;
__net_timestamp(skb);
vcc->push(vcc, skb);
@@ -35618,7 +32338,7 @@ index 5aca5f4..ce3a6b0 100644
}
} else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
struct sk_buff *sb;
-@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
if (len <= NS_SMBUFSIZE) {
if (!atm_charge(vcc, sb->truesize)) {
push_rxbufs(card, sb);
@@ -35627,7 +32347,7 @@ index 5aca5f4..ce3a6b0 100644
} else {
skb_put(sb, len);
dequeue_sm_buf(card, sb);
-@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
ATM_SKB(sb)->vcc = vcc;
__net_timestamp(sb);
vcc->push(vcc, sb);
@@ -35636,7 +32356,7 @@ index 5aca5f4..ce3a6b0 100644
}
push_rxbufs(card, skb);
-@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
if (!atm_charge(vcc, skb->truesize)) {
push_rxbufs(card, skb);
@@ -35645,7 +32365,7 @@ index 5aca5f4..ce3a6b0 100644
} else {
dequeue_lg_buf(card, skb);
#ifdef NS_USE_DESTRUCTORS
-@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
ATM_SKB(skb)->vcc = vcc;
__net_timestamp(skb);
vcc->push(vcc, skb);
@@ -35654,7 +32374,7 @@ index 5aca5f4..ce3a6b0 100644
}
push_rxbufs(card, sb);
-@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
printk
("nicstar%d: Out of huge buffers.\n",
card->index);
@@ -35663,7 +32383,7 @@ index 5aca5f4..ce3a6b0 100644
recycle_iovec_rx_bufs(card,
(struct iovec *)
iovb->data,
-@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
card->hbpool.count++;
} else
dev_kfree_skb_any(hb);
@@ -35672,7 +32392,7 @@ index 5aca5f4..ce3a6b0 100644
} else {
/* Copy the small buffer to the huge buffer */
sb = (struct sk_buff *)iov->iov_base;
-@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
#endif /* NS_USE_DESTRUCTORS */
__net_timestamp(hb);
vcc->push(vcc, hb);
@@ -35682,10 +32402,10 @@ index 5aca5f4..ce3a6b0 100644
}
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
-index 32784d1..4a8434a 100644
+index adfce9f..35501e1 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
-@@ -838,7 +838,7 @@ void solos_bh(unsigned long card_arg)
+@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
vcc->push(vcc, skb);
@@ -35694,20 +32414,20 @@ index 32784d1..4a8434a 100644
break;
case PKT_STATUS:
-@@ -1116,7 +1116,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) {
- atomic_inc(&vcc->stats->tx);
+ atomic_inc_unchecked(&vcc->stats->tx);
solos_pop(vcc, oldskb);
- } else {
+ } else
dev_kfree_skb_irq(oldskb);
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
-index 0215934..ce9f5b1 100644
+index 90f1ccc..04c4a1e 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
-@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
+@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
#define ADD_LIMITED(s,v) \
@@ -35767,10 +32487,10 @@ index 5120a96..e2572bd 100644
}
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
-index 969c3c2..9b72956 100644
+index d889f56..17eb71e 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
-@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
+@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
}
if (!size) {
dev_kfree_skb_irq(skb);
@@ -35779,7 +32499,7 @@ index 969c3c2..9b72956 100644
continue;
}
if (!atm_charge(vcc,skb->truesize)) {
-@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
+@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
skb->len = size;
ATM_SKB(skb)->vcc = vcc;
vcc->push(vcc,skb);
@@ -35788,7 +32508,7 @@ index 969c3c2..9b72956 100644
}
zout(pos & 0xffff,MTA(mbx));
#if 0 /* probably a stupid idea */
-@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
+@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
skb_queue_head(&zatm_vcc->backlog,skb);
break;
}
@@ -35797,33 +32517,24 @@ index 969c3c2..9b72956 100644
wake_up(&zatm_vcc->tx_wait);
}
-diff --git a/drivers/base/bus.c b/drivers/base/bus.c
-index 4c289ab..de1c333 100644
---- a/drivers/base/bus.c
-+++ b/drivers/base/bus.c
-@@ -1193,7 +1193,7 @@ int subsys_interface_register(struct subsys_interface *sif)
- return -EINVAL;
-
- mutex_lock(&subsys->p->mutex);
-- list_add_tail(&sif->node, &subsys->p->interfaces);
-+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
- if (sif->add_dev) {
- subsys_dev_iter_init(&iter, subsys, NULL, NULL);
- while ((dev = subsys_dev_iter_next(&iter)))
-@@ -1218,7 +1218,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
- subsys = sif->subsys;
-
- mutex_lock(&subsys->p->mutex);
-- list_del_init(&sif->node);
-+ pax_list_del_init((struct list_head *)&sif->node);
- if (sif->remove_dev) {
- subsys_dev_iter_init(&iter, subsys, NULL, NULL);
- while ((dev = subsys_dev_iter_next(&iter)))
+diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
+index 8fc200b..32763bb 100644
+--- a/drivers/base/attribute_container.c
++++ b/drivers/base/attribute_container.c
+@@ -167,7 +167,7 @@ attribute_container_add_device(struct device *dev,
+ ic->classdev.parent = get_device(dev);
+ ic->classdev.class = cont->class;
+ cont->class->dev_release = attribute_container_release;
+- dev_set_name(&ic->classdev, dev_name(dev));
++ dev_set_name(&ic->classdev, "%s", dev_name(dev));
+ if (fn)
+ fn(cont, dev, &ic->classdev);
+ else
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
-index 7413d06..79155fa 100644
+index a4760e0..ea524a0 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
-@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
+@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
if (!thread)
return 0;
@@ -35832,7 +32543,7 @@ index 7413d06..79155fa 100644
if (err)
printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
else
-@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
+@@ -393,11 +393,11 @@ static int devtmpfsd(void *p)
*err = sys_unshare(CLONE_NEWNS);
if (*err)
goto out;
@@ -35848,45 +32559,37 @@ index 7413d06..79155fa 100644
while (1) {
spin_lock(&req_lock);
diff --git a/drivers/base/node.c b/drivers/base/node.c
-index bc9f43b..29703b8 100644
+index 5693ece..e39a621 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
-@@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
+@@ -587,18 +587,16 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
+ {
+ int n;
+
+- n = nodelist_scnprintf(buf, PAGE_SIZE, node_states[state]);
+- if (n > 0 && PAGE_SIZE > n + 1) {
+- *(buf + n++) = '\n';
+- *(buf + n++) = '\0';
+- }
++ n = nodelist_scnprintf(buf, PAGE_SIZE-2, node_states[state]);
++ buf[n++] = '\n';
++ buf[n] = '\0';
+ return n;
+ }
+
struct node_attr {
- struct device_attribute attr;
+ struct sysdev_class_attribute attr;
enum node_states state;
-};
+} __do_const;
- static ssize_t show_node_state(struct device *dev,
- struct device_attribute *attr, char *buf)
-diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
-index bfb8955..42c9b9a 100644
---- a/drivers/base/power/domain.c
-+++ b/drivers/base/power/domain.c
-@@ -1850,7 +1850,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
- {
- struct cpuidle_driver *cpuidle_drv;
- struct gpd_cpu_data *cpu_data;
-- struct cpuidle_state *idle_state;
-+ cpuidle_state_no_const *idle_state;
- int ret = 0;
-
- if (IS_ERR_OR_NULL(genpd) || state < 0)
-@@ -1918,7 +1918,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
- int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
- {
- struct gpd_cpu_data *cpu_data;
-- struct cpuidle_state *idle_state;
-+ cpuidle_state_no_const *idle_state;
- int ret = 0;
-
- if (IS_ERR_OR_NULL(genpd))
+ static ssize_t show_node_state(struct sysdev_class *class,
+ struct sysdev_class_attribute *attr, char *buf)
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
-index 03e089a..0e9560c 100644
+index adf41be0..b044daf 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
-@@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
+@@ -184,7 +184,7 @@ static ssize_t rtpm_status_show(struct device *dev,
return -EIO;
}
}
@@ -35896,10 +32599,10 @@ index 03e089a..0e9560c 100644
static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
-index 2d56f41..8830f19 100644
+index caf995f..6f76697 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
-@@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
+@@ -30,14 +30,14 @@ bool events_check_enabled;
* They need to be modified together atomically, so it's better to use one
* atomic variable to hold them both.
*/
@@ -35916,24 +32619,24 @@ index 2d56f41..8830f19 100644
*cnt = (comb >> IN_PROGRESS_BITS);
*inpr = comb & MAX_IN_PROGRESS;
-@@ -395,7 +395,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
- ws->start_prevent_time = ws->last_time;
+@@ -353,7 +353,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
+ ws->last_time = ktime_get();
/* Increment the counter of events in progress. */
-- cec = atomic_inc_return(&combined_event_count);
-+ cec = atomic_inc_return_unchecked(&combined_event_count);
-
- trace_wakeup_source_activate(ws->name, cec);
+- atomic_inc(&combined_event_count);
++ atomic_inc_unchecked(&combined_event_count);
}
-@@ -521,7 +521,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
+
+ /**
+@@ -443,7 +443,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.
*/
-- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
-+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
- trace_wakeup_source_deactivate(ws->name, cec);
+- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
++ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
+ }
- split_counters(&cnt, &inpr);
+ /**
diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
index e8d11b6..7b1b36f 100644
--- a/drivers/base/syscore.c
@@ -35957,10 +32660,10 @@ index e8d11b6..7b1b36f 100644
}
EXPORT_SYMBOL_GPL(unregister_syscore_ops);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
-index edfa251..1734d4d 100644
+index d7ad865..61ddf2c 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
-@@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h)
+@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
while (!list_empty(&h->reqQ)) {
c = list_entry(h->reqQ.next, CommandList_struct, list);
/* can't do anything if fifo is full */
@@ -35969,7 +32672,7 @@ index edfa251..1734d4d 100644
dev_warn(&h->pdev->dev, "fifo full\n");
break;
}
-@@ -3021,7 +3021,7 @@ static void start_io(ctlr_info_t *h)
+@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
h->Qdepth--;
/* Tell the controller execute command */
@@ -35978,7 +32681,7 @@ index edfa251..1734d4d 100644
/* Put job onto the completed Q */
addQ(&h->cmpQ, c);
-@@ -3447,17 +3447,17 @@ startio:
+@@ -3444,17 +3444,17 @@ startio:
static inline unsigned long get_next_completion(ctlr_info_t *h)
{
@@ -35999,7 +32702,7 @@ index edfa251..1734d4d 100644
(h->interrupts_enabled == 0));
}
-@@ -3490,7 +3490,7 @@ static inline u32 next_command(ctlr_info_t *h)
+@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
u32 a;
if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
@@ -36008,7 +32711,7 @@ index edfa251..1734d4d 100644
if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
a = *(h->reply_pool_head); /* Next cmd in ring buffer */
-@@ -4047,7 +4047,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
+@@ -4045,7 +4045,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
trans_support & CFGTBL_Trans_use_short_tags);
/* Change the access methods to the performant access methods */
@@ -36017,7 +32720,7 @@ index edfa251..1734d4d 100644
h->transMethod = CFGTBL_Trans_Performant;
return;
-@@ -4327,7 +4327,7 @@ static int cciss_pci_init(ctlr_info_t *h)
+@@ -4317,7 +4317,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
if (prod_index < 0)
return -ENODEV;
h->product_name = products[prod_index].product_name;
@@ -36026,7 +32729,7 @@ index edfa251..1734d4d 100644
if (cciss_board_disabled(h)) {
dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
-@@ -5059,7 +5059,7 @@ reinit_after_soft_reset:
+@@ -5042,7 +5042,7 @@ reinit_after_soft_reset:
}
/* make sure the board interrupts are off */
@@ -36035,7 +32738,7 @@ index edfa251..1734d4d 100644
rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
if (rc)
goto clean2;
-@@ -5109,7 +5109,7 @@ reinit_after_soft_reset:
+@@ -5094,7 +5094,7 @@ reinit_after_soft_reset:
* fake ones to scoop up any residual completions.
*/
spin_lock_irqsave(&h->lock, flags);
@@ -36044,7 +32747,7 @@ index edfa251..1734d4d 100644
spin_unlock_irqrestore(&h->lock, flags);
free_irq(h->intr[h->intr_mode], h);
rc = cciss_request_irq(h, cciss_msix_discard_completions,
-@@ -5129,9 +5129,9 @@ reinit_after_soft_reset:
+@@ -5114,9 +5114,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");
@@ -36056,7 +32759,7 @@ index edfa251..1734d4d 100644
rc = controller_reset_failed(h->cfgtable);
if (rc)
-@@ -5154,7 +5154,7 @@ reinit_after_soft_reset:
+@@ -5139,7 +5139,7 @@ reinit_after_soft_reset:
cciss_scsi_setup(h);
/* Turn the interrupts on so we can service requests */
@@ -36065,7 +32768,7 @@ index edfa251..1734d4d 100644
/* Get the firmware version */
inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
-@@ -5226,7 +5226,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
+@@ -5212,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");
@@ -36088,10 +32791,10 @@ index 7fda30e..eb5dfe0 100644
/* queue and queue Info */
struct list_head reqQ;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
-index 2b94403..fd6ad1f 100644
+index 504bc16..e13b631 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
-@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
+@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
goto Enomem4;
}
@@ -36100,7 +32803,7 @@ index 2b94403..fd6ad1f 100644
if (request_irq(hba[i]->intr, do_ida_intr,
IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
{
-@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
+@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
add_timer(&hba[i]->timer);
/* Enable IRQ now that spinlock and rate limit timer are set up */
@@ -36118,7 +32821,7 @@ index 2b94403..fd6ad1f 100644
break;
}
}
-@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
+@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
hba[ctlr]->intr = intr;
sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
hba[ctlr]->product_name = products[j].product_name;
@@ -36127,7 +32830,7 @@ index 2b94403..fd6ad1f 100644
hba[ctlr]->ctlr = ctlr;
hba[ctlr]->board_id = board_id;
hba[ctlr]->pci_dev = NULL; /* not PCI */
-@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
+@@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
while((c = h->reqQ) != NULL) {
/* Can't do anything if we're busy */
@@ -36136,7 +32839,7 @@ index 2b94403..fd6ad1f 100644
return;
/* Get the first entry from the request Q */
-@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
+@@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
h->Qdepth--;
/* Tell the controller to do our bidding */
@@ -36145,7 +32848,7 @@ index 2b94403..fd6ad1f 100644
/* Get onto the completion Q */
addQ(&h->cmpQ, c);
-@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
+@@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
unsigned long flags;
__u32 a,a1;
@@ -36154,7 +32857,7 @@ index 2b94403..fd6ad1f 100644
/* Is this interrupt for us? */
if (istat == 0)
return IRQ_NONE;
-@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
+@@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
*/
spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
if (istat & FIFO_NOT_EMPTY) {
@@ -36163,7 +32866,7 @@ index 2b94403..fd6ad1f 100644
a1 = a; a &= ~3;
if ((c = h->cmpQ) == NULL)
{
-@@ -1448,11 +1448,11 @@ static int sendcmd(
+@@ -1450,11 +1450,11 @@ static int sendcmd(
/*
* Disable interrupt
*/
@@ -36177,7 +32880,7 @@ index 2b94403..fd6ad1f 100644
if (temp != 0) {
break;
}
-@@ -1465,7 +1465,7 @@ DBG(
+@@ -1467,7 +1467,7 @@ DBG(
/*
* Send the cmd
*/
@@ -36186,7 +32889,7 @@ index 2b94403..fd6ad1f 100644
complete = pollcomplete(ctlr);
pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
-@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
+@@ -1550,9 +1550,9 @@ static int revalidate_allvol(ctlr_info_t *host)
* we check the new geometry. Then turn interrupts back on when
* we're done.
*/
@@ -36198,7 +32901,7 @@ index 2b94403..fd6ad1f 100644
for(i=0; i<NWD; i++) {
struct gendisk *disk = ida_gendisk[ctlr][i];
-@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
+@@ -1592,7 +1592,7 @@ static int pollcomplete(int ctlr)
/* Wait (up to 2 seconds) for a command to complete */
for (i = 200000; i > 0; i--) {
@@ -36221,11 +32924,11 @@ index be73e9d..7fbf140 100644
cmdlist_t *reqQ;
cmdlist_t *cmpQ;
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
-index 2d7f608..11245fe 100644
+index 9cf2035..bffca95 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
-@@ -582,7 +582,7 @@ struct drbd_epoch {
- struct drbd_tconn *tconn;
+@@ -736,7 +736,7 @@ struct drbd_request;
+ struct drbd_epoch {
struct list_head list;
unsigned int barrier_nr;
- atomic_t epoch_size; /* increased on every request added. */
@@ -36233,93 +32936,168 @@ index 2d7f608..11245fe 100644
atomic_t active; /* increased on every req. added, and dec on every finished. */
unsigned long flags;
};
-@@ -1022,7 +1022,7 @@ struct drbd_conf {
- unsigned int al_tr_number;
- int al_tr_cycle;
+@@ -1108,7 +1108,7 @@ struct drbd_conf {
+ void *int_dig_in;
+ void *int_dig_vv;
wait_queue_head_t seq_wait;
- atomic_t packet_seq;
+ atomic_unchecked_t packet_seq;
unsigned int peer_seq;
spinlock_t peer_seq_lock;
unsigned int minor;
-@@ -1572,7 +1572,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
- char __user *uoptval;
- int err;
+@@ -1617,30 +1617,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
-- uoptval = (char __user __force *)optval;
-+ uoptval = (char __force_user *)optval;
+ static inline void drbd_tcp_cork(struct socket *sock)
+ {
+- int __user val = 1;
++ int val = 1;
+ (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
+- (char __user *)&val, sizeof(val));
++ (char __force_user *)&val, sizeof(val));
+ }
- set_fs(KERNEL_DS);
- if (level == SOL_SOCKET)
+ static inline void drbd_tcp_uncork(struct socket *sock)
+ {
+- int __user val = 0;
++ int val = 0;
+ (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
+- (char __user *)&val, sizeof(val));
++ (char __force_user *)&val, sizeof(val));
+ }
+
+ static inline void drbd_tcp_nodelay(struct socket *sock)
+ {
+- int __user val = 1;
++ int val = 1;
+ (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
+- (char __user *)&val, sizeof(val));
++ (char __force_user *)&val, sizeof(val));
+ }
+
+ static inline void drbd_tcp_quickack(struct socket *sock)
+ {
+- int __user val = 2;
++ int val = 2;
+ (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
+- (char __user *)&val, sizeof(val));
++ (char __force_user *)&val, sizeof(val));
+ }
+
+ 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 55635ed..40e837c 100644
+index 0358e55..bc33689 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
-@@ -1317,7 +1317,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
- p->sector = sector;
- p->block_id = block_id;
- p->blksize = blksize;
-- p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
-+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
- return drbd_send_command(mdev, sock, cmd, sizeof(*p), NULL, 0);
- }
+@@ -2397,7 +2397,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;
+- p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
++ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
+
+ if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
+ return false;
+@@ -2696,7 +2696,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;
+ p.seq_num = cpu_to_be32(req->seq_num =
+- atomic_add_return(1, &mdev->packet_seq));
++ atomic_add_return_unchecked(1, &mdev->packet_seq));
-@@ -1619,7 +1619,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
- return -EIO;
- p->sector = cpu_to_be64(req->i.sector);
- p->block_id = (unsigned long)req;
-- p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
-+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
- if (mdev->state.conn >= C_SYNC_SOURCE &&
- mdev->state.conn <= C_PAUSED_SYNC_T)
-@@ -2574,8 +2574,8 @@ void conn_destroy(struct kref *kref)
- {
- struct drbd_tconn *tconn = container_of(kref, struct drbd_tconn, kref);
-
-- if (atomic_read(&tconn->current_epoch->epoch_size) != 0)
-- conn_err(tconn, "epoch_size:%d\n", atomic_read(&tconn->current_epoch->epoch_size));
-+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size) != 0)
-+ conn_err(tconn, "epoch_size:%d\n", atomic_read_unchecked(&tconn->current_epoch->epoch_size));
- kfree(tconn->current_epoch);
- idr_destroy(&tconn->volumes);
+@@ -2981,7 +2981,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->packet_seq, 0);
++ atomic_set_unchecked(&mdev->packet_seq, 0);
+ atomic_set(&mdev->pp_in_use, 0);
+ atomic_set(&mdev->pp_in_use_by_net, 0);
+ atomic_set(&mdev->rs_sect_in, 0);
+@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
+ mdev->receiver.t_state);
+
+ /* no need to lock it, I'm the only thread alive */
+- if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
+- dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
++ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
++ dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
+ mdev->al_writ_cnt =
+ mdev->bm_writ_cnt =
+ mdev->read_cnt =
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
-index 8cc1e64..ba7ffa9 100644
+index af2a250..0fdeb75 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
-@@ -3440,7 +3440,7 @@ out:
-
- void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
- {
-- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
-+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
- struct sk_buff *msg;
- struct drbd_genlmsghdr *d_out;
- unsigned seq;
-@@ -3453,7 +3453,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
- return;
+@@ -2297,7 +2297,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
+ return;
}
-- seq = atomic_inc_return(&drbd_genl_seq);
-+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
- msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
- if (!msg)
- goto failed;
+- if (!cap_raised(current_cap(), CAP_SYS_ADMIN)) {
++ if (!capable(CAP_SYS_ADMIN)) {
+ retcode = ERR_PERM;
+ goto fail;
+ }
+@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
+ module_put(THIS_MODULE);
+ }
+
+-static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
++static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
+
+ static unsigned short *
+ __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
+@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
+ cn_reply->id.idx = CN_IDX_DRBD;
+ cn_reply->id.val = CN_VAL_DRBD;
+
+- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
++ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
+ cn_reply->ack = 0; /* not used here. */
+ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
+ (int)((char *)tl - (char *)reply->tag_list);
+@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
+ cn_reply->id.idx = CN_IDX_DRBD;
+ cn_reply->id.val = CN_VAL_DRBD;
+
+- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
++ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
+ cn_reply->ack = 0; /* not used here. */
+ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
+ (int)((char *)tl - (char *)reply->tag_list);
+@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
+ cn_reply->id.idx = CN_IDX_DRBD;
+ cn_reply->id.val = CN_VAL_DRBD;
+
+- cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
++ cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
+ cn_reply->ack = 0; // not used here.
+ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
+ (int)((char*)tl - (char*)reply->tag_list);
+@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
+ cn_reply->id.idx = CN_IDX_DRBD;
+ cn_reply->id.val = CN_VAL_DRBD;
+
+- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
++ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
+ cn_reply->ack = 0; /* not used here. */
+ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
+ (int)((char *)tl - (char *)reply->tag_list);
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
-index cc29cd3..d4b058b 100644
+index 13cbdd3..d374957 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
-@@ -834,7 +834,7 @@ int drbd_connected(struct drbd_conf *mdev)
- {
- int err;
+@@ -894,7 +894,7 @@ retry:
+ sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
+ sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
- atomic_set(&mdev->packet_seq, 0);
+ atomic_set_unchecked(&mdev->packet_seq, 0);
mdev->peer_seq = 0;
- mdev->state_mutex = mdev->tconn->agreed_pro_version < 100 ?
-@@ -1193,7 +1193,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
+ drbd_thread_start(&mdev->asender);
+@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
do {
next_epoch = NULL;
@@ -36328,7 +33106,7 @@ index cc29cd3..d4b058b 100644
switch (ev & ~EV_CLEANUP) {
case EV_PUT:
-@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
+@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
rv = FE_DESTROYED;
} else {
epoch->flags = 0;
@@ -36337,16 +33115,24 @@ index cc29cd3..d4b058b 100644
/* atomic_set(&epoch->active, 0); is already zero */
if (rv == FE_STILL_LIVE)
rv = FE_RECYCLED;
-@@ -1451,7 +1451,7 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
- conn_wait_active_ee_empty(tconn);
- drbd_flush(tconn);
+@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
+ drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
+ drbd_flush(mdev);
-- if (atomic_read(&tconn->current_epoch->epoch_size)) {
-+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
+- if (atomic_read(&mdev->current_epoch->epoch_size)) {
++ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
if (epoch)
break;
-@@ -1464,11 +1464,11 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
+ }
+
+ epoch = mdev->current_epoch;
+- wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
++ wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
+
+ D_ASSERT(atomic_read(&epoch->active) == 0);
+ D_ASSERT(epoch->flags == 0);
+@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
}
epoch->flags = 0;
@@ -36354,97 +33140,88 @@ index cc29cd3..d4b058b 100644
+ atomic_set_unchecked(&epoch->epoch_size, 0);
atomic_set(&epoch->active, 0);
- spin_lock(&tconn->epoch_lock);
-- if (atomic_read(&tconn->current_epoch->epoch_size)) {
-+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
- list_add(&epoch->list, &tconn->current_epoch->list);
- tconn->current_epoch = epoch;
- tconn->epochs++;
-@@ -2172,7 +2172,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
-
- err = wait_for_and_update_peer_seq(mdev, peer_seq);
- drbd_send_ack_dp(mdev, P_NEG_ACK, p, pi->size);
-- atomic_inc(&tconn->current_epoch->epoch_size);
-+ atomic_inc_unchecked(&tconn->current_epoch->epoch_size);
- err2 = drbd_drain_block(mdev, pi->size);
- if (!err)
- err = err2;
-@@ -2206,7 +2206,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
+ spin_lock(&mdev->epoch_lock);
+- if (atomic_read(&mdev->current_epoch->epoch_size)) {
++ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
+ list_add(&epoch->list, &mdev->current_epoch->list);
+ mdev->current_epoch = epoch;
+ mdev->epochs++;
+@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
+ spin_unlock(&mdev->peer_seq_lock);
+
+ drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
+- atomic_inc(&mdev->current_epoch->epoch_size);
++ atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
+ return drbd_drain_block(mdev, data_size);
+ }
- spin_lock(&tconn->epoch_lock);
- peer_req->epoch = tconn->current_epoch;
-- atomic_inc(&peer_req->epoch->epoch_size);
-+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
- atomic_inc(&peer_req->epoch->active);
- spin_unlock(&tconn->epoch_lock);
+@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
-@@ -4347,7 +4347,7 @@ struct data_cmd {
+ spin_lock(&mdev->epoch_lock);
+ e->epoch = mdev->current_epoch;
+- atomic_inc(&e->epoch->epoch_size);
++ atomic_inc_unchecked(&e->epoch->epoch_size);
+ atomic_inc(&e->epoch->active);
+ spin_unlock(&mdev->epoch_lock);
+
+@@ -3637,7 +3637,7 @@ struct data_cmd {
int expect_payload;
size_t pkt_size;
- int (*fn)(struct drbd_tconn *, struct packet_info *);
+ drbd_cmd_handler_f function;
-};
+} __do_const;
static struct data_cmd drbd_cmd_handler[] = {
[P_DATA] = { 1, sizeof(struct p_data), receive_Data },
-@@ -4467,7 +4467,7 @@ static void conn_disconnect(struct drbd_tconn *tconn)
- if (!list_empty(&tconn->current_epoch->list))
- conn_err(tconn, "ASSERTION FAILED: tconn->current_epoch->list not empty\n");
+@@ -3884,7 +3884,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
+ D_ASSERT(list_empty(&mdev->done_ee));
+
/* ok, no more ee's on the fly, it is safe to reset the epoch_size */
-- atomic_set(&tconn->current_epoch->epoch_size, 0);
-+ atomic_set_unchecked(&tconn->current_epoch->epoch_size, 0);
- tconn->send.seen_any_write_yet = false;
+- atomic_set(&mdev->current_epoch->epoch_size, 0);
++ atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
+ D_ASSERT(list_empty(&mdev->current_epoch->list));
+ }
- conn_info(tconn, "Connection closed\n");
-@@ -5223,7 +5223,7 @@ static int tconn_finish_peer_reqs(struct drbd_tconn *tconn)
+@@ -4492,7 +4492,7 @@ static int got_skip(struct drbd_conf *mdev, struct p_header80 *h)
struct asender_cmd {
size_t pkt_size;
- int (*fn)(struct drbd_tconn *tconn, struct packet_info *);
+ int (*process)(struct drbd_conf *mdev, struct p_header80 *h);
-};
+} __do_const;
- static struct asender_cmd asender_tbl[] = {
- [P_PING] = { 0, got_Ping },
+ static struct asender_cmd *get_asender_cmd(int cmd)
+ {
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 40e7155..df5c79a 100644
+index a365562..933bbbd 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
+@@ -227,7 +227,7 @@ static int __do_lo_send_write(struct file *file,
+ mm_segment_t old_fs = get_fs();
- file_start_write(file);
set_fs(get_ds());
- bw = file->f_op->write(file, buf, len, &pos);
+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
set_fs(old_fs);
- file_end_write(file);
if (likely(bw == len))
+ return 0;
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
-index 5618847..5a46f3b 100644
+index a63b0a2..30228d1 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
-@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
+@@ -83,7 +83,7 @@
- static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
- {
-- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
-+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
- }
+ #define MAX_SPEED 0xffff
- /*
-@@ -1897,7 +1897,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
- return -EROFS;
- }
- pd->settings.fp = ti.fp;
-- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
-+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
+-#define ZONE(sector, pd) (((sector) + (pd)->offset) & ~((pd)->settings.size - 1))
++#define ZONE(sector, pd) (((sector) + (pd)->offset) & ~((pd)->settings.size - 1UL))
- if (ti.nwa_v) {
- pd->nwa = be32_to_cpu(ti.next_writable);
+ static DEFINE_MUTEX(pktcdvd_mutex);
+ static struct pktcdvd_device *pkt_devs[MAX_WRITERS];
diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
-index 60abf59..80789e1 100644
+index b5f83b4..2f49d18 100644
--- a/drivers/bluetooth/btwilink.c
+++ b/drivers/bluetooth/btwilink.c
-@@ -293,7 +293,7 @@ static int ti_st_send_frame(struct sk_buff *skb)
+@@ -301,7 +301,7 @@ static void ti_st_destruct(struct hci_dev *hdev)
static int bt_ti_probe(struct platform_device *pdev)
{
@@ -36453,24 +33230,11 @@ index 60abf59..80789e1 100644
struct hci_dev *hdev;
int err;
-diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
-index 2009266..7be9ca2 100644
---- a/drivers/bus/arm-cci.c
-+++ b/drivers/bus/arm-cci.c
-@@ -405,7 +405,7 @@ static int __init cci_probe(void)
-
- nb_cci_ports = cci_config->nb_ace + cci_config->nb_ace_lite;
-
-- ports = kcalloc(sizeof(*ports), nb_cci_ports, GFP_KERNEL);
-+ ports = kcalloc(nb_cci_ports, sizeof(*ports), GFP_KERNEL);
- if (!ports)
- return -ENOMEM;
-
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
-index 8a3aff7..d7538c2 100644
+index 1331740..a691234 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
-@@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
+@@ -419,7 +419,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
ENSURE(reset, CDC_RESET);
ENSURE(generic_packet, CDC_GENERIC_PACKET);
cdi->mc_flags = 0;
@@ -36478,7 +33242,7 @@ index 8a3aff7..d7538c2 100644
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)
+@@ -439,8 +438,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
else
cdi->cdda_method = CDDA_OLD;
@@ -36492,7 +33256,7 @@ index 8a3aff7..d7538c2 100644
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)
+@@ -461,7 +463,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
if (cdi->exit)
cdi->exit(cdi);
@@ -36500,7 +33264,7 @@ index 8a3aff7..d7538c2 100644
cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
}
-@@ -2107,7 +2108,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
+@@ -2110,7 +2111,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
*/
nr = nframes;
do {
@@ -36509,7 +33273,7 @@ index 8a3aff7..d7538c2 100644
if (cgc.buffer)
break;
-@@ -3429,7 +3430,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
+@@ -3432,7 +3433,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
struct cdrom_device_info *cdi;
int ret;
@@ -36519,7 +33283,7 @@ index 8a3aff7..d7538c2 100644
return 1;
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
-index 5980cb9..6d7bd7e 100644
+index 3ceaf00..e3c3d38 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
@@ -36531,7 +33295,7 @@ index 5980cb9..6d7bd7e 100644
static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 1421997..33f5d6d 100644
+index 4364303..9adf4ee 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
@@ -36544,7 +33308,7 @@ index 1421997..33f5d6d 100644
help
Say Y here if you want to support the /dev/kmem device. The
/dev/kmem device is rarely used, but can be used for certain
-@@ -570,6 +571,7 @@ config DEVPORT
+@@ -596,6 +597,7 @@ config DEVPORT
bool
depends on !M68K
depends on ISA || PCI
@@ -36566,10 +33330,10 @@ index a48e05b..6bac831 100644
kfree(usegment);
kfree(ksegment);
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
-index 1b19239..b87b143 100644
+index 2e04433..771f2cc 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
-@@ -819,7 +819,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
+@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -36578,7 +33342,7 @@ index 1b19239..b87b143 100644
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-@@ -849,7 +849,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
+@@ -847,7 +847,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
if (segment == NULL)
return -ENOMEM;
@@ -36587,8 +33351,53 @@ index 1b19239..b87b143 100644
sizeof(struct agp_segment) * reserve.seg_count)) {
kfree(segment);
return -EFAULT;
+diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
+index 095ab90..afad0a4 100644
+--- a/drivers/char/briq_panel.c
++++ b/drivers/char/briq_panel.c
+@@ -9,6 +9,7 @@
+ #include <linux/types.h>
+ #include <linux/errno.h>
+ #include <linux/tty.h>
++#include <linux/mutex.h>
+ #include <linux/timer.h>
+ #include <linux/kernel.h>
+ #include <linux/wait.h>
+@@ -34,6 +35,7 @@ static int vfd_is_open;
+ static unsigned char vfd[40];
+ static int vfd_cursor;
+ static unsigned char ledpb, led;
++static DEFINE_MUTEX(vfd_mutex);
+
+ static void update_vfd(void)
+ {
+@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
+ if (!vfd_is_open)
+ return -EBUSY;
+
++ mutex_lock(&vfd_mutex);
+ for (;;) {
+ char c;
+ if (!indx)
+ break;
+- if (get_user(c, buf))
++ if (get_user(c, buf)) {
++ mutex_unlock(&vfd_mutex);
+ return -EFAULT;
++ }
+ if (esc) {
+ set_led(c);
+ esc = 0;
+@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
+ buf++;
+ }
+ update_vfd();
++ mutex_unlock(&vfd_mutex);
+
+ return len;
+ }
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
-index 4f94375..413694e 100644
+index f773a9d..65cd683 100644
--- a/drivers/char/genrtc.c
+++ b/drivers/char/genrtc.c
@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
@@ -36600,10 +33409,10 @@ index 4f94375..413694e 100644
return -EINVAL;
else
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
-index 448ce5e..3a76625 100644
+index 14d49e4..d331fd8 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
-@@ -559,7 +559,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
+@@ -560,7 +560,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
}
static int
@@ -36626,10 +33435,10 @@ index 86fe45c..c0ea948 100644
}
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index ec4e10f..f2a763b 100644
+index 58c0e63..46c16bf 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
-@@ -420,7 +420,7 @@ struct ipmi_smi {
+@@ -415,7 +415,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -36638,7 +33447,7 @@ index ec4e10f..f2a763b 100644
/*
* run_to_completion duplicate of smb_info, smi_info
-@@ -453,9 +453,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
+@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
#define ipmi_inc_stat(intf, stat) \
@@ -36650,7 +33459,7 @@ index ec4e10f..f2a763b 100644
static int is_lan_addr(struct ipmi_addr *addr)
{
-@@ -2883,7 +2883,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
+@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
INIT_LIST_HEAD(&intf->cmd_rcvrs);
init_waitqueue_head(&intf->waitq);
for (i = 0; i < IPMI_NUM_STATS; i++)
@@ -36660,10 +33469,10 @@ index ec4e10f..f2a763b 100644
intf->proc_dir = NULL;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
-index 15e4a60..b046093 100644
+index 9397ab4..d01bee1 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
-@@ -280,7 +280,7 @@ struct smi_info {
+@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
/* Counters and things for the proc filesystem. */
@@ -36672,7 +33481,7 @@ index 15e4a60..b046093 100644
struct task_struct *thread;
-@@ -289,9 +289,9 @@ struct smi_info {
+@@ -286,9 +286,9 @@ struct smi_info {
};
#define smi_inc_stat(smi, stat) \
@@ -36684,7 +33493,7 @@ index 15e4a60..b046093 100644
#define SI_MAX_PARMS 4
-@@ -3324,7 +3324,7 @@ static int try_smi_init(struct smi_info *new_smi)
+@@ -3230,7 +3230,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++)
@@ -36693,8 +33502,21 @@ index 15e4a60..b046093 100644
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 1aeaaba..e018570 100644
+--- a/drivers/char/mbcs.c
++++ b/drivers/char/mbcs.c
+@@ -800,7 +800,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 f895a8c..2bc9147 100644
+index 1451790..046b083 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -18,6 +18,7 @@
@@ -36705,9 +33527,9 @@ index f895a8c..2bc9147 100644
#include <linux/ptrace.h>
#include <linux/device.h>
#include <linux/highmem.h>
-@@ -37,6 +38,10 @@
-
- #define DEVPORT_MINOR 4
+@@ -35,6 +36,10 @@
+ # include <linux/efi.h>
+ #endif
+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
+extern const struct file_operations grsec_fops;
@@ -36716,7 +33538,7 @@ index f895a8c..2bc9147 100644
static inline unsigned long size_inside_page(unsigned long start,
unsigned long size)
{
-@@ -68,9 +73,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
+@@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
while (cursor < to) {
if (!devmem_is_allowed(pfn)) {
@@ -36730,7 +33552,7 @@ index f895a8c..2bc9147 100644
return 0;
}
cursor += PAGE_SIZE;
-@@ -78,6 +87,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
+@@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
}
return 1;
}
@@ -36742,7 +33564,7 @@ index f895a8c..2bc9147 100644
#else
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
{
-@@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+@@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
while (count > 0) {
unsigned long remaining;
@@ -36750,7 +33572,7 @@ index f895a8c..2bc9147 100644
sz = size_inside_page(p, count);
-@@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+@@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
if (!ptr)
return -EFAULT;
@@ -36775,18 +33597,27 @@ index f895a8c..2bc9147 100644
unxlate_dev_mem_ptr(p, ptr);
if (remaining)
return -EFAULT;
-@@ -364,9 +395,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -376,7 +407,7 @@ static ssize_t read_oldmem(struct file *file, char __user *buf,
+ else
+ csize = count;
+
+- rc = copy_oldmem_page(pfn, buf, csize, offset, 1);
++ rc = copy_oldmem_page(pfn, (char __force_kernel *)buf, csize, offset, 1);
+ if (rc < 0)
+ return rc;
+ buf += csize;
+@@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
unsigned long p = *ppos;
- ssize_t low_count, read, sz;
+ ssize_t low_count, read, sz, err = 0;
- char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
+ char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
- int err = 0;
read = 0;
if (p < (unsigned long) high_memory) {
-@@ -388,6 +418,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
}
#endif
while (low_count > 0) {
@@ -36795,7 +33626,7 @@ index f895a8c..2bc9147 100644
sz = size_inside_page(p, low_count);
/*
-@@ -397,7 +429,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
*/
kbuf = xlate_dev_kmem_ptr((char *)p);
@@ -36819,9 +33650,21 @@ index f895a8c..2bc9147 100644
return -EFAULT;
buf += sz;
p += sz;
-@@ -822,6 +869,9 @@ static const struct memdev {
- #ifdef CONFIG_PRINTK
- [11] = { "kmsg", 0644, &kmsg_fops, NULL },
+@@ -815,6 +862,11 @@ static ssize_t kmsg_writev(struct kiocb *iocb, const struct iovec *iv,
+ ssize_t ret = -EFAULT;
+ size_t len = iov_length(iv, count);
+
++#ifdef CONFIG_GRKERNSEC_DMESG
++ if (!capable(CAP_SYSLOG))
++ return -EPERM;
++#endif
++
+ line = kmalloc(len + 1, GFP_KERNEL);
+ if (line == NULL)
+ return -ENOMEM;
+@@ -867,6 +919,9 @@ static const struct memdev {
+ #ifdef CONFIG_CRASH_DUMP
+ [12] = { "oldmem", 0, &oldmem_fops, NULL },
#endif
+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
@@ -36829,20 +33672,32 @@ index f895a8c..2bc9147 100644
};
static int memory_open(struct inode *inode, struct file *filp)
-@@ -893,7 +943,7 @@ static int __init chr_dev_init(void)
+@@ -931,7 +986,7 @@ static int __init chr_dev_init(void)
+ if (!devlist[minor].name)
continue;
-
device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
- NULL, devlist[minor].name);
+ NULL, "%s", devlist[minor].name);
}
return tty_init();
+diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c
+index c689697..04e6d6a2 100644
+--- a/drivers/char/mwave/tp3780i.c
++++ b/drivers/char/mwave/tp3780i.c
+@@ -479,6 +479,7 @@ int tp3780I_QueryAbilities(THINKPAD_BD_DATA * pBDData, MW_ABILITIES * pAbilities
+ PRINTK_2(TRACE_TP3780I,
+ "tp3780i::tp3780I_QueryAbilities entry pBDData %p\n", pBDData);
+
++ memset(pAbilities, 0, sizeof(*pAbilities));
+ /* fill out standard constant fields */
+ pAbilities->instr_per_sec = pBDData->rDspSettings.uIps;
+ pAbilities->data_size = pBDData->rDspSettings.uDStoreSize;
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
-index 9df78e2..01ba9ae 100644
+index da3cfee..a5a6606 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
-@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
+@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
spin_unlock_irq(&rtc_lock);
@@ -36851,83 +33706,8 @@ index 9df78e2..01ba9ae 100644
return -EFAULT;
*ppos = i;
-diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
-index d39cca6..8c1e269 100644
---- a/drivers/char/pcmcia/synclink_cs.c
-+++ b/drivers/char/pcmcia/synclink_cs.c
-@@ -2345,9 +2345,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",
-- __FILE__, __LINE__, info->device_name, port->count);
-+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
-
-- WARN_ON(!port->count);
-+ WARN_ON(!atomic_read(&port->count));
-
- if (tty_port_close_start(port, tty, filp) == 0)
- goto cleanup;
-@@ -2365,7 +2365,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__,
-- tty->driver->name, port->count);
-+ tty->driver->name, atomic_read(&port->count));
- }
-
- /* Wait until the transmitter is empty.
-@@ -2507,7 +2507,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",
-- __FILE__, __LINE__, tty->driver->name, port->count);
-+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
-
- /* If port is closing, signal caller to try again */
- if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
-@@ -2527,11 +2527,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
- goto cleanup;
- }
- spin_lock(&port->lock);
-- port->count++;
-+ atomic_inc(&port->count);
- spin_unlock(&port->lock);
- spin_unlock_irqrestore(&info->netlock, flags);
-
-- if (port->count == 1) {
-+ if (atomic_read(&port->count) == 1) {
- /* 1st open on this device, init hardware */
- retval = startup(info, tty);
- if (retval < 0)
-@@ -3920,7 +3920,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
- unsigned short new_crctype;
-
- /* return error if TTY interface open */
-- if (info->port.count)
-+ if (atomic_read(&info->port.count))
- return -EBUSY;
-
- switch (encoding)
-@@ -4024,7 +4024,7 @@ static int hdlcdev_open(struct net_device *dev)
-
- /* arbitrate between network and tty opens */
- spin_lock_irqsave(&info->netlock, flags);
-- if (info->port.count != 0 || info->netcount != 0) {
-+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
- printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
- spin_unlock_irqrestore(&info->netlock, flags);
- return -EBUSY;
-@@ -4114,7 +4114,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 (info->port.count)
-+ if (atomic_read(&info->port.count))
- return -EBUSY;
-
- if (cmd != SIOCWANDEV)
diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 7a744d3..35a177ee 100644
+index b651733..788c4ba 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -269,8 +269,13 @@
@@ -36962,7 +33742,15 @@ index 7a744d3..35a177ee 100644
#if 0
/* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
{ 2048, 1638, 1231, 819, 411, 1 },
-@@ -521,8 +533,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
+@@ -434,6 +446,7 @@ struct entropy_store {
+ int entropy_count;
+ int entropy_total;
+ unsigned int initialized:1;
++ bool last_data_init;
+ __u8 last_data[EXTRACT_SIZE];
+ };
+
+@@ -524,8 +537,8 @@ static void __mix_pool_bytes(struct entropy_store *r, const void *in,
input_rotate += i ? 7 : 14;
}
@@ -36973,7 +33761,71 @@ index 7a744d3..35a177ee 100644
smp_wmb();
if (out)
-@@ -1029,7 +1041,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
+@@ -877,6 +890,7 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min,
+ int reserved)
+ {
+ unsigned long flags;
++ int wakeup_write = 0;
+
+ /* Hold lock while accounting */
+ spin_lock_irqsave(&r->lock, flags);
+@@ -906,10 +920,8 @@ retry:
+ goto retry;
+ }
+
+- if (entropy_count < random_write_wakeup_thresh) {
+- wake_up_interruptible(&random_write_wait);
+- kill_fasync(&fasync, SIGIO, POLL_OUT);
+- }
++ if (entropy_count < random_write_wakeup_thresh)
++ wakeup_write = 1;
+ }
+
+ DEBUG_ENT("debiting %d entropy credits from %s%s\n",
+@@ -917,6 +929,11 @@ retry:
+
+ spin_unlock_irqrestore(&r->lock, flags);
+
++ if (wakeup_write) {
++ wake_up_interruptible(&random_write_wait);
++ kill_fasync(&fasync, SIGIO, POLL_OUT);
++ }
++
+ return nbytes;
+ }
+
+@@ -986,6 +1003,21 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
+ {
+ ssize_t ret = 0, i;
+ __u8 tmp[EXTRACT_SIZE];
++ unsigned long flags;
++
++ /* if last_data isn't primed, we need EXTRACT_SIZE extra bytes */
++ if (fips_enabled) {
++ spin_lock_irqsave(&r->lock, flags);
++ if (!r->last_data_init) {
++ r->last_data_init = true;
++ spin_unlock_irqrestore(&r->lock, flags);
++ xfer_secondary_pool(r, EXTRACT_SIZE);
++ extract_buf(r, tmp);
++ spin_lock_irqsave(&r->lock, flags);
++ memcpy(r->last_data, tmp, EXTRACT_SIZE);
++ }
++ spin_unlock_irqrestore(&r->lock, flags);
++ }
+
+ xfer_secondary_pool(r, nbytes);
+ nbytes = account(r, nbytes, min, reserved);
+@@ -994,8 +1026,6 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
+ extract_buf(r, tmp);
+
+ if (fips_enabled) {
+- unsigned long flags;
+-
+ spin_lock_irqsave(&r->lock, flags);
+ if (!memcmp(tmp, r->last_data, EXTRACT_SIZE))
+ panic("Hardware RNG duplicated output!\n");
+@@ -1036,7 +1066,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);
@@ -36982,7 +33834,15 @@ index 7a744d3..35a177ee 100644
ret = -EFAULT;
break;
}
-@@ -1365,7 +1377,7 @@ EXPORT_SYMBOL(generate_random_uuid);
+@@ -1113,6 +1143,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))
+@@ -1387,7 +1418,7 @@ EXPORT_SYMBOL(generate_random_uuid);
#include <linux/sysctl.h>
static int min_read_thresh = 8, min_write_thresh;
@@ -36991,28 +33851,28 @@ index 7a744d3..35a177ee 100644
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-@@ -1381,7 +1393,7 @@ static char sysctl_bootid[16];
- static int proc_do_uuid(struct ctl_table *table, int write,
+@@ -1403,7 +1434,7 @@ static char sysctl_bootid[16];
+ static int proc_do_uuid(ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-- struct ctl_table fake_table;
+- ctl_table fake_table;
+ ctl_table_no_const fake_table;
unsigned char buf[64], tmp_uuid[16], *uuid;
uuid = table->data;
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
-index 7cc1fe22..b602d6b 100644
+index 1ee8ce7..b778bef 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
-@@ -54,6 +54,7 @@
-
+@@ -55,6 +55,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
+ #include <asm/system.h>
+#include <asm/local.h>
#include <linux/sonypi.h>
-@@ -490,7 +491,7 @@ static struct sonypi_device {
+@@ -491,7 +492,7 @@ static struct sonypi_device {
spinlock_t fifo_lock;
wait_queue_head_t fifo_proc_list;
struct fasync_struct *fifo_async;
@@ -37021,7 +33881,7 @@ index 7cc1fe22..b602d6b 100644
int model;
struct input_dev *input_jog_dev;
struct input_dev *input_key_dev;
-@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
+@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
static int sonypi_misc_release(struct inode *inode, struct file *file)
{
mutex_lock(&sonypi_device.lock);
@@ -37030,7 +33890,7 @@ index 7cc1fe22..b602d6b 100644
mutex_unlock(&sonypi_device.lock);
return 0;
}
-@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
+@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
{
mutex_lock(&sonypi_device.lock);
/* Flush input queue on first open */
@@ -37042,29 +33902,24 @@ index 7cc1fe22..b602d6b 100644
mutex_unlock(&sonypi_device.lock);
return 0;
-diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
-index 64420b3..5c40b56 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)
+diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
+index 0d91655..96118e0 100644
+--- a/drivers/char/tpm/tpm.c
++++ b/drivers/char/tpm/tpm.c
+@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
+ chip->vendor.req_complete_val)
+ goto out_recv;
+
+- if ((status == chip->vendor.req_canceled)) {
++ if (status == chip->vendor.req_canceled) {
+ 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)
event = addr;
if ((event->event_type == 0 && event->event_size == 0) ||
@@ -37073,7 +33928,7 @@ index 84ddc55..1d32f1e 100644
return NULL;
return addr;
-@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
+@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
return NULL;
if ((event->event_type == 0 && event->event_size == 0) ||
@@ -37082,7 +33937,7 @@ index 84ddc55..1d32f1e 100644
return NULL;
(*pos)++;
-@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
+@@ -291,7 +291,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++)
@@ -37092,11 +33947,26 @@ index 84ddc55..1d32f1e 100644
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 b79cf3e..de172d64f 100644
+index c68b8ad..ef7a702 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
-@@ -682,7 +682,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
+@@ -570,7 +570,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
if (to_user) {
ssize_t ret;
@@ -37105,7 +33975,7 @@ index b79cf3e..de172d64f 100644
if (ret)
return -EFAULT;
} else {
-@@ -785,7 +785,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
+@@ -673,7 +673,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
if (!port_has_data(port) && !port->host_connected)
return 0;
@@ -37113,68 +33983,190 @@ index b79cf3e..de172d64f 100644
+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
}
- static int wait_port_writable(struct port *port, bool nonblock)
-diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
-index a33f46f..a720eed 100644
---- a/drivers/clk/clk-composite.c
-+++ b/drivers/clk/clk-composite.c
-@@ -122,7 +122,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
- struct clk *clk;
- struct clk_init_data init;
- struct clk_composite *composite;
-- struct clk_ops *clk_composite_ops;
-+ clk_ops_no_const *clk_composite_ops;
-
- composite = kzalloc(sizeof(*composite), GFP_KERNEL);
- if (!composite) {
-diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
-index 81dd31a..ef5c542 100644
---- a/drivers/clk/socfpga/clk.c
-+++ b/drivers/clk/socfpga/clk.c
-@@ -22,6 +22,7 @@
- #include <linux/clk-provider.h>
- #include <linux/io.h>
- #include <linux/of.h>
-+#include <asm/pgtable.h>
+ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
+diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
+index 46bbf43..9954dff 100644
+--- a/drivers/connector/cn_proc.c
++++ b/drivers/connector/cn_proc.c
+@@ -62,8 +62,9 @@ void proc_fork_connector(struct task_struct *task)
+ if (atomic_read(&proc_event_num_listeners) < 1)
+ return;
- /* Clock Manager offsets */
- #define CLKMGR_CTRL 0x0
-@@ -152,8 +153,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node,
- streq(clk_name, "periph_pll") ||
- streq(clk_name, "sdram_pll")) {
- socfpga_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
-- clk_pll_ops.enable = clk_gate_ops.enable;
-- clk_pll_ops.disable = clk_gate_ops.disable;
-+ pax_open_kernel();
-+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
-+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
-+ pax_close_kernel();
- }
+- msg = (struct cn_msg*)buffer;
+- ev = (struct proc_event*)msg->data;
++ msg = (struct cn_msg *)buffer;
++ ev = (struct proc_event *)msg->data;
++ memset(&ev->event_data, 0, sizeof(ev->event_data));
+ get_seq(&msg->seq, &ev->cpu);
+ ktime_get_ts(&ts); /* get high res monotonic timestamp */
+ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+@@ -79,6 +80,7 @@ void proc_fork_connector(struct task_struct *task)
+ memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+ msg->ack = 0; /* not used */
+ msg->len = sizeof(*ev);
++ msg->flags = 0; /* not used */
+ /* If cn_netlink_send() failed, the data is not sent */
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+ }
+@@ -93,8 +95,9 @@ void proc_exec_connector(struct task_struct *task)
+ if (atomic_read(&proc_event_num_listeners) < 1)
+ return;
- clk = clk_register(NULL, &socfpga_clk->hw.hw);
-@@ -244,7 +247,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
- return parent_rate / div;
- }
+- msg = (struct cn_msg*)buffer;
+- ev = (struct proc_event*)msg->data;
++ msg = (struct cn_msg *)buffer;
++ ev = (struct proc_event *)msg->data;
++ memset(&ev->event_data, 0, sizeof(ev->event_data));
+ get_seq(&msg->seq, &ev->cpu);
+ ktime_get_ts(&ts); /* get high res monotonic timestamp */
+ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+@@ -105,6 +108,7 @@ void proc_exec_connector(struct task_struct *task)
+ memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+ msg->ack = 0; /* not used */
+ msg->len = sizeof(*ev);
++ msg->flags = 0; /* not used */
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+ }
+
+@@ -119,8 +123,9 @@ void proc_id_connector(struct task_struct *task, int which_id)
+ if (atomic_read(&proc_event_num_listeners) < 1)
+ return;
--static struct clk_ops gateclk_ops = {
-+static clk_ops_no_const gateclk_ops __read_only = {
- .recalc_rate = socfpga_clk_recalc_rate,
- .get_parent = socfpga_clk_get_parent,
- .set_parent = socfpga_clk_set_parent,
+- msg = (struct cn_msg*)buffer;
+- ev = (struct proc_event*)msg->data;
++ msg = (struct cn_msg *)buffer;
++ ev = (struct proc_event *)msg->data;
++ memset(&ev->event_data, 0, sizeof(ev->event_data));
+ ev->what = which_id;
+ ev->event_data.id.process_pid = task->pid;
+ ev->event_data.id.process_tgid = task->tgid;
+@@ -144,6 +149,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
+ memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+ msg->ack = 0; /* not used */
+ msg->len = sizeof(*ev);
++ msg->flags = 0; /* not used */
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+ }
+
+@@ -159,6 +165,7 @@ void proc_sid_connector(struct task_struct *task)
+
+ msg = (struct cn_msg *)buffer;
+ ev = (struct proc_event *)msg->data;
++ memset(&ev->event_data, 0, sizeof(ev->event_data));
+ get_seq(&msg->seq, &ev->cpu);
+ ktime_get_ts(&ts); /* get high res monotonic timestamp */
+ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+@@ -169,6 +176,7 @@ void proc_sid_connector(struct task_struct *task)
+ memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+ msg->ack = 0; /* not used */
+ msg->len = sizeof(*ev);
++ msg->flags = 0; /* not used */
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+ }
+
+@@ -184,6 +192,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
+
+ msg = (struct cn_msg *)buffer;
+ ev = (struct proc_event *)msg->data;
++ memset(&ev->event_data, 0, sizeof(ev->event_data));
+ get_seq(&msg->seq, &ev->cpu);
+ ktime_get_ts(&ts); /* get high res monotonic timestamp */
+ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+@@ -202,6 +211,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
+ memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+ msg->ack = 0; /* not used */
+ msg->len = sizeof(*ev);
++ msg->flags = 0; /* not used */
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+ }
+
+@@ -217,6 +227,7 @@ void proc_comm_connector(struct task_struct *task)
+
+ msg = (struct cn_msg *)buffer;
+ ev = (struct proc_event *)msg->data;
++ memset(&ev->event_data, 0, sizeof(ev->event_data));
+ get_seq(&msg->seq, &ev->cpu);
+ ktime_get_ts(&ts); /* get high res monotonic timestamp */
+ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+@@ -228,6 +239,7 @@ void proc_comm_connector(struct task_struct *task)
+ memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+ msg->ack = 0; /* not used */
+ msg->len = sizeof(*ev);
++ msg->flags = 0; /* not used */
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+ }
+
+@@ -241,8 +253,9 @@ void proc_exit_connector(struct task_struct *task)
+ if (atomic_read(&proc_event_num_listeners) < 1)
+ return;
+
+- msg = (struct cn_msg*)buffer;
+- ev = (struct proc_event*)msg->data;
++ msg = (struct cn_msg *)buffer;
++ ev = (struct proc_event *)msg->data;
++ memset(&ev->event_data, 0, sizeof(ev->event_data));
+ get_seq(&msg->seq, &ev->cpu);
+ ktime_get_ts(&ts); /* get high res monotonic timestamp */
+ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+@@ -255,6 +268,7 @@ void proc_exit_connector(struct task_struct *task)
+ memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+ msg->ack = 0; /* not used */
+ msg->len = sizeof(*ev);
++ msg->flags = 0; /* not used */
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+ }
+
+@@ -276,8 +290,9 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
+ if (atomic_read(&proc_event_num_listeners) < 1)
+ return;
+
+- msg = (struct cn_msg*)buffer;
+- ev = (struct proc_event*)msg->data;
++ msg = (struct cn_msg *)buffer;
++ ev = (struct proc_event *)msg->data;
++ memset(&ev->event_data, 0, sizeof(ev->event_data));
+ msg->seq = rcvd_seq;
+ ktime_get_ts(&ts); /* get high res monotonic timestamp */
+ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
+@@ -287,6 +302,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
+ memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
+ msg->ack = rcvd_ack + 1;
+ msg->len = sizeof(*ev);
++ msg->flags = 0; /* not used */
+ cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
+ }
+
+diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
+index dde6a0f..ea6efe8 100644
+--- a/drivers/connector/connector.c
++++ b/drivers/connector/connector.c
+@@ -157,17 +157,18 @@ static int cn_call_callback(struct sk_buff *skb)
+ static void cn_rx_skb(struct sk_buff *__skb)
+ {
+ struct nlmsghdr *nlh;
+- int err;
+ struct sk_buff *skb;
++ int len, err;
+
+ skb = skb_get(__skb);
+
+ if (skb->len >= NLMSG_SPACE(0)) {
+ nlh = nlmsg_hdr(skb);
++ len = nlmsg_len(nlh);
+
+- if (nlh->nlmsg_len < sizeof(struct cn_msg) ||
++ if (len < (int)sizeof(struct cn_msg) ||
+ skb->len < nlh->nlmsg_len ||
+- nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) {
++ len > CONNECTOR_MAX_MSG_SIZE) {
+ kfree_skb(skb);
+ return;
+ }
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
-index 506fd23..01a593f 100644
+index 56c6c6b..99056e6 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
-@@ -172,7 +172,7 @@ static ssize_t show_global_boost(struct kobject *kobj,
- return sprintf(buf, "%u\n", boost_enabled);
- }
-
--static struct global_attr global_boost = __ATTR(boost, 0644,
-+static global_attr_no_const global_boost = __ATTR(boost, 0644,
- show_global_boost,
- store_global_boost);
-
-@@ -721,8 +721,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
+@@ -533,8 +533,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
per_cpu(acfreq_data, cpu) = data;
@@ -37188,7 +34180,7 @@ index 506fd23..01a593f 100644
result = acpi_processor_register_performance(data->acpi_data, cpu);
if (result)
-@@ -850,7 +853,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
+@@ -644,7 +647,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
break;
case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@ -37199,20 +34191,34 @@ index 506fd23..01a593f 100644
policy->cur = get_cur_freq_on_cpu(cpu);
break;
default:
+@@ -655,8 +660,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
+ acpi_processor_notify_smm(THIS_MODULE);
+
+ /* Check for APERF/MPERF support in hardware */
+- if (boot_cpu_has(X86_FEATURE_APERFMPERF))
+- acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;
++ if (boot_cpu_has(X86_FEATURE_APERFMPERF)) {
++ pax_open_kernel();
++ *(void **)&acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;
++ pax_close_kernel();
++ }
+
+ pr_debug("CPU%u - ACPI performance management activated.\n", cpu);
+ for (i = 0; i < perf->state_count; i++)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 04548f7..457a342 100644
+index 987a165..d7f2bcd 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
-@@ -2069,7 +2069,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
+@@ -1790,7 +1790,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
-static struct notifier_block __refdata cpufreq_cpu_notifier = {
+static struct notifier_block cpufreq_cpu_notifier = {
- .notifier_call = cpufreq_cpu_callback,
+ .notifier_call = cpufreq_cpu_callback,
};
-@@ -2101,8 +2101,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
+@@ -1819,8 +1819,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
pr_debug("trying to register driver %s\n", driver_data->name);
@@ -37224,100 +34230,13 @@ index 04548f7..457a342 100644
+ pax_close_kernel();
+ }
- write_lock_irqsave(&cpufreq_driver_lock, flags);
+ spin_lock_irqsave(&cpufreq_driver_lock, flags);
if (cpufreq_driver) {
-diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
-index 0806c31..6a73276 100644
---- a/drivers/cpufreq/cpufreq_governor.c
-+++ b/drivers/cpufreq/cpufreq_governor.c
-@@ -187,7 +187,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
- struct dbs_data *dbs_data;
- struct od_cpu_dbs_info_s *od_dbs_info = NULL;
- struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
-- struct od_ops *od_ops = NULL;
-+ const struct od_ops *od_ops = NULL;
- struct od_dbs_tuners *od_tuners = NULL;
- struct cs_dbs_tuners *cs_tuners = NULL;
- struct cpu_dbs_common_info *cpu_cdbs;
-@@ -253,7 +253,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
-
- if ((cdata->governor == GOV_CONSERVATIVE) &&
- (!policy->governor->initialized)) {
-- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
-+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
-
- cpufreq_register_notifier(cs_ops->notifier_block,
- CPUFREQ_TRANSITION_NOTIFIER);
-@@ -273,7 +273,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
-
- if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
- (policy->governor->initialized == 1)) {
-- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
-+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
-
- cpufreq_unregister_notifier(cs_ops->notifier_block,
- CPUFREQ_TRANSITION_NOTIFIER);
-diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
-index 88cd39f..87f0393 100644
---- a/drivers/cpufreq/cpufreq_governor.h
-+++ b/drivers/cpufreq/cpufreq_governor.h
-@@ -202,7 +202,7 @@ struct common_dbs_data {
- void (*exit)(struct dbs_data *dbs_data);
-
- /* Governor specific ops, see below */
-- void *gov_ops;
-+ const void *gov_ops;
- };
-
- /* Governor Per policy data */
-@@ -222,7 +222,7 @@ struct od_ops {
- unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
- unsigned int freq_next, unsigned int relation);
- void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
--};
-+} __no_const;
-
- struct cs_ops {
- struct notifier_block *notifier_block;
-diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
-index 32f26f6..feb657b 100644
---- a/drivers/cpufreq/cpufreq_ondemand.c
-+++ b/drivers/cpufreq/cpufreq_ondemand.c
-@@ -522,7 +522,7 @@ static void od_exit(struct dbs_data *dbs_data)
-
- define_get_cpu_dbs_routines(od_cpu_dbs_info);
-
--static struct od_ops od_ops = {
-+static struct od_ops od_ops __read_only = {
- .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
- .powersave_bias_target = generic_powersave_bias_target,
- .freq_increase = dbs_freq_increase,
-@@ -577,14 +577,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
- (struct cpufreq_policy *, unsigned int, unsigned int),
- unsigned int powersave_bias)
- {
-- od_ops.powersave_bias_target = f;
-+ pax_open_kernel();
-+ *(void **)&od_ops.powersave_bias_target = f;
-+ pax_close_kernel();
- od_set_powersave_bias(powersave_bias);
- }
- EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
-
- void od_unregister_powersave_bias_handler(void)
- {
-- od_ops.powersave_bias_target = generic_powersave_bias_target;
-+ pax_open_kernel();
-+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
-+ pax_close_kernel();
- od_set_powersave_bias(0);
- }
- EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
-index 4cf0d28..5830372 100644
+index 4bf374d..b170d80 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
-@@ -352,7 +352,7 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
+@@ -342,7 +342,7 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
}
/* priority=1 so this will get called before cpufreq_remove_dev */
@@ -37327,10 +34246,10 @@ index 4cf0d28..5830372 100644
.priority = 1,
};
diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
-index 2f0a2a6..93d728e 100644
+index 6be3e07..dafe020 100644
--- a/drivers/cpufreq/p4-clockmod.c
+++ b/drivers/cpufreq/p4-clockmod.c
-@@ -160,10 +160,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
+@@ -166,10 +166,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
case 0x0F: /* Core Duo */
case 0x16: /* Celeron Core */
case 0x1C: /* Atom */
@@ -37347,7 +34266,7 @@ index 2f0a2a6..93d728e 100644
/* fall through */
case 0x09: /* Pentium M (Banias) */
return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
-@@ -175,7 +179,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
+@@ -181,7 +185,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
/* on P-4s, the TSC runs with constant frequency independent whether
* throttling is active or not. */
@@ -37358,118 +34277,29 @@ index 2f0a2a6..93d728e 100644
if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
-diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
-index ac76b48..2445bc6 100644
---- a/drivers/cpufreq/sparc-us3-cpufreq.c
-+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
-@@ -18,14 +18,12 @@
- #include <asm/head.h>
- #include <asm/timer.h>
-
--static struct cpufreq_driver *cpufreq_us3_driver;
--
- struct us3_freq_percpu_info {
- struct cpufreq_frequency_table table[4];
- };
-
- /* Indexed by cpu number. */
--static struct us3_freq_percpu_info *us3_freq_table;
-+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
-
- /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
- * in the Safari config register.
-@@ -186,12 +184,25 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
-
- static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
- {
-- if (cpufreq_us3_driver)
-- us3_set_cpu_divider_index(policy, 0);
-+ us3_set_cpu_divider_index(policy->cpu, 0);
-
- return 0;
- }
-
-+static int __init us3_freq_init(void);
-+static void __exit us3_freq_exit(void);
-+
-+static struct cpufreq_driver cpufreq_us3_driver = {
-+ .init = us3_freq_cpu_init,
-+ .verify = us3_freq_verify,
-+ .target = us3_freq_target,
-+ .get = us3_freq_get,
-+ .exit = us3_freq_cpu_exit,
-+ .owner = THIS_MODULE,
-+ .name = "UltraSPARC-III",
-+
-+};
-+
- static int __init us3_freq_init(void)
- {
- unsigned long manuf, impl, ver;
-@@ -208,55 +219,15 @@ static int __init us3_freq_init(void)
- (impl == CHEETAH_IMPL ||
- impl == CHEETAH_PLUS_IMPL ||
- impl == JAGUAR_IMPL ||
-- impl == PANTHER_IMPL)) {
-- struct cpufreq_driver *driver;
--
-- ret = -ENOMEM;
-- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
-- if (!driver)
-- goto err_out;
--
-- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
-- GFP_KERNEL);
-- if (!us3_freq_table)
-- goto err_out;
--
-- driver->init = us3_freq_cpu_init;
-- driver->verify = us3_freq_verify;
-- driver->target = us3_freq_target;
-- driver->get = us3_freq_get;
-- driver->exit = us3_freq_cpu_exit;
-- strcpy(driver->name, "UltraSPARC-III");
--
-- cpufreq_us3_driver = driver;
-- ret = cpufreq_register_driver(driver);
-- if (ret)
-- goto err_out;
--
-- return 0;
--
--err_out:
-- if (driver) {
-- kfree(driver);
-- cpufreq_us3_driver = NULL;
-- }
-- kfree(us3_freq_table);
-- us3_freq_table = NULL;
-- return ret;
-- }
-+ impl == PANTHER_IMPL))
-+ return cpufreq_register_driver(&cpufreq_us3_driver);
+diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
+index f6cd315..ce0d3b7 100644
+--- a/drivers/cpufreq/powernow-k8.c
++++ b/drivers/cpufreq/powernow-k8.c
+@@ -1341,8 +1341,11 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
+ }
- return -ENODEV;
- }
+ /* Check for APERF/MPERF support in hardware */
+- if (cpu_has(c, X86_FEATURE_APERFMPERF))
+- cpufreq_amd64_driver.getavg = cpufreq_get_measured_perf;
++ if (cpu_has(c, X86_FEATURE_APERFMPERF)) {
++ pax_open_kernel();
++ *(void **)&cpufreq_amd64_driver.getavg = cpufreq_get_measured_perf;
++ pax_close_kernel();
++ }
- static void __exit us3_freq_exit(void)
- {
-- if (cpufreq_us3_driver) {
-- cpufreq_unregister_driver(cpufreq_us3_driver);
-- kfree(cpufreq_us3_driver);
-- cpufreq_us3_driver = NULL;
-- kfree(us3_freq_table);
-- us3_freq_table = NULL;
-- }
-+ cpufreq_unregister_driver(&cpufreq_us3_driver);
- }
+ cpufreq_frequency_table_get_attr(data->powernow_table, pol->cpu);
- MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
-index f897d51..15da295 100644
+index 6ea3455..4a1af8f 100644
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
-@@ -353,8 +353,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
+@@ -352,8 +352,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
!cpu_has(cpu, X86_FEATURE_EST))
return -ENODEV;
@@ -37484,10 +34314,10 @@ index f897d51..15da295 100644
if (policy->cpu != 0)
return -ENODEV;
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
-index d75040d..4738ca5 100644
+index 06ce268..1e0d3e4 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
-@@ -252,7 +252,7 @@ static int poll_idle(struct cpuidle_device *dev,
+@@ -188,7 +188,7 @@ static int poll_idle(struct cpuidle_device *dev,
static void poll_idle_init(struct cpuidle_driver *drv)
{
@@ -37519,20 +34349,20 @@ index ea2f8e7..70ac501 100644
}
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
-index 8739cc0..dc859d0 100644
+index 1e756e1..6f7ead5 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
-@@ -134,7 +134,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
+@@ -131,7 +131,7 @@ static struct attribute *cpuclass_switch_attrs[] = {
NULL
};
--static struct attribute_group cpuidle_attr_group = {
-+static attribute_group_no_const cpuidle_attr_group = {
- .attrs = cpuidle_default_attrs,
+-static struct attribute_group cpuclass_attr_group = {
++static attribute_group_no_const cpuclass_attr_group = {
+ .attrs = cpuclass_default_attrs,
.name = "cpuidle",
};
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
-index 12fea3e..1e28f47 100644
+index fe765f4..0bc6d6a 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
@@ -37544,7 +34374,7 @@ index 12fea3e..1e28f47 100644
#define ACRYPTO_OP_DECRYPT 0
#define ACRYPTO_OP_ENCRYPT 1
-@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+@@ -2576,7 +2576,7 @@ static int __devinit hifn_probe(struct pci_dev *pdev, const struct pci_device_id
goto err_out_disable_pci_device;
snprintf(name, sizeof(name), "hifn%d",
@@ -37554,32 +34384,36 @@ index 12fea3e..1e28f47 100644
err = pci_request_regions(pdev, name);
if (err)
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
-index c99c00d..990a4b2 100644
+index 59d24e9..0d20240 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
-@@ -607,7 +607,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
- goto err_out;
- }
-
-- list_add(&governor->node, &devfreq_governor_list);
-+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
-
- list_for_each_entry(devfreq, &devfreq_list, node) {
- int ret = 0;
-@@ -695,7 +695,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
- }
- }
+@@ -372,7 +372,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
+ = msecs_to_jiffies(devfreq->profile->polling_ms);
+ devfreq->nb.notifier_call = devfreq_notifier_call;
-- list_del(&governor->node);
-+ pax_list_del((struct list_head *)&governor->node);
- err_out:
- mutex_unlock(&devfreq_list_lock);
-
-diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
-index 1069e88..dfcd642 100644
---- a/drivers/dma/sh/shdmac.c
-+++ b/drivers/dma/sh/shdmac.c
-@@ -511,7 +511,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
+- dev_set_name(&devfreq->dev, dev_name(dev));
++ dev_set_name(&devfreq->dev, "%s", dev_name(dev));
+ err = device_register(&devfreq->dev);
+ if (err) {
+ put_device(&devfreq->dev);
+diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
+index eb1d864..39ee5a7 100644
+--- a/drivers/dma/dmatest.c
++++ b/drivers/dma/dmatest.c
+@@ -591,7 +591,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
+ }
+ if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
+ cnt = dmatest_add_threads(dtc, DMA_PQ);
+- thread_count += cnt > 0 ?: 0;
++ thread_count += cnt > 0 ? cnt : 0;
+ }
+
+ pr_info("dmatest: Started %u threads using %s\n",
+diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
+index 81809c2..6409470 100644
+--- a/drivers/dma/shdma.c
++++ b/drivers/dma/shdma.c
+@@ -1054,7 +1054,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
return ret;
}
@@ -37588,11 +34422,63 @@ index 1069e88..dfcd642 100644
.notifier_call = sh_dmae_nmi_handler,
/* Run before NMI debug handler and KGDB */
+diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
+index a9d5482..376077f 100644
+--- a/drivers/edac/amd64_edac.c
++++ b/drivers/edac/amd64_edac.c
+@@ -2682,7 +2682,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
+ * PCI core identifies what devices are on a system during boot, and then
+ * inquiry this table to see if this driver is for a given device found.
+ */
+-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
++static const struct pci_device_id amd64_pci_table[] __devinitconst = {
+ {
+ .vendor = PCI_VENDOR_ID_AMD,
+ .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
+diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
+index e47e73b..348e0bd 100644
+--- a/drivers/edac/amd76x_edac.c
++++ b/drivers/edac/amd76x_edac.c
+@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ AMD762},
+diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
+index 1af531a..3a8ff27 100644
+--- a/drivers/edac/e752x_edac.c
++++ b/drivers/edac/e752x_edac.c
+@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ E7520},
+diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
+index 6ffb6d2..383d8d7 100644
+--- a/drivers/edac/e7xxx_edac.c
++++ b/drivers/edac/e7xxx_edac.c
+@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
++static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ E7205},
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
-index 211021d..201d47f 100644
+index c3f6743..e2c52b0 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
-@@ -474,9 +474,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
+@@ -483,9 +483,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
*/
int edac_device_alloc_index(void)
{
@@ -37604,45 +34490,11 @@ index 211021d..201d47f 100644
}
EXPORT_SYMBOL_GPL(edac_device_alloc_index);
-diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
-index 9f7e0e60..348c875 100644
---- a/drivers/edac/edac_mc_sysfs.c
-+++ b/drivers/edac/edac_mc_sysfs.c
-@@ -150,7 +150,7 @@ static const char * const edac_caps[] = {
- struct dev_ch_attribute {
- struct device_attribute attr;
- int channel;
--};
-+} __do_const;
-
- #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
- struct dev_ch_attribute dev_attr_legacy_##_name = \
-@@ -1007,14 +1007,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
- }
-
- if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
-+ pax_open_kernel();
- if (mci->get_sdram_scrub_rate) {
-- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
-- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
-+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
-+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
- }
- if (mci->set_sdram_scrub_rate) {
-- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
-- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
-+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
-+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
- }
-+ pax_close_kernel();
- err = device_create_file(&mci->dev,
- &dev_attr_sdram_scrub_rate);
- if (err) {
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
-index dd370f9..0281629 100644
+index 2b378207..99ba0bd 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
static DEFINE_MUTEX(edac_pci_ctls_mutex);
static LIST_HEAD(edac_pci_list);
@@ -37651,7 +34503,7 @@ index dd370f9..0281629 100644
/*
* edac_pci_alloc_ctl_info
-@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
+@@ -316,7 +316,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
*/
int edac_pci_alloc_index(void)
{
@@ -37661,7 +34513,7 @@ index dd370f9..0281629 100644
EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
-index e8658e4..22746d6 100644
+index 8cc8676..90b70b9 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 */
@@ -37675,7 +34527,7 @@ index e8658e4..22746d6 100644
static struct kobject *edac_pci_top_main_kobj;
static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
-@@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
+@@ -236,7 +236,7 @@ struct edac_pci_dev_attribute {
void *value;
ssize_t(*show) (void *, char *);
ssize_t(*store) (void *, const char *, size_t);
@@ -37684,7 +34536,7 @@ index e8658e4..22746d6 100644
/* Set of show/store abstract level functions for PCI Parity object */
static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
-@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
edac_printk(KERN_CRIT, EDAC_PCI,
"Signaled System Error on %s\n",
pci_name(dev));
@@ -37693,7 +34545,7 @@ index e8658e4..22746d6 100644
}
if (status & (PCI_STATUS_PARITY)) {
-@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
"Master Data Parity Error on %s\n",
pci_name(dev));
@@ -37702,7 +34554,7 @@ index e8658e4..22746d6 100644
}
if (status & (PCI_STATUS_DETECTED_PARITY)) {
-@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
"Detected Parity Error on %s\n",
pci_name(dev));
@@ -37711,7 +34563,7 @@ index e8658e4..22746d6 100644
}
}
-@@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
"Signaled System Error on %s\n",
pci_name(dev));
@@ -37720,7 +34572,7 @@ index e8658e4..22746d6 100644
}
if (status & (PCI_STATUS_PARITY)) {
-@@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
"Master Data Parity Error on "
"%s\n", pci_name(dev));
@@ -37729,7 +34581,7 @@ index e8658e4..22746d6 100644
}
if (status & (PCI_STATUS_DETECTED_PARITY)) {
-@@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
"Detected Parity Error on %s\n",
pci_name(dev));
@@ -37738,7 +34590,7 @@ index e8658e4..22746d6 100644
}
}
}
-@@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
+@@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
if (!check_pci_errors)
return;
@@ -37747,7 +34599,7 @@ index e8658e4..22746d6 100644
/* scan all PCI devices looking for a Parity Error on devices and
* bridges.
-@@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
+@@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
/* Only if operator has selected panic on PCI Error */
if (edac_pci_get_panic_on_pe()) {
/* If the count is different 'after' from 'before' */
@@ -37756,24 +34608,206 @@ index e8658e4..22746d6 100644
panic("EDAC: PCI Parity Error");
}
}
+diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
+index c0510b3..6e2a954 100644
+--- a/drivers/edac/i3000_edac.c
++++ b/drivers/edac/i3000_edac.c
+@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ I3000},
+diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
+index aa08497..7e6822a 100644
+--- a/drivers/edac/i3200_edac.c
++++ b/drivers/edac/i3200_edac.c
+@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ I3200},
+diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
+index 4dc3ac2..67d05a6 100644
+--- a/drivers/edac/i5000_edac.c
++++ b/drivers/edac/i5000_edac.c
+@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
+ *
+ * The "E500P" device is the first device supported.
+ */
+-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
+ .driver_data = I5000P},
+
+diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
+index bcbdeec..9886d16 100644
+--- a/drivers/edac/i5100_edac.c
++++ b/drivers/edac/i5100_edac.c
+@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
+ /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
+ { 0, }
+diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
+index 74d6ec34..baff517 100644
+--- a/drivers/edac/i5400_edac.c
++++ b/drivers/edac/i5400_edac.c
+@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
+ *
+ * The "E500P" device is the first device supported.
+ */
+-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
+ {0,} /* 0 terminated list. */
+ };
+diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
+index 2244df0..8a3b7a9 100644
+--- a/drivers/edac/i7300_edac.c
++++ b/drivers/edac/i7300_edac.c
+@@ -1192,7 +1192,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
+ *
+ * Has only 8086:360c PCI ID
+ */
+-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
+ {0,} /* 0 terminated list. */
+ };
+diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
+index b3ccefa..d39303b 100644
+--- a/drivers/edac/i7core_edac.c
++++ b/drivers/edac/i7core_edac.c
+@@ -391,7 +391,7 @@ static const struct pci_id_table pci_dev_table[] = {
+ /*
+ * pci_device_id table for which devices we are looking for
+ */
+-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
+ {0,} /* 0 terminated list. */
+diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
+index 4329d39..f3022ef 100644
+--- a/drivers/edac/i82443bxgx_edac.c
++++ b/drivers/edac/i82443bxgx_edac.c
+@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
+
+ EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
+
+-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
+diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
+index 931a057..fd28340 100644
+--- a/drivers/edac/i82860_edac.c
++++ b/drivers/edac/i82860_edac.c
+@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ I82860},
+diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
+index 33864c6..01edc61 100644
+--- a/drivers/edac/i82875p_edac.c
++++ b/drivers/edac/i82875p_edac.c
+@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ I82875P},
+diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
+index 01658ca..092a452 100644
+--- a/drivers/edac/i82975x_edac.c
++++ b/drivers/edac/i82975x_edac.c
+@@ -601,7 +601,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ I82975X
diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
-index 51b7e3a..aa8a3e8 100644
+index 0106747..0b40417 100644
--- a/drivers/edac/mce_amd.h
+++ b/drivers/edac/mce_amd.h
-@@ -77,7 +77,7 @@ struct amd_decoder_ops {
- bool (*mc0_mce)(u16, u8);
- bool (*mc1_mce)(u16, u8);
- bool (*mc2_mce)(u16, u8);
+@@ -83,7 +83,7 @@ struct amd_decoder_ops {
+ bool (*dc_mce)(u16, u8);
+ bool (*ic_mce)(u16, u8);
+ bool (*nb_mce)(u16, u8);
-};
+} __no_const;
void amd_report_gart_errors(bool);
void amd_register_ecc_decoder(void (*f)(int, struct mce *));
+diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
+index b153674..ad2ba9b 100644
+--- a/drivers/edac/r82600_edac.c
++++ b/drivers/edac/r82600_edac.c
+@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
++static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
+ {
+ PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
+ },
+diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
+index da71881..8d7d62c 100644
+--- a/drivers/edac/sb_edac.c
++++ b/drivers/edac/sb_edac.c
+@@ -367,7 +367,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
+ /*
+ * pci_device_id table for which devices we are looking for
+ */
+-static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
++static const struct pci_device_id sbridge_pci_tbl[] __devinitconst = {
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
+ {0,} /* 0 terminated list. */
+ };
+diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
+index b6f47de..c5acf3a 100644
+--- a/drivers/edac/x38_edac.c
++++ b/drivers/edac/x38_edac.c
+@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
+ edac_mc_free(mci);
+ }
+
+-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
++static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
+ {
+ PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ X38},
diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
-index 57ea7f4..af06b76 100644
+index 85661b0..cdd4560 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
-@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
+@@ -512,9 +512,9 @@ void fw_card_initialize(struct fw_card *card,
const struct fw_card_driver *driver,
struct device *device)
{
@@ -37785,7 +34819,7 @@ index 57ea7f4..af06b76 100644
card->driver = driver;
card->device = device;
card->current_tlabel = 0;
-@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
+@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
void fw_core_remove_card(struct fw_card *card)
{
@@ -37794,11 +34828,25 @@ index 57ea7f4..af06b76 100644
card->driver->update_phy_reg(card, 4,
PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
+diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
+index b97d4f0..7578a4d 100644
+--- a/drivers/firewire/core-cdev.c
++++ b/drivers/firewire/core-cdev.c
+@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct client *client,
+ int ret;
+
+ if ((request->channels == 0 && request->bandwidth == 0) ||
+- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
+- request->bandwidth < 0)
++ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
+ return -EINVAL;
+
+ r = kmalloc(sizeof(*r), GFP_KERNEL);
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
-index de4aa40..49ab1f2 100644
+index 1f3dd51..1ad071c 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
-@@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
+@@ -232,7 +232,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
struct config_rom_attribute {
struct device_attribute attr;
u32 key;
@@ -37808,10 +34856,10 @@ index de4aa40..49ab1f2 100644
static ssize_t show_immediate(struct device *dev,
struct device_attribute *dattr, char *buf)
diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
-index e5af0e3..d318058 100644
+index 855ab3f..11f4bbd 100644
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
-@@ -38,6 +38,7 @@
+@@ -37,6 +37,7 @@
#include <linux/timer.h>
#include <linux/types.h>
#include <linux/workqueue.h>
@@ -37820,10 +34868,10 @@ index e5af0e3..d318058 100644
#include <asm/byteorder.h>
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
-index 515a42c..5ecf3ba 100644
+index b45be57..5fad18b 100644
--- a/drivers/firewire/core.h
+++ b/drivers/firewire/core.h
-@@ -111,6 +111,7 @@ struct fw_card_driver {
+@@ -101,6 +101,7 @@ struct fw_card_driver {
int (*stop_iso)(struct fw_iso_context *ctx);
};
@@ -37845,10 +34893,22 @@ index 94a58a0..f5eba42 100644
container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
-index fa0affb..aa448eb 100644
+index 4cd392d..4b629e1 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
-@@ -791,7 +791,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
+@@ -490,11 +490,6 @@ void __init dmi_scan_machine(void)
+ }
+ }
+ else {
+- /*
+- * no iounmap() for that ioremap(); it would be a no-op, but
+- * it's so early in setup that sucker gets confused into doing
+- * what it shouldn't if we actually call it.
+- */
+ p = dmi_ioremap(0xF0000, 0x10000);
+ if (p == NULL)
+ goto error;
+@@ -769,7 +764,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
if (buf == NULL)
return -1;
@@ -37857,45 +34917,28 @@ index fa0affb..aa448eb 100644
iounmap(buf);
return 0;
-diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 5145fa3..0d3babd 100644
---- a/drivers/firmware/efi/efi.c
-+++ b/drivers/firmware/efi/efi.c
-@@ -65,14 +65,16 @@ static struct attribute_group efi_subsys_attr_group = {
- };
-
- static struct efivars generic_efivars;
--static struct efivar_operations generic_ops;
-+static efivar_operations_no_const generic_ops __read_only;
-
- static int generic_ops_register(void)
- {
-- generic_ops.get_variable = efi.get_variable;
-- generic_ops.set_variable = efi.set_variable;
-- generic_ops.get_next_variable = efi.get_next_variable;
-- generic_ops.query_variable_store = efi_query_variable_store;
-+ pax_open_kernel();
-+ *(void **)&generic_ops.get_variable = efi.get_variable;
-+ *(void **)&generic_ops.set_variable = efi.set_variable;
-+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
-+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
-+ pax_close_kernel();
-
- return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
- }
-diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
-index 8a7432a..28fb839 100644
---- a/drivers/firmware/efi/efivars.c
-+++ b/drivers/firmware/efi/efivars.c
-@@ -452,7 +452,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
+diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
+index 2a64e69..ac8fe51 100644
+--- a/drivers/firmware/efivars.c
++++ b/drivers/firmware/efivars.c
+@@ -1221,7 +1221,7 @@ efivar_create_sysfs_entry(struct efivars *efivars,
static int
- create_efivars_bin_attributes(void)
+ create_efivars_bin_attributes(struct efivars *efivars)
{
- struct bin_attribute *attr;
+ bin_attribute_no_const *attr;
int error;
/* new_var */
+@@ -1413,7 +1413,7 @@ out:
+ }
+ EXPORT_SYMBOL_GPL(register_efivars);
+
+-static struct efivar_operations ops;
++static efivar_operations_no_const ops __read_only;
+
+ /*
+ * For now we register the efi subsystem with the firmware subsystem
diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
index 2a90ba6..07f3733 100644
--- a/drivers/firmware/google/memconsole.c
@@ -37911,21 +34954,8 @@ index 2a90ba6..07f3733 100644
ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
-diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
-index 814addb..0937d7f 100644
---- a/drivers/gpio/gpio-ich.c
-+++ b/drivers/gpio/gpio-ich.c
-@@ -71,7 +71,7 @@ struct ichx_desc {
- /* Some chipsets have quirks, let these use their own request/get */
- int (*request)(struct gpio_chip *chip, unsigned offset);
- int (*get)(struct gpio_chip *chip, unsigned offset);
--};
-+} __do_const;
-
- static struct {
- spinlock_t lock;
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
-index 9902732..64b62dd 100644
+index 98723cb..10ca85b 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
@@ -37937,11 +34967,107 @@ index 9902732..64b62dd 100644
return -EINVAL;
}
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index 3f1799b..3a853eb 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
+@@ -1379,7 +1379,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
+ */
+ if ((out_resp->count_modes >= mode_count) && mode_count) {
+ copied = 0;
+- mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
++ mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
+ list_for_each_entry(mode, &connector->modes, head) {
+ drm_crtc_convert_to_umode(&u_mode, mode);
+ if (copy_to_user(mode_ptr + copied,
+@@ -1394,8 +1394,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
+
+ if ((out_resp->count_props >= props_count) && props_count) {
+ copied = 0;
+- prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
+- prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
++ prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
++ prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
+ for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
+ if (connector->property_ids[i] != 0) {
+ if (put_user(connector->property_ids[i],
+@@ -1417,7 +1417,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
+
+ if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
+ copied = 0;
+- encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
++ encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
+ for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
+ if (connector->encoder_ids[i] != 0) {
+ if (put_user(connector->encoder_ids[i],
+@@ -1576,7 +1576,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
+ }
+
+ for (i = 0; i < crtc_req->count_connectors; i++) {
+- set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
++ set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
+ if (get_user(out_id, &set_connectors_ptr[i])) {
+ ret = -EFAULT;
+ goto out;
+@@ -1846,7 +1846,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
+ fb = obj_to_fb(obj);
+
+ num_clips = r->num_clips;
+- clips_ptr = (struct drm_clip_rect *)(unsigned long)r->clips_ptr;
++ clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
+
+ if (!num_clips != !clips_ptr) {
+ ret = -EINVAL;
+@@ -2272,7 +2272,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
+ out_resp->flags = property->flags;
+
+ if ((out_resp->count_values >= value_count) && value_count) {
+- values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
++ values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
+ for (i = 0; i < value_count; i++) {
+ if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
+ ret = -EFAULT;
+@@ -2285,7 +2285,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
+ if (property->flags & DRM_MODE_PROP_ENUM) {
+ if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
+ copied = 0;
+- enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
++ enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
+ list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
+
+ if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
+@@ -2308,7 +2308,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
+ if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
+ copied = 0;
+ blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
+- blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
++ blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
+
+ list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
+ if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
+@@ -2369,7 +2369,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
+ struct drm_mode_get_blob *out_resp = data;
+ struct drm_property_blob *blob;
+ int ret = 0;
+- void *blob_ptr;
++ void __user *blob_ptr;
+
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+@@ -2383,7 +2383,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
+ blob = obj_to_blob(obj);
+
+ if (out_resp->length == blob->length) {
+- blob_ptr = (void *)(unsigned long)out_resp->data;
++ blob_ptr = (void __user *)(unsigned long)out_resp->data;
+ if (copy_to_user(blob_ptr, blob->data, blob->length)){
+ ret = -EFAULT;
+ goto done;
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index c722c3b..2ec6040 100644
+index 11788f7..cd469eb 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -328,7 +328,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
+@@ -279,7 +279,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
struct drm_crtc *tmp;
int crtc_mask = 1;
@@ -37951,19 +35077,10 @@ index c722c3b..2ec6040 100644
dev = crtc->dev;
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index fe58d08..07bc38e 100644
+index 40c187c..59da444 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
-@@ -186,7 +186,7 @@ static void drm_legacy_dev_reinit(struct drm_device *dev)
- atomic_set(&dev->vma_count, 0);
-
- for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
-- atomic_set(&dev->counts[i], 0);
-+ atomic_set_unchecked(&dev->counts[i], 0);
-
- dev->sigdata.lock = NULL;
-
-@@ -302,7 +302,7 @@ module_exit(drm_core_exit);
+@@ -308,7 +308,7 @@ module_exit(drm_core_exit);
/**
* Copy and IOCTL return string to user space
*/
@@ -37972,70 +35089,85 @@ index fe58d08..07bc38e 100644
{
int len;
-@@ -372,7 +372,7 @@ long drm_ioctl(struct file *filp,
+@@ -378,7 +378,7 @@ long drm_ioctl(struct file *filp,
struct drm_file *file_priv = filp->private_data;
struct drm_device *dev;
- const struct drm_ioctl_desc *ioctl = NULL;
+ struct drm_ioctl_desc *ioctl;
- drm_ioctl_t *func;
+ drm_ioctl_no_const_t func;
unsigned int nr = DRM_IOCTL_NR(cmd);
int retcode = -EINVAL;
char stack_kdata[128];
-@@ -385,7 +385,7 @@ long drm_ioctl(struct file *filp,
- return -ENODEV;
+@@ -387,7 +387,7 @@ long drm_ioctl(struct file *filp,
+ dev = file_priv->minor->dev;
atomic_inc(&dev->ioctl_count);
- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
++file_priv->ioctl_count;
- if ((nr >= DRM_CORE_IOCTL_COUNT) &&
+ DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
+diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
+index fb94355..e1fcec5 100644
+--- a/drivers/gpu/drm/drm_encoder_slave.c
++++ b/drivers/gpu/drm/drm_encoder_slave.c
+@@ -54,16 +54,12 @@ int drm_i2c_encoder_init(struct drm_device *dev,
+ struct i2c_adapter *adap,
+ const struct i2c_board_info *info)
+ {
+- char modalias[sizeof(I2C_MODULE_PREFIX)
+- + I2C_NAME_SIZE];
+ struct module *module = NULL;
+ struct i2c_client *client;
+ struct drm_i2c_encoder_driver *encoder_drv;
+ int err = 0;
+
+- snprintf(modalias, sizeof(modalias),
+- "%s%s", I2C_MODULE_PREFIX, info->type);
+- request_module(modalias);
++ request_module("%s%s", I2C_MODULE_PREFIX, info->type);
+
+ client = i2c_new_device(adap, info);
+ if (!client) {
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 3f84277..c627c54 100644
+index 020b103..68ae292 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
-@@ -97,7 +97,7 @@ int drm_open(struct inode *inode, struct file *filp)
- if (drm_device_is_unplugged(dev))
- return -ENODEV;
+@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
+ }
+
+ for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
+- atomic_set(&dev->counts[i], 0);
++ atomic_set_unchecked(&dev->counts[i], 0);
+
+ dev->sigdata.lock = NULL;
+
+@@ -135,11 +135,11 @@ int drm_open(struct inode *inode, struct file *filp)
-- if (!dev->open_count++)
-+ if (local_inc_return(&dev->open_count) == 1)
- need_setup = 1;
- mutex_lock(&dev->struct_mutex);
- old_imapping = inode->i_mapping;
-@@ -113,7 +113,7 @@ int drm_open(struct inode *inode, struct file *filp)
retcode = drm_open_helper(inode, filp, dev);
- 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)
-@@ -128,7 +128,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);
-@@ -405,7 +405,7 @@ int drm_release(struct inode *inode, struct file *filp)
+ 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)
+- dev->open_count--;
++ local_dec(&dev->open_count);
+ }
+ }
+ if (!retcode) {
+@@ -476,7 +476,7 @@ int drm_release(struct inode *inode, struct file *filp)
mutex_lock(&drm_global_mutex);
- DRM_DEBUG("open_count = %d\n", dev->open_count);
-+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
++ DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
if (dev->driver->preclose)
dev->driver->preclose(dev, file_priv);
-@@ -414,10 +414,10 @@ int drm_release(struct inode *inode, struct file *filp)
- * Begin inline drm_release
- */
-
-- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
-+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
+@@ -488,7 +488,7 @@ int drm_release(struct inode *inode, struct file *filp)
+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
task_pid_nr(current),
(long)old_encode_dev(file_priv->minor->device),
- dev->open_count);
@@ -38043,7 +35175,7 @@ index 3f84277..c627c54 100644
/* Release any auth tokens that might point to this file_priv,
(do that under the drm_global_mutex) */
-@@ -516,8 +516,8 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -574,8 +574,8 @@ int drm_release(struct inode *inode, struct file *filp)
* End inline drm_release
*/
@@ -38055,7 +35187,7 @@ index 3f84277..c627c54 100644
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 f731116..629842c 100644
+index c87dc96..326055d 100644
--- a/drivers/gpu/drm/drm_global.c
+++ b/drivers/gpu/drm/drm_global.c
@@ -36,7 +36,7 @@
@@ -38116,7 +35248,7 @@ index f731116..629842c 100644
item->object = NULL;
}
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
-index 5329832..b503f49 100644
+index ab1162d..42587b2 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)
@@ -38147,7 +35279,7 @@ index 5329832..b503f49 100644
type = "??";
else
type = types[map->type];
-@@ -257,7 +261,11 @@ int drm_vma_info(struct seq_file *m, void *data)
+@@ -290,7 +294,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' : '-',
@@ -38160,10 +35292,10 @@ index 5329832..b503f49 100644
#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 2f4c434..dd12cd2 100644
+index ddd70db..d1db604 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,
+@@ -456,7 +456,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
request = compat_alloc_user_space(nbytes);
if (!access_ok(VERIFY_WRITE, request, nbytes))
return -EFAULT;
@@ -38172,7 +35304,7 @@ index 2f4c434..dd12cd2 100644
if (__put_user(count, &request->count)
|| __put_user(list, &request->list))
-@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
+@@ -517,7 +517,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
request = compat_alloc_user_space(nbytes);
if (!access_ok(VERIFY_WRITE, request, nbytes))
return -EFAULT;
@@ -38181,7 +35313,7 @@ index 2f4c434..dd12cd2 100644
if (__put_user(count, &request->count)
|| __put_user(list, &request->list))
-@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
+@@ -1015,7 +1015,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
return 0;
}
@@ -38190,7 +35322,7 @@ index 2f4c434..dd12cd2 100644
[DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
[DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
-@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
+@@ -1061,7 +1061,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -38198,7 +35330,7 @@ index 2f4c434..dd12cd2 100644
int ret;
/* Assume that ioctls without an explicit compat routine will just
-@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+@@ -1071,10 +1070,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (nr >= ARRAY_SIZE(drm_compat_ioctls))
return drm_ioctl(filp, cmd, arg);
@@ -38211,11 +35343,24 @@ index 2f4c434..dd12cd2 100644
else
ret = drm_ioctl(filp, cmd, arg);
+diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
+index 904d7e9..ab88581 100644
+--- a/drivers/gpu/drm/drm_ioctl.c
++++ b/drivers/gpu/drm/drm_ioctl.c
+@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev, void *data,
+ stats->data[i].value =
+ (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
+ else
+- stats->data[i].value = atomic_read(&dev->counts[i]);
++ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
+ stats->data[i].type = dev->types[i];
+ }
+
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
-index d752c96..fe08455 100644
+index 632ae24..244cf4a 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)
+@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
master->lock.lock_time = jiffies;
@@ -38224,7 +35369,7 @@ index d752c96..fe08455 100644
break; /* Got lock */
}
-@@ -157,7 +157,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
+@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
return -EINVAL;
}
@@ -38233,24 +35378,11 @@ index d752c96..fe08455 100644
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 39d8645..59e06fa 100644
---- a/drivers/gpu/drm/drm_stub.c
-+++ b/drivers/gpu/drm/drm_stub.c
-@@ -484,7 +484,7 @@ void drm_unplug_dev(struct drm_device *dev)
-
- drm_device_set_unplugged(dev);
-
-- if (dev->open_count == 0) {
-+ if (local_read(&dev->open_count) == 0) {
- drm_put_dev(dev);
- }
- mutex_unlock(&drm_global_mutex);
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
-index 2290b3b..22056a1 100644
+index 0f9ef9b..48bd695 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
-@@ -524,7 +524,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event);
+@@ -495,7 +495,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event);
int drm_sysfs_device_add(struct drm_minor *minor)
{
int err;
@@ -38260,10 +35392,10 @@ index 2290b3b..22056a1 100644
minor->kdev.parent = minor->dev->dev;
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
-index ab1892eb..d7009ca 100644
+index 8f371e8..9f85d52 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
-@@ -944,8 +944,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
+@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -38274,7 +35406,7 @@ index ab1892eb..d7009ca 100644
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-@@ -1105,8 +1105,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
+@@ -1111,8 +1111,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);
@@ -38286,7 +35418,7 @@ index ab1892eb..d7009ca 100644
sarea_priv->last_dispatch = (int)hw_status[5];
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
-index d4d16ed..8fb0b51 100644
+index c9339f4..f5e1b9d 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
@@ -38301,23 +35433,32 @@ index d4d16ed..8fb0b51 100644
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 a6f4cb5..6b2beb2 100644
+index 9b4e5c6..d7ec240 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
-@@ -624,7 +624,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
+@@ -500,7 +500,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_each_ring(ring, dev_priv, i) {
+ for (i = 0; i < I915_NUM_RINGS; i++) {
if (IS_GEN6(dev) || IS_GEN7(dev)) {
- seq_printf(m,
+ seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
+@@ -1234,7 +1234,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
+ return ret;
+
+ if (opregion->header)
+- seq_write(m, opregion->header, OPREGION_SIZE);
++ seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
+
+ mutex_unlock(&dev->struct_mutex);
+
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index d5c784d..06e5c36 100644
+index ca67338..0003ba7 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1263,7 +1263,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -1172,7 +1172,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
bool can_switch;
spin_lock(&dev->count_lock);
@@ -38327,23 +35468,50 @@ index d5c784d..06e5c36 100644
return can_switch;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index ab0f2c0..53c1bda 100644
+index 61274bf..72cb4a2 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -1181,7 +1181,7 @@ typedef struct drm_i915_private {
- drm_dma_handle_t *status_page_dmah;
- struct resource mch_res;
+@@ -321,7 +321,7 @@ typedef struct drm_i915_private {
+ int current_page;
+ int page_flipping;
- atomic_t irq_received;
+ atomic_unchecked_t irq_received;
/* protects the irq masks */
spinlock_t irq_lock;
+@@ -898,7 +898,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.
+ */
+- atomic_t pending_flip;
++ atomic_unchecked_t pending_flip;
+ };
+
+ #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
+@@ -1275,7 +1275,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
+ extern void intel_teardown_gmbus(struct drm_device *dev);
+ 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);
+-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
++static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
+ {
+ 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 bf34577..3fd2ffa 100644
+index b1bb734..324ed11 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -768,9 +768,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
+@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
+ 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);
+
+ /* The actual obj->write_domain will be updated with
+ * pending_write_domain after we emit the accumulated flush for all
+@@ -904,9 +904,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
static int
validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
@@ -38355,20 +35523,29 @@ index bf34577..3fd2ffa 100644
int relocs_total = 0;
int relocs_max = INT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
+@@ -1371,7 +1371,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
+ return -ENOMEM;
+ }
+ ret = copy_from_user(exec2_list,
+- (struct drm_i915_relocation_entry __user *)
++ (struct drm_i915_gem_exec_object2 __user *)
+ (uintptr_t) args->buffers_ptr,
+ sizeof(*exec2_list) * args->buffer_count);
+ if (ret != 0) {
diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
-index 3c59584..500f2e9 100644
+index 13b0289..5fb9e24 100644
--- a/drivers/gpu/drm/i915/i915_ioc32.c
+++ b/drivers/gpu/drm/i915/i915_ioc32.c
@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
(unsigned long)request);
}
--static drm_ioctl_compat_t *i915_compat_ioctls[] = {
-+static drm_ioctl_compat_t i915_compat_ioctls[] = {
+-drm_ioctl_compat_t *i915_compat_ioctls[] = {
++drm_ioctl_compat_t i915_compat_ioctls[] = {
[DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
[DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
[DRM_I915_GETPARAM] = compat_i915_getparam,
-@@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
+@@ -201,18 +201,15 @@ drm_ioctl_compat_t *i915_compat_ioctls[] = {
long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -38391,104 +35568,131 @@ index 3c59584..500f2e9 100644
return ret;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 4b91228..590c643 100644
+index 93e74fb..4a1182d 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -1085,7 +1085,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
- int pipe;
- u32 pipe_stats[I915_MAX_PIPES];
+@@ -496,7 +496,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
+ u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
+ struct drm_i915_master_private *master_priv;
- atomic_inc(&dev_priv->irq_received);
+ atomic_inc_unchecked(&dev_priv->irq_received);
- while (true) {
- iir = I915_READ(VLV_IIR);
-@@ -1390,7 +1390,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
- irqreturn_t ret = IRQ_NONE;
- bool err_int_reenable = false;
+ /* disable master interrupt before clearing iir */
+ de_ier = I915_READ(DEIER);
+@@ -579,7 +579,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
+ struct drm_i915_master_private *master_priv;
+ u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
- atomic_inc(&dev_priv->irq_received);
+ atomic_inc_unchecked(&dev_priv->irq_received);
- /* We get interrupts on unclaimed registers, so check for this before we
- * do any I915_{READ,WRITE}. */
-@@ -2146,7 +2146,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
- {
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- I915_WRITE(HWSTAM, 0xeffe);
-
-@@ -2164,7 +2164,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;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- /* VLV magic */
- I915_WRITE(VLV_IMR, 0);
-@@ -2452,7 +2452,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;
-
-- atomic_set(&dev_priv->irq_received, 0);
-+ atomic_set_unchecked(&dev_priv->irq_received, 0);
-
- for_each_pipe(pipe)
- I915_WRITE(PIPESTAT(pipe), 0);
-@@ -2530,7 +2530,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
- I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
+ if (IS_GEN6(dev))
+ bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
+@@ -1229,7 +1229,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+ int ret = IRQ_NONE, pipe;
+ bool blc_event = false;
- atomic_inc(&dev_priv->irq_received);
+ atomic_inc_unchecked(&dev_priv->irq_received);
- iir = I915_READ16(IIR);
- if (iir == 0)
-@@ -2604,7 +2604,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
+ iir = I915_READ(IIR);
+
+@@ -1748,7 +1748,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
+ {
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- int pipe;
- atomic_set(&dev_priv->irq_received, 0);
+ atomic_set_unchecked(&dev_priv->irq_received, 0);
- if (I915_HAS_HOTPLUG(dev)) {
- I915_WRITE(PORT_HOTPLUG_EN, 0);
-@@ -2703,7 +2703,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
- int pipe, ret = IRQ_NONE;
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
-
- iir = I915_READ(IIR);
- do {
-@@ -2827,7 +2827,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
+ INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
+ INIT_WORK(&dev_priv->error_work, i915_error_work_func);
+@@ -1936,7 +1936,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int pipe;
- atomic_set(&dev_priv->irq_received, 0);
+ atomic_set_unchecked(&dev_priv->irq_received, 0);
- I915_WRITE(PORT_HOTPLUG_EN, 0);
- I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
-@@ -2941,7 +2941,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
- I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
-
-- atomic_inc(&dev_priv->irq_received);
-+ atomic_inc_unchecked(&dev_priv->irq_received);
-
- iir = I915_READ(IIR);
-
+ INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
+ INIT_WORK(&dev_priv->error_work, i915_error_work_func);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index d78d33f..01d7c58 100644
+index ee29c1f..07609a4 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -9972,13 +9972,13 @@ struct intel_quirk {
+@@ -2215,7 +2215,7 @@ intel_finish_fb(struct drm_framebuffer *old_fb)
+
+ wait_event(dev_priv->pending_flip_queue,
+ atomic_read(&dev_priv->mm.wedged) ||
+- atomic_read(&obj->pending_flip) == 0);
++ atomic_read_unchecked(&obj->pending_flip) == 0);
+
+ /* Big Hammer, we also need to ensure that any pending
+ * MI_WAIT_FOR_EVENT inside a user batch buffer on the
+@@ -6987,8 +6987,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);
+@@ -7197,7 +7196,13 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
+ OUT_RING(fb->pitch | obj->tiling_mode);
+ OUT_RING(obj->gtt_offset);
+
+- pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
++ /* Contrary to the suggestions in the documentation,
++ * "Enable Panel Fitter" does not seem to be required when page
++ * flipping with a non-native mode, and worse causes a normal
++ * modeset to fail.
++ * pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
++ */
++ pf = 0;
+ pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
+ OUT_RING(pf | pipesrc);
+
+@@ -7329,7 +7334,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);
+
+ ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
+ if (ret)
+@@ -7343,7 +7348,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
+ return 0;
+
+ cleanup_pending:
+- 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);
+ crtc->fb = old_fb;
+ drm_gem_object_unreference(&work->old_fb_obj->base);
+ drm_gem_object_unreference(&obj->base);
+@@ -7478,11 +7483,15 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+ if (HAS_PCH_SPLIT(dev)) {
+ if (pipe == 2 && IS_IVYBRIDGE(dev))
+ intel_crtc->no_pll = true;
+- intel_helper_funcs.prepare = ironlake_crtc_prepare;
+- intel_helper_funcs.commit = ironlake_crtc_commit;
++ pax_open_kernel();
++ *(void **)&intel_helper_funcs.prepare = ironlake_crtc_prepare;
++ *(void **)&intel_helper_funcs.commit = ironlake_crtc_commit;
++ pax_close_kernel();
+ } else {
+- intel_helper_funcs.prepare = i9xx_crtc_prepare;
+- intel_helper_funcs.commit = i9xx_crtc_commit;
++ pax_open_kernel();
++ *(void **)&intel_helper_funcs.prepare = i9xx_crtc_prepare;
++ *(void **)&intel_helper_funcs.commit = i9xx_crtc_commit;
++ pax_close_kernel();
+ }
+
+ drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
+@@ -8858,7 +8867,7 @@ struct intel_quirk {
int subsystem_vendor;
int subsystem_device;
void (*hook)(struct drm_device *dev);
@@ -38497,46 +35701,8 @@ index d78d33f..01d7c58 100644
/* For systems that don't have a meaningful PCI subdevice/subvendor ID */
struct intel_dmi_quirk {
- void (*hook)(struct drm_device *dev);
- const struct dmi_system_id (*dmi_id_list)[];
--};
-+} __do_const;
-
- static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
- {
-@@ -9986,18 +9986,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
- return 1;
- }
-
--static const struct intel_dmi_quirk intel_dmi_quirks[] = {
-+static const struct dmi_system_id intel_dmi_quirks_table[] = {
- {
-- .dmi_id_list = &(const struct dmi_system_id[]) {
-- {
-- .callback = intel_dmi_reverse_brightness,
-- .ident = "NCR Corporation",
-- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
-- DMI_MATCH(DMI_PRODUCT_NAME, ""),
-- },
-- },
-- { } /* terminating entry */
-+ .callback = intel_dmi_reverse_brightness,
-+ .ident = "NCR Corporation",
-+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
- },
-+ },
-+ { } /* terminating entry */
-+};
-+
-+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
-+ {
-+ .dmi_id_list = &intel_dmi_quirks_table,
- .hook = quirk_invert_brightness,
- },
- };
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
-index ca4bc54..ee598a2 100644
+index 54558a0..2d97005 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
@@ -38552,10 +35718,10 @@ index ca4bc54..ee598a2 100644
unsigned int fb_cpp;
diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
-index 709e90d..89a1c0d 100644
+index c1f877b..0ae6960 100644
--- a/drivers/gpu/drm/mga/mga_ioc32.c
+++ b/drivers/gpu/drm/mga/mga_ioc32.c
-@@ -189,7 +189,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
+@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
return 0;
}
@@ -38564,7 +35730,7 @@ index 709e90d..89a1c0d 100644
[DRM_MGA_INIT] = compat_mga_init,
[DRM_MGA_GETPARAM] = compat_mga_getparam,
[DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
-@@ -207,18 +207,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
+@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -38587,10 +35753,10 @@ index 709e90d..89a1c0d 100644
return ret;
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
-index 598c281..60d590e 100644
+index 2581202..f230a8d9 100644
--- a/drivers/gpu/drm/mga/mga_irq.c
+++ b/drivers/gpu/drm/mga/mga_irq.c
-@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
+@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
if (crtc != 0)
return 0;
@@ -38599,7 +35765,7 @@ index 598c281..60d590e 100644
}
-@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
/* VBLANK interrupt */
if (status & MGA_VLINEPEN) {
MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
@@ -38608,7 +35774,7 @@ index 598c281..60d590e 100644
drm_handle_vblank(dev, 0);
handled = 1;
}
-@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
if ((prim_start & ~0x03) != (prim_end & ~0x03))
MGA_WRITE(MGA_PRIMEND, prim_end);
@@ -38617,7 +35783,7 @@ index 598c281..60d590e 100644
DRM_WAKEUP(&dev_priv->fence_queue);
handled = 1;
}
-@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
+@@ -130,7 +130,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,
@@ -38627,10 +35793,19 @@ index 598c281..60d590e 100644
*sequence = cur_fence;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
-index 3e72876..d1c15ad 100644
+index 5fc201b..7b032b9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
+@@ -201,7 +201,7 @@ struct methods {
+ const char desc[8];
+ void (*loadbios)(struct drm_device *, uint8_t *);
+ const bool rw;
+-};
++} __do_const;
+
+ static struct methods shadow_methods[] = {
+ { "PRAMIN", load_vbios_pramin, true },
+@@ -5474,7 +5474,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 *);
@@ -38639,23 +35814,93 @@ index 3e72876..d1c15ad 100644
#define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
-index 994fd6e..6e12565 100644
---- a/drivers/gpu/drm/nouveau/nouveau_drm.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
-@@ -94,7 +94,6 @@ struct nouveau_drm {
+diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
+index 4c0be3a..8f2cbb5 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
++++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
+@@ -238,7 +238,7 @@ struct nouveau_channel {
+ struct list_head pending;
+ uint32_t sequence;
+ uint32_t sequence_ack;
+- atomic_t last_sequence_irq;
++ atomic_unchecked_t last_sequence_irq;
+ struct nouveau_vma vma;
+ } fence;
+
+@@ -319,7 +319,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;
+@@ -341,13 +341,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;
+@@ -706,7 +706,7 @@ struct drm_nouveau_private {
struct drm_global_reference mem_global_ref;
struct ttm_bo_global_ref bo_global_ref;
struct ttm_bo_device bdev;
- atomic_t validate_sequence;
- int (*move)(struct nouveau_channel *,
- struct ttm_buffer_object *,
- struct ttm_mem_reg *, struct ttm_mem_reg *);
++ atomic_unchecked_t validate_sequence;
+ } ttm;
+
+ struct {
+diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
+index 2f6daae..c9d7b9e 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
++++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
+@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
+ if (USE_REFCNT(dev))
+ sequence = nvchan_rd32(chan, 0x48);
+ else
+- sequence = atomic_read(&chan->fence.last_sequence_irq);
++ sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq);
+
+ if (chan->fence.sequence_ack == sequence)
+ goto out;
+@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
+ return ret;
+ }
+
+- atomic_set(&chan->fence.last_sequence_irq, 0);
++ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
+ return 0;
+ }
+
+diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
+index 7ce3fde..cb3ea04 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
++++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
+@@ -314,7 +314,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);
+ retry:
+ if (++trycnt > 100000) {
+ NV_ERROR(dev, "%s failed and gave up.\n", __func__);
diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
-index c1a7e5a..38b8539 100644
+index 475ba81..a6c530c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
-@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
+@@ -51,7 +51,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg)
{
unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -38664,11 +35909,11 @@ index c1a7e5a..38b8539 100644
int ret;
if (nr < DRM_COMMAND_BASE)
-diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
-index 81638d7..2e45854 100644
---- a/drivers/gpu/drm/nouveau/nouveau_vga.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
-@@ -65,7 +65,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
+diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
+index 01adcfb..c6726fe 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_state.c
++++ b/drivers/gpu/drm/nouveau/nouveau_state.c
+@@ -544,7 +544,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
bool can_switch;
spin_lock(&dev->count_lock);
@@ -38677,195 +35922,24 @@ index 81638d7..2e45854 100644
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
-index eb89653..613cf71 100644
---- a/drivers/gpu/drm/qxl/qxl_cmd.c
-+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
-@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
- int ret;
-
- mutex_lock(&qdev->async_io_mutex);
-- irq_num = atomic_read(&qdev->irq_received_io_cmd);
-+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
- if (qdev->last_sent_io_cmd > irq_num) {
- if (intr)
- ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
-- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
-+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
- else
- ret = wait_event_timeout(qdev->io_cmd_event,
-- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
-+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
- /* 0 is timeout, just bail the "hw" has gone away */
- if (ret <= 0)
- goto out;
-- irq_num = atomic_read(&qdev->irq_received_io_cmd);
-+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
- }
- outb(val, addr);
- qdev->last_sent_io_cmd = irq_num + 1;
- if (intr)
- ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
-- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
-+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
- else
- ret = wait_event_timeout(qdev->io_cmd_event,
-- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
-+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
- out:
- if (ret > 0)
- ret = 0;
-diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
-index c3c2bbd..bc3c0fb 100644
---- a/drivers/gpu/drm/qxl/qxl_debugfs.c
-+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
-@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct qxl_device *qdev = node->minor->dev->dev_private;
-
-- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
-- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
-- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
-- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
-+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
-+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
-+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
-+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
- seq_printf(m, "%d\n", qdev->irq_received_error);
+diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
+index dbdea8e..cd6eeeb 100644
+--- a/drivers/gpu/drm/nouveau/nv04_graph.c
++++ b/drivers/gpu/drm/nouveau/nv04_graph.c
+@@ -554,7 +554,7 @@ static int
+ nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
+ u32 class, u32 mthd, u32 data)
+ {
+- atomic_set(&chan->fence.last_sequence_irq, data);
++ atomic_set_unchecked(&chan->fence.last_sequence_irq, data);
return 0;
}
-diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
-index f7c9add..fb971d2 100644
---- a/drivers/gpu/drm/qxl/qxl_drv.h
-+++ b/drivers/gpu/drm/qxl/qxl_drv.h
-@@ -290,10 +290,10 @@ struct qxl_device {
- unsigned int last_sent_io_cmd;
-
- /* interrupt handling */
-- atomic_t irq_received;
-- atomic_t irq_received_display;
-- atomic_t irq_received_cursor;
-- atomic_t irq_received_io_cmd;
-+ atomic_unchecked_t irq_received;
-+ atomic_unchecked_t irq_received_display;
-+ atomic_unchecked_t irq_received_cursor;
-+ atomic_unchecked_t irq_received_io_cmd;
- unsigned irq_received_error;
- wait_queue_head_t display_event;
- wait_queue_head_t cursor_event;
-diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
-index 21393dc..329f3a9 100644
---- a/drivers/gpu/drm/qxl/qxl_irq.c
-+++ b/drivers/gpu/drm/qxl/qxl_irq.c
-@@ -33,19 +33,19 @@ irqreturn_t qxl_irq_handler(DRM_IRQ_ARGS)
-
- pending = xchg(&qdev->ram_header->int_pending, 0);
-
-- atomic_inc(&qdev->irq_received);
-+ atomic_inc_unchecked(&qdev->irq_received);
-
- if (pending & QXL_INTERRUPT_DISPLAY) {
-- atomic_inc(&qdev->irq_received_display);
-+ atomic_inc_unchecked(&qdev->irq_received_display);
- wake_up_all(&qdev->display_event);
- qxl_queue_garbage_collect(qdev, false);
- }
- if (pending & QXL_INTERRUPT_CURSOR) {
-- atomic_inc(&qdev->irq_received_cursor);
-+ atomic_inc_unchecked(&qdev->irq_received_cursor);
- wake_up_all(&qdev->cursor_event);
- }
- if (pending & QXL_INTERRUPT_IO_CMD) {
-- atomic_inc(&qdev->irq_received_io_cmd);
-+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
- wake_up_all(&qdev->io_cmd_event);
- }
- if (pending & QXL_INTERRUPT_ERROR) {
-@@ -82,10 +82,10 @@ int qxl_irq_init(struct qxl_device *qdev)
- init_waitqueue_head(&qdev->io_cmd_event);
- INIT_WORK(&qdev->client_monitors_config_work,
- qxl_client_monitors_config_work_func);
-- atomic_set(&qdev->irq_received, 0);
-- atomic_set(&qdev->irq_received_display, 0);
-- atomic_set(&qdev->irq_received_cursor, 0);
-- atomic_set(&qdev->irq_received_io_cmd, 0);
-+ atomic_set_unchecked(&qdev->irq_received, 0);
-+ atomic_set_unchecked(&qdev->irq_received_display, 0);
-+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
-+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
- qdev->irq_received_error = 0;
- ret = drm_irq_install(qdev->ddev);
- qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
-diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
-index 037786d..2a95e33 100644
---- a/drivers/gpu/drm/qxl/qxl_ttm.c
-+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
-@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
- }
- }
-
--static struct vm_operations_struct qxl_ttm_vm_ops;
-+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
- static const struct vm_operations_struct *ttm_vm_ops;
-
- static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-@@ -147,8 +147,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
- return r;
- if (unlikely(ttm_vm_ops == NULL)) {
- ttm_vm_ops = vma->vm_ops;
-+ pax_open_kernel();
- qxl_ttm_vm_ops = *ttm_vm_ops;
- qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
-+ pax_close_kernel();
- }
- vma->vm_ops = &qxl_ttm_vm_ops;
- return 0;
-@@ -558,25 +560,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
- static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
- {
- #if defined(CONFIG_DEBUG_FS)
-- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
-- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
-- unsigned i;
-+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
-+ {
-+ .name = "qxl_mem_mm",
-+ .show = &qxl_mm_dump_table,
-+ },
-+ {
-+ .name = "qxl_surf_mm",
-+ .show = &qxl_mm_dump_table,
-+ }
-+ };
-
-- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
-- if (i == 0)
-- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
-- else
-- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
-- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
-- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
-- qxl_mem_types_list[i].driver_features = 0;
-- if (i == 0)
-- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
-- else
-- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
-+ pax_open_kernel();
-+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
-+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
-+ pax_close_kernel();
-- }
-- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
-+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
- #else
- return 0;
- #endif
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
-index c451257..0ad2134 100644
+index bcac90b..53bfc76 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
-@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
+@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
/* GH: Simple idle check.
*/
@@ -38875,7 +35949,7 @@ index c451257..0ad2134 100644
/* We don't support anything other than bus-mastering ring mode,
* but the ring can be in either AGP or PCI space for the ring
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
-index 56eb5e3..c4ec43d 100644
+index 930c71b..499aded 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
@@ -38896,10 +35970,10 @@ index 56eb5e3..c4ec43d 100644
u32 color_fmt;
unsigned int front_offset;
diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
-index a954c54..9cc595c 100644
+index 51c99fc..8acd411 100644
--- a/drivers/gpu/drm/r128/r128_ioc32.c
+++ b/drivers/gpu/drm/r128/r128_ioc32.c
-@@ -177,7 +177,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
+@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
}
@@ -38908,7 +35982,7 @@ index a954c54..9cc595c 100644
[DRM_R128_INIT] = compat_r128_init,
[DRM_R128_DEPTH] = compat_r128_depth,
[DRM_R128_STIPPLE] = compat_r128_stipple,
-@@ -196,18 +196,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
+@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -38931,10 +36005,10 @@ index a954c54..9cc595c 100644
return ret;
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
-index 2ea4f09..d391371 100644
+index 429d5a0..7e899ed 100644
--- a/drivers/gpu/drm/r128/r128_irq.c
+++ b/drivers/gpu/drm/r128/r128_irq.c
-@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
+@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
if (crtc != 0)
return 0;
@@ -38943,7 +36017,7 @@ index 2ea4f09..d391371 100644
}
irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
-@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -56,7 +56,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);
@@ -38953,10 +36027,10 @@ index 2ea4f09..d391371 100644
return IRQ_HANDLED;
}
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
-index 01dd9ae..6352f04 100644
+index a9e33ce..09edd4b 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
-@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
+@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
{
@@ -38969,11 +36043,26 @@ index 01dd9ae..6352f04 100644
}
#endif
+diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
+index a68057a..f3e26dd 100644
+--- a/drivers/gpu/drm/radeon/evergreen.c
++++ b/drivers/gpu/drm/radeon/evergreen.c
+@@ -3094,7 +3094,9 @@ static int evergreen_startup(struct radeon_device *rdev)
+ r = evergreen_blit_init(rdev);
+ if (r) {
+ r600_blit_fini(rdev);
+- rdev->asic->copy = NULL;
++ pax_open_kernel();
++ *(void **)&rdev->asic->copy = NULL;
++ pax_close_kernel();
+ dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
+ }
+
diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
-index af85299..ed9ac8d 100644
+index 5a82b6b..9e69c73 100644
--- a/drivers/gpu/drm/radeon/mkregtable.c
+++ b/drivers/gpu/drm/radeon/mkregtable.c
-@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
+@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
regex_t mask_rex;
regmatch_t match[4];
char buf[1024];
@@ -38990,11 +36079,156 @@ index af85299..ed9ac8d 100644
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
+diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
+index 77e6fb1..43e5aae 100644
+--- a/drivers/gpu/drm/radeon/ni.c
++++ b/drivers/gpu/drm/radeon/ni.c
+@@ -1380,7 +1380,9 @@ static int cayman_startup(struct radeon_device *rdev)
+ r = evergreen_blit_init(rdev);
+ if (r) {
+ r600_blit_fini(rdev);
+- rdev->asic->copy = NULL;
++ pax_open_kernel();
++ *(void **)&rdev->asic->copy = NULL;
++ pax_close_kernel();
+ dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
+ }
+
+diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
+index 76c1290..865d31e 100644
+--- a/drivers/gpu/drm/radeon/r100.c
++++ b/drivers/gpu/drm/radeon/r100.c
+@@ -592,8 +592,10 @@ int r100_pci_gart_init(struct radeon_device *rdev)
+ if (r)
+ return r;
+ rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;
+- rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
+- rdev->asic->gart_set_page = &r100_pci_gart_set_page;
++ pax_open_kernel();
++ *(void **)&rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
++ *(void **)&rdev->asic->gart_set_page = &r100_pci_gart_set_page;
++ pax_close_kernel();
+ return radeon_gart_table_ram_alloc(rdev);
+ }
+
+diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
+index 441570b..8896094 100644
+--- a/drivers/gpu/drm/radeon/r300.c
++++ b/drivers/gpu/drm/radeon/r300.c
+@@ -105,8 +105,10 @@ int rv370_pcie_gart_init(struct radeon_device *rdev)
+ if (r)
+ DRM_ERROR("Failed to register debugfs file for PCIE gart !\n");
+ rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;
+- rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
+- rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
++ pax_open_kernel();
++ *(void **)&rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
++ *(void **)&rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
++ pax_close_kernel();
+ return radeon_gart_table_vram_alloc(rdev);
+ }
+
+diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
+index 57e45c6..73bf8a5 100644
+--- a/drivers/gpu/drm/radeon/r600.c
++++ b/drivers/gpu/drm/radeon/r600.c
+@@ -2440,7 +2440,9 @@ int r600_startup(struct radeon_device *rdev)
+ r = r600_blit_init(rdev);
+ if (r) {
+ r600_blit_fini(rdev);
+- rdev->asic->copy = NULL;
++ pax_open_kernel();
++ *(void **)&rdev->asic->copy = NULL;
++ pax_close_kernel();
+ dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
+ }
+
+diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
+index cb1acff..8861bc5 100644
+--- a/drivers/gpu/drm/radeon/r600_cs.c
++++ b/drivers/gpu/drm/radeon/r600_cs.c
+@@ -1304,6 +1304,7 @@ static int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx,
+ h0 = G_038004_TEX_HEIGHT(word1) + 1;
+ d0 = G_038004_TEX_DEPTH(word1);
+ nfaces = 1;
++ array = 0;
+ switch (G_038000_DIM(word0)) {
+ case V_038000_SQ_TEX_DIM_1D:
+ case V_038000_SQ_TEX_DIM_2D:
+diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
+index 28e69e9..c4a82cc 100644
+--- a/drivers/gpu/drm/radeon/radeon.h
++++ b/drivers/gpu/drm/radeon/radeon.h
+@@ -177,7 +177,7 @@ extern int sumo_get_temp(struct radeon_device *rdev);
+ */
+ struct radeon_fence_driver {
+ uint32_t scratch_reg;
+- atomic_t seq;
++ atomic_unchecked_t seq;
+ uint32_t last_seq;
+ unsigned long last_jiffies;
+ unsigned long last_timeout;
+diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
+index a2e1eae..8e4a0ec 100644
+--- a/drivers/gpu/drm/radeon/radeon_asic.c
++++ b/drivers/gpu/drm/radeon/radeon_asic.c
+@@ -114,13 +114,17 @@ void radeon_agp_disable(struct radeon_device *rdev)
+ rdev->family == CHIP_R423) {
+ DRM_INFO("Forcing AGP to PCIE mode\n");
+ rdev->flags |= RADEON_IS_PCIE;
+- rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
+- rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
++ pax_open_kernel();
++ *(void **)&rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush;
++ *(void **)&rdev->asic->gart_set_page = &rv370_pcie_gart_set_page;
++ pax_close_kernel();
+ } else {
+ DRM_INFO("Forcing AGP to PCI mode\n");
+ rdev->flags |= RADEON_IS_PCI;
+- rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
+- rdev->asic->gart_set_page = &r100_pci_gart_set_page;
++ pax_open_kernel();
++ *(void **)&rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;
++ *(void **)&rdev->asic->gart_set_page = &r100_pci_gart_set_page;
++ pax_close_kernel();
+ }
+ rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
+ }
+@@ -974,10 +978,12 @@ int radeon_asic_init(struct radeon_device *rdev)
+ rdev->asic = &r420_asic;
+ /* handle macs */
+ if (rdev->bios == NULL) {
+- rdev->asic->get_engine_clock = &radeon_legacy_get_engine_clock;
+- rdev->asic->set_engine_clock = &radeon_legacy_set_engine_clock;
+- rdev->asic->get_memory_clock = &radeon_legacy_get_memory_clock;
+- rdev->asic->set_memory_clock = NULL;
++ pax_open_kernel();
++ *(void **)&rdev->asic->get_engine_clock = &radeon_legacy_get_engine_clock;
++ *(void **)&rdev->asic->set_engine_clock = &radeon_legacy_set_engine_clock;
++ *(void **)&rdev->asic->get_memory_clock = &radeon_legacy_get_memory_clock;
++ *(void **)&rdev->asic->set_memory_clock = NULL;
++ pax_close_kernel();
+ }
+ break;
+ case CHIP_RS400:
+@@ -1057,8 +1063,10 @@ int radeon_asic_init(struct radeon_device *rdev)
+ }
+
+ if (rdev->flags & RADEON_IS_IGP) {
+- rdev->asic->get_memory_clock = NULL;
+- rdev->asic->set_memory_clock = NULL;
++ pax_open_kernel();
++ *(void **)&rdev->asic->get_memory_clock = NULL;
++ *(void **)&rdev->asic->set_memory_clock = NULL;
++ pax_close_kernel();
+ }
+
+ return 0;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index 841d0e0..9eaa268 100644
+index 8cde84b..0d3f11f 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
-@@ -1117,7 +1117,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -687,7 +687,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
bool can_switch;
spin_lock(&dev->count_lock);
@@ -39004,10 +36238,10 @@ index 841d0e0..9eaa268 100644
return can_switch;
}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index b369d42..8dd04eb 100644
+index a1b59ca..86f2d44 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
-@@ -258,7 +258,7 @@ typedef struct drm_radeon_private {
+@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
/* SW interrupt */
wait_queue_head_t swi_queue;
@@ -39016,11 +36250,33 @@ index b369d42..8dd04eb 100644
int vblank_crtc;
uint32_t irq_enable_reg;
uint32_t r500_disp_irq_reg;
+diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
+index 76ec0e9..6feb1a3 100644
+--- a/drivers/gpu/drm/radeon/radeon_fence.c
++++ b/drivers/gpu/drm/radeon/radeon_fence.c
+@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
+ write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
+ return 0;
+ }
+- fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
++ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
+ if (!rdev->cp.ready)
+ /* FIXME: cp is not running assume everythings is done right
+ * away
+@@ -373,7 +373,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
+ return r;
+ }
+ radeon_fence_write(rdev, 0);
+- atomic_set(&rdev->fence_drv.seq, 0);
++ atomic_set_unchecked(&rdev->fence_drv.seq, 0);
+ INIT_LIST_HEAD(&rdev->fence_drv.created);
+ INIT_LIST_HEAD(&rdev->fence_drv.emited);
+ INIT_LIST_HEAD(&rdev->fence_drv.signaled);
diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
-index c180df8..5fd8186 100644
+index 48b7cea..b10b216 100644
--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
-@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
+@@ -359,7 +359,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)
@@ -39029,16 +36285,16 @@ index c180df8..5fd8186 100644
&request->value))
return -EFAULT;
-@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
+@@ -369,7 +369,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
#define compat_radeon_cp_setparam NULL
#endif /* X86_64 || IA64 */
--static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
-+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
+-drm_ioctl_compat_t *radeon_compat_ioctls[] = {
++drm_ioctl_compat_t radeon_compat_ioctls[] = {
[DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
[DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
[DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
-@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
+@@ -394,18 +394,15 @@ drm_ioctl_compat_t *radeon_compat_ioctls[] = {
long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -39061,10 +36317,10 @@ index c180df8..5fd8186 100644
return ret;
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
-index 8d68e97..9dcfed8 100644
+index 00da384..32f972d 100644
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
-@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
+@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
unsigned int ret;
RING_LOCALS;
@@ -39075,7 +36331,7 @@ index 8d68e97..9dcfed8 100644
BEGIN_RING(4);
OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
-@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
+@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
drm_radeon_private_t *dev_priv =
(drm_radeon_private_t *) dev->dev_private;
@@ -39084,8 +36340,38 @@ index 8d68e97..9dcfed8 100644
DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
dev->max_vblank_count = 0x001fffff;
+diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
+index 65be5e8..578b3c2 100644
+--- a/drivers/gpu/drm/radeon/radeon_ring.c
++++ b/drivers/gpu/drm/radeon/radeon_ring.c
+@@ -487,16 +487,20 @@ int radeon_debugfs_ib_init(struct radeon_device *rdev)
+ unsigned i;
+ int r;
+
+- radeon_debugfs_ib_bogus_info_list[0].data = rdev;
++ pax_open_kernel();
++ *(void **)&radeon_debugfs_ib_bogus_info_list[0].data = rdev;
++ pax_close_kernel();
+ r = radeon_debugfs_add_files(rdev, radeon_debugfs_ib_bogus_info_list, 1);
+ if (r)
+ return r;
+ for (i = 0; i < RADEON_IB_POOL_SIZE; i++) {
+ sprintf(radeon_debugfs_ib_names[i], "radeon_ib_%04u", i);
+- radeon_debugfs_ib_list[i].name = radeon_debugfs_ib_names[i];
+- radeon_debugfs_ib_list[i].show = &radeon_debugfs_ib_info;
+- radeon_debugfs_ib_list[i].driver_features = 0;
+- radeon_debugfs_ib_list[i].data = &rdev->ib_pool.ibs[i];
++ pax_open_kernel();
++ *(void **)&radeon_debugfs_ib_list[i].name = radeon_debugfs_ib_names[i];
++ *(void **)&radeon_debugfs_ib_list[i].show = &radeon_debugfs_ib_info;
++ *(u32 *)&radeon_debugfs_ib_list[i].driver_features = 0;
++ *(void **)&radeon_debugfs_ib_list[i].data = &rdev->ib_pool.ibs[i];
++ pax_close_kernel();
+ }
+ return radeon_debugfs_add_files(rdev, radeon_debugfs_ib_list,
+ RADEON_IB_POOL_SIZE);
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
-index 4d20910..6726b6d 100644
+index e8422ae..d22d4a8 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 *
@@ -39107,10 +36393,10 @@ index 4d20910..6726b6d 100644
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 71245d6..94c556d 100644
+index 0b5468b..74cfb87 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -784,7 +784,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
+@@ -631,7 +631,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
man->size = size >> PAGE_SHIFT;
}
@@ -39119,7 +36405,7 @@ index 71245d6..94c556d 100644
static const struct vm_operations_struct *ttm_vm_ops = NULL;
static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-@@ -825,8 +825,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
+@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
}
if (unlikely(ttm_vm_ops == NULL)) {
ttm_vm_ops = vma->vm_ops;
@@ -39130,14 +36416,14 @@ index 71245d6..94c556d 100644
}
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
-@@ -855,38 +857,33 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
+@@ -820,30 +822,25 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
{
#if defined(CONFIG_DEBUG_FS)
-- static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2];
-- static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+2][32];
+- static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+1];
+- static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+1][32];
- unsigned i;
-+ static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2] = {
++ static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+1] = {
+ {
+ .name = "radeon_vram_mm",
+ .show = &radeon_mm_dump_table,
@@ -39150,12 +36436,7 @@ index 71245d6..94c556d 100644
+ .name = "ttm_page_pool",
+ .show = &ttm_page_alloc_debugfs,
+ },
-+ {
-+ .name = "ttm_dma_page_pool",
-+ .show = &ttm_dma_page_alloc_debugfs,
-+ },
+ };
-+ unsigned i = RADEON_DEBUGFS_MEM_TYPES + 1;
- for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) {
- if (i == 0)
@@ -39176,32 +36457,22 @@ index 71245d6..94c556d 100644
- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
- radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs;
- radeon_mem_types_list[i].driver_features = 0;
-- radeon_mem_types_list[i++].data = NULL;
+- radeon_mem_types_list[i].data = NULL;
+ pax_open_kernel();
+ *(void **)&radeon_mem_types_list[0].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
+ *(void **)&radeon_mem_types_list[1].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
+ pax_close_kernel();
- #ifdef CONFIG_SWIOTLB
-- if (swiotlb_nr_tbl()) {
-- sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool");
-- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
-- radeon_mem_types_list[i].show = &ttm_dma_page_alloc_debugfs;
-- radeon_mem_types_list[i].driver_features = 0;
-- radeon_mem_types_list[i++].data = NULL;
-- }
-+ if (swiotlb_nr_tbl())
-+ i++;
- #endif
- return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i);
+ return radeon_debugfs_add_files(rdev, radeon_mem_types_list, RADEON_DEBUGFS_MEM_TYPES+1);
+ #endif
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
-index 1447d79..40b2a5b 100644
+index 93bce72..00332c1 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
-@@ -345,9 +345,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
- if (max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
+@@ -304,9 +304,11 @@ 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)
- max_bandwidth = rdev->pm.sideport_bandwidth;
+ rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
+ read_delay_latency.full = dfixed_const(800 * 1000);
read_delay_latency.full = dfixed_div(read_delay_latency,
@@ -39209,13 +36480,28 @@ index 1447d79..40b2a5b 100644
+ a.full = dfixed_const(370);
+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
} else {
- if (max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
+ if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
rdev->pm.k8_bandwidth.full)
+diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
+index 3e72074..9fbe45b 100644
+--- a/drivers/gpu/drm/radeon/rv770.c
++++ b/drivers/gpu/drm/radeon/rv770.c
+@@ -1083,7 +1083,9 @@ static int rv770_startup(struct radeon_device *rdev)
+ r = r600_blit_init(rdev);
+ if (r) {
+ r600_blit_fini(rdev);
+- rdev->asic->copy = NULL;
++ pax_open_kernel();
++ *(void **)&rdev->asic->copy = NULL;
++ pax_close_kernel();
+ dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
+ }
+
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
-index dbc2def..0a9f710 100644
+index e70ddd8..ddfa1cd 100644
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c
-@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
+@@ -263,7 +263,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
zone->glob = glob;
glob->zone_kernel = zone;
ret = kobject_init_and_add(
@@ -39224,7 +36510,7 @@ index dbc2def..0a9f710 100644
if (unlikely(ret != 0)) {
kobject_put(&zone->kobj);
return ret;
-@@ -347,7 +347,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
+@@ -346,7 +346,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
zone->glob = glob;
glob->zone_dma32 = zone;
ret = kobject_init_and_add(
@@ -39234,12 +36520,12 @@ index dbc2def..0a9f710 100644
kobject_put(&zone->kobj);
return ret;
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
-index 863bef9..cba15cf 100644
+index 9e4313e..46fad36 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
-@@ -391,9 +391,9 @@ out:
- static unsigned long
- ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
+@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages(void)
+ static int ttm_pool_mm_shrink(struct shrinker *shrink,
+ struct shrink_control *sc)
{
- static atomic_t start_pool = ATOMIC_INIT(0);
+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
@@ -39248,21 +36534,9 @@ index 863bef9..cba15cf 100644
+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
struct ttm_page_pool *pool;
int shrink_pages = sc->nr_to_scan;
- unsigned long freed = 0;
-diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
-index 97e9d61..bf23c461 100644
---- a/drivers/gpu/drm/udl/udl_fb.c
-+++ b/drivers/gpu/drm/udl/udl_fb.c
-@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
- fb_deferred_io_cleanup(info);
- kfree(info->fbdefio);
- info->fbdefio = NULL;
-- info->fbops->fb_mmap = udl_fb_mmap;
- }
- pr_warn("released /dev/fb%d user=%d count=%d\n",
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
-index a811ef2..ff99b05 100644
+index 9cf87d9..2000b7d 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 {
@@ -39284,10 +36558,10 @@ index a811ef2..ff99b05 100644
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 ac98964..5dbf512 100644
+index d391f48..10c8ca3 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
-@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
+@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
if (crtc != 0)
return 0;
@@ -39296,7 +36570,7 @@ index ac98964..5dbf512 100644
}
irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
-@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
status = VIA_READ(VIA_REG_INTERRUPT);
if (status & VIA_IRQ_VBLANK_PENDING) {
@@ -39307,7 +36581,7 @@ index ac98964..5dbf512 100644
do_gettimeofday(&cur_vblank);
if (dev_priv->last_vblank_valid) {
dev_priv->usec_per_vblank =
-@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
dev_priv->last_vblank = cur_vblank;
dev_priv->last_vblank_valid = 1;
}
@@ -39316,7 +36590,7 @@ index ac98964..5dbf512 100644
DRM_DEBUG("US per vblank is: %u\n",
dev_priv->usec_per_vblank);
}
-@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -138,7 +138,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) {
@@ -39325,7 +36599,7 @@ index ac98964..5dbf512 100644
DRM_WAKEUP(&cur_irq->irq_queue);
handled = 1;
if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
-@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
+@@ -243,11 +243,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]));
@@ -39339,7 +36613,7 @@ index ac98964..5dbf512 100644
*sequence) <= (1 << 23)));
}
*sequence = cur_irq_sequence;
-@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
+@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
}
for (i = 0; i < dev_priv->num_irqs; ++i) {
@@ -39348,7 +36622,7 @@ index ac98964..5dbf512 100644
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);
-@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
+@@ -367,7 +367,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 +=
@@ -39358,10 +36632,10 @@ index ac98964..5dbf512 100644
case VIA_IRQ_ABSOLUTE:
break;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-index 150ec64..f5165f2 100644
+index 0e3fa7d..35f9ed6 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-@@ -290,7 +290,7 @@ struct vmw_private {
+@@ -260,7 +260,7 @@ struct vmw_private {
* Fencing and IRQs.
*/
@@ -39371,7 +36645,7 @@ index 150ec64..f5165f2 100644
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 3eb1486..0a47ee9 100644
+index a0c2f12..68ae6cb 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)
@@ -39411,10 +36685,10 @@ index 3eb1486..0a47ee9 100644
if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
-index c509d40..3b640c3 100644
+index 66917c6..2dcc8ae 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
-@@ -138,7 +138,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
+@@ -135,7 +135,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
int ret;
num_clips = arg->num_clips;
@@ -39423,7 +36697,7 @@ index c509d40..3b640c3 100644
if (unlikely(num_clips == 0))
return 0;
-@@ -222,7 +222,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
+@@ -221,7 +221,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
int ret;
num_clips = arg->num_clips;
@@ -39433,7 +36707,7 @@ index c509d40..3b640c3 100644
if (unlikely(num_clips == 0))
return 0;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
-index 4640adb..e1384ed 100644
+index cabc95f..14b3d77 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,
@@ -39467,46 +36741,11 @@ index 8a8725c2..afed796 100644
else {
marker = list_first_entry(&queue->head,
struct vmw_marker, head);
-diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c
-index b1a05ad..1c9d899 100644
---- a/drivers/gpu/host1x/drm/dc.c
-+++ b/drivers/gpu/host1x/drm/dc.c
-@@ -1004,7 +1004,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
- }
-
- for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
-- dc->debugfs_files[i].data = dc;
-+ *(void **)&dc->debugfs_files[i].data = dc;
-
- err = drm_debugfs_create_files(dc->debugfs_files,
- ARRAY_SIZE(debugfs_files),
-diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
-index ec0ae2d..dc0780b 100644
---- a/drivers/gpu/vga/vga_switcheroo.c
-+++ b/drivers/gpu/vga/vga_switcheroo.c
-@@ -643,7 +643,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
-
- /* this version is for the case where the power switch is separate
- to the device being powered down. */
--int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
-+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
- {
- /* copy over all the bus versions */
- if (dev->bus && dev->bus->pm) {
-@@ -688,7 +688,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
- return ret;
- }
-
--int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
-+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
- {
- /* copy over all the bus versions */
- if (dev->bus && dev->bus->pm) {
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index e80da62..bbcba01 100644
+index 9ac4389..5c05af3 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
-@@ -2417,7 +2417,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
+@@ -2102,7 +2102,7 @@ static bool hid_ignore(struct hid_device *hdev)
int hid_add_device(struct hid_device *hdev)
{
@@ -39515,7 +36754,7 @@ index e80da62..bbcba01 100644
int ret;
if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -2451,7 +2451,7 @@ int hid_add_device(struct hid_device *hdev)
+@@ -2117,7 +2117,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,
@@ -39524,55 +36763,46 @@ index e80da62..bbcba01 100644
hid_debug_register(hdev, dev_name(&hdev->dev));
ret = device_add(&hdev->dev);
-diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
-index c13fb5b..55a3802 100644
---- a/drivers/hid/hid-wiimote-debug.c
-+++ b/drivers/hid/hid-wiimote-debug.c
-@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
- else if (size == 0)
- return -EIO;
-
-- if (copy_to_user(u, buf, size))
-+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
- return -EFAULT;
-
- *off += size;
-diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
-index 93b00d7..0a71596 100644
---- a/drivers/hid/uhid.c
-+++ b/drivers/hid/uhid.c
-@@ -47,7 +47,7 @@ struct uhid_device {
- struct mutex report_lock;
- wait_queue_head_t report_wait;
- atomic_t report_done;
-- atomic_t report_id;
-+ atomic_unchecked_t report_id;
- struct uhid_event report_buf;
- };
-
-@@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 13af0f1..dc797c9 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -195,6 +195,9 @@ static void mt_feature_mapping(struct hid_device *hdev,
+ td->inputmode = field->report->id;
+ break;
+ case HID_DG_CONTACTMAX:
++ /* Ignore if value count is out of bounds. */
++ if (field->report_count < 1)
++ break;
+ td->maxcontacts = field->value[0];
+ if (td->mtclass->maxcontacts)
+ /* check if the maxcontacts is given by the class */
+@@ -506,7 +509,6 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
+ if (field->index == td->last_field_index
+ && td->num_received >= td->num_expected)
+ mt_emit_event(td, field->hidinput->input);
+-
+ }
- spin_lock_irqsave(&uhid->qlock, flags);
- ev->type = UHID_FEATURE;
-- ev->u.feature.id = atomic_inc_return(&uhid->report_id);
-+ ev->u.feature.id = atomic_inc_return_unchecked(&uhid->report_id);
- ev->u.feature.rnum = rnum;
- ev->u.feature.rtype = report_type;
+ /* we have handled the hidinput part, now remains hiddev */
+diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
+index 4ef02b2..8a96831 100644
+--- a/drivers/hid/usbhid/hiddev.c
++++ b/drivers/hid/usbhid/hiddev.c
+@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+ break;
-@@ -446,7 +446,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
- spin_lock_irqsave(&uhid->qlock, flags);
+ case HIDIOCAPPLICATION:
+- if (arg < 0 || arg >= hid->maxapplication)
++ if (arg >= hid->maxapplication)
+ break;
- /* id for old report; drop it silently */
-- if (atomic_read(&uhid->report_id) != ev->u.feature_answer.id)
-+ if (atomic_read_unchecked(&uhid->report_id) != ev->u.feature_answer.id)
- goto unlock;
- if (atomic_read(&uhid->report_done))
- goto unlock;
+ for (i = 0; i < hid->maxcollection; i++)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
-index 6de6c98..18319e9 100644
+index f4c3d28..82f45a9 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
-@@ -406,8 +406,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
+@@ -402,8 +402,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
int ret = 0;
int t;
@@ -39584,10 +36814,10 @@ index 6de6c98..18319e9 100644
ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
if (ret)
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
-index 88f4096..e50452e 100644
+index 0fb100e..baf87e5 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
-@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
+@@ -132,7 +132,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;
@@ -39596,96 +36826,11 @@ index 88f4096..e50452e 100644
__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
"=a"(hv_status_lo) : "d" (control_hi),
-diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
-index 7e17a54..a50a33d 100644
---- a/drivers/hv/hv_balloon.c
-+++ b/drivers/hv/hv_balloon.c
-@@ -464,7 +464,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
-
- module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
- MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
--static atomic_t trans_id = ATOMIC_INIT(0);
-+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
-
- static int dm_ring_size = (5 * PAGE_SIZE);
-
-@@ -886,7 +886,7 @@ static void hot_add_req(struct work_struct *dummy)
- pr_info("Memory hot add failed\n");
-
- dm->state = DM_INITIALIZED;
-- resp.hdr.trans_id = atomic_inc_return(&trans_id);
-+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
- vmbus_sendpacket(dm->dev->channel, &resp,
- sizeof(struct dm_hot_add_response),
- (unsigned long)NULL,
-@@ -960,7 +960,7 @@ static void post_status(struct hv_dynmem_device *dm)
- memset(&status, 0, sizeof(struct dm_status));
- status.hdr.type = DM_STATUS_REPORT;
- status.hdr.size = sizeof(struct dm_status);
-- status.hdr.trans_id = atomic_inc_return(&trans_id);
-+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
-
- /*
- * The host expects the guest to report free memory.
-@@ -980,7 +980,7 @@ static void post_status(struct hv_dynmem_device *dm)
- * send the status. This can happen if we were interrupted
- * after we picked our transaction ID.
- */
-- if (status.hdr.trans_id != atomic_read(&trans_id))
-+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
- return;
-
- vmbus_sendpacket(dm->dev->channel, &status,
-@@ -1108,7 +1108,7 @@ static void balloon_up(struct work_struct *dummy)
- */
-
- do {
-- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
-+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
- ret = vmbus_sendpacket(dm_device.dev->channel,
- bl_resp,
- bl_resp->hdr.size,
-@@ -1152,7 +1152,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
-
- memset(&resp, 0, sizeof(struct dm_unballoon_response));
- resp.hdr.type = DM_UNBALLOON_RESPONSE;
-- resp.hdr.trans_id = atomic_inc_return(&trans_id);
-+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
- resp.hdr.size = sizeof(struct dm_unballoon_response);
-
- vmbus_sendpacket(dm_device.dev->channel, &resp,
-@@ -1215,7 +1215,7 @@ static void version_resp(struct hv_dynmem_device *dm,
- memset(&version_req, 0, sizeof(struct dm_version_request));
- version_req.hdr.type = DM_VERSION_REQUEST;
- version_req.hdr.size = sizeof(struct dm_version_request);
-- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
-+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
- version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
- version_req.is_last_attempt = 1;
-
-@@ -1385,7 +1385,7 @@ static int balloon_probe(struct hv_device *dev,
- memset(&version_req, 0, sizeof(struct dm_version_request));
- version_req.hdr.type = DM_VERSION_REQUEST;
- version_req.hdr.size = sizeof(struct dm_version_request);
-- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
-+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
- version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
- version_req.is_last_attempt = 0;
-
-@@ -1416,7 +1416,7 @@ static int balloon_probe(struct hv_device *dev,
- memset(&cap_msg, 0, sizeof(struct dm_capabilities));
- cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
- cap_msg.hdr.size = sizeof(struct dm_capabilities);
-- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
-+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
-
- cap_msg.caps.cap_bits.balloon = 1;
- cap_msg.caps.cap_bits.hot_add = 1;
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
-index d84918f..7f38f9f 100644
+index 0aee112..b72d21f 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
-@@ -595,7 +595,7 @@ enum vmbus_connect_state {
+@@ -556,7 +556,7 @@ enum vmbus_connect_state {
struct vmbus_connection {
enum vmbus_connect_state conn_state;
@@ -39695,10 +36840,10 @@ index d84918f..7f38f9f 100644
/*
* Represents channel interrupts. Each bit position represents a
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index f9fe46f..356b119 100644
+index 44442d5..9f4b007 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
-@@ -672,10 +672,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
+@@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
{
int ret = 0;
@@ -39712,10 +36857,10 @@ index f9fe46f..356b119 100644
child_device_obj->device.bus = &hv_bus;
child_device_obj->device.parent = &hv_acpi_dev->dev;
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
-index a9e3d01..9dd246e 100644
+index 66f6729..4de8c4a 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
-@@ -117,7 +117,7 @@ struct sensor_template {
+@@ -124,7 +124,7 @@ struct rw_sensor_template {
struct device_attribute *devattr,
const char *buf, size_t count);
int index;
@@ -39724,8 +36869,26 @@ index a9e3d01..9dd246e 100644
/* Averaging interval */
static int update_avg_interval(struct acpi_power_meter_resource *resource)
-@@ -629,7 +629,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
- struct sensor_template *attrs)
+@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
+ return res;
+
+ temp /= 1000;
+- if (temp < 0)
+- return -EINVAL;
+
+ mutex_lock(&resource->lock);
+ resource->trip[attr->index - 7] = temp;
+@@ -622,7 +620,7 @@ static int register_ro_attrs(struct acpi_power_meter_resource *resource,
+ struct ro_sensor_template *ro)
+ {
+ struct device *dev = &resource->acpi_dev->dev;
+- struct sensor_device_attribute *sensors =
++ sensor_device_attribute_no_const *sensors =
+ &resource->sensors[resource->num_sensors];
+ int res = 0;
+
+@@ -650,7 +648,7 @@ static int register_rw_attrs(struct acpi_power_meter_resource *resource,
+ struct rw_sensor_template *rw)
{
struct device *dev = &resource->acpi_dev->dev;
- struct sensor_device_attribute *sensors =
@@ -39734,10 +36897,10 @@ index a9e3d01..9dd246e 100644
int res = 0;
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
-index 3288f13..71cfb4e 100644
+index 30cac58..f6406b3 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
-@@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
+@@ -1069,7 +1069,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
{
struct applesmc_node_group *grp;
struct applesmc_dev_attr *node;
@@ -39747,10 +36910,10 @@ index 3288f13..71cfb4e 100644
for (grp = groups; grp->format; grp++) {
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
-index b25c643..a13460d 100644
+index 83d2fbd6..93017f7 100644
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
-@@ -152,10 +152,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
+@@ -149,10 +149,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
struct atk_sensor_data {
struct list_head list;
struct atk_data *data;
@@ -39765,7 +36928,7 @@ index b25c643..a13460d 100644
char label_attr_name[ATTR_NAME_SIZE];
char input_attr_name[ATTR_NAME_SIZE];
char limit1_attr_name[ATTR_NAME_SIZE];
-@@ -275,7 +275,7 @@ static ssize_t atk_name_show(struct device *dev,
+@@ -271,7 +271,7 @@ static ssize_t atk_name_show(struct device *dev,
static struct device_attribute atk_name_attr =
__ATTR(name, 0444, atk_name_show, NULL);
@@ -39775,10 +36938,10 @@ index b25c643..a13460d 100644
{
sysfs_attr_init(&attr->attr);
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
-index 78be661..4dd032f 100644
+index 3d630bb..77756d7 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
-@@ -797,7 +797,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
+@@ -787,7 +787,7 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
@@ -39788,10 +36951,10 @@ index 78be661..4dd032f 100644
};
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
-index 632f1dc..57e6a58 100644
+index 6a967d7..7f0f923 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
-@@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
+@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
struct aem_rw_sensor_template *rw)
{
struct device *dev = &data->pdev->dev;
@@ -39800,103 +36963,36 @@ index 632f1dc..57e6a58 100644
int err;
/* Set up read-only sensors */
-diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
-index 708081b..fe2d4ab 100644
---- a/drivers/hwmon/iio_hwmon.c
-+++ b/drivers/hwmon/iio_hwmon.c
-@@ -73,7 +73,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
- {
- struct device *dev = &pdev->dev;
- struct iio_hwmon_state *st;
-- struct sensor_device_attribute *a;
-+ sensor_device_attribute_no_const *a;
- int ret, i;
- int in_i = 1, temp_i = 1, curr_i = 1;
- enum iio_chan_type type;
-diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
-index 6eb03ce..bea7e3e 100644
---- a/drivers/hwmon/nct6775.c
-+++ b/drivers/hwmon/nct6775.c
-@@ -936,10 +936,10 @@ static struct attribute_group *
- nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
- int repeat)
- {
-- struct attribute_group *group;
-+ attribute_group_no_const *group;
- struct sensor_device_attr_u *su;
-- struct sensor_device_attribute *a;
-- struct sensor_device_attribute_2 *a2;
-+ sensor_device_attribute_no_const *a;
-+ sensor_device_attribute_2_no_const *a2;
- struct attribute **attrs;
- struct sensor_device_template **t;
- int err, i, j, count;
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
-index 9319fcf..189ff45 100644
+index d89b339..fdb124c 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
-@@ -781,7 +781,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
- return 0;
- }
-
--static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
-+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
- const char *name,
- umode_t mode,
- ssize_t (*show)(struct device *dev,
-@@ -798,7 +798,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
- dev_attr->store = store;
- }
+@@ -809,7 +809,7 @@ static ssize_t pmbus_show_label(struct device *dev,
--static void pmbus_attr_init(struct sensor_device_attribute *a,
-+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
- const char *name,
- umode_t mode,
- ssize_t (*show)(struct device *dev,
-@@ -820,7 +820,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
- u16 reg, u8 mask)
- {
- struct pmbus_boolean *boolean;
-- struct sensor_device_attribute *a;
-+ sensor_device_attribute_no_const *a;
-
- boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
- if (!boolean)
-@@ -845,7 +845,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
- bool update, bool readonly)
- {
- struct pmbus_sensor *sensor;
-- struct device_attribute *a;
-+ device_attribute_no_const *a;
-
- sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
- if (!sensor)
-@@ -876,7 +876,7 @@ static int pmbus_add_label(struct pmbus_data *data,
- const char *lstring, int index)
- {
- struct pmbus_label *label;
-- struct device_attribute *a;
-+ device_attribute_no_const *a;
-
- label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
- if (!label)
+ #define PMBUS_ADD_ATTR(data, _name, _idx, _mode, _type, _show, _set) \
+ do { \
+- struct sensor_device_attribute *a \
++ sensor_device_attribute_no_const *a \
+ = &data->_type##s[data->num_##_type##s].attribute; \
+ BUG_ON(data->num_attributes >= data->max_attributes); \
+ sysfs_attr_init(&a->dev_attr.attr); \
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
-index 97cd45a..ac54d8b 100644
+index 3e3153e..d445962 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
-@@ -169,7 +169,7 @@ struct sht15_data {
- int supply_uv;
- bool supply_uv_valid;
+@@ -166,7 +166,7 @@ struct sht15_data {
+ int supply_uV;
+ bool supply_uV_valid;
struct work_struct update_supply_work;
- atomic_t interrupt_handled;
+ atomic_unchecked_t interrupt_handled;
};
/**
-@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
- ret = gpio_direction_input(data->pdata->gpio_data);
- if (ret)
+@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
return ret;
+
+ gpio_direction_input(data->pdata->gpio_data);
- atomic_set(&data->interrupt_handled, 0);
+ atomic_set_unchecked(&data->interrupt_handled, 0);
@@ -39909,7 +37005,7 @@ index 97cd45a..ac54d8b 100644
schedule_work(&data->read_work);
}
ret = wait_event_timeout(data->wait_queue,
-@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
+@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
/* First disable the interrupt */
disable_irq_nosync(irq);
@@ -39918,14 +37014,14 @@ index 97cd45a..ac54d8b 100644
/* Then schedule a reading work struct */
if (data->state != SHT15_READING_NOTHING)
schedule_work(&data->read_work);
-@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
+@@ -804,11 +804,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!
*/
- atomic_set(&data->interrupt_handled, 0);
+ atomic_set_unchecked(&data->interrupt_handled, 0);
enable_irq(gpio_to_irq(data->pdata->gpio_data));
- /* If still not occurred or another handler was scheduled */
+ /* If still not occurred or another handler has been scheduled */
if (gpio_get_value(data->pdata->gpio_data)
- || atomic_read(&data->interrupt_handled))
+ || atomic_read_unchecked(&data->interrupt_handled))
@@ -39933,10 +37029,10 @@ index 97cd45a..ac54d8b 100644
}
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
-index 38944e9..ae9e5ed 100644
+index 8eac67d..d7b2fa5 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
-@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
+@@ -304,7 +304,7 @@ static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
@@ -39946,7 +37042,7 @@ index 38944e9..ae9e5ed 100644
};
diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
-index 07f01ac..d79ad3d 100644
+index 378fcb5..5e91fa8 100644
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -43,7 +43,7 @@
@@ -39959,7 +37055,7 @@ index 07f01ac..d79ad3d 100644
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(amd756_lock);
diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
-index dae3ddf..26e21d1 100644
+index 7636671..53a2cab 100644
--- a/drivers/i2c/busses/i2c-diolan-u2c.c
+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
@@ -99,7 +99,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
@@ -39972,7 +37068,7 @@ index dae3ddf..26e21d1 100644
int ret = 0;
int actual;
diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
-index 2ca268d..c6acbdf 100644
+index 29015eb..af2d8e9 100644
--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
@@ -41,7 +41,7 @@
@@ -39985,20 +37081,249 @@ index 2ca268d..c6acbdf 100644
/* Wrapper access functions for multiplexed SMBus */
static DEFINE_MUTEX(nforce2_lock);
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
-index c3ccdea..5b3dc1a 100644
+index 57a45ce8..51bd6c1 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
-@@ -271,7 +271,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
+@@ -276,7 +276,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
+ res = -EINVAL;
break;
}
-
- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
if (IS_ERR(rdwr_pa[i].buf)) {
res = PTR_ERR(rdwr_pa[i].buf);
+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 0b510ba..4fbb5085 100644
+index 8126824..55a2798 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
@@ -40010,21 +37335,307 @@ index 0b510ba..4fbb5085 100644
drive->dma = 0;
}
}
-diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
-index f95c697..0a1b05c 100644
---- a/drivers/iio/industrialio-core.c
-+++ b/drivers/iio/industrialio-core.c
-@@ -506,7 +506,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
- }
+diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
+index a743e68..1cfd674 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
--int __iio_device_attr_init(struct device_attribute *dev_attr,
-+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
- const char *postfix,
- struct iio_chan_spec const *chan,
- ssize_t (*readfunc)(struct device *dev,
+-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..863a5e92 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 eb0e2cc..14241c7 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 784b97c..c9ceadf 100644
+index 8b72f39..55df4c8 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]
@@ -40036,7 +37647,7 @@ index 784b97c..c9ceadf 100644
};
struct cm_counter_attribute {
-@@ -1395,7 +1395,7 @@ static void cm_dup_req_handler(struct cm_work *work,
+@@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
struct ib_mad_send_buf *msg = NULL;
int ret;
@@ -40045,7 +37656,7 @@ index 784b97c..c9ceadf 100644
counter[CM_REQ_COUNTER]);
/* Quick state check to discard duplicate REQs. */
-@@ -1779,7 +1779,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
+@@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
if (!cm_id_priv)
return;
@@ -40054,7 +37665,7 @@ index 784b97c..c9ceadf 100644
counter[CM_REP_COUNTER]);
ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
if (ret)
-@@ -1946,7 +1946,7 @@ static int cm_rtu_handler(struct cm_work *work)
+@@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
if (cm_id_priv->id.state != IB_CM_REP_SENT &&
cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
spin_unlock_irq(&cm_id_priv->lock);
@@ -40063,7 +37674,7 @@ index 784b97c..c9ceadf 100644
counter[CM_RTU_COUNTER]);
goto out;
}
-@@ -2129,7 +2129,7 @@ static int cm_dreq_handler(struct cm_work *work)
+@@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
dreq_msg->local_comm_id);
if (!cm_id_priv) {
@@ -40072,7 +37683,7 @@ index 784b97c..c9ceadf 100644
counter[CM_DREQ_COUNTER]);
cm_issue_drep(work->port, work->mad_recv_wc);
return -EINVAL;
-@@ -2154,7 +2154,7 @@ static int cm_dreq_handler(struct cm_work *work)
+@@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
case IB_CM_MRA_REP_RCVD:
break;
case IB_CM_TIMEWAIT:
@@ -40081,7 +37692,7 @@ index 784b97c..c9ceadf 100644
counter[CM_DREQ_COUNTER]);
if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
goto unlock;
-@@ -2168,7 +2168,7 @@ static int cm_dreq_handler(struct cm_work *work)
+@@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
cm_free_msg(msg);
goto deref;
case IB_CM_DREQ_RCVD:
@@ -40090,7 +37701,7 @@ index 784b97c..c9ceadf 100644
counter[CM_DREQ_COUNTER]);
goto unlock;
default:
-@@ -2535,7 +2535,7 @@ static int cm_mra_handler(struct cm_work *work)
+@@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
ib_modify_mad(cm_id_priv->av.port->mad_agent,
cm_id_priv->msg, timeout)) {
if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
@@ -40099,7 +37710,7 @@ index 784b97c..c9ceadf 100644
counter_group[CM_RECV_DUPLICATES].
counter[CM_MRA_COUNTER]);
goto out;
-@@ -2544,7 +2544,7 @@ static int cm_mra_handler(struct cm_work *work)
+@@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
break;
case IB_CM_MRA_REQ_RCVD:
case IB_CM_MRA_REP_RCVD:
@@ -40108,7 +37719,7 @@ index 784b97c..c9ceadf 100644
counter[CM_MRA_COUNTER]);
/* fall through */
default:
-@@ -2706,7 +2706,7 @@ static int cm_lap_handler(struct cm_work *work)
+@@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
case IB_CM_LAP_IDLE:
break;
case IB_CM_MRA_LAP_SENT:
@@ -40117,7 +37728,7 @@ index 784b97c..c9ceadf 100644
counter[CM_LAP_COUNTER]);
if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
goto unlock;
-@@ -2722,7 +2722,7 @@ static int cm_lap_handler(struct cm_work *work)
+@@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
cm_free_msg(msg);
goto deref;
case IB_CM_LAP_RCVD:
@@ -40126,7 +37737,7 @@ index 784b97c..c9ceadf 100644
counter[CM_LAP_COUNTER]);
goto unlock;
default:
-@@ -3006,7 +3006,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
+@@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
if (cur_cm_id_priv) {
spin_unlock_irq(&cm.lock);
@@ -40135,7 +37746,7 @@ index 784b97c..c9ceadf 100644
counter[CM_SIDR_REQ_COUNTER]);
goto out; /* Duplicate message. */
}
-@@ -3218,10 +3218,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
+@@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
msg->retries = 1;
@@ -40148,7 +37759,7 @@ index 784b97c..c9ceadf 100644
&port->counter_group[CM_XMIT_RETRIES].
counter[attr_index]);
-@@ -3431,7 +3431,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
+@@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
}
attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
@@ -40157,7 +37768,7 @@ index 784b97c..c9ceadf 100644
counter[attr_id - CM_ATTR_ID_OFFSET]);
work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
-@@ -3636,7 +3636,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
+@@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
cm_attr = container_of(attr, struct cm_counter_attribute, attr);
return sprintf(buf, "%ld\n",
@@ -40167,7 +37778,7 @@ index 784b97c..c9ceadf 100644
static const struct sysfs_ops cm_counter_ops = {
diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
-index 9f5ad7c..588cd84 100644
+index 176c8f9..2627b62 100644
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@@ -98,8 +98,8 @@ struct ib_fmr_pool {
@@ -40181,7 +37792,7 @@ index 9f5ad7c..588cd84 100644
wait_queue_head_t force_wait;
};
-@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
+@@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
struct ib_fmr_pool *pool = pool_ptr;
do {
@@ -40194,7 +37805,7 @@ index 9f5ad7c..588cd84 100644
wake_up_interruptible(&pool->force_wait);
if (pool->flush_function)
-@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
+@@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
}
set_current_state(TASK_INTERRUPTIBLE);
@@ -40203,7 +37814,7 @@ index 9f5ad7c..588cd84 100644
!kthread_should_stop())
schedule();
__set_current_state(TASK_RUNNING);
-@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
+@@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
pool->dirty_watermark = params->dirty_watermark;
pool->dirty_len = 0;
spin_lock_init(&pool->pool_lock);
@@ -40214,7 +37825,7 @@ index 9f5ad7c..588cd84 100644
init_waitqueue_head(&pool->force_wait);
pool->thread = kthread_run(ib_fmr_cleanup_thread,
-@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
+@@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
}
spin_unlock_irq(&pool->pool_lock);
@@ -40228,7 +37839,7 @@ index 9f5ad7c..588cd84 100644
return -EINTR;
return 0;
-@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
+@@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
} else {
list_add_tail(&fmr->list, &pool->dirty_list);
if (++pool->dirty_len >= pool->dirty_watermark) {
@@ -40238,10 +37849,10 @@ index 9f5ad7c..588cd84 100644
}
}
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
-index 4cb8eb2..146bf60 100644
+index 40c8353..946b0e4 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
-@@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
+@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
int err;
struct fw_ri_tpte tpt;
u32 stag_idx;
@@ -40250,15 +37861,40 @@ index 4cb8eb2..146bf60 100644
if (c4iw_fatal_error(rdev))
return -EIO;
-@@ -266,7 +266,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
- if (rdev->stats.stag.cur > rdev->stats.stag.max)
- rdev->stats.stag.max = rdev->stats.stag.cur;
- mutex_unlock(&rdev->stats.lock);
+@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
+ &rdev->resource.tpt_fifo_lock);
+ if (!stag_idx)
+ return -ENOMEM;
- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
}
PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
__func__, stag_state, type, pdid, stag_idx);
+diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
+index e571e60..523c505 100644
+--- a/drivers/infiniband/hw/ehca/ehca_irq.c
++++ b/drivers/infiniband/hw/ehca/ehca_irq.c
+@@ -883,7 +883,7 @@ static int __cpuinit comp_pool_callback(struct notifier_block *nfb,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block comp_pool_callback_nb __cpuinitdata = {
++static struct notifier_block comp_pool_callback_nb = {
+ .notifier_call = comp_pool_callback,
+ .priority = 0,
+ };
+diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
+index 31ae1b1..fe606ac 100644
+--- a/drivers/infiniband/hw/ipath/ipath_fs.c
++++ b/drivers/infiniband/hw/ipath/ipath_fs.c
+@@ -410,6 +410,7 @@ static struct file_system_type ipathfs_fs_type = {
+ .mount = ipathfs_mount,
+ .kill_sb = ipathfs_kill_super,
+ };
++MODULE_ALIAS_FS("ipathfs");
+
+ int __init ipath_init_ipathfs(void)
+ {
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 79b3dbc..96e5fcc 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -40313,45 +37949,6 @@ index 1f95bba..9530f87 100644
(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
sdata, wqe->wr.wr.atomic.swap);
goto send_comp;
-diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
-index f2a3f48..673ec79 100644
---- a/drivers/infiniband/hw/mlx4/mad.c
-+++ b/drivers/infiniband/hw/mlx4/mad.c
-@@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
-
- __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
- {
-- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
-+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
- cpu_to_be64(0xff00000000000000LL);
- }
-
-diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
-index 25b2cdf..099ff97 100644
---- a/drivers/infiniband/hw/mlx4/mcg.c
-+++ b/drivers/infiniband/hw/mlx4/mcg.c
-@@ -1040,7 +1040,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
- {
- char name[20];
-
-- atomic_set(&ctx->tid, 0);
-+ atomic_set_unchecked(&ctx->tid, 0);
- sprintf(name, "mlx4_ib_mcg%d", ctx->port);
- ctx->mcg_wq = create_singlethread_workqueue(name);
- if (!ctx->mcg_wq)
-diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
-index 036b663..c9a8c73 100644
---- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
-+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
-@@ -404,7 +404,7 @@ struct mlx4_ib_demux_ctx {
- struct list_head mcg_mgid0_list;
- struct workqueue_struct *mcg_wq;
- struct mlx4_ib_demux_pv_ctx **tun;
-- atomic_t tid;
-+ atomic_unchecked_t tid;
- int flushing; /* flushing the work queue */
- };
-
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 9d3e5c1..6f166df 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -40393,7 +37990,7 @@ index 9d3e5c1..6f166df 100644
void *in_mad, void *response_mad)
{
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
-index 87897b9..7e79542 100644
+index aa12a53..c145bc2 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -692,7 +692,7 @@ err_close:
@@ -40450,10 +38047,10 @@ index 5b71d43..35a9e14 100644
struct mthca_dev *dev = to_mdev(ibcq->device);
struct mthca_cq *cq = to_mcq(ibcq);
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
-index 4291410..d2ab1fb 100644
+index 5965b3d..16817fb 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
-@@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
+@@ -103,7 +103,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);
@@ -40462,7 +38059,7 @@ index 4291410..d2ab1fb 100644
static unsigned int ee_flsh_adapter;
static unsigned int sysfs_nonidx_addr;
-@@ -269,7 +269,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
+@@ -272,7 +272,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;
@@ -40472,10 +38069,10 @@ index 4291410..d2ab1fb 100644
/* Free the control structures */
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
-index 33cc589..3bd6538 100644
+index 3ade373..f3b68b7 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
+@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
extern unsigned int wqm_quanta;
extern struct list_head nes_adapter_list;
@@ -40504,7 +38101,7 @@ index 33cc589..3bd6538 100644
extern u32 mh_detected;
extern u32 mh_pauses_sent;
extern u32 cm_packets_sent;
-@@ -196,16 +196,16 @@ extern u32 cm_packets_created;
+@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
extern u32 cm_packets_received;
extern u32 cm_packets_dropped;
extern u32 cm_packets_retrans;
@@ -40531,7 +38128,7 @@ index 33cc589..3bd6538 100644
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 6b29249..57081dd 100644
+index 0a52d72..0642f36 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;
@@ -40577,7 +38174,7 @@ index 6b29249..57081dd 100644
int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
{
-@@ -1272,7 +1272,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
+@@ -1271,7 +1271,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
kfree(listener);
listener = NULL;
ret = 0;
@@ -40586,7 +38183,7 @@ index 6b29249..57081dd 100644
} else {
spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
}
-@@ -1466,7 +1466,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
+@@ -1473,7 +1473,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);
@@ -40595,7 +38192,7 @@ index 6b29249..57081dd 100644
return cm_node;
}
-@@ -1524,7 +1524,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
+@@ -1531,7 +1531,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
}
atomic_dec(&cm_core->node_cnt);
@@ -40604,7 +38201,7 @@ index 6b29249..57081dd 100644
nesqp = cm_node->nesqp;
if (nesqp) {
nesqp->cm_node = NULL;
-@@ -1588,7 +1588,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
+@@ -1595,7 +1595,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
static void drop_packet(struct sk_buff *skb)
{
@@ -40613,7 +38210,7 @@ index 6b29249..57081dd 100644
dev_kfree_skb_any(skb);
}
-@@ -1651,7 +1651,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
+@@ -1658,7 +1658,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.. */
@@ -40622,7 +38219,7 @@ index 6b29249..57081dd 100644
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));
-@@ -2292,7 +2292,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
+@@ -2299,7 +2299,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;
}
@@ -40631,7 +38228,7 @@ index 6b29249..57081dd 100644
loopbackremotenode->loopbackpartner = cm_node;
loopbackremotenode->tcp_cntxt.rcv_wscale =
NES_CM_DEFAULT_RCV_WND_SCALE;
-@@ -2567,7 +2567,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
+@@ -2574,7 +2574,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);
@@ -40640,7 +38237,7 @@ index 6b29249..57081dd 100644
dev_kfree_skb_any(skb);
}
break;
-@@ -2875,7 +2875,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
+@@ -2880,7 +2880,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
if ((cm_id) && (cm_id->event_handler)) {
if (issue_disconn) {
@@ -40649,7 +38246,7 @@ index 6b29249..57081dd 100644
cm_event.event = IW_CM_EVENT_DISCONNECT;
cm_event.status = disconn_status;
cm_event.local_addr = cm_id->local_addr;
-@@ -2897,7 +2897,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
+@@ -2902,7 +2902,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
}
if (issue_close) {
@@ -40658,7 +38255,7 @@ index 6b29249..57081dd 100644
nes_disconnect(nesqp, 1);
cm_id->provider_data = nesqp;
-@@ -3035,7 +3035,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+@@ -3038,7 +3038,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);
@@ -40667,7 +38264,7 @@ index 6b29249..57081dd 100644
nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
netdev_refcnt_read(nesvnic->netdev));
-@@ -3224,7 +3224,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
+@@ -3240,7 +3240,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;
@@ -40676,16 +38273,16 @@ index 6b29249..57081dd 100644
cm_node = (struct nes_cm_node *)cm_id->provider_data;
loopback = cm_node->loopbackpartner;
cm_core = cm_node->cm_core;
-@@ -3286,7 +3286,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
- ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
- ntohs(laddr->sin_port));
+@@ -3300,7 +3300,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));
- atomic_inc(&cm_connects);
+ atomic_inc_unchecked(&cm_connects);
nesqp->active_conn = 1;
/* cache the cm_id in the qp */
-@@ -3398,7 +3398,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
+@@ -3406,7 +3406,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;
}
@@ -40694,7 +38291,7 @@ index 6b29249..57081dd 100644
}
cm_id->add_ref(cm_id);
-@@ -3505,7 +3505,7 @@ static void cm_event_connected(struct nes_cm_event *event)
+@@ -3507,7 +3507,7 @@ static void cm_event_connected(struct nes_cm_event *event)
if (nesqp->destroyed)
return;
@@ -40702,8 +38299,8 @@ index 6b29249..57081dd 100644
+ atomic_inc_unchecked(&cm_connecteds);
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, ntohl(raddr->sin_addr.s_addr),
-@@ -3686,7 +3686,7 @@ static void cm_event_reset(struct nes_cm_event *event)
+ nesqp->hwqp.qp_id,
+@@ -3694,7 +3694,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);
@@ -40712,7 +38309,7 @@ index 6b29249..57081dd 100644
cm_event.event = IW_CM_EVENT_CLOSE;
cm_event.status = 0;
cm_event.provider_data = cm_id->provider_data;
-@@ -3726,7 +3726,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
+@@ -3730,7 +3730,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
return;
cm_id = cm_node->cm_id;
@@ -40731,7 +38328,7 @@ index 6b29249..57081dd 100644
cm_node, cm_id, jiffies);
diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
-index 4166452..fc952c3 100644
+index b3b2a24..7bfaf1e 100644
--- a/drivers/infiniband/hw/nes/nes_mgt.c
+++ b/drivers/infiniband/hw/nes/nes_mgt.c
@@ -40,8 +40,8 @@
@@ -40754,7 +38351,7 @@ index 4166452..fc952c3 100644
/* Free packets that have not yet been forwarded */
/* Lock is acquired by skb_dequeue when removing the skb */
-@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
+@@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
skb_queue_head_init(&nesqp->pau_list);
spin_lock_init(&nesqp->pau_lock);
@@ -40764,10 +38361,10 @@ index 4166452..fc952c3 100644
}
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
-index 49eb511..a774366 100644
+index c00d2f3..8834298 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
-@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
+@@ -1277,39 +1277,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;
@@ -40828,7 +38425,7 @@ index 49eb511..a774366 100644
/**
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
-index 5b53ca5..443da3c 100644
+index b0471b4..9ba4e9f 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -46,9 +46,9 @@
@@ -40844,7 +38441,7 @@ index 5b53ca5..443da3c 100644
static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
-@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
+@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
if (init_attr->create_flags)
return ERR_PTR(-EINVAL);
@@ -40853,7 +38450,7 @@ index 5b53ca5..443da3c 100644
switch (init_attr->qp_type) {
case IB_QPT_RC:
if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
-@@ -1466,7 +1466,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;
@@ -40863,22 +38460,34 @@ index 5b53ca5..443da3c 100644
/* Blow away the connection if it exists. */
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
-index 1946101..09766d2 100644
+index b881bdc..c2e360c 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
-@@ -52,6 +52,7 @@
+@@ -51,6 +51,7 @@
+ #include <linux/completion.h>
#include <linux/kref.h>
#include <linux/sched.h>
- #include <linux/kthread.h>
+#include <linux/slab.h>
#include "qib_common.h"
#include "qib_verbs.h"
+diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
+index df7fa25..f11b448 100644
+--- a/drivers/infiniband/hw/qib/qib_fs.c
++++ b/drivers/infiniband/hw/qib/qib_fs.c
+@@ -603,6 +603,7 @@ static struct file_system_type qibfs_fs_type = {
+ .mount = qibfs_mount,
+ .kill_sb = qibfs_kill_super,
+ };
++MODULE_ALIAS_FS("ipathfs");
+
+ int __init qib_init_qibfs(void)
+ {
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
-index 922a7fe..bb035db 100644
+index c351aa4..e6967c2 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
-@@ -487,14 +487,14 @@ EXPORT_SYMBOL(gameport_set_phys);
+@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
*/
static void gameport_init_port(struct gameport *gameport)
{
@@ -40896,29 +38505,29 @@ index 922a7fe..bb035db 100644
gameport->dev.release = gameport_release_port;
if (gameport->parent)
diff --git a/drivers/input/input.c b/drivers/input/input.c
-index e75d015..57d1c28 100644
+index da38d97..2aa0b79 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
-@@ -1734,7 +1734,7 @@ EXPORT_SYMBOL_GPL(input_class);
+@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
*/
- struct input_dev *input_allocate_device(void)
+ 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_dev *dev;
-
- dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
-@@ -1749,7 +1749,7 @@ struct input_dev *input_allocate_device(void)
- INIT_LIST_HEAD(&dev->node);
+ struct input_handler *handler;
+ const char *path;
+ int error;
+@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
+ dev->setkeycode = input_default_setkeycode;
- dev_set_name(&dev->dev, "input%ld",
-- (unsigned long) atomic_inc_return(&input_no) - 1);
-+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
+ dev_set_name(&dev->dev, "input%ld",
+- (unsigned long) atomic_inc_return(&input_no) - 1);
++ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
- __module_get(THIS_MODULE);
- }
+ error = device_add(&dev->dev);
+ if (error)
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
-index 04c69af..5f92d00 100644
+index b8d8611..7a4a04b 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -30,6 +30,7 @@
@@ -40930,10 +38539,10 @@ index 04c69af..5f92d00 100644
#include <linux/input.h>
#include <linux/gameport.h>
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
-index 75e3b10..fb390fd 100644
+index 2189cbf..05ad609 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
-@@ -736,7 +736,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
+@@ -714,7 +714,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
static int xpad_led_probe(struct usb_xpad *xpad)
{
@@ -40942,7 +38551,7 @@ index 75e3b10..fb390fd 100644
long led_no;
struct xpad_led *led;
struct led_classdev *led_cdev;
-@@ -749,7 +749,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
+@@ -727,7 +727,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
if (!led)
return -ENOMEM;
@@ -40951,33 +38560,11 @@ index 75e3b10..fb390fd 100644
snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
led->xpad = xpad;
-diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
-index e204f26..8459f15 100644
---- a/drivers/input/misc/ims-pcu.c
-+++ b/drivers/input/misc/ims-pcu.c
-@@ -1621,7 +1621,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
-
- static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
- {
-- static atomic_t device_no = ATOMIC_INIT(0);
-+ static atomic_unchecked_t device_no = ATOMIC_INIT(0);
-
- const struct ims_pcu_device_info *info;
- u8 device_id;
-@@ -1653,7 +1653,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
- }
-
- /* Device appears to be operable, complete initialization */
-- pcu->device_no = atomic_inc_return(&device_no) - 1;
-+ pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
-
- error = ims_pcu_setup_backlight(pcu);
- if (error)
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
-index 2f0b39d..7370f13 100644
+index 9b84b0c..027158f 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
-@@ -116,7 +116,7 @@ struct psmouse_attribute {
+@@ -110,7 +110,7 @@ struct psmouse_attribute {
ssize_t (*set)(struct psmouse *psmouse, void *data,
const char *buf, size_t count);
bool protect;
@@ -40987,10 +38574,10 @@ index 2f0b39d..7370f13 100644
ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
-index 4c842c3..590b0bf 100644
+index 0110b5a..d3ad144 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
-@@ -738,7 +738,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
+@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
spin_unlock_irq(&client->packet_lock);
@@ -41000,10 +38587,10 @@ index 4c842c3..590b0bf 100644
return count;
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
-index 2b56855..5a55837 100644
+index ba70058..571d25d 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
-@@ -496,7 +496,7 @@ static void serio_release_port(struct device *dev)
+@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
*/
static void serio_init_port(struct serio *serio)
{
@@ -41012,7 +38599,7 @@ index 2b56855..5a55837 100644
__module_get(THIS_MODULE);
-@@ -507,7 +507,7 @@ static void serio_init_port(struct serio *serio)
+@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
mutex_init(&serio->drv_mutex);
device_initialize(&serio->dev);
dev_set_name(&serio->dev, "serio%ld",
@@ -41022,10 +38609,10 @@ index 2b56855..5a55837 100644
serio->dev.release = serio_release_port;
serio->dev.groups = serio_device_attr_groups;
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
-index 59df2e7..8f1cafb 100644
+index 4d4cd14..d6fdd87 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
-@@ -293,7 +293,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
+@@ -280,7 +280,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
{
@@ -41034,7 +38621,7 @@ index 59df2e7..8f1cafb 100644
struct serio_raw *serio_raw;
int err;
-@@ -304,7 +304,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
+@@ -291,7 +291,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
}
snprintf(serio_raw->name, sizeof(serio_raw->name),
@@ -41043,76 +38630,11 @@ index 59df2e7..8f1cafb 100644
kref_init(&serio_raw->kref);
INIT_LIST_HEAD(&serio_raw->client_list);
init_waitqueue_head(&serio_raw->wait);
-diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index fbe9ca7..dbee61d 100644
---- a/drivers/iommu/iommu.c
-+++ b/drivers/iommu/iommu.c
-@@ -583,7 +583,7 @@ static struct notifier_block iommu_bus_nb = {
- static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
- {
- bus_register_notifier(bus, &iommu_bus_nb);
-- bus_for_each_dev(bus, NULL, ops, add_iommu_group);
-+ bus_for_each_dev(bus, NULL, (void *)ops, add_iommu_group);
- }
-
- /**
-diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
-index 39f81ae..2660096 100644
---- a/drivers/iommu/irq_remapping.c
-+++ b/drivers/iommu/irq_remapping.c
-@@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
- void panic_if_irq_remap(const char *msg)
- {
- if (irq_remapping_enabled)
-- panic(msg);
-+ panic("%s", msg);
- }
-
- static void ir_ack_apic_edge(struct irq_data *data)
-@@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
-
- void irq_remap_modify_chip_defaults(struct irq_chip *chip)
- {
-- chip->irq_print_chip = ir_print_prefix;
-- chip->irq_ack = ir_ack_apic_edge;
-- chip->irq_eoi = ir_ack_apic_level;
-- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
-+ pax_open_kernel();
-+ *(void **)&chip->irq_print_chip = ir_print_prefix;
-+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
-+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
-+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
-+ pax_close_kernel();
- }
-
- bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
-diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
-index d0e9480..d2b6340 100644
---- a/drivers/irqchip/irq-gic.c
-+++ b/drivers/irqchip/irq-gic.c
-@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
- * Supported arch specific GIC irq extension.
- * Default make them NULL.
- */
--struct irq_chip gic_arch_extn = {
-+irq_chip_no_const gic_arch_extn = {
- .irq_eoi = NULL,
- .irq_mask = NULL,
- .irq_unmask = NULL,
-@@ -333,7 +333,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
- chained_irq_exit(chip, desc);
- }
-
--static struct irq_chip gic_chip = {
-+static irq_chip_no_const gic_chip __read_only = {
- .name = "GIC",
- .irq_mask = gic_mask_irq,
- .irq_unmask = gic_unmask_irq,
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
-index ac6f72b..81150f2 100644
+index e44933d..9ba484a 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
-@@ -81,8 +81,8 @@ struct capiminor {
+@@ -83,8 +83,8 @@ struct capiminor {
struct capi20_appl *ap;
u32 ncci;
@@ -41123,7 +38645,7 @@ index ac6f72b..81150f2 100644
struct tty_port port;
int ttyinstop;
-@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
+@@ -397,7 +397,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);
@@ -41132,7 +38654,7 @@ index ac6f72b..81150f2 100644
capimsg_setu32(s, 8, mp->ncci);
capimsg_setu16(s, 12, datahandle);
}
-@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
+@@ -518,14 +518,14 @@ static void handle_minor_send(struct capiminor *mp)
mp->outbytes -= len;
spin_unlock_bh(&mp->outlock);
@@ -41149,39 +38671,167 @@ index ac6f72b..81150f2 100644
capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
capimsg_setu16(skb->data, 16, len); /* Data length */
+diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
+index 2b33b26..a9c638b 100644
+--- a/drivers/isdn/capi/kcapi.c
++++ b/drivers/isdn/capi/kcapi.c
+@@ -93,7 +93,7 @@ capi_ctr_put(struct capi_ctr *ctr)
+
+ static inline struct capi_ctr *get_capi_ctr_by_nr(u16 contr)
+ {
+- if (contr - 1 >= CAPI_MAXCONTR)
++ if (contr < 1 || contr - 1 >= CAPI_MAXCONTR)
+ return NULL;
+
+ return capi_controller[contr - 1];
+@@ -103,7 +103,7 @@ static inline struct capi20_appl *__get_capi_appl_by_nr(u16 applid)
+ {
+ lockdep_assert_held(&capi_controller_lock);
+
+- if (applid - 1 >= CAPI_MAXAPPL)
++ if (applid < 1 || applid - 1 >= CAPI_MAXAPPL)
+ return NULL;
+
+ return capi_applications[applid - 1];
+@@ -111,7 +111,7 @@ static inline struct capi20_appl *__get_capi_appl_by_nr(u16 applid)
+
+ static inline struct capi20_appl *get_capi_appl_by_nr(u16 applid)
+ {
+- if (applid - 1 >= CAPI_MAXAPPL)
++ if (applid < 1 || applid - 1 >= CAPI_MAXAPPL)
+ return NULL;
+
+ return rcu_dereference(capi_applications[applid - 1]);
+diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
+index db621db..825ea1a 100644
+--- a/drivers/isdn/gigaset/common.c
++++ b/drivers/isdn/gigaset/common.c
+@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
+ cs->commands_pending = 0;
+ cs->cur_at_seq = 0;
+ cs->gotfwver = -1;
+- cs->open_count = 0;
++ local_set(&cs->open_count, 0);
+ cs->dev = NULL;
+ cs->tty = NULL;
+ cs->tty_dev = NULL;
+diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
+index 212efaf..f187c6b 100644
+--- a/drivers/isdn/gigaset/gigaset.h
++++ b/drivers/isdn/gigaset/gigaset.h
+@@ -35,6 +35,7 @@
+ #include <linux/tty_driver.h>
+ #include <linux/list.h>
+ #include <linux/atomic.h>
++#include <asm/local.h>
+
+ #define GIG_VERSION {0, 5, 0, 0}
+ #define GIG_COMPAT {0, 4, 0, 0}
+@@ -433,7 +434,7 @@ struct cardstate {
+ spinlock_t cmdlock;
+ unsigned curlen, cmdbytes;
+
+- unsigned open_count;
++ local_t open_count;
+ struct tty_struct *tty;
+ struct tasklet_struct if_wake_tasklet;
+ unsigned control_state;
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
-index 600c79b..3752bab 100644
+index ee0a549..a7c9798 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
-@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
+@@ -163,9 +163,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
}
tty->driver_data = cs;
-- ++cs->port.count;
-+ atomic_inc(&cs->port.count);
+- ++cs->open_count;
+-
+- if (cs->open_count == 1) {
++ if (local_inc_return(&cs->open_count) == 1) {
+ spin_lock_irqsave(&cs->lock, flags);
+ cs->tty = tty;
+ spin_unlock_irqrestore(&cs->lock, flags);
+@@ -193,10 +191,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
-- if (cs->port.count == 1) {
-+ if (atomic_read(&cs->port.count) == 1) {
- tty_port_tty_set(&cs->port, tty);
- cs->port.low_latency = 1;
+ if (!cs->connected)
+ gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
+- else if (!cs->open_count)
++ else if (!local_read(&cs->open_count))
+ dev_warn(cs->dev, "%s: device not opened\n", __func__);
+ else {
+- if (!--cs->open_count) {
++ if (!local_dec_return(&cs->open_count)) {
+ spin_lock_irqsave(&cs->lock, flags);
+ cs->tty = NULL;
+ spin_unlock_irqrestore(&cs->lock, flags);
+@@ -231,7 +229,7 @@ static int if_ioctl(struct tty_struct *tty,
+ if (!cs->connected) {
+ gig_dbg(DEBUG_IF, "not connected");
+ retval = -ENODEV;
+- } else if (!cs->open_count)
++ } else if (!local_read(&cs->open_count))
+ dev_warn(cs->dev, "%s: device not opened\n", __func__);
+ else {
+ retval = 0;
+@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
+ retval = -ENODEV;
+ goto done;
}
-@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
+- if (!cs->open_count) {
++ if (!local_read(&cs->open_count)) {
+ dev_warn(cs->dev, "%s: device not opened\n", __func__);
+ retval = -ENODEV;
+ goto done;
+@@ -414,7 +412,7 @@ static int if_write_room(struct tty_struct *tty)
+ if (!cs->connected) {
+ gig_dbg(DEBUG_IF, "not connected");
+ retval = -ENODEV;
+- } else if (!cs->open_count)
++ } else if (!local_read(&cs->open_count))
+ dev_warn(cs->dev, "%s: device not opened\n", __func__);
+ else if (cs->mstate != MS_LOCKED) {
+ dev_warn(cs->dev, "can't write to unlocked device\n");
+@@ -444,7 +442,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
+
+ if (!cs->connected)
+ gig_dbg(DEBUG_IF, "not connected");
+- else if (!cs->open_count)
++ else if (!local_read(&cs->open_count))
+ dev_warn(cs->dev, "%s: device not opened\n", __func__);
+ else if (cs->mstate != MS_LOCKED)
+ dev_warn(cs->dev, "can't write to unlocked device\n");
+@@ -472,7 +470,7 @@ static void if_throttle(struct tty_struct *tty)
if (!cs->connected)
gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
-- else if (!cs->port.count)
-+ else if (!atomic_read(&cs->port.count))
+- else if (!cs->open_count)
++ else if (!local_read(&cs->open_count))
dev_warn(cs->dev, "%s: device not opened\n", __func__);
-- else if (!--cs->port.count)
-+ else if (!atomic_dec_return(&cs->port.count))
- tty_port_tty_set(&cs->port, NULL);
+ else
+ gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
+@@ -496,7 +494,7 @@ static void if_unthrottle(struct tty_struct *tty)
- mutex_unlock(&cs->mutex);
+ if (!cs->connected)
+ gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
+- else if (!cs->open_count)
++ else if (!local_read(&cs->open_count))
+ dev_warn(cs->dev, "%s: device not opened\n", __func__);
+ else
+ gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
+@@ -527,7 +525,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
+ goto out;
+ }
+
+- if (!cs->open_count) {
++ if (!local_read(&cs->open_count)) {
+ dev_warn(cs->dev, "%s: device not opened\n", __func__);
+ goto out;
+ }
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
-index d0a41cb..f0cdb8c 100644
+index 5e3300d..dc7d752 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
-@@ -547,7 +547,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
+@@ -546,7 +546,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
memcpy(cs->hw.usb->bchars, buf, 6);
return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
@@ -41189,12 +38839,12 @@ index d0a41cb..f0cdb8c 100644
+ 0, 0, buf, 6, 2000);
}
- static void gigaset_freebcshw(struct bc_state *bcs)
+ static int gigaset_freebcshw(struct bc_state *bcs)
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
-index 4d9b195..455075c 100644
+index 2a57da59..e7a12ed 100644
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
-@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
+@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
}
if (left) {
if (t4file->user) {
@@ -41203,7 +38853,7 @@ index 4d9b195..455075c 100644
return -EFAULT;
} else {
memcpy(buf, dp, left);
-@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
+@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
}
if (left) {
if (config->user) {
@@ -41213,88 +38863,36 @@ index 4d9b195..455075c 100644
} else {
memcpy(buf, dp, left);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
-index 9bb12ba..d4262f7 100644
+index 6ddb795e..bd2e875 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
-@@ -1651,6 +1651,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
- } else
- return -EINVAL;
- case IIOCDBGVAR:
-+ if (!capable(CAP_SYS_RAWIO))
-+ return -EPERM;
- if (arg) {
- if (copy_to_user(argp, &dev, sizeof(ulong)))
- return -EFAULT;
-diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
-index 3c5f249..5fac4d0 100644
---- a/drivers/isdn/i4l/isdn_tty.c
-+++ b/drivers/isdn/i4l/isdn_tty.c
-@@ -1508,9 +1508,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));
- #endif
-- port->count++;
-+ atomic_inc(&port->count);
- port->tty = tty;
- /*
- * Start up serial port
-@@ -1554,7 +1554,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
- #endif
- return;
- }
-- if ((tty->count == 1) && (port->count != 1)) {
-+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
- /*
- * Uh, oh. tty->count is 1, which means that the tty
- * structure will be freed. Info->count should always
-@@ -1563,15 +1563,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, "
-- "info->count is %d\n", port->count);
-- port->count = 1;
-+ "info->count is %d\n", atomic_read(&port->count));
-+ atomic_set(&port->count, 1);
- }
-- if (--port->count < 0) {
-+ if (atomic_dec_return(&port->count) < 0) {
- printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
-- info->line, port->count);
-- port->count = 0;
-+ info->line, atomic_read(&port->count));
-+ atomic_set(&port->count, 0);
- }
-- if (port->count) {
-+ if (atomic_read(&port->count)) {
- #ifdef ISDN_DEBUG_MODEM_OPEN
- printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
- #endif
-@@ -1625,7 +1625,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->count = 0;
-+ atomic_set(&port->count, 0);
- port->flags &= ~ASYNC_NORMAL_ACTIVE;
- port->tty = NULL;
- wake_up_interruptible(&port->open_wait);
-@@ -1970,7 +1970,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];
-
-- if (info->port.count == 0)
-+ if (atomic_read(&info->port.count) == 0)
- continue;
- if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
- (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
+@@ -1656,6 +1656,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
+ } else
+ return -EINVAL;
+ case IIOCDBGVAR:
++ if (!capable(CAP_SYS_RAWIO))
++ return -EPERM;
+ if (arg) {
+ if (copy_to_user(argp, &dev, sizeof(ulong)))
+ return -EFAULT;
+diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
+index 2339d73..802ab87a 100644
+--- a/drivers/isdn/i4l/isdn_net.c
++++ b/drivers/isdn/i4l/isdn_net.c
+@@ -1901,7 +1901,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
+ {
+ isdn_net_local *lp = netdev_priv(dev);
+ unsigned char *p;
+- ushort len = 0;
++ int len = 0;
+
+ switch (lp->p_encap) {
+ case ISDN_NET_ENCAP_ETHER:
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
-index e74df7c..03a03ba 100644
+index 1f355bb..43f1fea 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
-@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
+@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
if (count > len)
count = len;
if (user) {
@@ -41304,38 +38902,34 @@ index e74df7c..03a03ba 100644
} else
memcpy(msg, buf, count);
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
-index baf2686..02125e6 100644
+index 509135f..c8645eb 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
-@@ -1083,8 +1083,10 @@ isdnloop_start(isdnloop_card *card, isdnloop_sdef *sdefp)
- spin_unlock_irqrestore(&card->isdnloop_lock, flags);
- return -ENOMEM;
- }
-- for (i = 0; i < 3; i++)
-- strcpy(card->s0num[i], sdef.num[i]);
-+ for (i = 0; i < 3; i++) {
-+ strlcpy(card->s0num[i], sdef.num[i],
-+ sizeof(card->s0num[0]));
-+ }
- break;
- case ISDN_PTYPE_1TR6:
- if (isdnloop_fake(card, "DRV1.04TC-1TR6-CAPI-CNS-BASIS-29.11.95",
-@@ -1097,7 +1099,7 @@ isdnloop_start(isdnloop_card *card, isdnloop_sdef *sdefp)
- spin_unlock_irqrestore(&card->isdnloop_lock, flags);
- return -ENOMEM;
- }
-- strcpy(card->s0num[0], sdef.num[0]);
-+ strlcpy(card->s0num[0], sdef.num[0], sizeof(card->s0num[0]));
- card->s0num[1][0] = '\0';
- card->s0num[2][0] = '\0';
- break;
+@@ -1084,7 +1084,7 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
+ return -ENOMEM;
+ }
+ for (i = 0; i < 3; i++)
+- strcpy(card->s0num[i], sdef.num[i]);
++ strlcpy(card->s0num[i], sdef.num[i], sizeof(card->s0num[0]));
+ break;
+ case ISDN_PTYPE_1TR6:
+ if (isdnloop_fake(card, "DRV1.04TC-1TR6-CAPI-CNS-BASIS-29.11.95",
+@@ -1097,7 +1097,7 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
+ spin_unlock_irqrestore(&card->isdnloop_lock, flags);
+ return -ENOMEM;
+ }
+- strcpy(card->s0num[0], sdef.num[0]);
++ strlcpy(card->s0num[0], sdef.num[0], sizeof(card->s0num[0]));
+ card->s0num[1][0] = '\0';
+ card->s0num[2][0] = '\0';
+ break;
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
-index a4f05c5..1433bc5 100644
+index 4d395de..c504763 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
-@@ -1628,7 +1628,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
+@@ -1623,7 +1623,7 @@ u32 dsp_spl_jiffies; /* calculate the next time to fire */
static u16 dsp_count; /* last sample count */
- static int dsp_count_valid; /* if we have last sample count */
+ static int dsp_count_valid ; /* if we have last sample count */
-void
+void __intentional_overflow(-1)
@@ -41343,54 +38937,67 @@ index a4f05c5..1433bc5 100644
{
struct dsp_conf *conf;
diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
-index d93e245..e7ece6b 100644
+index a498135..6a39f48 100644
--- a/drivers/leds/leds-clevo-mail.c
+++ b/drivers/leds/leds-clevo-mail.c
-@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
+@@ -39,7 +39,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
* detected as working, but in reality it is not) as low as
* possible.
*/
--static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
-+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
+-static struct dmi_system_id __initdata mail_led_whitelist[] = {
++static const struct dmi_system_id __initconst mail_led_whitelist[] = {
{
.callback = clevo_mail_led_dmi_callback,
.ident = "Clevo D410J",
+diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
+index b3393a9..33f6979 100644
+--- a/drivers/leds/leds-mc13783.c
++++ b/drivers/leds/leds-mc13783.c
+@@ -280,7 +280,7 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev)
+ return -EINVAL;
+ }
+
+- led = kzalloc(sizeof(*led) * pdata->num_leds, GFP_KERNEL);
++ led = kcalloc(pdata->num_leds, sizeof(*led), GFP_KERNEL);
+ if (led == NULL) {
+ dev_err(&pdev->dev, "failed to alloc memory\n");
+ return -ENOMEM;
diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
-index 5b8f938..b73d657 100644
+index 614ebeb..ce439fd 100644
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
-@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
+@@ -92,7 +92,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
* detected as working, but in reality it is not) as low as
* possible.
*/
--static struct dmi_system_id nas_led_whitelist[] __initdata = {
-+static struct dmi_system_id nas_led_whitelist[] __initconst = {
+-static struct dmi_system_id __initdata nas_led_whitelist[] = {
++static const struct dmi_system_id __initconst nas_led_whitelist[] = {
{
.callback = ss4200_led_dmi_callback,
.ident = "Intel SS4200-E",
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
-index 0bf1e4e..b4bf44e 100644
+index b5fdcb7..8ed3519 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
-@@ -97,9 +97,17 @@ static __init int map_switcher(void)
- * The end address needs +1 because __get_vm_area allocates an
- * extra guard page, so we need space for that.
+@@ -92,9 +92,17 @@ static __init int map_switcher(void)
+ * it's worked so far. The end address needs +1 because __get_vm_area
+ * allocates an extra guard page, so we need space for that.
*/
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
-+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
++ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
+#else
switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
- VM_ALLOC, switcher_addr, switcher_addr
+ VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
+ (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
+#endif
+
if (!switcher_vma) {
err = -ENOMEM;
printk("lguest: could not map switcher pages high\n");
-@@ -124,7 +132,7 @@ static __init int map_switcher(void)
+@@ -119,7 +127,7 @@ static __init int map_switcher(void)
* Now the Switcher is mapped at the right address, we can't fail!
* Copy in the compiled-in Switcher code (from x86/switcher_32.S).
*/
@@ -41400,10 +39007,10 @@ index 0bf1e4e..b4bf44e 100644
printk(KERN_INFO "lguest: mapped switcher at %p\n",
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
-index bfb39bb..08a603b 100644
+index 3b62be16..e33134a 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
-@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
+@@ -532,7 +532,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
/*:*/
#ifdef CONFIG_X86_PAE
@@ -41413,19 +39020,19 @@ index bfb39bb..08a603b 100644
/* If the entry's not present, there's nothing to release. */
if (pmd_flags(*spmd) & _PAGE_PRESENT) {
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
-index 5169239..47cb4db 100644
+index 65af42f..530c87a 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -59,7 +59,7 @@ static struct {
/* Offset from where switcher.S was compiled to where we've copied it */
static unsigned long switcher_offset(void)
{
-- return switcher_addr - (unsigned long)start_switcher_text;
-+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
+- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
++ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
}
- /* This cpu's struct lguest_pages (after the Switcher text page) */
-@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
+ /* This cpu's struct lguest_pages. */
+@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
* These copies are pretty cheap, so we do them unconditionally: */
/* Save the current Host top-level page directory.
*/
@@ -41439,7 +39046,7 @@ index 5169239..47cb4db 100644
/*
* Set up the Guest's page tables to see this CPU's pages (and no
* other CPU's pages).
-@@ -475,7 +481,7 @@ void __init lguest_arch_host_init(void)
+@@ -472,7 +478,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++)
@@ -41448,7 +39055,7 @@ index 5169239..47cb4db 100644
/*
* Set up the Switcher's per-cpu areas.
-@@ -558,7 +564,7 @@ void __init lguest_arch_host_init(void)
+@@ -555,7 +561,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.
*/
@@ -41519,50 +39126,24 @@ index 40634b0..4f5855e 100644
// Every interrupt can come to us here
// But we must truly tell each apart.
-diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
-index 0003992..854bbce 100644
---- a/drivers/md/bcache/closure.h
-+++ b/drivers/md/bcache/closure.h
-@@ -622,7 +622,7 @@ static inline void closure_wake_up(struct closure_waitlist *list)
- static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
- struct workqueue_struct *wq)
- {
-- BUG_ON(object_is_on_stack(cl));
-+ BUG_ON(object_starts_on_stack(cl));
- closure_set_ip(cl);
- cl->fn = fn;
- cl->wq = wq;
-diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
-index 547c4c5..5be1de4 100644
---- a/drivers/md/bcache/super.c
-+++ b/drivers/md/bcache/super.c
-@@ -1644,7 +1644,7 @@ err_unlock_gc:
- err:
- closure_sync(&op.cl);
- /* XXX: test this, it's broken */
-- bch_cache_set_error(c, err);
-+ bch_cache_set_error(c, "%s", err);
- }
-
- static bool can_attach_cache(struct cache *ca, struct cache_set *c)
-diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
-index a7fd821..9dcf6c3 100644
---- a/drivers/md/bitmap.c
-+++ b/drivers/md/bitmap.c
-@@ -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_path(seq, &bitmap->storage.file->f_path, " \t\n");
-+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
- }
-
- seq_printf(seq, "\n");
+diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
+index 4daf9e5..b8d1d0f 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/dm-ioctl.c b/drivers/md/dm-ioctl.c
-index afe0814..8cf3794 100644
+index e6a300c..cc9c96c 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
-@@ -1745,7 +1745,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;
@@ -41571,8 +39152,21 @@ index afe0814..8cf3794 100644
if (!*param->name) {
DMWARN("name not supplied when creating device");
return -EINVAL;
+diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
+index 1f23e04..08d9a20 100644
+--- a/drivers/md/dm-log-userspace-transfer.c
++++ b/drivers/md/dm-log-userspace-transfer.c
+@@ -134,7 +134,7 @@ static void cn_ulog_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
+ {
+ struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1);
+
+- if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN))
+ return;
+
+ spin_lock(&receiving_list_lock);
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
-index 9584443..9fc9ac9 100644
+index b7b649d..fcf5ef7 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -40,7 +40,7 @@ enum dm_raid1_error {
@@ -41584,7 +39178,7 @@ index 9584443..9fc9ac9 100644
unsigned long error_type;
struct dm_dev *dev;
sector_t offset;
-@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
+@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
struct mirror *m;
for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
@@ -41593,7 +39187,7 @@ index 9584443..9fc9ac9 100644
return m;
return NULL;
-@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
+@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
* simple way to tell if a device has encountered
* errors.
*/
@@ -41602,7 +39196,7 @@ index 9584443..9fc9ac9 100644
if (test_and_set_bit(error_type, &m->error_type))
return;
-@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
+@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
struct mirror *m = get_default_mirror(ms);
do {
@@ -41611,7 +39205,7 @@ index 9584443..9fc9ac9 100644
return m;
if (m-- == ms->mirror)
-@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
+@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
{
struct mirror *default_mirror = get_default_mirror(m->ms);
@@ -41620,7 +39214,7 @@ index 9584443..9fc9ac9 100644
}
static int mirror_available(struct mirror_set *ms, struct bio *bio)
-@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
+@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
*/
if (likely(region_in_sync(ms, region, 1)))
m = choose_mirror(ms, bio->bi_sector);
@@ -41629,7 +39223,7 @@ index 9584443..9fc9ac9 100644
m = NULL;
if (likely(m))
-@@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
+@@ -937,7 +937,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
}
ms->mirror[mirror].ms = ms;
@@ -41638,7 +39232,7 @@ index 9584443..9fc9ac9 100644
ms->mirror[mirror].error_type = 0;
ms->mirror[mirror].offset = offset;
-@@ -1339,7 +1339,7 @@ static void mirror_resume(struct dm_target *ti)
+@@ -1348,7 +1348,7 @@ static void mirror_resume(struct dm_target *ti)
*/
static char device_status_char(struct mirror *m)
{
@@ -41647,35 +39241,11 @@ index 9584443..9fc9ac9 100644
return 'A';
return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
-index 3d404c1..b62af0e 100644
---- a/drivers/md/dm-stats.c
-+++ b/drivers/md/dm-stats.c
-@@ -382,7 +382,7 @@ do_sync_free:
- synchronize_rcu_expedited();
- dm_stat_free(&s->rcu_head);
- } else {
-- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
-+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
- call_rcu(&s->rcu_head, dm_stat_free);
- }
- return 0;
-@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
- ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
- (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
- ));
-- ACCESS_ONCE(last->last_sector) = end_sector;
-- ACCESS_ONCE(last->last_rw) = bi_rw;
-+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
-+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
- }
-
- rcu_read_lock();
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
-index 73c1712..7347292 100644
+index cbd41d2..1717044 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
-@@ -21,7 +21,7 @@ struct stripe {
+@@ -20,7 +20,7 @@ struct stripe {
struct dm_dev *dev;
sector_t physical_start;
@@ -41684,7 +39254,7 @@ index 73c1712..7347292 100644
};
struct stripe_c {
-@@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
+@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
kfree(sc);
return r;
}
@@ -41693,7 +39263,7 @@ index 73c1712..7347292 100644
}
ti->private = sc;
-@@ -327,7 +327,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
+@@ -314,7 +314,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
DMEMIT("%d ", sc->stripes);
for (i = 0; i < sc->stripes; i++) {
DMEMIT("%s ", sc->stripe[i].dev->name);
@@ -41702,7 +39272,7 @@ index 73c1712..7347292 100644
'D' : 'A';
}
buffer[i] = '\0';
-@@ -372,8 +372,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
+@@ -360,8 +360,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
*/
for (i = 0; i < sc->stripes; i++)
if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
@@ -41714,10 +39284,10 @@ index 73c1712..7347292 100644
schedule_work(&sc->trigger_event);
}
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
-index 8f87835..531854d 100644
+index 52848ab..b8a17d4 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
-@@ -286,7 +286,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
+@@ -323,7 +323,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
static int open_dev(struct dm_dev_internal *d, dev_t dev,
struct mapped_device *md)
{
@@ -41726,7 +39296,7 @@ index 8f87835..531854d 100644
struct block_device *bdev;
int r;
-@@ -354,7 +354,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
+@@ -391,7 +391,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
if (!dev_size)
return 0;
@@ -41736,21 +39306,21 @@ index 8f87835..531854d 100644
"start=%llu, len=%llu, dev_size=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
-index 60bce43..9b997d0 100644
+index 237571a..fb6d19b 100644
--- a/drivers/md/dm-thin-metadata.c
+++ b/drivers/md/dm-thin-metadata.c
-@@ -397,7 +397,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
- {
- pmd->info.tm = pmd->tm;
+@@ -432,7 +432,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
+
+ pmd->info.tm = tm;
pmd->info.levels = 2;
- pmd->info.value_type.context = pmd->data_sm;
+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
pmd->info.value_type.size = sizeof(__le64);
pmd->info.value_type.inc = data_block_inc;
pmd->info.value_type.dec = data_block_dec;
-@@ -416,7 +416,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
+@@ -451,7 +451,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
- pmd->bl_info.tm = pmd->tm;
+ pmd->bl_info.tm = tm;
pmd->bl_info.levels = 1;
- pmd->bl_info.value_type.context = pmd->data_sm;
+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
@@ -41758,10 +39328,10 @@ index 60bce43..9b997d0 100644
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 b3e26c7..1efca94 100644
+index 8953630..29b12d9 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
-@@ -179,9 +179,9 @@ struct mapped_device {
+@@ -177,9 +177,9 @@ struct mapped_device {
/*
* Event handling.
*/
@@ -41773,8 +39343,8 @@ index b3e26c7..1efca94 100644
struct list_head uevent_list;
spinlock_t uevent_lock; /* Protect access to uevent_list */
-@@ -1985,8 +1985,8 @@ static struct mapped_device *alloc_dev(int minor)
- spin_lock_init(&md->deferred_lock);
+@@ -1871,8 +1871,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);
- atomic_set(&md->event_nr, 0);
@@ -41784,7 +39354,7 @@ index b3e26c7..1efca94 100644
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
-@@ -2139,7 +2139,7 @@ static void event_callback(void *context)
+@@ -2006,7 +2006,7 @@ static void event_callback(void *context)
dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
@@ -41793,7 +39363,7 @@ index b3e26c7..1efca94 100644
wake_up(&md->eventq);
}
-@@ -2832,18 +2832,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
+@@ -2648,18 +2648,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
uint32_t dm_next_uevent_seq(struct mapped_device *md)
{
@@ -41816,10 +39386,10 @@ index b3e26c7..1efca94 100644
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 561a65f..f4e8c71 100644
+index 2d0544c..bc3c200 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -234,10 +234,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
+@@ -278,10 +278,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
* start build, activate spare
*/
static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
@@ -41832,7 +39402,7 @@ index 561a65f..f4e8c71 100644
wake_up(&md_event_waiters);
}
EXPORT_SYMBOL_GPL(md_new_event);
-@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
+@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
*/
static void md_new_event_inintr(struct mddev *mddev)
{
@@ -41841,16 +39411,16 @@ index 561a65f..f4e8c71 100644
wake_up(&md_event_waiters);
}
-@@ -1502,7 +1502,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);
+@@ -1534,7 +1534,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
+
+ rdev->preferred_minor = 0xffff;
+ rdev->data_offset = le64_to_cpu(sb->data_offset);
- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1746,7 +1746,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
+@@ -1751,7 +1751,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
else
sb->resync_offset = cpu_to_le64(0);
@@ -41859,7 +39429,7 @@ index 561a65f..f4e8c71 100644
sb->raid_disks = cpu_to_le32(mddev->raid_disks);
sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2751,7 +2751,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
+@@ -2649,7 +2649,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
static ssize_t
errors_show(struct md_rdev *rdev, char *page)
{
@@ -41868,7 +39438,7 @@ index 561a65f..f4e8c71 100644
}
static ssize_t
-@@ -2760,7 +2760,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
+@@ -2658,7 +2658,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')) {
@@ -41877,7 +39447,7 @@ index 561a65f..f4e8c71 100644
return len;
}
return -EINVAL;
-@@ -3208,8 +3208,8 @@ int md_rdev_init(struct md_rdev *rdev)
+@@ -3052,8 +3052,8 @@ int md_rdev_init(struct md_rdev *rdev)
rdev->sb_loaded = 0;
rdev->bb_page = NULL;
atomic_set(&rdev->nr_pending, 0);
@@ -41888,7 +39458,7 @@ index 561a65f..f4e8c71 100644
INIT_LIST_HEAD(&rdev->same_set);
init_waitqueue_head(&rdev->blocked_wait);
-@@ -7042,7 +7042,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
+@@ -6703,7 +6703,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
spin_unlock(&pers_lock);
seq_printf(seq, "\n");
@@ -41897,7 +39467,16 @@ index 561a65f..f4e8c71 100644
return 0;
}
if (v == (void*)2) {
-@@ -7145,7 +7145,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
+@@ -6792,7 +6792,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
+ chunk_kb ? "KB" : "B");
+ if (bitmap->file) {
+ seq_printf(seq, ", file: ");
+- seq_path(seq, &bitmap->file->f_path, " \t\n");
++ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
+ }
+
+ seq_printf(seq, "\n");
+@@ -6823,7 +6823,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
return error;
seq = file->private_data;
@@ -41906,7 +39485,7 @@ index 561a65f..f4e8c71 100644
return error;
}
-@@ -7159,7 +7159,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
+@@ -6837,7 +6837,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
/* always allow read */
mask = POLLIN | POLLRDNORM;
@@ -41915,7 +39494,7 @@ index 561a65f..f4e8c71 100644
mask |= POLLERR | POLLPRI;
return mask;
}
-@@ -7203,7 +7203,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
+@@ -6881,7 +6881,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]) -
@@ -41925,10 +39504,10 @@ index 561a65f..f4e8c71 100644
* 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 608050c..6e77db5d 100644
+index cf742d9..7c7c745 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
-@@ -94,13 +94,13 @@ struct md_rdev {
+@@ -120,13 +120,13 @@ struct md_rdev {
* only maintained for arrays that
* support hot removal
*/
@@ -41944,7 +39523,7 @@ index 608050c..6e77db5d 100644
* for reporting to userspace and storing
* in superblock.
*/
-@@ -446,7 +446,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
+@@ -410,7 +410,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
{
@@ -41953,23 +39532,36 @@ index 608050c..6e77db5d 100644
}
struct md_personality
+diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
+index fc90c11..c8cd9a9 100644
+--- a/drivers/md/persistent-data/dm-space-map-checker.c
++++ b/drivers/md/persistent-data/dm-space-map-checker.c
+@@ -167,7 +167,7 @@ static int ca_commit(struct count_array *old, struct count_array *new)
+ /*----------------------------------------------------------------*/
+
+ struct sm_checker {
+- struct dm_space_map sm;
++ dm_space_map_no_const sm;
+
+ struct count_array old_counts;
+ struct count_array counts;
diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
-index 3e6d115..ffecdeb 100644
+index 1cbfc6b..56e1dbb 100644
--- a/drivers/md/persistent-data/dm-space-map.h
+++ b/drivers/md/persistent-data/dm-space-map.h
-@@ -71,6 +71,7 @@ struct dm_space_map {
- dm_sm_threshold_fn fn,
- void *context);
+@@ -60,6 +60,7 @@ struct dm_space_map {
+ int (*root_size)(struct dm_space_map *sm, size_t *result);
+ int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
};
+typedef struct dm_space_map __no_const dm_space_map_no_const;
/*----------------------------------------------------------------*/
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
-index aacf6bf..67d63f2 100644
+index c706a7b..2cc7511 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
-@@ -1824,7 +1824,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
+@@ -1591,7 +1591,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)
@@ -41978,7 +39570,7 @@ index aacf6bf..67d63f2 100644
}
sectors -= s;
sect += s;
-@@ -2051,7 +2051,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
+@@ -1810,7 +1810,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)) {
@@ -41988,10 +39580,10 @@ index aacf6bf..67d63f2 100644
"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 73dc8a3..bdd515a 100644
+index 8bba438..f065cc3 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
-@@ -1963,7 +1963,7 @@ static void end_sync_read(struct bio *bio, int error)
+@@ -1465,7 +1465,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
*/
@@ -42000,7 +39592,7 @@ index 73dc8a3..bdd515a 100644
&conf->mirrors[d].rdev->corrected_errors);
/* for reconstruct, we always reschedule after a read.
-@@ -2321,7 +2321,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -1765,7 +1765,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
{
struct timespec cur_time_mon;
unsigned long hours_since_last;
@@ -42009,7 +39601,7 @@ index 73dc8a3..bdd515a 100644
ktime_get_ts(&cur_time_mon);
-@@ -2343,9 +2343,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -1787,9 +1787,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))
@@ -42021,7 +39613,7 @@ index 73dc8a3..bdd515a 100644
}
static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
-@@ -2399,8 +2399,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -1839,8 +1839,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
return;
check_decay_read_errors(mddev, rdev);
@@ -42032,7 +39624,7 @@ index 73dc8a3..bdd515a 100644
char b[BDEVNAME_SIZE];
bdevname(rdev->bdev, b);
-@@ -2408,7 +2408,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -1848,7 +1848,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,
@@ -42041,9 +39633,9 @@ index 73dc8a3..bdd515a 100644
printk(KERN_NOTICE
"md/raid10:%s: %s: Failing raid device\n",
mdname(mddev), b);
-@@ -2563,7 +2563,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
- sect +
- choose_data_offset(r10_bio, rdev)),
+@@ -1993,7 +1993,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+ (unsigned long long)(
+ sect + rdev->data_offset),
bdevname(rdev->bdev, b));
- atomic_add(s, &rdev->corrected_errors);
+ atomic_add_unchecked(s, &rdev->corrected_errors);
@@ -42051,48 +39643,59 @@ index 73dc8a3..bdd515a 100644
rdev_dec_pending(rdev, mddev);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index f8b9068..7a2b9fc 100644
+index 26ef63a..bd587cd 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
-@@ -1886,21 +1886,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
- mdname(conf->mddev), STRIPE_SECTORS,
- (unsigned long long)s,
+@@ -1618,19 +1618,19 @@ static void raid5_end_read_request(struct bio * bi, int error)
+ (unsigned long long)(sh->sector
+ + rdev->data_offset),
bdevname(rdev->bdev, b));
- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
clear_bit(R5_ReadError, &sh->dev[i].flags);
clear_bit(R5_ReWrite, &sh->dev[i].flags);
- } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
- clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
-
-- if (atomic_read(&rdev->read_errors))
-- atomic_set(&rdev->read_errors, 0);
-+ if (atomic_read_unchecked(&rdev->read_errors))
-+ atomic_set_unchecked(&rdev->read_errors, 0);
+ }
+- if (atomic_read(&conf->disks[i].rdev->read_errors))
+- atomic_set(&conf->disks[i].rdev->read_errors, 0);
++ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
++ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
} else {
- const char *bdn = bdevname(rdev->bdev, b);
+ const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
int retry = 0;
- int set_bad = 0;
+ rdev = conf->disks[i].rdev;
clear_bit(R5_UPTODATE, &sh->dev[i].flags);
- atomic_inc(&rdev->read_errors);
+ atomic_inc_unchecked(&rdev->read_errors);
- if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
+ if (conf->mddev->degraded >= conf->max_degraded)
printk_ratelimited(
KERN_WARNING
-@@ -1928,7 +1928,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
- mdname(conf->mddev),
- (unsigned long long)s,
+@@ -1650,7 +1650,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
+ (unsigned long long)(sh->sector
+ + rdev->data_offset),
bdn);
-- } else if (atomic_read(&rdev->read_errors)
-+ } else if (atomic_read_unchecked(&rdev->read_errors)
+- else if (atomic_read(&rdev->read_errors)
++ else if (atomic_read_unchecked(&rdev->read_errors)
> conf->max_nr_stripes)
printk(KERN_WARNING
"md/raid:%s: Too many read errors, failing device %s.\n",
-diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
-index 401ef64..836e563 100644
---- a/drivers/media/dvb-core/dvbdev.c
-+++ b/drivers/media/dvb-core/dvbdev.c
+diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
+index ba9a643..e474ab5 100644
+--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
++++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
+@@ -1678,7 +1678,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/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
+index d5cda35..017af46 100644
+--- a/drivers/media/dvb/dvb-core/dvbdev.c
++++ b/drivers/media/dvb/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)
{
@@ -42102,10 +39705,36 @@ index 401ef64..836e563 100644
struct device *clsdev;
int minor;
int id;
-diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
-index 9b6c3bb..baeb5c7 100644
---- a/drivers/media/dvb-frontends/dib3000.h
-+++ b/drivers/media/dvb-frontends/dib3000.h
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index 9f2a02c..5920f88 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -1069,7 +1069,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
+ struct dib0700_adapter_state {
+ int (*set_param_save) (struct dvb_frontend *,
+ struct dvb_frontend_parameters *);
+-};
++} __no_const;
+
+ static int dib7070_set_param_override(struct dvb_frontend *fe,
+ struct dvb_frontend_parameters *fep)
+diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
+index f103ec1..5e8968b 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
+index 404f63a..4796533 100644
+--- 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);
@@ -42113,13 +39742,109 @@ index 9b6c3bb..baeb5c7 100644
-};
+} __no_const;
- #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
+ #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/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
-index ecf21d9..b992428d 100644
---- a/drivers/media/pci/cx88/cx88-video.c
-+++ b/drivers/media/pci/cx88/cx88-video.c
-@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
+diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
+index 90bf573..e8463da 100644
+--- a/drivers/media/dvb/frontends/ds3000.c
++++ b/drivers/media/dvb/frontends/ds3000.c
+@@ -1210,7 +1210,7 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,
+
+ for (i = 0; i < 30 ; i++) {
+ ds3000_read_status(fe, &status);
+- if (status && FE_HAS_LOCK)
++ if (status & FE_HAS_LOCK)
+ break;
+
+ msleep(10);
+diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
+index 0564192..75b16f5 100644
+--- a/drivers/media/dvb/ngene/ngene-cards.c
++++ b/drivers/media/dvb/ngene/ngene-cards.c
+@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780 = {
+
+ /****************************************************************************/
+
+-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
++static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
+ 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 16a089f..1661b11 100644
+--- a/drivers/media/radio/radio-cadet.c
++++ b/drivers/media/radio/radio-cadet.c
+@@ -326,6 +326,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) {
+ dev->rdsstat = 1;
+@@ -347,7 +349,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
+ readbuf[i++] = dev->rdsbuf[dev->rdsout++];
+ mutex_unlock(&dev->lock);
+
+- if (copy_to_user(data, readbuf, i))
++ if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
+ return -EFAULT;
+ return i;
+ }
+diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
+index a47ba33..deafb02 100644
+--- a/drivers/media/rc/rc-main.c
++++ b/drivers/media/rc/rc-main.c
+@@ -1031,7 +1031,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
+
+ int rc_register_device(struct rc_dev *dev)
+ {
+- static atomic_t devno = ATOMIC_INIT(0);
++ static atomic_unchecked_t devno = ATOMIC_INIT(0);
+ struct rc_map *rc_map;
+ const char *path;
+ int rc;
+@@ -1063,7 +1063,7 @@ int rc_register_device(struct rc_dev *dev)
+ */
+ mutex_lock(&dev->lock);
+
+- dev->devno = (unsigned long)(atomic_inc_return(&devno) - 1);
++ dev->devno = (unsigned long)(atomic_inc_return_unchecked(&devno) - 1);
+ dev_set_name(&dev->dev, "rc%ld", dev->devno);
+ dev_set_drvdata(&dev->dev, dev);
+ rc = device_add(&dev->dev);
+diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
+index 61287fc..8b08712 100644
+--- a/drivers/media/rc/redrat3.c
++++ b/drivers/media/rc/redrat3.c
+@@ -905,7 +905,7 @@ static int redrat3_set_tx_carrier(struct rc_dev *dev, u32 carrier)
+ return carrier;
+ }
+
+-static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)
++static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf, u32 n)
+ {
+ struct redrat3_dev *rr3 = rcdev->priv;
+ struct device *dev = rr3->dev;
+diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
+index 68d1240..46b32eb 100644
+--- a/drivers/media/video/cx88/cx88-alsa.c
++++ b/drivers/media/video/cx88/cx88-alsa.c
+@@ -766,7 +766,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/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
+index 921c56d..7e6c4b2 100644
+--- a/drivers/media/video/cx88/cx88-video.c
++++ b/drivers/media/video/cx88/cx88-video.c
+@@ -49,9 +49,9 @@ MODULE_VERSION(CX88_VERSION);
/* ------------------------------------------------------------------ */
@@ -42132,11 +39857,11 @@ index ecf21d9..b992428d 100644
module_param_array(video_nr, int, NULL, 0444);
module_param_array(vbi_nr, int, NULL, 0444);
-diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
-index c08ae3e..eb59af1 100644
---- a/drivers/media/pci/ivtv/ivtv-driver.c
-+++ b/drivers/media/pci/ivtv/ivtv-driver.c
-@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
+diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
+index 41108a9a..8ad2437 100644
+--- a/drivers/media/video/ivtv/ivtv-driver.c
++++ b/drivers/media/video/ivtv/ivtv-driver.c
+@@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl[] __devinitdata = {
MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
/* ivtv instance counter */
@@ -42145,11 +39870,11 @@ index c08ae3e..eb59af1 100644
/* Parameter declarations */
static int cardtype[IVTV_MAX_CARDS];
-diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
-index dfd0a21..6bbb465 100644
---- a/drivers/media/platform/omap/omap_vout.c
-+++ b/drivers/media/platform/omap/omap_vout.c
-@@ -63,7 +63,6 @@ enum omap_vout_channels {
+diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
+index d345215..b607565 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 {
OMAP_VIDEO2,
};
@@ -42157,7 +39882,7 @@ index dfd0a21..6bbb465 100644
/* Variables configurable through module params*/
static u32 video1_numbuffers = 3;
static u32 video2_numbuffers = 3;
-@@ -1014,6 +1013,12 @@ static int omap_vout_open(struct file *file)
+@@ -1001,6 +1000,12 @@ static int omap_vout_open(struct file *file)
{
struct videobuf_queue *q;
struct omap_vout_device *vout = NULL;
@@ -42170,7 +39895,7 @@ index dfd0a21..6bbb465 100644
vout = video_drvdata(file);
v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
-@@ -1031,10 +1036,6 @@ static int omap_vout_open(struct file *file)
+@@ -1018,10 +1023,6 @@ static int omap_vout_open(struct file *file)
vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
q = &vout->vbq;
@@ -42181,285 +39906,33 @@ index dfd0a21..6bbb465 100644
spin_lock_init(&vout->vbq_lock);
videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
-diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
-index 04e6490..2df65bf 100644
---- a/drivers/media/platform/s5p-tv/mixer.h
-+++ b/drivers/media/platform/s5p-tv/mixer.h
-@@ -156,7 +156,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 b713403..53cb5ad 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 641b1f0..49cff30 100644
---- a/drivers/media/platform/s5p-tv/mixer_video.c
-+++ b/drivers/media/platform/s5p-tv/mixer_video.c
-@@ -210,7 +210,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);
- }
-
-@@ -228,7 +228,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);
- }
-@@ -334,7 +334,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;
-@@ -342,12 +342,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 */
-@@ -474,7 +474,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;
-@@ -955,13 +955,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;
-@@ -1031,7 +1031,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 */
-@@ -1070,8 +1070,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)
-@@ -1097,7 +1097,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/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
-index 545c04c..a14bded 100644
---- a/drivers/media/radio/radio-cadet.c
-+++ b/drivers/media/radio/radio-cadet.c
-@@ -324,6 +324,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);
-@@ -339,7 +341,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-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
-index 5236035..c622c74 100644
---- a/drivers/media/radio/radio-maxiradio.c
-+++ b/drivers/media/radio/radio-maxiradio.c
-@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
- /* TEA5757 pin mappings */
- static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
-
--static atomic_t maxiradio_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
-
- #define PCI_VENDOR_ID_GUILLEMOT 0x5046
- #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
-diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
-index b914772..7ddbf9b 100644
---- a/drivers/media/radio/radio-shark.c
-+++ b/drivers/media/radio/radio-shark.c
-@@ -79,7 +79,7 @@ struct shark_device {
- u32 last_val;
+diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
+index a0895bf..b451f5b 100644
+--- a/drivers/media/video/timblogiw.c
++++ b/drivers/media/video/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 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,
+@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
+ .vidioc_enum_framesizes = timblogiw_enum_framesizes,
};
--static atomic_t shark_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
-
- static void shark_write_val(struct snd_tea575x *tea, u32 val)
- {
-diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
-index 9fb6697..f167415 100644
---- a/drivers/media/radio/radio-shark2.c
-+++ b/drivers/media/radio/radio-shark2.c
-@@ -74,7 +74,7 @@ struct shark_device {
- u8 *transfer_buffer;
- };
-
--static atomic_t shark_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
-
- static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
- {
-diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
-index 9c9084c..a9e8dfb 100644
---- a/drivers/media/radio/radio-si476x.c
-+++ b/drivers/media/radio/radio-si476x.c
-@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
- struct si476x_radio *radio;
- struct v4l2_ctrl *ctrl;
-
-- static atomic_t instance = ATOMIC_INIT(0);
-+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
-
- radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
- if (!radio)
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
-index 46da365..3ba4206 100644
---- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -1065,7 +1065,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
- int rc_register_device(struct rc_dev *dev)
- {
- static bool raw_init = false; /* raw decoders loaded? */
-- static atomic_t devno = ATOMIC_INIT(0);
-+ static atomic_unchecked_t devno = ATOMIC_INIT(0);
- struct rc_map *rc_map;
- const char *path;
- int rc;
-@@ -1096,7 +1096,7 @@ int rc_register_device(struct rc_dev *dev)
- */
- mutex_lock(&dev->lock);
-
-- dev->devno = (unsigned long)(atomic_inc_return(&devno) - 1);
-+ dev->devno = (unsigned long)(atomic_inc_return_unchecked(&devno) - 1);
- dev_set_name(&dev->dev, "rc%ld", dev->devno);
- dev_set_drvdata(&dev->dev, dev);
- rc = device_add(&dev->dev);
-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 6e237b6..dc25556 100644
---- a/drivers/media/usb/dvb-usb/dw2102.c
-+++ b/drivers/media/usb/dvb-usb/dw2102.c
-@@ -118,7 +118,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/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-index 8f7a6a4..59502dd 100644
---- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-@@ -326,7 +326,7 @@ struct v4l2_buffer32 {
+-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
++static struct v4l2_file_operations timblogiw_fops = {
+ .owner = THIS_MODULE,
+ .open = timblogiw_open,
+ .release = timblogiw_close,
+diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
+index c68531b..82a9ea0 100644
+--- a/drivers/media/video/v4l2-compat-ioctl32.c
++++ b/drivers/media/video/v4l2-compat-ioctl32.c
+@@ -332,7 +332,7 @@ struct v4l2_buffer32 {
__u32 reserved;
};
@@ -42468,7 +39941,7 @@ index 8f7a6a4..59502dd 100644
enum v4l2_memory memory)
{
void __user *up_pln;
-@@ -355,7 +355,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
+@@ -358,7 +358,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
return 0;
}
@@ -42477,20 +39950,11 @@ index 8f7a6a4..59502dd 100644
enum v4l2_memory memory)
{
if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
-@@ -772,7 +772,7 @@ static int put_v4l2_subdev_edid32(struct v4l2_subdev_edid *kp, struct v4l2_subde
- put_user(kp->start_block, &up->start_block) ||
- put_user(kp->blocks, &up->blocks) ||
- put_user(tmp, &up->edid) ||
-- copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
-+ copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
- return -EFAULT;
- return 0;
- }
-diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
-index 02d1b63..5fd6b16 100644
---- a/drivers/media/v4l2-core/v4l2-device.c
-+++ b/drivers/media/v4l2-core/v4l2-device.c
-@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
+diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
+index 8b0777f..e29f31e 100644
+--- a/drivers/media/video/v4l2-device.c
++++ b/drivers/media/video/v4l2-device.c
+@@ -74,9 +74,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
EXPORT_SYMBOL_GPL(v4l2_device_put);
int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
@@ -42502,30 +39966,11 @@ index 02d1b63..5fd6b16 100644
int len = strlen(basename);
if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 68e6b5e..d8b923e 100644
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1939,7 +1939,8 @@ struct v4l2_ioctl_info {
- struct file *file, void *fh, void *p);
- } u;
- void (*debug)(const void *arg, bool write_only);
--};
-+} __do_const;
-+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
-
- /* This control needs a priority check */
- #define INFO_FL_PRIO (1 << 0)
-@@ -2120,7 +2121,7 @@ static long __video_do_ioctl(struct file *file,
- struct video_device *vfd = video_devdata(file);
- const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
- bool write_only = false;
-- struct v4l2_ioctl_info default_info;
-+ v4l2_ioctl_info_no_const default_info;
- const struct v4l2_ioctl_info *info;
- void *fh = file->private_data;
- struct v4l2_fh *vfh = NULL;
-@@ -2194,7 +2195,7 @@ done:
+diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
+index 639abee..e2336f4 100644
+--- a/drivers/media/video/v4l2-ioctl.c
++++ b/drivers/media/video/v4l2-ioctl.c
+@@ -2197,7 +2197,7 @@ static unsigned long cmd_input_size(unsigned int cmd)
}
static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
@@ -42534,7 +39979,7 @@ index 68e6b5e..d8b923e 100644
{
int ret = 0;
-@@ -2210,7 +2211,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2212,7 +2212,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
ret = -EINVAL;
break;
}
@@ -42543,7 +39988,7 @@ index 68e6b5e..d8b923e 100644
*kernel_ptr = (void *)&buf->m.planes;
*array_size = sizeof(struct v4l2_plane) * buf->length;
ret = 1;
-@@ -2245,7 +2246,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2230,7 +2230,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
ret = -EINVAL;
break;
}
@@ -42552,11 +39997,32 @@ index 68e6b5e..d8b923e 100644
*kernel_ptr = (void *)&ctrls->controls;
*array_size = sizeof(struct v4l2_ext_control)
* ctrls->count;
+diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
+index 668f5c6..65df5f2 100644
+--- a/drivers/memstick/host/r592.c
++++ b/drivers/memstick/host/r592.c
+@@ -454,7 +454,7 @@ static int r592_transfer_fifo_pio(struct r592_device *dev)
+ /* Executes one TPC (data is read/written from small or large fifo) */
+ static void r592_execute_tpc(struct r592_device *dev)
+ {
+- bool is_write = dev->req->tpc >= MS_TPC_SET_RW_REG_ADRS;
++ bool is_write;
+ int len, error;
+ u32 status, reg;
+
+@@ -463,6 +463,7 @@ static void r592_execute_tpc(struct r592_device *dev)
+ return;
+ }
+
++ is_write = dev->req->tpc >= MS_TPC_SET_RW_REG_ADRS;
+ len = dev->req->long_data ?
+ dev->req->sg.length : dev->req->data_len;
+
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
-index 767ff4d..c69d259 100644
+index e9c6a60..a1d04d6 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
-@@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
+@@ -6753,8 +6753,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);
@@ -42570,7 +40036,7 @@ index 767ff4d..c69d259 100644
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-@@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
+@@ -6767,7 +6772,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
ioc->facts.GlobalCredits);
seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
@@ -42583,7 +40049,7 @@ index 767ff4d..c69d259 100644
seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
-index dd239bd..689c4f7 100644
+index 9d95042..b808101 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
@@ -42635,10 +40101,10 @@ index dd239bd..689c4f7 100644
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
-index 727819c..ad74694 100644
+index 0c3ced7..1fe34ec 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
-@@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
+@@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
@@ -42664,15 +40130,16 @@ index 727819c..ad74694 100644
return h->info_kbuf;
}
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
-index b7d87cd..3fb36da 100644
+index 07dbeaf..59a658c 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
-@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
+@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
--static char *chtostr(char *tmp, u8 *chars, int n)
+-static char *chtostr(u8 * chars, int n)
-{
+- char tmp[256];
- tmp[0] = 0;
- return strncat(tmp, (char *)chars, n);
-}
@@ -42680,7 +40147,7 @@ index b7d87cd..3fb36da 100644
static int i2o_report_query_status(struct seq_file *seq, int block_status,
char *group)
{
-@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
+@@ -721,9 +714,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
static int i2o_seq_show_hw(struct seq_file *seq, void *v)
{
struct i2o_controller *c = (struct i2o_controller *)seq->private;
@@ -42693,45 +40160,28 @@ index b7d87cd..3fb36da 100644
int token;
u32 hwcap;
-@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
- } *result;
-
- i2o_exec_execute_ddm_table ddm_table;
-- char tmp[28 + 1];
-
- result = kmalloc(sizeof(*result), GFP_KERNEL);
- if (!result)
-@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
+@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
seq_printf(seq, "%-#8x", ddm_table.module_id);
- seq_printf(seq, "%-29s",
-- chtostr(tmp, ddm_table.module_name_version, 28));
+- chtostr(ddm_table.module_name_version, 28));
+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
seq_printf(seq, "%9d ", ddm_table.data_size);
seq_printf(seq, "%8d", ddm_table.code_size);
-@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
-
- i2o_driver_result_table *result;
- i2o_driver_store_table *dst;
-- char tmp[28 + 1];
-
- result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
- if (result == NULL)
-@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
+@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
seq_printf(seq, "%-#8x", dst->module_id);
-- seq_printf(seq, "%-29s",
-- chtostr(tmp, dst->module_name_version, 28));
-- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
+- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
+- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
+ seq_printf(seq, "%-.28s", dst->module_name_version);
+ seq_printf(seq, "%-.8s", dst->date);
seq_printf(seq, "%8d ", dst->module_size);
seq_printf(seq, "%8d ", dst->mpb_size);
seq_printf(seq, "0x%04x", dst->module_flags);
-@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
+@@ -1257,9 +1249,9 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
{
struct i2o_device *d = (struct i2o_device *)seq->private;
@@ -42741,22 +40191,20 @@ index b7d87cd..3fb36da 100644
- static u16 *work16 = (u16 *) work32;
+ u16 *work16 = (u16 *) work32;
int token;
-- char tmp[16 + 1];
token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
-
-@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
+@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
- seq_printf(seq, "Vendor info : %s\n",
-- chtostr(tmp, (u8 *) (work32 + 2), 16));
+- chtostr((u8 *) (work32 + 2), 16));
- seq_printf(seq, "Product info : %s\n",
-- chtostr(tmp, (u8 *) (work32 + 6), 16));
+- chtostr((u8 *) (work32 + 6), 16));
- seq_printf(seq, "Description : %s\n",
-- chtostr(tmp, (u8 *) (work32 + 10), 16));
+- chtostr((u8 *) (work32 + 10), 16));
- seq_printf(seq, "Product rev. : %s\n",
-- chtostr(tmp, (u8 *) (work32 + 14), 8));
+- chtostr((u8 *) (work32 + 14), 8));
+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
@@ -42764,49 +40212,31 @@ index b7d87cd..3fb36da 100644
seq_printf(seq, "Serial number : ");
print_serial_number(seq, (u8 *) (work32 + 16),
-@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
- u8 pad[256]; // allow up to 256 byte (max) serial number
- } result;
-
-- char tmp[24 + 1];
--
- token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
-
- if (token < 0) {
-@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
+@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
}
seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
- seq_printf(seq, "Module name : %s\n",
-- chtostr(tmp, result.module_name, 24));
+- chtostr(result.module_name, 24));
- seq_printf(seq, "Module revision : %s\n",
-- chtostr(tmp, result.module_rev, 8));
+- chtostr(result.module_rev, 8));
+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
seq_printf(seq, "Serial number : ");
print_serial_number(seq, result.serial_number, sizeof(result) - 36);
-@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
- u8 instance_number[4];
- } result;
-
-- char tmp[64 + 1];
--
- token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
-
- if (token < 0) {
-@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
+@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
return 0;
}
- seq_printf(seq, "Device name : %s\n",
-- chtostr(tmp, result.device_name, 64));
+- chtostr(result.device_name, 64));
- seq_printf(seq, "Service name : %s\n",
-- chtostr(tmp, result.service_name, 64));
+- chtostr(result.service_name, 64));
- seq_printf(seq, "Physical name : %s\n",
-- chtostr(tmp, result.physical_location, 64));
+- chtostr(result.physical_location, 64));
- seq_printf(seq, "Instance number : %s\n",
-- chtostr(tmp, result.instance_number, 4));
+- chtostr(result.instance_number, 4));
+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
@@ -42814,7 +40244,7 @@ index b7d87cd..3fb36da 100644
return 0;
}
-@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
+@@ -1374,9 +1356,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
{
struct i2o_device *d = (struct i2o_device *)seq->private;
@@ -42855,7 +40285,7 @@ index a8c08f3..155fe3d 100644
#endif
diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
-index fcbb2e9..2635e11 100644
+index 5c2a06a..8fa077c 100644
--- a/drivers/mfd/janz-cmodio.c
+++ b/drivers/mfd/janz-cmodio.c
@@ -13,6 +13,7 @@
@@ -42867,45 +40297,45 @@ index fcbb2e9..2635e11 100644
#include <linux/pci.h>
#include <linux/interrupt.h>
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
-index de7fb80..7c1b931 100644
+index 0219115..0743393 100644
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
-@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
+@@ -139,7 +139,7 @@ static int __devinit max8925_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
+ struct max8925_platform_data *pdata = client->dev.platform_data;
- static struct max8925_chip *chip;
+ struct max8925_chip *chip;
- struct device_node *node = client->dev.of_node;
- if (node && !pdata) {
-diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
-index d792772..cd73ba3 100644
---- a/drivers/mfd/tps65910.c
-+++ b/drivers/mfd/tps65910.c
-@@ -229,7 +229,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
- struct tps65910_platform_data *pdata)
- {
- int ret = 0;
-- static struct regmap_irq_chip *tps6591x_irqs_chip;
-+ struct regmap_irq_chip *tps6591x_irqs_chip;
+ if (!pdata) {
+ pr_info("%s: platform data is missing\n", __func__);
+diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
+index 6dad2ef..ef80da6 100644
+--- a/drivers/mfd/mfd-core.c
++++ b/drivers/mfd/mfd-core.c
+@@ -167,7 +167,7 @@ int mfd_add_devices(struct device *parent, int id,
+ atomic_t *cnts;
+
+ /* initialize reference counting for all cells */
+- cnts = kcalloc(sizeof(*cnts), n_devs, GFP_KERNEL);
++ cnts = kcalloc(n_devs, sizeof(*cnts), GFP_KERNEL);
+ if (!cnts)
+ return -ENOMEM;
- if (!irq) {
- dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
-index 9aa6d1e..1631bfc 100644
+index 29f11e0..89f0c3d 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
-@@ -35,6 +35,7 @@
- #include <linux/of.h>
- #include <linux/irqdomain.h>
+@@ -33,6 +33,7 @@
+ #include <linux/slab.h>
+
#include <linux/i2c/twl.h>
+#include <asm/pgtable.h>
#include "twl-core.h"
-@@ -726,10 +727,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
- * Install an irq handler for each of the SIH modules;
+@@ -713,10 +714,12 @@ int twl4030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
+ /* install an irq handler for each of the SIH modules;
* clone dummy irq_chip since PIH can't *do* anything
*/
- twl4030_irq_chip = dummy_irq_chip;
@@ -42920,26 +40350,59 @@ index 9aa6d1e..1631bfc 100644
for (i = irq_base; i < irq_end; i++) {
irq_set_chip_and_handler(i, &twl4030_irq_chip,
+diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
+index 83f4988..80f7a01 100644
+--- a/drivers/mfd/twl6030-irq.c
++++ b/drivers/mfd/twl6030-irq.c
+@@ -376,10 +376,12 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
+ /* install an irq handler for each of the modules;
+ * clone dummy irq_chip since PIH can't *do* anything
+ */
+- twl6030_irq_chip = dummy_irq_chip;
+- twl6030_irq_chip.name = "twl6030";
+- twl6030_irq_chip.irq_set_type = NULL;
+- twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake;
++ pax_open_kernel();
++ memcpy((void *)&twl6030_irq_chip, &dummy_irq_chip, sizeof twl6030_irq_chip);
++ *(const char **)&twl6030_irq_chip.name = "twl6030";
++ *(void **)&twl6030_irq_chip.irq_set_type = NULL;
++ *(void **)&twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake;
++ pax_close_kernel();
+
+ for (i = irq_base; i < irq_end; i++) {
+ irq_set_chip_and_handler(i, &twl6030_irq_chip,
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
-index 464419b..64bae8d 100644
+index 19fc7c1..09a4d26 100644
--- a/drivers/misc/c2port/core.c
+++ b/drivers/misc/c2port/core.c
-@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
- goto error_idr_alloc;
- c2dev->id = ret;
+@@ -924,7 +924,9 @@ struct c2port_device *c2port_device_register(char *name,
+ mutex_init(&c2dev->mutex);
-- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
+ /* Create binary file */
+- c2port_bin_attrs.size = ops->blocks_num * ops->block_size;
+ pax_open_kernel();
-+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
++ *(size_t *)&c2port_bin_attrs.size = ops->blocks_num * ops->block_size;
+ pax_close_kernel();
+ ret = device_create_bin_file(c2dev->dev, &c2port_bin_attrs);
+ if (unlikely(ret))
+ goto error_device_create_bin_file;
+diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
+index 8994772..f8453cc 100644
+--- a/drivers/misc/ibmasm/ibmasmfs.c
++++ b/drivers/misc/ibmasm/ibmasmfs.c
+@@ -110,6 +110,7 @@ static struct file_system_type ibmasmfs_type = {
+ .mount = ibmasmfs_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("ibmasmfs");
- c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
- "c2port%d", c2dev->id);
+ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
+ {
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
-index 36f5d52..32311c3 100644
+index 3aa9a96..59cf685 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
-@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
+@@ -832,7 +832,7 @@ static void run_plant_and_detach_test(int is_early)
char before[BREAK_INSTR_SIZE];
char after[BREAK_INSTR_SIZE];
@@ -42948,7 +40411,7 @@ index 36f5d52..32311c3 100644
BREAK_INSTR_SIZE);
init_simple_test();
ts.tst = plant_and_detach_test;
-@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
+@@ -840,7 +840,7 @@ static void run_plant_and_detach_test(int is_early)
/* Activate test with initial breakpoint */
if (!is_early)
kgdb_breakpoint();
@@ -42958,10 +40421,10 @@ index 36f5d52..32311c3 100644
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 036effe..b3a6336 100644
+index 29d12a7..f900ba4 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
-@@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
+@@ -464,7 +464,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.
*/
@@ -42970,7 +40433,7 @@ index 036effe..b3a6336 100644
wake_up_interruptible(&lis3->misc_wait);
kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
-@@ -584,7 +584,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
+@@ -550,7 +550,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
if (lis3->pm_dev)
pm_runtime_get_sync(lis3->pm_dev);
@@ -42979,7 +40442,7 @@ index 036effe..b3a6336 100644
return 0;
}
-@@ -616,7 +616,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
+@@ -583,7 +583,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);
@@ -42988,7 +40451,7 @@ index 036effe..b3a6336 100644
if (data)
break;
-@@ -657,7 +657,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
+@@ -624,7 +624,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
struct lis3lv02d, miscdev);
poll_wait(file, &lis3->misc_wait, wait);
@@ -42998,10 +40461,10 @@ index 036effe..b3a6336 100644
return 0;
}
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
-index c439c82..1f20f57 100644
+index 2b1482a..5d33616 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.h
+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
-@@ -297,7 +297,7 @@ struct lis3lv02d {
+@@ -266,7 +266,7 @@ struct lis3lv02d {
struct input_polled_dev *idev; /* input device */
struct platform_device *pdev; /* platform device */
struct regulator_bulk_data regulators[2];
@@ -43010,6 +40473,19 @@ index c439c82..1f20f57 100644
union axis_conversion ac; /* hw -> logical axis */
int mapped_btns[3];
+diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
+index 150cd70..1d5d99b 100644
+--- a/drivers/misc/lkdtm.c
++++ b/drivers/misc/lkdtm.c
+@@ -473,6 +473,8 @@ static ssize_t lkdtm_debugfs_read(struct file *f, char __user *user_buf,
+ int i, n, out;
+
+ buf = (char *)__get_free_page(GFP_KERNEL);
++ if (buf == NULL)
++ return -ENOMEM;
+
+ n = snprintf(buf, PAGE_SIZE, "Available crash types:\n");
+ for (i = 0; i < ARRAY_SIZE(cp_type); i++)
diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
index 2f30bad..c4c13d0 100644
--- a/drivers/misc/sgi-gru/gruhandles.c
@@ -43026,7 +40502,7 @@ index 2f30bad..c4c13d0 100644
mcs_op_statistics[op].max = nsec;
}
diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
-index 4f76359..cdfcb2e 100644
+index 7768b87..f8aac38 100644
--- a/drivers/misc/sgi-gru/gruprocfs.c
+++ b/drivers/misc/sgi-gru/gruprocfs.c
@@ -32,9 +32,9 @@
@@ -43234,10 +40710,10 @@ index 5c3ce24..4915ccb 100644
#ifdef CONFIG_SGI_GRU_DEBUG
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
-index c862cd4..0d176fe 100644
+index 851b2f2..a4ec097 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
-@@ -288,7 +288,7 @@ struct xpc_interface {
+@@ -289,7 +289,7 @@ struct xpc_interface {
xpc_notify_func, void *);
void (*received) (short, int, void *);
enum xp_retval (*partid_to_nasids) (short, void *);
@@ -43268,7 +40744,7 @@ index b94d5f7..7f494c5 100644
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 82dc574..8539ab2 100644
+index d971817..33bdca5 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
@@ -43289,69 +40765,40 @@ index 82dc574..8539ab2 100644
xpc_die_deactivate();
break;
-diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
-index ef18348..1b53cf0 100644
---- a/drivers/mmc/core/mmc_ops.c
-+++ b/drivers/mmc/core/mmc_ops.c
-@@ -213,7 +213,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 81b2994..dce857e 100644
---- a/drivers/mmc/host/dw_mmc.h
-+++ b/drivers/mmc/host/dw_mmc.h
-@@ -203,5 +203,5 @@ struct dw_mci_drv_data {
- void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
- void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
- int (*parse_dt)(struct dw_mci *host);
--};
-+} __do_const;
- #endif /* _DW_MMC_H_ */
-diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
-index c3785ed..1984c44 100644
---- a/drivers/mmc/host/mmci.c
-+++ b/drivers/mmc/host/mmci.c
-@@ -1482,7 +1482,9 @@ static int mmci_probe(struct amba_device *dev,
- }
-
- if (variant->busy_detect) {
-- mmci_ops.card_busy = mmci_card_busy;
-+ pax_open_kernel();
-+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
-+ pax_close_kernel();
- mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
- }
-
-diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
-index 6debda9..2ba7427 100644
---- a/drivers/mmc/host/sdhci-s3c.c
-+++ b/drivers/mmc/host/sdhci-s3c.c
-@@ -668,9 +668,11 @@ static int 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();
- }
+diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
+index ba168a7..399925d6 100644
+--- a/drivers/misc/ti-st/st_core.c
++++ b/drivers/misc/ti-st/st_core.c
+@@ -347,6 +347,11 @@ void st_int_recv(void *disc_data,
+ st_gdata->rx_skb = alloc_skb(
+ st_gdata->list[type]->max_frame_size,
+ GFP_ATOMIC);
++ if (st_gdata->rx_skb == NULL) {
++ pr_err("out of memory: dropping\n");
++ goto done;
++ }
++
+ skb_reserve(st_gdata->rx_skb,
+ st_gdata->list[type]->reserve);
+ /* next 2 required for BT only */
+diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
+index 83b51b5..ec2396c 100644
+--- a/drivers/mmc/host/sdhci-pci.c
++++ b/drivers/mmc/host/sdhci-pci.c
+@@ -674,7 +674,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
+ .probe = via_probe,
+ };
- /* It supports additional host capabilities if needed */
+-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,
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
-index 096993f..f02c23b 100644
+index 179814a..01cb750 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
-@@ -669,7 +669,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
+@@ -674,7 +674,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
size_t totlen = 0, thislen;
int ret = 0;
size_t buflen = 0;
@@ -43360,12 +40807,50 @@ index 096993f..f02c23b 100644
if (!ECCBUF_SIZE) {
/* We should fall back to a general writev implementation.
+diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
+index e9fad91..0a7a16a 100644
+--- a/drivers/mtd/devices/doc2000.c
++++ b/drivers/mtd/devices/doc2000.c
+@@ -773,7 +773,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
+
+ /* The ECC will not be calculated correctly if less than 512 is written */
+ /* DBB-
+- if (len != 0x200 && eccbuf)
++ if (len != 0x200)
+ printk(KERN_WARNING
+ "ECC needs a full sector write (adr: %lx size %lx)\n",
+ (long) to, (long) len);
+diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
+index a3f7a27..234016e 100644
+--- a/drivers/mtd/devices/doc2001.c
++++ b/drivers/mtd/devices/doc2001.c
+@@ -392,7 +392,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
+ struct Nand *mychip = &this->chips[from >> (this->chipshift)];
+
+ /* Don't allow read past end of device */
+- if (from >= this->totlen)
++ if (from >= this->totlen || !len)
+ return -EINVAL;
+
+ /* Don't allow a single read to cross a 512-byte block boundary */
+diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
+index 1d90e26..865d439 100644
+--- a/drivers/mtd/mtdchar.c
++++ b/drivers/mtd/mtdchar.c
+@@ -1215,6 +1215,7 @@ static struct file_system_type mtd_inodefs_type = {
+ .mount = mtd_inodefs_mount,
+ .kill_sb = kill_anon_super,
+ };
++MODULE_ALIAS_FS("mtd_inodefs");
+
+ static void mtdchar_notify_add(struct mtd_info *mtd)
+ {
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
-index 2ed2bb3..2d0b82e 100644
+index 3984d48..28aa897 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
-@@ -24,6 +24,7 @@
- #include <linux/slab.h>
+@@ -26,6 +26,7 @@
+ #include <linux/pci.h>
#include <linux/mtd/mtd.h>
#include <linux/module.h>
+#include <linux/slab.h>
@@ -43373,7 +40858,7 @@ index 2ed2bb3..2d0b82e 100644
#include "denali.h"
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
-index 51b9d6a..52af9a7 100644
+index ac40925..483b753 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -24,6 +24,7 @@
@@ -43385,12 +40870,12 @@ index 51b9d6a..52af9a7 100644
#include <linux/mtd/nand.h>
#include <linux/mtd/nftl.h>
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
-index 4b8e895..6b3c498 100644
+index a9ff89ff..461d313 100644
--- a/drivers/mtd/sm_ftl.c
+++ b/drivers/mtd/sm_ftl.c
-@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
+@@ -56,7 +56,7 @@ ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
#define SM_CIS_VENDOR_OFFSET 0x59
- static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
+ struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
{
- struct attribute_group *attr_group;
+ attribute_group_no_const *attr_group;
@@ -43398,19 +40883,19 @@ index 4b8e895..6b3c498 100644
struct sm_sysfs_attribute *vendor_attribute;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index e883bfe..e51a1ec 100644
+index 1bf36ac..55c534e 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
-@@ -4511,7 +4511,7 @@ static unsigned int bond_get_num_tx_queues(void)
- return tx_queues;
+@@ -4803,7 +4803,7 @@ static int bond_get_tx_queues(struct net *net, struct nlattr *tb[],
+ return 0;
}
-static struct rtnl_link_ops bond_link_ops __read_mostly = {
+static struct rtnl_link_ops bond_link_ops = {
- .kind = "bond",
- .priv_size = sizeof(struct bonding),
- .setup = bond_setup,
-@@ -4636,8 +4636,8 @@ static void __exit bonding_exit(void)
+ .kind = "bond",
+ .priv_size = sizeof(struct bonding),
+ .setup = bond_setup,
+@@ -4928,8 +4928,8 @@ static void __exit bonding_exit(void)
bond_destroy_debugfs();
@@ -43420,8 +40905,30 @@ index e883bfe..e51a1ec 100644
#ifdef CONFIG_NET_POLL_CONTROLLER
/*
+diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
+index 8ed48c2..ae2cb9a 100644
+--- a/drivers/net/bonding/bond_sysfs.c
++++ b/drivers/net/bonding/bond_sysfs.c
+@@ -1056,7 +1056,7 @@ static ssize_t bonding_store_primary(struct device *d,
+ goto out;
+ }
+
+- sscanf(buf, "%16s", ifname); /* IFNAMSIZ */
++ sscanf(buf, "%15s", ifname); /* IFNAMSIZ */
+
+ /* check to see if we are clearing primary */
+ if (!strlen(ifname) || buf[0] == '\n') {
+@@ -1229,7 +1229,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
+ goto out;
+ }
+
+- 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/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
-index f92f001..0b2f9bf 100644
+index e9f8432..45308e6 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)
@@ -43437,11 +40944,24 @@ index f92f001..0b2f9bf 100644
}
if (!request_mem_region(mem->start, mem_size, pdev->name)) {
+diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
+index 1feae59..c2a61d2 100644
+--- a/drivers/net/ethernet/atheros/atlx/atl2.c
++++ b/drivers/net/ethernet/atheros/atlx/atl2.c
+@@ -2857,7 +2857,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_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
-index da8fcaa..f4b5d3b 100644
+index 283d663..4373534 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
-@@ -1138,7 +1138,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
+@@ -1240,7 +1240,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 */
@@ -43451,10 +40971,10 @@ index da8fcaa..f4b5d3b 100644
/* 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 9fbeee5..5e3e37a 100644
+index 1451769..0275580 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
-@@ -2590,15 +2590,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
+@@ -2290,15 +2290,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
return rc;
}
@@ -43476,10 +40996,10 @@ index 9fbeee5..5e3e37a 100644
}
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-index 658f4e3..15074a6 100644
+index 9a517c2..6d245e1 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-@@ -1325,8 +1325,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
+@@ -1207,8 +1207,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
/********************* RX MODE ****************/
@@ -43488,12 +41008,12 @@ index 658f4e3..15074a6 100644
+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
/**
- * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
+ * 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 7025780..e55a71c 100644
+index da90ba5..dcba1fd 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
-@@ -147,6 +147,7 @@
+@@ -134,6 +134,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
#define CHIPREV_ID_5750_A3 0x4003
@@ -43501,8 +41021,22 @@ index 7025780..e55a71c 100644
#define CHIPREV_ID_5750_C2 0x4202
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
+diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+index 4d15c8f..1bc7689 100644
+--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
++++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+@@ -3031,7 +3031,9 @@ static void t3_io_resume(struct pci_dev *pdev)
+ CH_ALERT(adapter, "adapter recovering, PEX ERR 0x%x\n",
+ t3_read_reg(adapter, A_PCIE_PEX_ERR));
+
++ rtnl_lock();
+ t3_resume_ports(adapter);
++ rtnl_unlock();
+ }
+
+ static struct pci_error_handlers t3_err_handler = {
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
-index 8cffcdf..aadf043 100644
+index c5f5479..2e8c260 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
@@ -43514,24 +41048,36 @@ index 8cffcdf..aadf043 100644
#define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
-diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-index c73cabd..cd278b1 100644
---- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-@@ -2186,7 +2186,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
-
- int i;
- struct adapter *ap = netdev2adap(dev);
-- static const unsigned int *reg_ranges;
-+ const unsigned int *reg_ranges;
- int arr_size = 0, buf_size = 0;
-
- if (is_t4(ap->chip)) {
+diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
+index cfb60e1..f0fe46f 100644
+--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
++++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
+@@ -1537,9 +1537,9 @@ static void deferred_unmap_destructor(struct sk_buff *skb)
+ dui = (struct deferred_unmap_info *)skb->head;
+ p = dui->addr;
+
+- if (skb->tail - skb->transport_header)
++ if (skb_tail_pointer(skb) - skb_transport_header(skb))
+ pci_unmap_single(dui->pdev, *p++,
+- skb->tail - skb->transport_header,
++ skb_tail_pointer(skb) - skb_transport_header(skb),
+ PCI_DMA_TODEVICE);
+
+ si = skb_shinfo(skb);
+@@ -1600,7 +1600,7 @@ static void write_ofld_wr(struct adapter *adap, struct sk_buff *skb,
+ flits = skb_transport_offset(skb) / 8;
+ sgp = ndesc == 1 ? (struct sg_ent *)&d->flit[flits] : sgl;
+ sgl_flits = make_sgl(skb, sgp, skb_transport_header(skb),
+- skb->tail - skb->transport_header,
++ skb_tail_pointer(skb) - skb_transport_header(skb),
+ adap->pdev);
+ if (need_skb_unmap()) {
+ setup_deferred_unmapping(skb, adap->pdev, sgp, sgl_flits);
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
-index 263b92c..f05134b 100644
+index 871bcaa..4043505 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
-@@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
}
@@ -43540,7 +41086,7 @@ index 263b92c..f05134b 100644
break;
case DE4X5_SET_HWADDR: /* Set the hardware address */
-@@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+@@ -5437,7 +5437,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
spin_lock_irqsave(&lp->lock, flags);
memcpy(&statbuf, &lp->pktStats, ioc->len);
spin_unlock_irqrestore(&lp->lock, flags);
@@ -43549,11 +41095,50 @@ index 263b92c..f05134b 100644
return -EFAULT;
break;
}
+diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
+index 14d5b61..1398636 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/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
+index 4d01219..b58d26d 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 dcd7f7a..ecb7fb3 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 2c38cc4..0323f6e 100644
+index 36c7c4e..7de1382 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
-@@ -470,7 +470,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
+@@ -397,7 +397,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
if (wrapped)
newacc += 65536;
@@ -43561,12 +41146,12 @@ index 2c38cc4..0323f6e 100644
+ ACCESS_ONCE_RW(*acc) = newacc;
}
- static void populate_erx_stats(struct be_adapter *adapter,
+ void be_parse_stats(struct be_adapter *adapter)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
-index 212f44b..fb69959 100644
+index fb5579a..debdffa 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
-@@ -31,6 +31,8 @@
+@@ -30,6 +30,8 @@
#include <linux/netdevice.h>
#include <linux/phy.h>
#include <linux/platform_device.h>
@@ -43576,10 +41161,10 @@ index 212f44b..fb69959 100644
#include "ftgmac100.h"
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
-index 8be5b40..081bc1b 100644
+index a127cb2..0d043cd 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
-@@ -31,6 +31,8 @@
+@@ -30,6 +30,8 @@
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/platform_device.h>
@@ -43588,21 +41173,232 @@ index 8be5b40..081bc1b 100644
#include "ftmac100.h"
-diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-index 5184e2a..acb28c3 100644
---- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-@@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
- }
+diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
+index 61d2bdd..7f1154a 100644
+--- a/drivers/net/ethernet/fealnx.c
++++ b/drivers/net/ethernet/fealnx.c
+@@ -150,7 +150,7 @@ struct chip_info {
+ int flags;
+ };
- /* update the base incval used to calculate frequency adjustment */
-- ACCESS_ONCE(adapter->base_incval) = incval;
-+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
- smp_mb();
+-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/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
+index ed79b2d..b17b19d 100644
+--- a/drivers/net/ethernet/ibm/emac/core.c
++++ b/drivers/net/ethernet/ibm/emac/core.c
+@@ -2309,7 +2309,7 @@ static int __devinit emac_of_bus_notify(struct notifier_block *nb,
+ return 0;
+ }
+
+-static struct notifier_block emac_of_bus_notifier __devinitdata = {
++static struct notifier_block emac_of_bus_notifier = {
+ .notifier_call = emac_of_bus_notify
+ };
+
+diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+index e1159e5..34efe3e 100644
+--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
++++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+@@ -205,7 +205,6 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
+ {
+ struct e1000_hw *hw = &adapter->hw;
+ struct e1000_mac_info *mac = &hw->mac;
+- struct e1000_mac_operations *func = &mac->ops;
+
+ /* Set media type */
+ switch (adapter->pdev->device) {
+@@ -233,16 +232,16 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
+ /* check for link */
+ switch (hw->phy.media_type) {
+ case e1000_media_type_copper:
+- func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
+- func->check_for_link = e1000e_check_for_copper_link;
++ mac->ops.setup_physical_interface = e1000_setup_copper_link_80003es2lan;
++ mac->ops.check_for_link = e1000e_check_for_copper_link;
+ break;
+ case e1000_media_type_fiber:
+- func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
+- func->check_for_link = e1000e_check_for_fiber_link;
++ mac->ops.setup_physical_interface = e1000e_setup_fiber_serdes_link;
++ mac->ops.check_for_link = e1000e_check_for_fiber_link;
+ break;
+ case e1000_media_type_internal_serdes:
+- func->setup_physical_interface = e1000e_setup_fiber_serdes_link;
+- func->check_for_link = e1000e_check_for_serdes_link;
++ mac->ops.setup_physical_interface = e1000e_setup_fiber_serdes_link;
++ mac->ops.check_for_link = e1000e_check_for_serdes_link;
+ break;
+ default:
+ return -E1000_ERR_CONFIG;
+diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
+index 4f4d52a..faf0fa4 100644
+--- a/drivers/net/ethernet/intel/e1000e/82571.c
++++ b/drivers/net/ethernet/intel/e1000e/82571.c
+@@ -239,7 +239,6 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
+ {
+ struct e1000_hw *hw = &adapter->hw;
+ struct e1000_mac_info *mac = &hw->mac;
+- struct e1000_mac_operations *func = &mac->ops;
+ u32 swsm = 0;
+ u32 swsm2 = 0;
+ bool force_clear_smbi = false;
+@@ -272,22 +271,22 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
+ /* check for link */
+ switch (hw->phy.media_type) {
+ case e1000_media_type_copper:
+- func->setup_physical_interface = e1000_setup_copper_link_82571;
+- func->check_for_link = e1000e_check_for_copper_link;
+- func->get_link_up_info = e1000e_get_speed_and_duplex_copper;
++ mac->ops.setup_physical_interface = e1000_setup_copper_link_82571;
++ mac->ops.check_for_link = e1000e_check_for_copper_link;
++ mac->ops.get_link_up_info = e1000e_get_speed_and_duplex_copper;
+ break;
+ case e1000_media_type_fiber:
+- func->setup_physical_interface =
++ mac->ops.setup_physical_interface =
+ e1000_setup_fiber_serdes_link_82571;
+- func->check_for_link = e1000e_check_for_fiber_link;
+- func->get_link_up_info =
++ mac->ops.check_for_link = e1000e_check_for_fiber_link;
++ mac->ops.get_link_up_info =
+ e1000e_get_speed_and_duplex_fiber_serdes;
+ break;
+ case e1000_media_type_internal_serdes:
+- func->setup_physical_interface =
++ mac->ops.setup_physical_interface =
+ e1000_setup_fiber_serdes_link_82571;
+- func->check_for_link = e1000_check_for_serdes_link_82571;
+- func->get_link_up_info =
++ mac->ops.check_for_link = e1000_check_for_serdes_link_82571;
++ mac->ops.get_link_up_info =
+ e1000e_get_speed_and_duplex_fiber_serdes;
+ break;
+ default:
+@@ -297,10 +296,10 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
+
+ switch (hw->mac.type) {
+ case e1000_82573:
+- func->set_lan_id = e1000_set_lan_id_single_port;
+- func->check_mng_mode = e1000e_check_mng_mode_generic;
+- func->led_on = e1000e_led_on_generic;
+- func->blink_led = e1000e_blink_led_generic;
++ mac->ops.set_lan_id = e1000_set_lan_id_single_port;
++ mac->ops.check_mng_mode = e1000e_check_mng_mode_generic;
++ mac->ops.led_on = e1000e_led_on_generic;
++ mac->ops.blink_led = e1000e_blink_led_generic;
+
+ /* FWSM register */
+ mac->has_fwsm = true;
+@@ -314,14 +313,14 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
+ break;
+ case e1000_82574:
+ case e1000_82583:
+- func->set_lan_id = e1000_set_lan_id_single_port;
+- func->check_mng_mode = e1000_check_mng_mode_82574;
+- func->led_on = e1000_led_on_82574;
++ mac->ops.set_lan_id = e1000_set_lan_id_single_port;
++ mac->ops.check_mng_mode = e1000_check_mng_mode_82574;
++ mac->ops.led_on = e1000_led_on_82574;
+ break;
+ default:
+- func->check_mng_mode = e1000e_check_mng_mode_generic;
+- func->led_on = e1000e_led_on_generic;
+- func->blink_led = e1000e_blink_led_generic;
++ mac->ops.check_mng_mode = e1000e_check_mng_mode_generic;
++ mac->ops.led_on = e1000e_led_on_generic;
++ mac->ops.blink_led = e1000e_blink_led_generic;
+
+ /* FWSM register */
+ mac->has_fwsm = true;
+diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
+index 8e362bb..679d9da 100644
+--- a/drivers/net/ethernet/intel/e1000e/e1000.h
++++ b/drivers/net/ethernet/intel/e1000e/e1000.h
+@@ -175,7 +175,7 @@ struct e1000_info;
+ #define E1000_TXDCTL_DMA_BURST_ENABLE \
+ (E1000_TXDCTL_GRAN | /* set descriptor granularity */ \
+ E1000_TXDCTL_COUNT_DESC | \
+- (5 << 16) | /* wthresh must be +1 more than desired */\
++ (1 << 16) | /* wthresh must be +1 more than desired */\
+ (1 << 8) | /* hthresh */ \
+ 0x1f) /* pthresh */
+
+diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+index 4c8e199..f7f5587 100644
+--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
++++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+@@ -956,8 +956,6 @@ static irqreturn_t ixgbevf_msix_clean_tx(int irq, void *data)
+ r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
+ for (i = 0; i < q_vector->txr_count; i++) {
+ tx_ring = &(adapter->tx_ring[r_idx]);
+- tx_ring->total_bytes = 0;
+- tx_ring->total_packets = 0;
+ ixgbevf_clean_tx_irq(adapter, tx_ring);
+ r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
+ r_idx + 1);
+@@ -981,16 +979,6 @@ static irqreturn_t ixgbevf_msix_clean_rx(int irq, void *data)
+ struct ixgbe_hw *hw = &adapter->hw;
+ struct ixgbevf_ring *rx_ring;
+ int r_idx;
+- int i;
+-
+- r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+- for (i = 0; i < q_vector->rxr_count; i++) {
+- rx_ring = &(adapter->rx_ring[r_idx]);
+- rx_ring->total_bytes = 0;
+- rx_ring->total_packets = 0;
+- r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
+- r_idx + 1);
+- }
+
+ if (!q_vector->rxr_count)
+ return IRQ_HANDLED;
+diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
+index 0b3567a..49bc4bc 100644
+--- a/drivers/net/ethernet/lantiq_etop.c
++++ b/drivers/net/ethernet/lantiq_etop.c
+@@ -756,7 +756,7 @@ ltq_etop_probe(struct platform_device *pdev)
+ return 0;
+
+ err_free:
+- kfree(dev);
++ free_netdev(dev);
+ err_out:
+ return err;
+ }
+diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
+index 24ee967..9a07e41 100644
+--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
++++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
+@@ -570,8 +570,8 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
+ int err;
+ int i;
- /* need lock to prevent incorrect read while modifying cyclecounter */
+- priv->eq_table.uar_map = kcalloc(sizeof *priv->eq_table.uar_map,
+- mlx4_num_eq_uar(dev), GFP_KERNEL);
++ priv->eq_table.uar_map = kcalloc(mlx4_num_eq_uar(dev),
++ sizeof *priv->eq_table.uar_map, GFP_KERNEL);
+ if (!priv->eq_table.uar_map) {
+ err = -ENOMEM;
+ goto err_out_free;
+diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
+index 94bbc85..78c12e6 100644
+--- a/drivers/net/ethernet/mellanox/mlx4/main.c
++++ b/drivers/net/ethernet/mellanox/mlx4/main.c
+@@ -40,6 +40,7 @@
+ #include <linux/dma-mapping.h>
+ #include <linux/slab.h>
+ #include <linux/io-mapping.h>
++#include <linux/sched.h>
+
+ #include <linux/mlx4/device.h>
+ #include <linux/mlx4/doorbell.h>
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
-index fbe5363..266b4e3 100644
+index 98e2c10..79af7f8 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,
@@ -43626,73 +41422,46 @@ index fbe5363..266b4e3 100644
fifo->mempool =
__vxge_hw_mempool_create(vpath->hldev,
fifo->config->memblock_size,
-diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
-index f09e787..f3916a8 100644
---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
-+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
-@@ -2055,7 +2055,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
-
- } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
- ahw->nic_mode = QLC_83XX_DEFAULT_MODE;
-- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
-+ pax_open_kernel();
-+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
-+ pax_close_kernel();
- ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
- } else {
- return -EIO;
-diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
-index 0248a4c..9648d96 100644
---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
-+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
-@@ -191,17 +191,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
- case QLCNIC_NON_PRIV_FUNC:
- ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
- ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
-- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
-+ pax_open_kernel();
-+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
-+ pax_close_kernel();
- break;
- case QLCNIC_PRIV_FUNC:
- ahw->op_mode = QLCNIC_PRIV_FUNC;
- ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
-- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
-+ pax_open_kernel();
-+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
-+ pax_close_kernel();
- break;
- case QLCNIC_MGMT_FUNC:
- ahw->op_mode = QLCNIC_MGMT_FUNC;
- ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
-- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
-+ pax_open_kernel();
-+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
-+ pax_close_kernel();
- break;
- default:
- dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
-diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
-index 1551360..ed6510f 100644
---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
-+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
-@@ -1108,7 +1108,7 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
- struct qlcnic_dump_entry *entry;
- struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
- struct qlcnic_dump_template_hdr *tmpl_hdr = fw_dump->tmpl_hdr;
-- static const struct qlcnic_dump_operations *fw_dump_ops;
-+ const struct qlcnic_dump_operations *fw_dump_ops;
- struct device *dev = &adapter->pdev->dev;
- struct qlcnic_hardware_context *ahw;
- void *temp_buffer;
+diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
+index 212f43b..fb31b51 100644
+--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
++++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
+@@ -683,10 +683,8 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)
+ p->phydev = phy_connect(netdev, phy_id, octeon_mgmt_adjust_link, 0,
+ PHY_INTERFACE_MODE_MII);
+
+- if (IS_ERR(p->phydev)) {
+- p->phydev = NULL;
++ if (!p->phydev)
+ return -1;
+- }
+
+ phy_start_aneg(p->phydev);
+
+diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
+index 49b549f..13d648c 100644
+--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
++++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
+@@ -1101,9 +1101,9 @@ static int pasemi_mac_phy_init(struct net_device *dev)
+ phydev = of_phy_connect(dev, phy_dn, &pasemi_adjust_link, 0,
+ PHY_INTERFACE_MODE_SGMII);
+
+- if (IS_ERR(phydev)) {
++ if (!phydev) {
+ printk(KERN_ERR "%s: Could not attach to phy\n", dev->name);
+- return PTR_ERR(phydev);
++ return -ENODEV;
+ }
+
+ mac->phydev = phydev;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 3397cee..101f8fa 100644
+index a3bd0ba..8a34a90 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -759,22 +759,22 @@ struct rtl8169_private {
+@@ -704,17 +704,17 @@ struct rtl8169_private {
struct mdio_ops {
- void (*write)(struct rtl8169_private *, int, int);
- int (*read)(struct rtl8169_private *, int);
+ void (*write)(void __iomem *, int, int);
+ int (*read)(void __iomem *, int);
- } mdio_ops;
+ } __no_const mdio_ops;
@@ -43708,29 +41477,23 @@ index 3397cee..101f8fa 100644
- } jumbo_ops;
+ } __no_const jumbo_ops;
- struct csi_ops {
- void (*write)(struct rtl8169_private *, int, int);
- u32 (*read)(struct rtl8169_private *, int);
-- } csi_ops;
-+ } __no_const csi_ops;
-
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/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
-index 03acf57..e1251ff 100644
---- a/drivers/net/ethernet/sfc/ptp.c
-+++ b/drivers/net/ethernet/sfc/ptp.c
-@@ -539,7 +539,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
- ptp->start.dma_addr);
-
- /* Clear flag that signals MC ready */
-- ACCESS_ONCE(*start) = 0;
-+ ACCESS_ONCE_RW(*start) = 0;
- rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
- MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
- EFX_BUG_ON_PARANOID(rc);
+diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
+index 1b4658c..a30dabb 100644
+--- a/drivers/net/ethernet/sis/sis190.c
++++ b/drivers/net/ethernet/sis/sis190.c
+@@ -1624,7 +1624,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/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
-index 50617c5..b13724c 100644
+index c07cfe9..81cbf7e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
@@ -43744,59 +41507,45 @@ index 50617c5..b13724c 100644
}
/* To mask all all interrupts.*/
-diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
-index e6fe0d8..2b7d752 100644
---- a/drivers/net/hyperv/hyperv_net.h
-+++ b/drivers/net/hyperv/hyperv_net.h
-@@ -101,7 +101,7 @@ struct rndis_device {
-
- enum rndis_device_state state;
- bool link_state;
-- atomic_t new_req_id;
-+ atomic_unchecked_t new_req_id;
-
- 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 0775f0a..d4fb316 100644
---- a/drivers/net/hyperv/rndis_filter.c
-+++ b/drivers/net/hyperv/rndis_filter.c
-@@ -104,7 +104,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
- * template
- */
- set = &rndis_msg->msg.set_req;
-- set->req_id = atomic_inc_return(&dev->new_req_id);
-+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
-
- /* Add to the request list */
- spin_lock_irqsave(&dev->request_lock, flags);
-@@ -752,7 +752,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
-
- /* Setup the rndis set */
- halt = &request->request_msg.msg.halt_req;
-- halt->req_id = atomic_inc_return(&dev->new_req_id);
-+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+index d4d2bc1..14b8672 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+@@ -1602,7 +1602,7 @@ static const struct file_operations stmmac_rings_status_fops = {
+ .open = stmmac_sysfs_ring_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+- .release = seq_release,
++ .release = single_release,
+ };
- /* 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 bf0d55e..82bcfbd1 100644
---- a/drivers/net/ieee802154/fakehard.c
-+++ b/drivers/net/ieee802154/fakehard.c
-@@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
- phy->transmit_power = 0xbf;
+ static int stmmac_sysfs_dma_cap_read(struct seq_file *seq, void *v)
+@@ -1674,7 +1674,7 @@ static const struct file_operations stmmac_dma_cap_fops = {
+ .open = stmmac_sysfs_dma_cap_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+- .release = seq_release,
++ .release = single_release,
+ };
- dev->netdev_ops = &fake_ops;
-- dev->ml_priv = &fake_mlme;
-+ dev->ml_priv = (void *)&fake_mlme;
+ static int stmmac_init_fs(struct net_device *dev)
+diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
+index d0893e4..14b0d44 100644
+--- a/drivers/net/loopback.c
++++ b/drivers/net/loopback.c
+@@ -216,6 +216,6 @@ out:
+ }
- priv = netdev_priv(dev);
- priv->phy = phy;
+ /* Registered in net/core/dev.c */
+-struct pernet_operations __net_initdata loopback_net_ops = {
++struct pernet_operations __net_initconst loopback_net_ops = {
+ .init = loopback_net_init,
+ };
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
-index 9bf46bd..bfdaa84 100644
+index 301b39e..345c414 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
-@@ -939,13 +939,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
+@@ -790,13 +790,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
int macvlan_link_register(struct rtnl_link_ops *ops)
{
/* common fields */
@@ -43819,7 +41568,7 @@ index 9bf46bd..bfdaa84 100644
return rtnl_link_register(ops);
};
-@@ -1001,7 +1003,7 @@ static int macvlan_device_event(struct notifier_block *unused,
+@@ -852,7 +854,7 @@ static int macvlan_device_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
@@ -43829,10 +41578,10 @@ index 9bf46bd..bfdaa84 100644
};
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
-index 9dccb1e..19fd4c9 100644
+index b0f9015..93da3cf 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
-@@ -1183,7 +1183,7 @@ static int macvtap_device_event(struct notifier_block *unused,
+@@ -1085,7 +1085,7 @@ static int macvtap_device_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
@@ -43842,10 +41591,10 @@ index 9dccb1e..19fd4c9 100644
};
diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
-index daec9b0..6428fcb 100644
+index 6539189..09875ce 100644
--- a/drivers/net/phy/mdio-bitbang.c
+++ b/drivers/net/phy/mdio-bitbang.c
-@@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
+@@ -225,6 +225,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
struct mdiobb_ctrl *ctrl = bus->priv;
module_put(ctrl->ops->owner);
@@ -43854,10 +41603,10 @@ index daec9b0..6428fcb 100644
}
EXPORT_SYMBOL(free_mdio_bitbang);
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
-index 72ff14b..11d442d 100644
+index 3ed983c..a1bb418 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
-@@ -999,7 +999,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -986,7 +986,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;
@@ -43865,7 +41614,7 @@ index 72ff14b..11d442d 100644
switch (cmd) {
case SIOCGPPPSTATS:
-@@ -1021,8 +1020,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
break;
case SIOCGPPPVER:
@@ -43876,10 +41625,10 @@ index 72ff14b..11d442d 100644
err = 0;
break;
diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
-index 1252d9c..80e660b 100644
+index 0a0a664..7e7deef 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
-@@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
+@@ -489,7 +489,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
register struct tcphdr *thp;
register struct iphdr *ip;
register struct cstate *cs;
@@ -43888,24 +41637,138 @@ index 1252d9c..80e660b 100644
unsigned char *cp = icp;
/* We've got a compressed packet; read the change byte */
-diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
-index 50e43e6..e1a5807 100644
---- a/drivers/net/team/team.c
-+++ b/drivers/net/team/team.c
-@@ -2869,7 +2869,7 @@ static int team_device_event(struct notifier_block *unused,
- return NOTIFY_DONE;
+diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
+index 515f122..41dd273 100644
+--- a/drivers/net/tokenring/abyss.c
++++ b/drivers/net/tokenring/abyss.c
+@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
+
+ static int __init abyss_init (void)
+ {
+- abyss_netdev_ops = tms380tr_netdev_ops;
++ pax_open_kernel();
++ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
+
+- abyss_netdev_ops.ndo_open = abyss_open;
+- abyss_netdev_ops.ndo_stop = abyss_close;
++ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
++ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
++ pax_close_kernel();
+
+ return pci_register_driver(&abyss_driver);
}
+diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
+index 6153cfd..cf69c1c 100644
+--- a/drivers/net/tokenring/madgemc.c
++++ b/drivers/net/tokenring/madgemc.c
+@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver = {
--static struct notifier_block team_notifier_block __read_mostly = {
-+static struct notifier_block team_notifier_block = {
- .notifier_call = team_device_event,
- };
+ static int __init madgemc_init (void)
+ {
+- madgemc_netdev_ops = tms380tr_netdev_ops;
+- madgemc_netdev_ops.ndo_open = madgemc_open;
+- madgemc_netdev_ops.ndo_stop = madgemc_close;
++ pax_open_kernel();
++ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
++ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
++ pax_close_kernel();
+
+ return mca_register_driver (&madgemc_driver);
+ }
+diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
+index 8d362e6..f91cc52 100644
+--- a/drivers/net/tokenring/proteon.c
++++ b/drivers/net/tokenring/proteon.c
+@@ -353,9 +353,11 @@ static int __init proteon_init(void)
+ struct platform_device *pdev;
+ int i, num = 0, err = 0;
+
+- proteon_netdev_ops = tms380tr_netdev_ops;
+- proteon_netdev_ops.ndo_open = proteon_open;
+- proteon_netdev_ops.ndo_stop = tms380tr_close;
++ pax_open_kernel();
++ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
++ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
++ pax_close_kernel();
+
+ err = platform_driver_register(&proteon_driver);
+ if (err)
+diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
+index 46db5c5..37c1536 100644
+--- a/drivers/net/tokenring/skisa.c
++++ b/drivers/net/tokenring/skisa.c
+@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
+ struct platform_device *pdev;
+ int i, num = 0, err = 0;
+- sk_isa_netdev_ops = tms380tr_netdev_ops;
+- sk_isa_netdev_ops.ndo_open = sk_isa_open;
+- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
++ pax_open_kernel();
++ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
++ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
++ pax_close_kernel();
+
+ err = platform_driver_register(&sk_isa_driver);
+ if (err)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
-index 7cb105c..11214ff 100644
+index ee1aab0..31aa71c 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
-@@ -1826,7 +1826,7 @@ unlock:
+@@ -359,7 +359,7 @@ static void tun_free_netdev(struct net_device *dev)
+ {
+ struct tun_struct *tun = netdev_priv(dev);
+
+- sock_put(tun->socket.sk);
++ sk_release_kernel(tun->socket.sk);
+ }
+
+ /* Net device open. */
+@@ -983,10 +983,18 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
+ return ret;
+ }
+
++static int tun_release(struct socket *sock)
++{
++ if (sock->sk)
++ sock_put(sock->sk);
++ return 0;
++}
++
+ /* Ops structure to mimic raw sockets with tun */
+ static const struct proto_ops tun_socket_ops = {
+ .sendmsg = tun_sendmsg,
+ .recvmsg = tun_recvmsg,
++ .release = tun_release,
+ };
+
+ static struct proto tun_proto = {
+@@ -1113,10 +1121,11 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
+ tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr);
+
+ err = -ENOMEM;
+- sk = sk_alloc(net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
++ sk = sk_alloc(&init_net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
+ if (!sk)
+ goto err_free_dev;
+
++ sk_change_net(sk, net);
+ tun->socket.wq = &tun->wq;
+ init_waitqueue_head(&tun->wq.wait);
+ tun->socket.ops = &tun_socket_ops;
+@@ -1177,7 +1186,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
+ return 0;
+
+ err_free_sk:
+- sock_put(sk);
++ tun_free_netdev(dev);
+ err_free_dev:
+ free_netdev(dev);
+ failed:
+@@ -1236,7 +1245,7 @@ static int set_offload(struct tun_struct *tun, unsigned long arg)
}
static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
@@ -43914,18 +41777,18 @@ index 7cb105c..11214ff 100644
{
struct tun_file *tfile = file->private_data;
struct tun_struct *tun;
-@@ -1839,6 +1839,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
- unsigned int ifindex;
+@@ -1247,6 +1256,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
+ int vnet_hdr_sz;
int ret;
+ if (ifreq_len > sizeof ifr)
+ return -EFAULT;
+
- if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
+ if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) {
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 86292e6..8d34433 100644
+index 304fe78..db112fa 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -71,7 +71,7 @@
@@ -43937,86 +41800,95 @@ index 86292e6..8d34433 100644
#define MOD_AUTHOR "Option Wireless"
#define MOD_DESCRIPTION "USB High Speed Option driver"
-@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
+@@ -257,7 +257,7 @@ struct hso_serial {
+
+ /* from usb_serial_port */
+ struct tty_struct *tty;
+- int open_count;
++ local_t open_count;
+ spinlock_t serial_lock;
+
+ int (*write_data) (struct hso_serial *serial);
+@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
struct urb *urb;
urb = serial->rx_urb[0];
-- if (serial->port.count > 0) {
-+ if (atomic_read(&serial->port.count) > 0) {
+- if (serial->open_count > 0) {
++ if (local_read(&serial->open_count) > 0) {
count = put_rxbuf_data(urb, serial);
if (count == -1)
return;
-@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
+@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
DUMP1(urb->transfer_buffer, urb->actual_length);
/* Anyone listening? */
-- if (serial->port.count == 0)
-+ if (atomic_read(&serial->port.count) == 0)
+- if (serial->open_count == 0)
++ if (local_read(&serial->open_count) == 0)
return;
if (status == 0) {
-@@ -1298,8 +1298,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
- tty_port_tty_set(&serial->port, tty);
+@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+ spin_unlock_irq(&serial->serial_lock);
/* check for port already opened, if not set the termios */
-- serial->port.count++;
-- if (serial->port.count == 1) {
-+ if (atomic_inc_return(&serial->port.count) == 1) {
+- serial->open_count++;
+- if (serial->open_count == 1) {
++ if (local_inc_return(&serial->open_count) == 1) {
serial->rx_state = RX_IDLE;
/* Force default termio settings */
_hso_serial_set_termios(tty, NULL);
-@@ -1311,7 +1310,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1324,7 +1323,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);
-- serial->port.count--;
-+ atomic_dec(&serial->port.count);
+- serial->open_count--;
++ local_dec(&serial->open_count);
kref_put(&serial->parent->ref, hso_serial_ref_free);
}
} else {
-@@ -1348,10 +1347,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
+@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
/* reset the rts and dtr */
/* do the actual close */
-- serial->port.count--;
-+ atomic_dec(&serial->port.count);
-
-- if (serial->port.count <= 0) {
-- serial->port.count = 0;
-+ if (atomic_read(&serial->port.count) <= 0) {
-+ atomic_set(&serial->port.count, 0);
- tty_port_tty_set(&serial->port, NULL);
- if (!usb_gone)
- hso_stop_serial_device(serial->parent);
-@@ -1427,7 +1426,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
+- serial->open_count--;
++ local_dec(&serial->open_count);
+
+- if (serial->open_count <= 0) {
+- serial->open_count = 0;
++ if (local_read(&serial->open_count) <= 0) {
++ local_set(&serial->open_count, 0);
+ spin_lock_irq(&serial->serial_lock);
+ if (serial->tty == tty) {
+ serial->tty->driver_data = NULL;
+@@ -1446,7 +1445,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 (serial->port.count)
-+ if (atomic_read(&serial->port.count))
+- if (serial->open_count)
++ if (local_read(&serial->open_count))
_hso_serial_set_termios(tty, old);
else
- tty->termios = *old;
-@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
+ tty->termios = old;
+@@ -1905,7 +1904,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 &&
-- serial->port.count > 0) {
-+ atomic_read(&serial->port.count) > 0) {
+- serial->open_count > 0) {
++ local_read(&serial->open_count) > 0) {
/* Setup and send a ctrl req read on
* port i */
if (!serial->rx_urb_filled[0]) {
-@@ -3062,7 +3061,7 @@ static int hso_resume(struct usb_interface *iface)
+@@ -3098,7 +3097,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)) {
-- if (dev2ser(serial_table[i])->port.count) {
-+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
+- if (dev2ser(serial_table[i])->open_count) {
++ if (local_read(&dev2ser(serial_table[i])->open_count)) {
result =
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
-index a79e9d3..78cd4fa 100644
+index e773250..9ee61ab 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -52,7 +52,7 @@ static const char driver_name[] = "sierra_net";
@@ -44028,7 +41900,7 @@ index a79e9d3..78cd4fa 100644
/*
* SYNC Timer Delay definition used to set the expiry time
-@@ -698,7 +698,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
+@@ -738,7 +738,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
dev->net->netdev_ops = &sierra_net_device_ops;
/* change MAC addr to include, ifacenum, and to be unique */
@@ -44037,37 +41909,106 @@ index a79e9d3..78cd4fa 100644
dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
/* we will have to manufacture ethernet headers, prepare template */
-diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index 2ef5b62..6fa0ec3 100644
---- a/drivers/net/vxlan.c
-+++ b/drivers/net/vxlan.c
-@@ -2615,7 +2615,7 @@ nla_put_failure:
- return -EMSGSIZE;
- }
-
--static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
-+static struct rtnl_link_ops vxlan_link_ops = {
- .kind = "vxlan",
- .maxtype = IFLA_VXLAN_MAX,
- .policy = vxlan_policy,
-diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
-index 0b60295..b8bfa5b 100644
---- a/drivers/net/wimax/i2400m/rx.c
-+++ b/drivers/net/wimax/i2400m/rx.c
-@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
- if (i2400m->rx_roq == NULL)
- goto error_roq_alloc;
-
-- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
-+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
- GFP_KERNEL);
- if (rd == NULL) {
- result = -ENOMEM;
+diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
+index dc53a8f..2b66cc1 100644
+--- a/drivers/net/usb/usbnet.c
++++ b/drivers/net/usb/usbnet.c
+@@ -344,6 +344,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;
++ }
++
+ if ((skb = alloc_skb (size + NET_IP_ALIGN, flags)) == NULL) {
+ netif_dbg(dev, rx_err, dev->net, "no rx skb\n");
+ usbnet_defer_kevent (dev, EVENT_RX_MEMORY);
+@@ -503,6 +509,17 @@ block:
+ break;
+ }
+
++ /* 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 (urb) {
+@@ -789,6 +806,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) {
+@@ -1227,6 +1249,9 @@ static void usbnet_bh (unsigned long param)
+ }
+ }
+
++ /* 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/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
+index e662cbc..8d4a102 100644
+--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
++++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
+@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
+ * Return with error code if any of the queue indices
+ * is out of range
+ */
+- if (p->ring_index[i] < 0 ||
+- p->ring_index[i] >= adapter->num_rx_queues)
++ if (p->ring_index[i] >= adapter->num_rx_queues)
+ return -EINVAL;
+ }
+
+diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
+index ebb9f24..7a4c491 100644
+--- a/drivers/net/wan/farsync.c
++++ b/drivers/net/wan/farsync.c
+@@ -1972,6 +1972,7 @@ fst_get_iface(struct fst_card_info *card, struct fst_port_info *port,
+ }
+
+ i = port->index;
++ memset(&sync, 0, sizeof(sync));
+ sync.clock_rate = FST_RDL(card, portConfig[i].lineSpeed);
+ /* Lucky card and linux use same encoding here */
+ sync.clock_type = FST_RDB(card, portConfig[i].internalClock) ==
+diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
+index 44b7071..c643d77 100644
+--- a/drivers/net/wan/wanxl.c
++++ b/drivers/net/wan/wanxl.c
+@@ -355,6 +355,7 @@ static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ ifr->ifr_settings.size = size; /* data size wanted */
+ return -ENOBUFS;
+ }
++ memset(&line, 0, sizeof(line));
+ line.clock_type = get_status(port)->clocking;
+ line.clock_rate = 0;
+ line.loopback = 0;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
-index 7fe1964..7016de0 100644
+index ac1176a..79e93d4 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
-@@ -7844,7 +7844,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
+@@ -7885,7 +7885,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
struct airo_info *ai = dev->ml_priv;
int ridcode;
int enabled;
@@ -44077,10 +42018,10 @@ index 7fe1964..7016de0 100644
/* Only super-user can write RIDs */
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
-index 34c8a33..3261fdc 100644
+index 4045e5a..506f1cf 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
-@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
+@@ -353,7 +353,7 @@ static u8 at76_dfu_get_state(struct usb_device *udev, u8 *state)
}
/* Convert timeout from the DFU status to jiffies */
@@ -44089,55 +42030,32 @@ index 34c8a33..3261fdc 100644
{
return msecs_to_jiffies((s->poll_timeout[2] << 16)
| (s->poll_timeout[1] << 8)
-diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
-index ef3329e..c28ff5d 100644
---- a/drivers/net/wireless/ath/ath10k/htc.c
-+++ b/drivers/net/wireless/ath/ath10k/htc.c
-@@ -963,7 +963,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
- /* registered target arrival callback from the HIF layer */
- int ath10k_htc_init(struct ath10k *ar)
- {
-- struct ath10k_hif_cb htc_callbacks;
-+ static struct ath10k_hif_cb htc_callbacks = {
-+ .rx_completion = ath10k_htc_rx_completion_handler,
-+ .tx_completion = ath10k_htc_tx_completion_handler,
-+ };
- struct ath10k_htc_ep *ep = NULL;
- struct ath10k_htc *htc = &ar->htc;
-
-@@ -973,8 +976,6 @@ int ath10k_htc_init(struct ath10k *ar)
- ath10k_htc_reset_endpoint_states(htc);
-
- /* setup HIF layer callbacks */
-- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
-- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
- htc->ar = ar;
-
- /* Get HIF default pipe for HTC message exchange */
-diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
-index e1dd8c7..9f91b3f 100644
---- a/drivers/net/wireless/ath/ath10k/htc.h
-+++ b/drivers/net/wireless/ath/ath10k/htc.h
-@@ -271,12 +271,12 @@ enum ath10k_htc_ep_id {
-
- struct ath10k_htc_ops {
- void (*target_send_suspend_complete)(struct ath10k *ar);
--};
-+} __no_const;
+diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
+index b346d04..04436fa 100644
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -1791,7 +1791,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;
- struct ath10k_htc_ep_ops {
- void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
- void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
--};
-+} __no_const;
+ if (WARN_ON(!vif)) {
+@@ -1806,6 +1806,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+ goto out;
+ }
- /* service connection information */
- struct ath10k_htc_svc_conn_req {
++ avf = (void *)vif->drv_priv;
+ ath5k_txbuf_free_skb(ah, avf->bbuf);
+ avf->bbuf->skb = skb;
+ ret = ath5k_beacon_setup(ah, avf->bbuf);
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
-index 8d78253..bebbb68 100644
+index b592016..fe47870 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
-@@ -184,8 +184,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+@@ -183,8 +183,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
@@ -44148,7 +42066,7 @@ index 8d78253..bebbb68 100644
ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
ctl6 = SM(i->keytype, AR_EncrType);
-@@ -199,26 +199,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+@@ -198,26 +198,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
if ((i->is_first || i->is_last) &&
i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
@@ -44182,7 +42100,7 @@ index 8d78253..bebbb68 100644
return;
}
-@@ -243,7 +243,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+@@ -242,7 +242,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
break;
}
@@ -44191,7 +42109,7 @@ index 8d78253..bebbb68 100644
| (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
| SM(i->txpower, AR_XmitPower)
| (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
-@@ -253,19 +253,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+@@ -252,19 +252,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
| (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
(i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
@@ -44217,11 +42135,11 @@ index 8d78253..bebbb68 100644
| 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 f6c5c1b..6058354 100644
+index f5ae3c6..7936af3 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)
- (i->qcu << AR_TxQcuNum_S) | desc_len;
+@@ -35,47 +35,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+ (i->qcu << AR_TxQcuNum_S) | 0x17;
checksum += val;
- ACCESS_ONCE(ads->info) = val;
@@ -44283,7 +42201,7 @@ index f6c5c1b..6058354 100644
}
ads->ctl20 = 0;
-@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+@@ -84,17 +84,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
ctl17 = SM(i->keytype, AR_EncrType);
if (!i->is_first) {
@@ -44309,7 +42227,7 @@ index f6c5c1b..6058354 100644
| (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
| SM(i->txpower, AR_XmitPower)
| (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
-@@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
+@@ -130,22 +130,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
ctl12 |= SM(val, AR_PAPRDChainMask);
@@ -44339,10 +42257,10 @@ index f6c5c1b..6058354 100644
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 69a907b..91e071c 100644
+index dc774cd..fd6efed 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -657,7 +657,7 @@ struct ath_hw_private_ops {
+@@ -607,7 +607,7 @@ struct ath_hw_private_ops {
/* ANI */
void (*ani_cache_ini_regs)(struct ath_hw *ah);
@@ -44350,21 +42268,21 @@ index 69a907b..91e071c 100644
+} __no_const;
/**
- * struct ath_spec_scan - parameters for Atheros spectral scan
-@@ -729,7 +729,7 @@ struct ath_hw_ops {
- #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
- void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
- #endif
+ * struct ath_hw_ops - callbacks used by hardware code and driver code
+@@ -637,7 +637,7 @@ struct ath_hw_ops {
+ void (*antdiv_comb_conf_set)(struct ath_hw *ah,
+ struct ath_hw_antcomb_conf *antconf);
+
-};
+} __no_const;
struct ath_nf_limits {
s16 max;
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
-index 92190da..f3a4c4c 100644
+index f93d66b..a6c7765 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
-@@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
+@@ -2520,7 +2520,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
{
struct ssb_bus *bus = dev->dev->sdev->bus;
@@ -44373,26 +42291,72 @@ index 92190da..f3a4c4c 100644
u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
u16 old_comm15, scale;
-diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
-index 9581d07..84f6a76 100644
---- a/drivers/net/wireless/iwlegacy/3945-mac.c
-+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
-@@ -3639,7 +3639,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+index 62dc461..5250f0b 100644
+--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
++++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+@@ -175,7 +175,7 @@ struct brcmf_cfg80211_event_loop {
+ struct net_device *ndev,
+ const struct brcmf_event_msg *e,
+ void *data);
+-};
++} __no_const;
+
+ /* representing interface of cfg80211 plane */
+ struct brcmf_cfg80211_iface {
+@@ -239,7 +239,7 @@ struct brcmf_cfg80211_profile {
+ struct brcmf_cfg80211_iscan_eloop {
+ s32 (*handler[WL_SCAN_ERSULTS_LAST])
+ (struct brcmf_cfg80211_priv *cfg_priv);
+-};
++} __no_const;
+
+ /* dongle iscan controller */
+ struct brcmf_cfg80211_iscan_ctrl {
+diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
+index b3d9f3f..9931f58 100644
+--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
++++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
+@@ -3685,7 +3685,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
*/
- if (il3945_mod_params.disable_hw_scan) {
- D_INFO("Disabling hw_scan\n");
-- il3945_mac_ops.hw_scan = NULL;
+ if (iwl3945_mod_params.disable_hw_scan) {
+ IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
+- iwl3945_hw_ops.hw_scan = NULL;
+ pax_open_kernel();
-+ *(void **)&il3945_mac_ops.hw_scan = NULL;
++ *(void **)&iwl3945_hw_ops.hw_scan = NULL;
+ pax_close_kernel();
}
- D_INFO("*** LOAD DRIVER ***\n");
-diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-index d94f8ab..5b568c8 100644
---- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
+ IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
+diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
+index 69a77e24..552b42c 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
++++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
+@@ -71,8 +71,8 @@ do { \
+ } while (0)
+
+ #else
+-#define IWL_DEBUG(m, level, fmt, args...)
+-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)
++#define IWL_DEBUG(m, level, fmt, args...) do {} while (0)
++#define IWL_DEBUG_LIMIT(m, level, fmt, args...) do {} while (0)
+ #define iwl_print_hex_dump(m, level, p, len)
+ #endif /* CONFIG_IWLWIFI_DEBUG */
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+index 93e6179..b221e4f 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
++++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+@@ -163,7 +163,7 @@ static ssize_t iwl_dbgfs_clear_traffic_statistics_write(struct file *file,
+ struct iwl_priv *priv = file->private_data;
+ u32 clear_flag;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+
+ memset(buf, 0, sizeof(buf));
+ buf_size = min(count, sizeof(buf) - 1);
+@@ -311,7 +311,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
{
struct iwl_priv *priv = file->private_data;
char buf[64];
@@ -44401,7 +42365,7 @@ index d94f8ab..5b568c8 100644
u32 offset, len;
memset(buf, 0, sizeof(buf));
-@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
+@@ -601,7 +601,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
struct iwl_priv *priv = file->private_data;
char buf[8];
@@ -44410,7 +42374,7 @@ index d94f8ab..5b568c8 100644
u32 reset_flag;
memset(buf, 0, sizeof(buf));
-@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
+@@ -682,7 +682,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
{
struct iwl_priv *priv = file->private_data;
char buf[8];
@@ -44419,7 +42383,7 @@ index d94f8ab..5b568c8 100644
int ht40;
memset(buf, 0, sizeof(buf));
-@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
+@@ -737,7 +737,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
{
struct iwl_priv *priv = file->private_data;
char buf[8];
@@ -44428,9 +42392,18 @@ index d94f8ab..5b568c8 100644
int value;
memset(buf, 0, sizeof(buf));
-@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
- DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
- DEBUGFS_READ_FILE_OPS(current_sleep_command);
+@@ -897,7 +897,7 @@ static ssize_t iwl_dbgfs_traffic_log_write(struct file *file,
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int traffic_log;
+
+ memset(buf, 0, sizeof(buf));
+@@ -912,10 +912,10 @@ static ssize_t iwl_dbgfs_traffic_log_write(struct file *file,
+ return count;
+ }
-static const char *fmt_value = " %-30s %10u\n";
-static const char *fmt_hex = " %-30s 0x%02X\n";
@@ -44443,7 +42416,7 @@ index d94f8ab..5b568c8 100644
"%-32s current cumulative delta max\n";
static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
-@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
+@@ -2078,7 +2078,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
{
struct iwl_priv *priv = file->private_data;
char buf[8];
@@ -44452,7 +42425,7 @@ index d94f8ab..5b568c8 100644
int clear;
memset(buf, 0, sizeof(buf));
-@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
+@@ -2123,7 +2123,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
{
struct iwl_priv *priv = file->private_data;
char buf[8];
@@ -44461,7 +42434,7 @@ index d94f8ab..5b568c8 100644
int trace;
memset(buf, 0, sizeof(buf));
-@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
+@@ -2193,7 +2193,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
{
struct iwl_priv *priv = file->private_data;
char buf[8];
@@ -44470,7 +42443,7 @@ index d94f8ab..5b568c8 100644
int missed;
memset(buf, 0, sizeof(buf));
-@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
+@@ -2234,7 +2234,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
struct iwl_priv *priv = file->private_data;
char buf[8];
@@ -44479,77 +42452,56 @@ index d94f8ab..5b568c8 100644
int plcp;
memset(buf, 0, sizeof(buf));
-@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
+@@ -2288,7 +2288,7 @@ static ssize_t iwl_dbgfs_force_reset_write(struct file *file,
struct iwl_priv *priv = file->private_data;
char buf[8];
- int buf_size;
+ size_t buf_size;
- int flush;
+ int reset, ret;
memset(buf, 0, sizeof(buf));
-@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
+@@ -2314,7 +2314,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
struct iwl_priv *priv = file->private_data;
char buf[8];
- int buf_size;
+ size_t buf_size;
- int rts;
+ int flush;
- if (!priv->cfg->ht_params)
-@@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
+ memset(buf, 0, sizeof(buf));
+@@ -2338,7 +2338,7 @@ static ssize_t iwl_dbgfs_wd_timeout_write(struct file *file,
{
struct iwl_priv *priv = file->private_data;
char buf[8];
- int buf_size;
+ size_t buf_size;
+ int timeout;
memset(buf, 0, sizeof(buf));
- buf_size = min(count, sizeof(buf) - 1);
-@@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
+@@ -2427,7 +2427,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
+
struct iwl_priv *priv = file->private_data;
- u32 event_log_flag;
char buf[8];
- int buf_size;
+ size_t buf_size;
+ int rts;
- /* check that the interface is up */
- if (!iwl_is_ready(priv))
-@@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
+ if (!priv->cfg->ht_params)
+@@ -2452,7 +2452,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
+ {
struct iwl_priv *priv = file->private_data;
char buf[8];
- u32 calib_disabled;
- int buf_size;
+ size_t buf_size;
memset(buf, 0, sizeof(buf));
- buf_size = min(count, sizeof(buf) - 1);
-diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
-index 7aad766..06addb4 100644
---- a/drivers/net/wireless/iwlwifi/dvm/main.c
-+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
-@@ -1123,7 +1123,7 @@ static void iwl_option_config(struct iwl_priv *priv)
- static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
- {
- struct iwl_nvm_data *data = priv->nvm_data;
-- char *debug_msg;
-+ static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
-
- if (data->sku_cap_11n_enable &&
- !priv->cfg->ht_params) {
-@@ -1137,7 +1137,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
- return -EINVAL;
- }
-
-- debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
- IWL_DEBUG_INFO(priv, debug_msg,
- data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
- data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
-diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
-index c3f904d..4cadf83 100644
---- a/drivers/net/wireless/iwlwifi/pcie/trans.c
-+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
-@@ -1252,7 +1252,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
+ buf_size = min(count, sizeof(buf) - 1);
+diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+index 75da4bc..7737dff 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
++++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+@@ -1890,7 +1890,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
char buf[8];
@@ -44558,7 +42510,7 @@ index c3f904d..4cadf83 100644
u32 reset_flag;
memset(buf, 0, sizeof(buf));
-@@ -1273,7 +1273,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
+@@ -1911,7 +1911,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
{
struct iwl_trans *trans = file->private_data;
char buf[8];
@@ -44568,53 +42520,69 @@ index c3f904d..4cadf83 100644
memset(buf, 0, sizeof(buf));
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
-index 2cd3f54..e936f90 100644
+index 523ad55..f8c5dc5 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -2196,25 +2196,19 @@ static int __init init_mac80211_hwsim(void)
+@@ -1678,9 +1678,11 @@ static int __init init_mac80211_hwsim(void)
+ return -EINVAL;
- if (channels > 1) {
- hwsim_if_comb.num_different_channels = channels;
+ if (fake_hw_scan) {
- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
-- mac80211_hwsim_ops.cancel_hw_scan =
-- mac80211_hwsim_cancel_hw_scan;
- mac80211_hwsim_ops.sw_scan_start = NULL;
- mac80211_hwsim_ops.sw_scan_complete = NULL;
-- mac80211_hwsim_ops.remain_on_channel =
-- mac80211_hwsim_roc;
-- mac80211_hwsim_ops.cancel_remain_on_channel =
-- mac80211_hwsim_croc;
-- mac80211_hwsim_ops.add_chanctx =
-- mac80211_hwsim_add_chanctx;
-- mac80211_hwsim_ops.remove_chanctx =
-- mac80211_hwsim_remove_chanctx;
-- mac80211_hwsim_ops.change_chanctx =
-- mac80211_hwsim_change_chanctx;
-- mac80211_hwsim_ops.assign_vif_chanctx =
-- mac80211_hwsim_assign_vif_chanctx;
-- mac80211_hwsim_ops.unassign_vif_chanctx =
-- mac80211_hwsim_unassign_vif_chanctx;
+ pax_open_kernel();
+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
-+ *(void **)&mac80211_hwsim_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
-+ *(void **)&mac80211_hwsim_ops.remain_on_channel = mac80211_hwsim_roc;
-+ *(void **)&mac80211_hwsim_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
-+ *(void **)&mac80211_hwsim_ops.add_chanctx = mac80211_hwsim_add_chanctx;
-+ *(void **)&mac80211_hwsim_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
-+ *(void **)&mac80211_hwsim_ops.change_chanctx = mac80211_hwsim_change_chanctx;
-+ *(void **)&mac80211_hwsim_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
-+ *(void **)&mac80211_hwsim_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
+ pax_close_kernel();
}
spin_lock_init(&hwsim_radio_lock);
+diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c
+index d26a78b..156ad04 100644
+--- a/drivers/net/wireless/mwifiex/debugfs.c
++++ b/drivers/net/wireless/mwifiex/debugfs.c
+@@ -26,10 +26,17 @@
+ static struct dentry *mwifiex_dfs_dir;
+
+ static char *bss_modes[] = {
+- "Unknown",
+- "Ad-hoc",
+- "Managed",
+- "Auto"
++ "UNSPECIFIED",
++ "ADHOC",
++ "STATION",
++ "AP",
++ "AP_VLAN",
++ "WDS",
++ "MONITOR",
++ "MESH_POINT",
++ "P2P_CLIENT",
++ "P2P_GO",
++ "P2P_DEVICE",
+ };
+
+ /* size/addr for mwifiex_debug_info */
+@@ -213,7 +220,12 @@ mwifiex_info_read(struct file *file, char __user *ubuf,
+ p += sprintf(p, "driver_version = %s", fmt);
+ p += sprintf(p, "\nverext = %s", priv->version_str);
+ p += sprintf(p, "\ninterface_name=\"%s\"\n", netdev->name);
+- p += sprintf(p, "bss_mode=\"%s\"\n", bss_modes[info.bss_mode]);
++
++ if (info.bss_mode >= ARRAY_SIZE(bss_modes))
++ p += sprintf(p, "bss_mode=\"%d\"\n", info.bss_mode);
++ else
++ p += sprintf(p, "bss_mode=\"%s\"\n", bss_modes[info.bss_mode]);
++
+ p += sprintf(p, "media_state=\"%s\"\n",
+ (!priv->media_connected ? "Disconnected" : "Connected"));
+ p += sprintf(p, "mac_address=\"%pM\"\n", netdev->dev_addr);
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
-index 8169a85..7fa3b47 100644
+index 0c13840..a5c3ed6 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
-@@ -1238,7 +1238,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
+@@ -1275,7 +1275,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -44623,40 +42591,11 @@ index 8169a85..7fa3b47 100644
rts_threshold = 2347;
tmp = cpu_to_le32(rts_threshold);
-diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
-index fe4c572..99dedfa 100644
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -387,7 +387,7 @@ struct rt2x00_intf {
- * for hardware which doesn't support hardware
- * sequence counting.
- */
-- atomic_t seqno;
-+ atomic_unchecked_t seqno;
- };
-
- 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 6c8a33b..78212fa 100644
---- a/drivers/net/wireless/rt2x00/rt2x00queue.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
-@@ -252,9 +252,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
- * sequence counter given by mac80211.
- */
- if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
-- seqno = atomic_add_return(0x10, &intf->seqno);
-+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
- else
-- seqno = atomic_read(&intf->seqno);
-+ seqno = atomic_read_unchecked(&intf->seqno);
-
- hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
- hdr->seq_ctrl |= cpu_to_le16(seqno);
-diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
-index e2b3d9c..67a5184 100644
---- a/drivers/net/wireless/ti/wl1251/sdio.c
-+++ b/drivers/net/wireless/ti/wl1251/sdio.c
-@@ -271,13 +271,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
+diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/wl1251/sdio.c
+index e2750a1..797e179 100644
+--- a/drivers/net/wireless/wl1251/sdio.c
++++ b/drivers/net/wireless/wl1251/sdio.c
+@@ -269,13 +269,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
@@ -44678,54 +42617,11 @@ index e2b3d9c..67a5184 100644
wl1251_info("using SDIO interrupt");
}
-diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
-index 1c627da..69f7d17 100644
---- a/drivers/net/wireless/ti/wl12xx/main.c
-+++ b/drivers/net/wireless/ti/wl12xx/main.c
-@@ -656,7 +656,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_SR_VER, WL127X_MAJOR_SR_VER,
-@@ -681,7 +683,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_SR_VER, WL127X_MAJOR_SR_VER,
-diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
-index 7aa0eb8..5a9ef38 100644
---- a/drivers/net/wireless/ti/wl18xx/main.c
-+++ b/drivers/net/wireless/ti/wl18xx/main.c
-@@ -1730,8 +1730,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/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
-index 7ef0b4a..ff65c28 100644
+index 785bdbe..ddde2d1 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
-@@ -386,7 +386,7 @@ static inline void handle_regs_int(struct urb *urb)
+@@ -387,7 +387,7 @@ static inline void handle_regs_int(struct urb *urb)
{
struct zd_usb *usb = urb->context;
struct zd_usb_interrupt *intr = &usb->intr;
@@ -44735,23 +42631,23 @@ index 7ef0b4a..ff65c28 100644
ZD_ASSERT(in_interrupt());
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
-index 59f95d8..53e0e7f 100644
+index 06c3642..c4ee5f2 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
-@@ -513,7 +513,7 @@ static struct nci_ops nfcwilink_ops = {
+@@ -237,7 +237,7 @@ static struct nci_ops nfcwilink_ops = {
static int nfcwilink_probe(struct platform_device *pdev)
{
- static struct nfcwilink *drv;
+ struct nfcwilink *drv;
int rc;
- __u32 protocols;
+ u32 protocols;
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
-index d93b2b6..ae50401 100644
+index f34b5b2..b5abb9f 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
-@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
+@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
if (cookie == NO_COOKIE)
offset = pc;
if (cookie == INVALID_COOKIE) {
@@ -44760,7 +42656,7 @@ index d93b2b6..ae50401 100644
offset = pc;
}
if (cookie != last_cookie) {
-@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
+@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
/* add userspace sample */
if (!mm) {
@@ -44777,7 +42673,7 @@ index d93b2b6..ae50401 100644
return 0;
}
-@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
+@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
/* ignore backtraces if failed to add a sample */
if (state == sb_bt_start) {
state = sb_bt_ignore;
@@ -44800,7 +42696,7 @@ index c0cc4e7..44d4e54 100644
}
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
-index ed2c3ec..deda85a 100644
+index f8c752e..28bf4fc 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
@@ -44813,7 +42709,7 @@ index ed2c3ec..deda85a 100644
}
diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
-index ee2cfce..7f8f699 100644
+index 84a208d..d61b0a1 100644
--- a/drivers/oprofile/oprofile_files.c
+++ b/drivers/oprofile/oprofile_files.c
@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
@@ -44826,7 +42722,7 @@ index ee2cfce..7f8f699 100644
{
return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
-index 59659ce..6c860a0 100644
+index 917d28e..d62d981 100644
--- a/drivers/oprofile/oprofile_stats.c
+++ b/drivers/oprofile/oprofile_stats.c
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
@@ -44847,7 +42743,7 @@ index 59659ce..6c860a0 100644
diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
-index 1fc622b..8c48fc3 100644
+index 38b6fc0..b5cbfce 100644
--- a/drivers/oprofile/oprofile_stats.h
+++ b/drivers/oprofile/oprofile_stats.h
@@ -13,11 +13,11 @@
@@ -44868,34 +42764,31 @@ index 1fc622b..8c48fc3 100644
extern struct oprofile_stat_struct oprofile_stats;
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
-index 3f49345..c750d0b 100644
+index 2f0aa0f..1ba4404 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
-@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
-
- static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
- {
-- atomic_t *val = file->private_data;
-- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
-+ atomic_unchecked_t *val = file->private_data;
-+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
- }
-
+@@ -193,7 +193,7 @@ static const struct file_operations atomic_ro_fops = {
-@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
-
- int oprofilefs_create_ro_atomic(struct dentry *root,
+ int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
- char const *name, atomic_t *val)
+ char const *name, atomic_unchecked_t *val)
{
- return __oprofilefs_create_file(root, name,
+ return __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444, val);
+@@ -279,6 +279,7 @@ static struct file_system_type oprofilefs_type = {
+ .mount = oprofilefs_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("oprofilefs");
+
+
+ int __init oprofilefs_register(void)
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
-index 61be1d9..dec05d7 100644
+index 878fba1..2084bcf 100644
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
-@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
+@@ -93,7 +93,7 @@ static int __cpuinit oprofile_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
@@ -44905,7 +42798,7 @@ index 61be1d9..dec05d7 100644
};
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
-index 92ed045..62d39bd7 100644
+index 3f56bc0..707d642 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
@@ -44927,10 +42820,10 @@ index 92ed045..62d39bd7 100644
#endif /* IEEE1284.3 support. */
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
-index 2f5786c..61ab4d1 100644
+index e525263..ebde92e 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
-@@ -463,7 +463,9 @@ static int __init ibm_acpiphp_init(void)
+@@ -464,7 +464,9 @@ static int __init ibm_acpiphp_init(void)
goto init_cleanup;
}
@@ -44942,7 +42835,7 @@ index 2f5786c..61ab4d1 100644
return retval;
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
-index a6a71c4..c91097b 100644
+index fb3f846..792d643 100644
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -73,7 +73,6 @@ static u16 port;
@@ -44964,7 +42857,7 @@ index a6a71c4..c91097b 100644
static int __init cpcihp_generic_init(void)
{
int status;
-@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
+@@ -169,7 +172,6 @@ static int __init cpcihp_generic_init(void)
pci_dev_put(dev);
memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
@@ -44973,13 +42866,13 @@ index a6a71c4..c91097b 100644
status = cpci_hp_register_controller(&generic_hpc);
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
-index 449b4bb..257e2e8 100644
+index 41f6a8d..da73050 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 int debug;
+ static int poll;
-static struct cpci_hp_controller_ops zt5550_hpc_ops;
static struct cpci_hp_controller zt5550_hpc;
@@ -45036,10 +42929,10 @@ index 76ba8a1..20ca857 100644
/* initialize our int15 lock */
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
-index ec20f74..c1d961e 100644
+index 6d2eea9..4bf3318 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
-@@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
+@@ -448,8 +448,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
return -EINVAL;
}
@@ -45053,10 +42946,10 @@ index ec20f74..c1d961e 100644
mutex_lock(&pci_hp_mutex);
/*
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
-index f4a18f5..ff2463c 100644
+index 9350af9..68623c4 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
-@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
+@@ -91,7 +91,7 @@ static int init_slot(struct controller *ctrl)
struct slot *slot = ctrl->slot;
struct hotplug_slot *hotplug = NULL;
struct hotplug_slot_info *info = NULL;
@@ -45066,10 +42959,10 @@ index f4a18f5..ff2463c 100644
int retval = -ENOMEM;
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
-index 7128cfd..a0640d6 100644
+index 106be0d..45a52b5 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
-@@ -1083,7 +1083,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
+@@ -950,7 +950,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
{
/* allocate attribute structure, piggyback attribute name */
int name_len = write_combine ? 13 : 10;
@@ -45078,7 +42971,7 @@ index 7128cfd..a0640d6 100644
int retval;
res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
-@@ -1268,7 +1268,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
+@@ -1135,7 +1135,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
static int pci_create_capabilities_sysfs(struct pci_dev *dev)
{
int retval;
@@ -45087,7 +42980,7 @@ index 7128cfd..a0640d6 100644
/* If the device has VPD, try to expose it in sysfs. */
if (dev->vpd) {
-@@ -1315,7 +1315,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
+@@ -1182,7 +1182,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
{
int retval;
int rom_size = 0;
@@ -45097,10 +42990,10 @@ index 7128cfd..a0640d6 100644
if (!sysfs_initialized)
return -EACCES;
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index 8a00c06..18a9715 100644
+index b74084e..a9c2922 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
-@@ -95,7 +95,7 @@ struct pci_vpd_ops {
+@@ -101,7 +101,7 @@ struct pci_vpd_ops {
struct pci_vpd {
unsigned int len;
const struct pci_vpd_ops *ops;
@@ -45108,9 +43001,9 @@ index 8a00c06..18a9715 100644
+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
};
- int pci_vpd_pci22_init(struct pci_dev *dev);
+ extern int pci_vpd_pci22_init(struct pci_dev *dev);
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
-index 403a443..034e050 100644
+index c73ed00..cc3edec 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -27,9 +27,9 @@
@@ -45127,23 +43020,23 @@ index 403a443..034e050 100644
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 7ef0f86..17b710f 100644
+index 9005380..c497080 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
- struct pci_bus_region region, inverted_region;
- bool bar_too_big = false, bar_disabled = false;
+@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+ u32 l, sz, mask;
+ u16 orig_cmd;
- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
- /* No printks while decoding is disabled! */
if (!dev->mmio_always_on) {
+ pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
-index cdc7836..528635c 100644
+index 27911b5..5b6db88 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
-@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
+@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
static int __init pci_proc_init(void)
{
struct pci_dev *dev = NULL;
@@ -45160,75 +43053,49 @@ index cdc7836..528635c 100644
proc_create("devices", 0, proc_bus_pci_dir,
&proc_bus_pci_dev_operations);
proc_initialized = 1;
-diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
-index 3e5b4497..dcdfb70 100644
---- a/drivers/platform/x86/chromeos_laptop.c
-+++ b/drivers/platform/x86/chromeos_laptop.c
-@@ -301,7 +301,7 @@ static int __init setup_tsl2563_als(const struct dmi_system_id *id)
- return 0;
- }
-
--static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
-+static struct dmi_system_id __initconst chromeos_laptop_dmi_table[] = {
- {
- .ident = "Samsung Series 5 550 - Touchpad",
- .matches = {
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
-index 62f8030..c7f2a45 100644
+index f204643..9ccea74 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
-@@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
-
- if (!quirks->ec_read_only) {
- /* allow userland write sysfs file */
-- dev_attr_bluetooth.store = store_bluetooth;
-- dev_attr_wlan.store = store_wlan;
-- dev_attr_threeg.store = store_threeg;
-- dev_attr_bluetooth.attr.mode |= S_IWUSR;
-- dev_attr_wlan.attr.mode |= S_IWUSR;
-- dev_attr_threeg.attr.mode |= S_IWUSR;
-+ pax_open_kernel();
-+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
-+ *(void **)&dev_attr_wlan.store = store_wlan;
-+ *(void **)&dev_attr_threeg.store = store_threeg;
-+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
-+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
-+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
-+ pax_close_kernel();
- }
+@@ -815,12 +815,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
+ int result;
+
+ /* allow userland write sysfs file */
+- dev_attr_bluetooth.store = store_bluetooth;
+- dev_attr_wlan.store = store_wlan;
+- dev_attr_threeg.store = store_threeg;
+- dev_attr_bluetooth.attr.mode |= S_IWUSR;
+- dev_attr_wlan.attr.mode |= S_IWUSR;
+- dev_attr_threeg.attr.mode |= S_IWUSR;
++ pax_open_kernel();
++ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
++ *(void **)&dev_attr_wlan.store = store_wlan;
++ *(void **)&dev_attr_threeg.store = store_threeg;
++ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
++ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
++ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
++ pax_close_kernel();
/* disable hardware control by fn key */
+ result = ec_read(MSI_STANDARD_EC_SCM_LOAD_ADDRESS, &data);
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
-index 70222f2..8c8ce66 100644
+index b96766b..909c5a0 100644
--- a/drivers/platform/x86/msi-wmi.c
+++ b/drivers/platform/x86/msi-wmi.c
-@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
+@@ -147,7 +147,7 @@ static const struct backlight_ops msi_backlight_ops = {
static void msi_wmi_notify(u32 value, void *context)
{
struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
- static struct key_entry *key;
+ struct key_entry *key;
union acpi_object *obj;
+ ktime_t cur;
acpi_status status;
-
-diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
-index 13ec195..6af61af 100644
---- a/drivers/platform/x86/sony-laptop.c
-+++ b/drivers/platform/x86/sony-laptop.c
-@@ -2475,7 +2475,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
- }
-
- /* High speed charging function */
--static struct device_attribute *hsc_handle;
-+static device_attribute_no_const *hsc_handle;
-
- static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
- struct device_attribute *attr,
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
-index 03ca6c1..1ef2ddd 100644
+index 8e6c4fa..a7539b3 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
-@@ -2091,7 +2091,7 @@ static int hotkey_mask_get(void)
+@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
return 0;
}
@@ -45237,7 +43104,7 @@ index 03ca6c1..1ef2ddd 100644
{
/* log only what the user can fix... */
const u32 wantedmask = hotkey_driver_mask &
-@@ -2318,11 +2318,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
+@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
}
}
@@ -45249,7 +43116,7 @@ index 03ca6c1..1ef2ddd 100644
#define TPACPI_COMPARE_KEY(__scancode, __member) \
do { \
if ((event_mask & (1 << __scancode)) && \
-@@ -2336,36 +2331,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
tpacpi_hotkey_send_key(__scancode); \
} while (0)
@@ -45316,7 +43183,7 @@ index 03ca6c1..1ef2ddd 100644
TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
-@@ -2399,7 +2400,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
oldn->volume_level != newn->volume_level) {
/* recently muted, or repeated mute keypress, or
* multiple presses ending in mute */
@@ -45325,7 +43192,7 @@ index 03ca6c1..1ef2ddd 100644
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
}
} else {
-@@ -2409,7 +2410,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
}
if (oldn->volume_level != newn->volume_level) {
@@ -45334,7 +43201,7 @@ index 03ca6c1..1ef2ddd 100644
} else if (oldn->volume_toggle != newn->volume_toggle) {
/* repeated vol up/down keypress at end of scale ? */
if (newn->volume_level == 0)
-@@ -2422,7 +2423,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
/* handle brightness */
if (oldn->brightness_level != newn->brightness_level) {
issue_brightnesschange(oldn->brightness_level,
@@ -45344,7 +43211,7 @@ index 03ca6c1..1ef2ddd 100644
} else if (oldn->brightness_toggle != newn->brightness_toggle) {
/* repeated key presses that didn't change state */
if (newn->brightness_level == 0)
-@@ -2431,10 +2433,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
&& !tp_features.bright_unkfw)
TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
}
@@ -45356,11 +43223,24 @@ index 03ca6c1..1ef2ddd 100644
/*
* Polling driver
+diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
+index a134c26..d024437 100644
+--- a/drivers/platform/x86/wmi.c
++++ b/drivers/platform/x86/wmi.c
+@@ -743,7 +743,7 @@ static int wmi_create_device(const struct guid_block *gblock,
+ wblock->dev.class = &wmi_class;
+
+ wmi_gtoa(gblock->guid, guid_string);
+- dev_set_name(&wblock->dev, guid_string);
++ dev_set_name(&wblock->dev, "%s", guid_string);
+
+ dev_set_drvdata(&wblock->dev, wblock);
+
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
-index 769d265..a3a05ca 100644
+index b859d16..5cc6b1a 100644
--- a/drivers/pnp/pnpbios/bioscalls.c
+++ b/drivers/pnp/pnpbios/bioscalls.c
-@@ -58,7 +58,7 @@ do { \
+@@ -59,7 +59,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -45369,7 +43249,7 @@ index 769d265..a3a05ca 100644
(unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
/*
-@@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
+@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
cpu = get_cpu();
save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
@@ -45380,7 +43260,7 @@ index 769d265..a3a05ca 100644
/* On some boxes IRQ's during PnP BIOS calls are deadly. */
spin_lock_irqsave(&pnp_bios_lock, flags);
-@@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
+@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
:"memory");
spin_unlock_irqrestore(&pnp_bios_lock, flags);
@@ -45391,7 +43271,7 @@ index 769d265..a3a05ca 100644
put_cpu();
/* If we get here and this is set then the PnP BIOS faulted on us. */
-@@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
+@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
return status;
}
@@ -45400,7 +43280,7 @@ index 769d265..a3a05ca 100644
{
int i;
-@@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
+@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
pnp_bios_callpoint.offset = header->fields.pm16offset;
pnp_bios_callpoint.segment = PNP_CS16;
@@ -45409,7 +43289,7 @@ index 769d265..a3a05ca 100644
for_each_possible_cpu(i) {
struct desc_struct *gdt = get_cpu_gdt_table(i);
if (!gdt)
-@@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
+@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
(unsigned long)__va(header->fields.pm16dseg));
}
@@ -45417,7 +43297,7 @@ index 769d265..a3a05ca 100644
+ pax_close_kernel();
}
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
-index d95e101..67f0c3f 100644
+index b0ecacb..7c9da2e 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
@@ -45438,36 +43318,11 @@ index d95e101..67f0c3f 100644
return 0;
/* check if the resource is reserved */
-diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
-index 0c52e2a..3421ab7 100644
---- a/drivers/power/pda_power.c
-+++ b/drivers/power/pda_power.c
-@@ -37,7 +37,11 @@ static int polling;
-
- #if IS_ENABLED(CONFIG_USB_PHY)
- 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
-
- static struct regulator *ac_draw;
-@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
-
- #if IS_ENABLED(CONFIG_USB_PHY)
- 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/power/power_supply.h b/drivers/power/power_supply.h
-index cc439fd..8fa30df 100644
+index 018de2b..bc8e317 100644
--- a/drivers/power/power_supply.h
+++ b/drivers/power/power_supply.h
-@@ -16,12 +16,12 @@ struct power_supply;
+@@ -12,12 +12,12 @@
#ifdef CONFIG_SYSFS
@@ -45483,10 +43338,10 @@ index cc439fd..8fa30df 100644
#endif /* CONFIG_SYSFS */
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
-index 00e6672..2642c08 100644
+index 329b46b..1b17633 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
-@@ -24,7 +24,10 @@
+@@ -23,7 +23,10 @@
struct class *power_supply_class;
EXPORT_SYMBOL_GPL(power_supply_class);
@@ -45496,9 +43351,9 @@ index 00e6672..2642c08 100644
+ .groups = power_supply_attr_groups,
+};
- static bool __power_supply_is_supplied_by(struct power_supply *supplier,
- struct power_supply *supply)
-@@ -584,7 +587,7 @@ static int __init power_supply_class_init(void)
+ static int __power_supply_changed_work(struct device *dev, void *data)
+ {
+@@ -215,7 +218,7 @@ static int __init power_supply_class_init(void)
return PTR_ERR(power_supply_class);
power_supply_class->dev_uevent = power_supply_uevent;
@@ -45508,10 +43363,10 @@ index 00e6672..2642c08 100644
return 0;
}
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
-index 44420d1..967126e 100644
+index e15d4c9..83cd617 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
-@@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
+@@ -208,17 +208,15 @@ static struct attribute_group power_supply_attr_group = {
.is_visible = power_supply_attr_is_visible,
};
@@ -45532,20 +43387,20 @@ index 44420d1..967126e 100644
__power_supply_attrs[i] = &power_supply_attrs[i].attr;
}
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index a01b8b3..37c2afe 100644
+index 6ec610c..078eaf3 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
-@@ -3307,7 +3307,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
+@@ -2639,7 +2639,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
+ struct device *dev, const struct regulator_init_data *init_data,
+ void *driver_data)
{
- const struct regulation_constraints *constraints = NULL;
- const struct regulator_init_data *init_data;
- static atomic_t regulator_no = ATOMIC_INIT(0);
+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
struct regulator_dev *rdev;
- struct device *dev;
int ret, i;
-@@ -3377,7 +3377,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
- rdev->dev.of_node = config->of_node;
+
+@@ -2698,7 +2698,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
+ rdev->dev.class = ®ulator_class;
rdev->dev.parent = dev;
dev_set_name(&rdev->dev, "regulator.%d",
- atomic_inc_return(®ulator_no) - 1);
@@ -45554,10 +43409,10 @@ index a01b8b3..37c2afe 100644
if (ret != 0) {
put_device(&rdev->dev);
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
-index 144bcac..d20e7db 100644
+index 33f5d9a..d957d3f 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
-@@ -420,8 +420,10 @@ static int max8660_probe(struct i2c_client *client,
+@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
max8660->shadow_regs[MAX8660_OVER1] = 5;
} else {
/* Otherwise devices can be toggled via software */
@@ -45570,30 +43425,11 @@ index 144bcac..d20e7db 100644
}
/*
-diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
-index 5b77ab7..a62f061 100644
---- a/drivers/regulator/max8973-regulator.c
-+++ b/drivers/regulator/max8973-regulator.c
-@@ -406,9 +406,11 @@ static int max8973_probe(struct i2c_client *client,
- if (!pdata || !pdata->enable_ext_control) {
- max->desc.enable_reg = MAX8973_VOUT;
- max->desc.enable_mask = MAX8973_VOUT_ENABLE;
-- max->ops.enable = regulator_enable_regmap;
-- max->ops.disable = regulator_disable_regmap;
-- max->ops.is_enabled = regulator_is_enabled_regmap;
-+ pax_open_kernel();
-+ *(void **)&max->ops.enable = regulator_enable_regmap;
-+ *(void **)&max->ops.disable = regulator_disable_regmap;
-+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
-+ pax_close_kernel();
- }
-
- if (pdata) {
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
-index 1037e07..e64dea1 100644
+index 023d17d..74ef35b 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
-@@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
+@@ -565,10 +565,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
}
mc13xxx_unlock(mc13892);
@@ -45605,14 +43441,14 @@ index 1037e07..e64dea1 100644
+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
= mc13892_vcam_get_mode;
+ pax_close_kernel();
-
- mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
- ARRAY_SIZE(mc13892_regulators));
+ for (i = 0; i < pdata->num_regulators; i++) {
+ init_data = &pdata->regulators[i];
+ priv->regulators[i] = regulator_register(
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index 24e733c..bfbaa3e 100644
+index e3eed18..155946b 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
-@@ -731,7 +731,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
+@@ -724,7 +724,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
hpet_rtc_timer_init();
/* export at least the first block of NVRAM */
@@ -45624,10 +43460,10 @@ index 24e733c..bfbaa3e 100644
if (retval < 0) {
dev_dbg(dev, "can't create nvram file? %d\n", retval);
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
-index d049393..bb20be0 100644
+index cace6d3..f623fda 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
-@@ -16,6 +16,7 @@
+@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/rtc.h>
#include <linux/sched.h>
@@ -45635,7 +43471,7 @@ index d049393..bb20be0 100644
#include "rtc-core.h"
static dev_t rtc_devt;
-@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
+@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
if (copy_from_user(&tm, uarg, sizeof(tm)))
return -EFAULT;
@@ -45644,26 +43480,13 @@ index d049393..bb20be0 100644
return rtc_set_time(rtc, &tm);
case RTC_PIE_ON:
-diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
-index ca18fd1..055e42d 100644
---- a/drivers/rtc/rtc-ds1307.c
-+++ b/drivers/rtc/rtc-ds1307.c
-@@ -107,7 +107,7 @@ struct ds1307 {
- u8 offset; /* register's offset */
- u8 regs[11];
- u16 nvram_offset;
-- struct bin_attribute *nvram;
-+ bin_attribute_no_const *nvram;
- enum ds_type type;
- unsigned long flags;
- #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
-index fcb0329..d77b7f2 100644
+index 2836538..30edf9d 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
-@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
- if (IS_ERR(m48t59->rtc))
- return PTR_ERR(m48t59->rtc);
+@@ -482,7 +482,9 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)
+ goto out;
+ }
- m48t59_nvram_attr.size = pdata->offset;
+ pax_open_kernel();
@@ -45671,7 +43494,29 @@ index fcb0329..d77b7f2 100644
+ pax_close_kernel();
ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
- if (ret)
+ if (ret) {
+diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
+index 705e13e..46f4afb 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) */
+@@ -771,6 +771,8 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long
+ static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
+ {
+ struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata;
++ if (!capable(CAP_SYS_RAWIO))
++ return -EPERM;
+ return aac_compat_do_ioctl(dev, cmd, (unsigned long)arg);
+ }
+
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 14b5f8d..cc9bd26 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -45713,8 +43558,21 @@ index 14b5f8d..cc9bd26 100644
}
}
/*
+diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
+index d5ff142..49c0ebb 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_control_phy = asd_control_phy,
+ };
+
+-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_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
-index e693af6..2e525b6 100644
+index 1080bcb..4a8ddd9 100644
--- a/drivers/scsi/bfa/bfa_fcpim.h
+++ b/drivers/scsi/bfa/bfa_fcpim.h
@@ -36,7 +36,7 @@ struct bfa_iotag_s {
@@ -45727,7 +43585,7 @@ index e693af6..2e525b6 100644
void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
-index 90814fe..4384138 100644
+index 546d46b..642fa5b 100644
--- a/drivers/scsi/bfa/bfa_ioc.h
+++ b/drivers/scsi/bfa/bfa_ioc.h
@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
@@ -45739,73 +43597,42 @@ index 90814fe..4384138 100644
/*
* IOC event notification mechanism.
-@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
- void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
- enum bfi_ioc_state fwstate);
- enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
+@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
+ void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
+ bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
+ bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
-};
+} __no_const;
/*
* Queue element to wait for room in request queue. FIFO order is
-diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
-index c9382d6..6619864 100644
---- a/drivers/scsi/fcoe/fcoe_sysfs.c
-+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
-@@ -33,8 +33,8 @@
- */
- #include "libfcoe.h"
-
--static atomic_t ctlr_num;
--static atomic_t fcf_num;
-+static atomic_unchecked_t ctlr_num;
-+static atomic_unchecked_t fcf_num;
-
- /*
- * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
-@@ -681,7 +681,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
- if (!ctlr)
- goto out;
-
-- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
-+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
- ctlr->f = f;
- ctlr->mode = FIP_CONN_TYPE_FABRIC;
- INIT_LIST_HEAD(&ctlr->fcfs);
-@@ -898,7 +898,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
- fcf->dev.parent = &ctlr->dev;
- fcf->dev.bus = &fcoe_bus_type;
- fcf->dev.type = &fcoe_fcf_device_type;
-- fcf->id = atomic_inc_return(&fcf_num) - 1;
-+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
- fcf->state = FCOE_FCF_STATE_UNKNOWN;
-
- fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
-@@ -934,8 +934,8 @@ int __init fcoe_sysfs_setup(void)
- {
- int error;
-
-- atomic_set(&ctlr_num, 0);
-- atomic_set(&fcf_num, 0);
-+ atomic_set_unchecked(&ctlr_num, 0);
-+ atomic_set_unchecked(&fcf_num, 0);
-
- error = bus_register(&fcoe_bus_type);
- if (error)
+diff --git a/drivers/scsi/bfa/bfad_debugfs.c b/drivers/scsi/bfa/bfad_debugfs.c
+index dee1a09..24adab6 100644
+--- a/drivers/scsi/bfa/bfad_debugfs.c
++++ b/drivers/scsi/bfa/bfad_debugfs.c
+@@ -186,7 +186,7 @@ bfad_debugfs_lseek(struct file *file, loff_t offset, int orig)
+ file->f_pos += offset;
+ break;
+ case 2:
+- file->f_pos = debug->buffer_len - offset;
++ file->f_pos = debug->buffer_len + offset;
+ break;
+ default:
+ return -EINVAL;
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
-index df0c3c7..b00e1d0 100644
+index ee77a58..af9d518 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -42,7 +42,7 @@
#include "scsi_logging.h"
--static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
-+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
+-static atomic_t scsi_host_next_hn; /* host_no for next new host */
++static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
static void scsi_host_cls_release(struct device *dev)
-@@ -361,7 +361,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
+@@ -358,7 +358,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
* subtract one because we increment first then return, but we need to
* know what the next host number was before increment
*/
@@ -45815,19 +43642,19 @@ index df0c3c7..b00e1d0 100644
/* These three are default values which can be overridden */
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 891c86b..dd1224a0 100644
+index 0f48550..e3fb2d8 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
-@@ -578,7 +578,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
- unsigned long flags;
+@@ -523,7 +523,7 @@ static inline u32 next_command(struct ctlr_info *h)
+ u32 a;
if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
-- return h->access.command_completed(h, q);
-+ return h->access->command_completed(h, q);
+- return h->access.command_completed(h);
++ return h->access->command_completed(h);
- if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
- a = rq->head[rq->current_entry];
-@@ -3444,7 +3444,7 @@ static void start_io(struct ctlr_info *h)
+ if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
+ a = *(h->reply_pool_head); /* Next cmd in ring buffer */
+@@ -3034,7 +3034,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 */
@@ -45836,21 +43663,21 @@ index 891c86b..dd1224a0 100644
dev_warn(&h->pdev->dev, "fifo full\n");
break;
}
-@@ -3466,7 +3466,7 @@ static void start_io(struct ctlr_info *h)
+@@ -3044,7 +3044,7 @@ static void start_io(struct ctlr_info *h)
+ h->Qdepth--;
/* Tell the controller execute command */
- spin_unlock_irqrestore(&h->lock, flags);
- h->access.submit_command(h, c);
+ h->access->submit_command(h, c);
- spin_lock_irqsave(&h->lock, flags);
- }
- spin_unlock_irqrestore(&h->lock, flags);
-@@ -3474,17 +3474,17 @@ static void start_io(struct ctlr_info *h)
- static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
+ /* Put job onto the completed Q */
+ addQ(&h->cmpQ, c);
+@@ -3053,17 +3053,17 @@ static void start_io(struct ctlr_info *h)
+
+ static inline unsigned long get_next_completion(struct ctlr_info *h)
{
-- return h->access.command_completed(h, q);
-+ return h->access->command_completed(h, q);
+- return h->access.command_completed(h);
++ return h->access->command_completed(h);
}
static inline bool interrupt_pending(struct ctlr_info *h)
@@ -45866,16 +43693,16 @@ index 891c86b..dd1224a0 100644
(h->interrupts_enabled == 0);
}
-@@ -4386,7 +4386,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
+@@ -3963,7 +3963,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;
- h->access = *(products[prod_index].access);
+ h->access = products[prod_index].access;
- pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
- PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
-@@ -4668,7 +4668,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
+ if (hpsa_board_disabled(h->pdev)) {
+ dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
+@@ -4208,7 +4208,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
assert_spin_locked(&lockup_detector_lock);
remove_ctlr_from_lockup_detector_list(h);
@@ -45884,7 +43711,7 @@ index 891c86b..dd1224a0 100644
spin_lock_irqsave(&h->lock, flags);
h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
spin_unlock_irqrestore(&h->lock, flags);
-@@ -4845,7 +4845,7 @@ reinit_after_soft_reset:
+@@ -4384,7 +4384,7 @@ reinit_after_soft_reset:
}
/* make sure the board interrupts are off */
@@ -45893,16 +43720,16 @@ index 891c86b..dd1224a0 100644
if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
goto clean2;
-@@ -4879,7 +4879,7 @@ reinit_after_soft_reset:
+@@ -4418,7 +4418,7 @@ reinit_after_soft_reset:
* fake ones to scoop up any residual completions.
*/
spin_lock_irqsave(&h->lock, flags);
- h->access.set_intr_mask(h, HPSA_INTR_OFF);
+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
spin_unlock_irqrestore(&h->lock, flags);
- free_irqs(h);
+ free_irq(h->intr[h->intr_mode], h);
rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4898,9 +4898,9 @@ reinit_after_soft_reset:
+@@ -4437,9 +4437,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");
@@ -45914,7 +43741,7 @@ index 891c86b..dd1224a0 100644
rc = controller_reset_failed(h->cfgtable);
if (rc)
-@@ -4921,7 +4921,7 @@ reinit_after_soft_reset:
+@@ -4460,7 +4460,7 @@ reinit_after_soft_reset:
}
/* Turn the interrupts on so we can service requests */
@@ -45923,16 +43750,16 @@ index 891c86b..dd1224a0 100644
hpsa_hba_inquiry(h);
hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
-@@ -4976,7 +4976,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
+@@ -4512,7 +4512,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
* To write all data in the battery backed cache to disks
*/
hpsa_flush_cache(h);
- h->access.set_intr_mask(h, HPSA_INTR_OFF);
+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
- hpsa_free_irqs_and_disable_msix(h);
- }
-
-@@ -5144,7 +5144,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
+ free_irq(h->intr[h->intr_mode], h);
+ #ifdef CONFIG_PCI_MSI
+ if (h->msix_vector)
+@@ -4676,7 +4676,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
return;
}
/* Change the access methods to the performant access methods */
@@ -45942,10 +43769,10 @@ index 891c86b..dd1224a0 100644
}
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
-index bc85e72..ae04a39 100644
+index c721509..8be5717 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
-@@ -79,7 +79,7 @@ struct ctlr_info {
+@@ -73,7 +73,7 @@ struct ctlr_info {
unsigned int msix_vector;
unsigned int msi_vector;
int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
@@ -45955,12 +43782,12 @@ index bc85e72..ae04a39 100644
/* queue and queue Info */
struct list_head reqQ;
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
-index 5879929..32b241d 100644
+index 9de9db2..1e09660 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
-@@ -100,12 +100,12 @@ struct fc_exch_mgr {
- u16 pool_max_index;
-
+@@ -105,12 +105,12 @@ struct fc_exch_mgr {
+ * all together if not used XXX
+ */
struct {
- atomic_t no_free_exch;
- atomic_t no_free_exch_xid;
@@ -45977,7 +43804,7 @@ index 5879929..32b241d 100644
} stats;
};
-@@ -736,7 +736,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
+@@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
/* allocate memory for exchange */
ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
if (!ep) {
@@ -45986,7 +43813,7 @@ index 5879929..32b241d 100644
goto out;
}
memset(ep, 0, sizeof(*ep));
-@@ -797,7 +797,7 @@ out:
+@@ -780,7 +780,7 @@ out:
return ep;
err:
spin_unlock_bh(&pool->lock);
@@ -45995,7 +43822,7 @@ index 5879929..32b241d 100644
mempool_free(ep, mp->ep_pool);
return NULL;
}
-@@ -940,7 +940,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
+@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
xid = ntohs(fh->fh_ox_id); /* we originated exch */
ep = fc_exch_find(mp, xid);
if (!ep) {
@@ -46004,7 +43831,7 @@ index 5879929..32b241d 100644
reject = FC_RJT_OX_ID;
goto out;
}
-@@ -970,7 +970,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
+@@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
ep = fc_exch_find(mp, xid);
if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
if (ep) {
@@ -46013,7 +43840,7 @@ index 5879929..32b241d 100644
reject = FC_RJT_RX_ID;
goto rel;
}
-@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
+@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
}
xid = ep->xid; /* get our XID */
} else if (!ep) {
@@ -46022,7 +43849,7 @@ index 5879929..32b241d 100644
reject = FC_RJT_RX_ID; /* XID not found */
goto out;
}
-@@ -998,7 +998,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
+@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
} else {
sp = &ep->seq;
if (sp->id != fh->fh_seq_id) {
@@ -46031,7 +43858,7 @@ index 5879929..32b241d 100644
if (f_ctl & FC_FC_END_SEQ) {
/*
* Update sequence_id based on incoming last
-@@ -1448,22 +1448,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
+@@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
if (!ep) {
@@ -46058,7 +43885,7 @@ index 5879929..32b241d 100644
goto rel;
}
sof = fr_sof(fp);
-@@ -1472,7 +1472,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
+@@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
sp->ssb_stat |= SSB_ST_RESP;
sp->id = fh->fh_seq_id;
} else if (sp->id != fh->fh_seq_id) {
@@ -46067,7 +43894,7 @@ index 5879929..32b241d 100644
goto rel;
}
-@@ -1536,9 +1536,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
+@@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
if (!sp)
@@ -46079,31 +43906,11 @@ index 5879929..32b241d 100644
fc_frame_free(fp);
}
-@@ -2185,13 +2185,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
-
- list_for_each_entry(ema, &lport->ema_list, ema_list) {
- mp = ema->mp;
-- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
-+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
- st->fc_no_free_exch_xid +=
-- atomic_read(&mp->stats.no_free_exch_xid);
-- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
-- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
-- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
-- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
-+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
-+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
-+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
-+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
-+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
- }
- }
- EXPORT_SYMBOL(fc_exch_update_stats);
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
-index 161c98e..6d563b3 100644
+index 4868fc9..7f2e028 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 = {
+@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sata_ops = {
.postreset = ata_std_postreset,
.error_handler = ata_std_error_handler,
.post_internal_cmd = sas_ata_post_internal,
@@ -46113,10 +43920,10 @@ index 161c98e..6d563b3 100644
.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 4e1b75c..0bbdfa9 100644
+index bb4c8e0..f33d849 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
-@@ -432,7 +432,7 @@ struct lpfc_vport {
+@@ -425,7 +425,7 @@ struct lpfc_vport {
struct dentry *debug_nodelist;
struct dentry *vport_debugfs_root;
struct lpfc_debugfs_trc *disc_trc;
@@ -46125,7 +43932,7 @@ index 4e1b75c..0bbdfa9 100644
#endif
uint8_t stat_data_enabled;
uint8_t stat_data_blocked;
-@@ -865,8 +865,8 @@ struct lpfc_hba {
+@@ -835,8 +835,8 @@ struct lpfc_hba {
struct timer_list fabric_block_timer;
unsigned long bit_flags;
#define FABRIC_COMANDS_BLOCKED 0
@@ -46136,7 +43943,7 @@ index 4e1b75c..0bbdfa9 100644
unsigned long last_rsrc_error_time;
unsigned long last_ramp_down_time;
unsigned long last_ramp_up_time;
-@@ -902,7 +902,7 @@ struct lpfc_hba {
+@@ -866,7 +866,7 @@ struct lpfc_hba {
struct dentry *debug_slow_ring_trc;
struct lpfc_debugfs_trc *slow_ring_trc;
@@ -46146,7 +43953,7 @@ index 4e1b75c..0bbdfa9 100644
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 60084e6..0e2e700 100644
+index 2838259..35b747a 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,
@@ -46176,7 +43983,7 @@ index 60084e6..0e2e700 100644
(lpfc_debugfs_max_slow_ring_trc - 1);
for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
dtp = phba->slow_ring_trc + i;
-@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
+@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
!vport || !vport->disc_trc)
return;
@@ -46193,7 +44000,7 @@ index 60084e6..0e2e700 100644
dtp->jif = jiffies;
#endif
return;
-@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
+@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
!phba || !phba->slow_ring_trc)
return;
@@ -46210,7 +44017,16 @@ index 60084e6..0e2e700 100644
dtp->jif = jiffies;
#endif
return;
-@@ -4168,7 +4168,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -1151,7 +1151,7 @@ lpfc_debugfs_lseek(struct file *file, loff_t off, int whence)
+ pos = file->f_pos + off;
+ break;
+ case 2:
+- pos = debug->len - off;
++ pos = debug->len + off;
+ }
+ return (pos < 0 || pos > debug->len) ? -EINVAL : (file->f_pos = pos);
+ }
+@@ -3986,7 +3986,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
"slow_ring buffer\n");
goto debug_failed;
}
@@ -46219,7 +44035,7 @@ index 60084e6..0e2e700 100644
memset(phba->slow_ring_trc, 0,
(sizeof(struct lpfc_debugfs_trc) *
lpfc_debugfs_max_slow_ring_trc));
-@@ -4214,7 +4214,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -4032,7 +4032,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
"buffer\n");
goto debug_failed;
}
@@ -46229,11 +44045,11 @@ index 60084e6..0e2e700 100644
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 647f5bf..d0068b9 100644
+index 55bc4fc..a2a109c 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
-@@ -10952,8 +10952,10 @@ lpfc_init(void)
- "misc_register returned with status %d", error);
+@@ -10027,8 +10027,10 @@ lpfc_init(void)
+ printk(LPFC_COPYRIGHT "\n");
if (lpfc_enable_npiv) {
- lpfc_transport_functions.vport_create = lpfc_vport_create;
@@ -46246,10 +44062,10 @@ index 647f5bf..d0068b9 100644
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 c913e8c..d34a119 100644
+index 2e1e54e..1af0a0d 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
-@@ -353,7 +353,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);
@@ -46258,7 +44074,7 @@ index c913e8c..d34a119 100644
phba->last_rsrc_error_time = jiffies;
if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
-@@ -394,7 +394,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;
@@ -46267,7 +44083,7 @@ index c913e8c..d34a119 100644
if (vport->cfg_lun_queue_depth <= queue_depth)
return;
-@@ -438,8 +438,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;
@@ -46276,9 +44092,9 @@ index c913e8c..d34a119 100644
+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
- /*
- * The error and success command counters are global per
-@@ -467,8 +467,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
+ vports = lpfc_create_vport_work_array(phba);
+ if (vports != NULL)
+@@ -411,8 +411,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
}
}
lpfc_destroy_vport_work_array(phba, vports);
@@ -46289,7 +44105,7 @@ index c913e8c..d34a119 100644
}
/**
-@@ -502,8 +502,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
+@@ -446,8 +446,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
}
}
lpfc_destroy_vport_work_array(phba, vports);
@@ -46301,10 +44117,10 @@ index c913e8c..d34a119 100644
/**
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-index 7f0af4f..193ac3e 100644
+index 987c6d6..575985c 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-@@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
+@@ -1532,7 +1532,7 @@ _scsih_get_resync(struct device *dev)
{
struct scsi_device *sdev = to_scsi_device(dev);
struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
@@ -46313,7 +44129,7 @@ index 7f0af4f..193ac3e 100644
unsigned long flags;
Mpi2RaidVolPage0_t vol_pg0;
Mpi2ConfigReply_t mpi_reply;
-@@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
+@@ -1571,7 +1571,7 @@ _scsih_get_state(struct device *dev)
{
struct scsi_device *sdev = to_scsi_device(dev);
struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
@@ -46322,7 +44138,7 @@ index 7f0af4f..193ac3e 100644
unsigned long flags;
Mpi2RaidVolPage0_t vol_pg0;
Mpi2ConfigReply_t mpi_reply;
-@@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
+@@ -6532,7 +6532,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
struct fw_event_work *fw_event)
{
Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
@@ -46331,17 +44147,17 @@ index 7f0af4f..193ac3e 100644
unsigned long flags;
u16 handle;
-@@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
+@@ -7005,7 +7005,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
u64 sas_address;
struct _sas_device *sas_device;
struct _sas_node *expander_device;
- static struct _raid_device *raid_device;
+ struct _raid_device *raid_device;
u8 retry_count;
- unsigned long flags;
+ printk(MPT2SAS_INFO_FMT "scan devices: start\n", ioc->name);
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
-index 1eb7b028..b2a6080 100644
+index 5163edb..7b142bc 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)
@@ -46376,7 +44192,7 @@ index 1eb7b028..b2a6080 100644
pinstance->num_hrrq;
cmd->cmd_done = pmcraid_io_done;
-@@ -3846,7 +3846,7 @@ static long pmcraid_ioctl_passthrough(
+@@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
* block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
* hrrq_id assigned here in queuecommand
*/
@@ -46385,7 +44201,7 @@ index 1eb7b028..b2a6080 100644
pinstance->num_hrrq;
if (request_size) {
-@@ -4483,7 +4483,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
+@@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
pinstance = container_of(workp, struct pmcraid_instance, worker_q);
/* add resources only after host is added into system */
@@ -46394,7 +44210,7 @@ index 1eb7b028..b2a6080 100644
return;
fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
-@@ -5310,8 +5310,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
+@@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
init_waitqueue_head(&pinstance->reset_wait_q);
atomic_set(&pinstance->outstanding_cmds, 0);
@@ -46405,7 +44221,7 @@ index 1eb7b028..b2a6080 100644
INIT_LIST_HEAD(&pinstance->free_res_q);
INIT_LIST_HEAD(&pinstance->used_res_q);
-@@ -6024,7 +6024,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
+@@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
/* Schedule worker thread to handle CCN and take care of adding and
* removing devices to OS
*/
@@ -46415,7 +44231,7 @@ index 1eb7b028..b2a6080 100644
return rc;
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
-index e1d150f..6c6df44 100644
+index ca496c7..9c791d5 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -748,7 +748,7 @@ struct pmcraid_instance {
@@ -46447,48 +44263,11 @@ index e1d150f..6c6df44 100644
/* 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 5f174b8..98d32b0 100644
---- a/drivers/scsi/qla2xxx/qla_attr.c
-+++ b/drivers/scsi/qla2xxx/qla_attr.c
-@@ -2040,7 +2040,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
- return 0;
- }
-
--struct fc_function_template qla2xxx_transport_functions = {
-+fc_function_template_no_const qla2xxx_transport_functions = {
-
- .show_host_node_name = 1,
- .show_host_port_name = 1,
-@@ -2088,7 +2088,7 @@ struct fc_function_template qla2xxx_transport_functions = {
- .bsg_timeout = qla24xx_bsg_timeout,
- };
-
--struct fc_function_template qla2xxx_transport_vport_functions = {
-+fc_function_template_no_const qla2xxx_transport_vport_functions = {
-
- .show_host_node_name = 1,
- .show_host_port_name = 1,
-diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
-index 4446bf5..9a3574d 100644
---- a/drivers/scsi/qla2xxx/qla_gbl.h
-+++ b/drivers/scsi/qla2xxx/qla_gbl.h
-@@ -538,8 +538,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 struct fc_function_template qla2xxx_transport_functions;
--extern struct fc_function_template qla2xxx_transport_vport_functions;
-+extern fc_function_template_no_const qla2xxx_transport_functions;
-+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
- 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 9f01bbb..5e1dcee 100644
+index 82a5ca6..97ace97 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -1572,8 +1572,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
+@@ -1429,8 +1429,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;
@@ -46502,10 +44281,10 @@ index 9f01bbb..5e1dcee 100644
}
}
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
-index 41327d4..feb03d479 100644
+index fd5edc6..4906148 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
-@@ -296,7 +296,7 @@ struct ddb_entry {
+@@ -258,7 +258,7 @@ struct ddb_entry {
* (4000 only) */
atomic_t relogin_timer; /* Max Time to wait for
* relogin to complete */
@@ -46515,10 +44294,10 @@ index 41327d4..feb03d479 100644
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 f8a0a26..ec03cee 100644
+index 4169c8b..a8b896b 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
-@@ -3066,12 +3066,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
+@@ -2104,12 +2104,12 @@ void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
*/
if (!iscsi_is_session_online(cls_sess)) {
/* Reset retry relogin timer */
@@ -46533,20 +44312,20 @@ index f8a0a26..ec03cee 100644
ddb_entry->default_time2wait + 4));
set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
atomic_set(&ddb_entry->retry_relogin_timer,
-@@ -5209,7 +5209,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
+@@ -3835,7 +3835,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);
- atomic_set(&ddb_entry->relogin_retry_count, 0);
+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
- def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
+
ddb_entry->default_relogin_timeout =
- (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
+ le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index eaa808e..95f8841 100644
+index 831db24..aef1598 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
-@@ -661,7 +661,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
+@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
unsigned long timeout;
int rtn = 0;
@@ -46556,10 +44335,10 @@ index eaa808e..95f8841 100644
/* 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 d1549b7..2f60767 100644
+index 6c4b620..78feefb 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
-@@ -1474,7 +1474,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
+@@ -1426,7 +1426,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;
@@ -46568,7 +44347,7 @@ index d1549b7..2f60767 100644
/*
* SCSI request completion path will do scsi_device_unbusy(),
-@@ -1500,9 +1500,9 @@ static void scsi_softirq_done(struct request *rq)
+@@ -1452,9 +1452,9 @@ static void scsi_softirq_done(struct request *rq)
INIT_LIST_HEAD(&cmd->eh_entry);
@@ -46581,10 +44360,10 @@ index d1549b7..2f60767 100644
disposition = scsi_decide_disposition(cmd);
if (disposition != SUCCESS &&
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
-index 40c6394..62356c2 100644
+index 72ca515..708d627 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
-@@ -687,7 +687,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
+@@ -657,7 +657,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
struct scsi_device *sdev = to_scsi_device(dev); \
@@ -46607,10 +44386,10 @@ index 84a1fdf..693b0d6 100644
/*
* TODO: need to fixup sg_tablesize, max_segment_size,
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
-index 4628fd5..a94a1c2 100644
+index 1b21491..1b7f60e 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
-@@ -497,7 +497,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
+@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
* Netlink Infrastructure
*/
@@ -46619,7 +44398,7 @@ index 4628fd5..a94a1c2 100644
/**
* fc_get_event_number - Obtain the next sequential FC event number
-@@ -510,7 +510,7 @@ static atomic_t fc_event_seq;
+@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
u32
fc_get_event_number(void)
{
@@ -46628,7 +44407,7 @@ index 4628fd5..a94a1c2 100644
}
EXPORT_SYMBOL(fc_get_event_number);
-@@ -654,7 +654,7 @@ static __init int fc_transport_init(void)
+@@ -645,7 +645,7 @@ static __init int fc_transport_init(void)
{
int error;
@@ -46637,7 +44416,7 @@ index 4628fd5..a94a1c2 100644
error = transport_class_register(&fc_host_class);
if (error)
-@@ -844,7 +844,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
+@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
char *cp;
*val = simple_strtoul(buf, &cp, 0);
@@ -46647,7 +44426,7 @@ index 4628fd5..a94a1c2 100644
/*
* 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 e4a989f..293090c 100644
+index c874458..568a977 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -79,7 +79,7 @@ struct iscsi_internal {
@@ -46659,7 +44438,7 @@ index e4a989f..293090c 100644
static struct workqueue_struct *iscsi_eh_timer_workq;
static DEFINE_IDA(iscsi_sess_ida);
-@@ -1737,7 +1737,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
+@@ -1062,7 +1062,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
int err;
ihost = shost->shost_data;
@@ -46668,7 +44447,7 @@ index e4a989f..293090c 100644
if (target_id == ISCSI_MAX_TARGET) {
id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
-@@ -4077,7 +4077,7 @@ static __init int iscsi_transport_init(void)
+@@ -2663,7 +2663,7 @@ static __init int iscsi_transport_init(void)
printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
ISCSI_TRANSPORT_VERSION);
@@ -46678,7 +44457,7 @@ index e4a989f..293090c 100644
err = class_register(&iscsi_transport_class);
if (err)
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
-index f379c7f..e8fc69c 100644
+index 21a045e..ec89e03 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -33,7 +33,7 @@
@@ -46690,7 +44469,7 @@ index f379c7f..e8fc69c 100644
};
#define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
-@@ -61,7 +61,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
+@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
struct Scsi_Host *shost = dev_to_shost(dev);
struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
@@ -46699,7 +44478,7 @@ index f379c7f..e8fc69c 100644
return 0;
}
-@@ -210,7 +210,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
+@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
rport->roles = ids->roles;
@@ -46709,23 +44488,23 @@ index f379c7f..e8fc69c 100644
transport_setup_device(&rport->dev);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 5693f6d7..b0bf05a 100644
+index f6d2b62..d9aa1a4 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
-@@ -2934,7 +2934,7 @@ static int sd_probe(struct device *dev)
- sdkp->disk = gd;
- sdkp->index = index;
- atomic_set(&sdkp->openers, 0);
-- atomic_set(&sdkp->device->ioerr_cnt, 0);
-+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
-
- if (!sdp->request_queue->rq_timeout) {
- if (sdp->type != TYPE_MOD)
+@@ -2632,7 +2632,7 @@ static int sd_probe(struct device *dev)
+ device_initialize(&sdkp->dev);
+ sdkp->dev.parent = dev;
+ sdkp->dev.class = &sd_disk_class;
+- dev_set_name(&sdkp->dev, dev_name(dev));
++ dev_set_name(&sdkp->dev, "%s", dev_name(dev));
+
+ if (device_add(&sdkp->dev))
+ goto out_free_index;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
-index df5e961..df6b97f 100644
+index 441a1c5..07cece7 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
-@@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
+@@ -1077,7 +1077,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
sdp->disk->disk_name,
MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
NULL,
@@ -46734,11 +44513,42 @@ index df5e961..df6b97f 100644
case BLKTRACESTART:
return blk_trace_startstop(sdp->device->request_queue, 1);
case BLKTRACESTOP:
+@@ -2312,7 +2312,7 @@ struct sg_proc_leaf {
+ const struct file_operations * fops;
+ };
+
+-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
++static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
+ {"allow_dio", &adio_fops},
+ {"debug", &debug_fops},
+ {"def_reserved_size", &dressz_fops},
+@@ -2327,7 +2327,7 @@ sg_proc_init(void)
+ {
+ int k, mask;
+ int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
+- struct sg_proc_leaf * leaf;
++ const struct sg_proc_leaf * leaf;
+
+ sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
+ if (!sg_proc_sgp)
+diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
+index f64250e..1ee3049 100644
+--- a/drivers/spi/spi-dw-pci.c
++++ b/drivers/spi/spi-dw-pci.c
+@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
+ #define spi_resume NULL
+ #endif
+
+-static const struct pci_device_id pci_ids[] __devinitdata = {
++static const struct pci_device_id pci_ids[] __devinitconst = {
+ /* Intel MID platform SPI controller 0 */
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
+ {},
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 9e039c6..ae9e800 100644
+index b2ccdea..84cde75 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
-@@ -1762,7 +1762,7 @@ int spi_bus_unlock(struct spi_master *master)
+@@ -1024,7 +1024,7 @@ int spi_bus_unlock(struct spi_master *master)
EXPORT_SYMBOL_GPL(spi_bus_unlock);
/* portable code must never pass more than 32 bytes */
@@ -46747,229 +44557,121 @@ index 9e039c6..ae9e800 100644
static u8 *buf;
-diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
-index 2c61783..4d49e4e 100644
---- a/drivers/staging/android/timed_output.c
-+++ b/drivers/staging/android/timed_output.c
-@@ -25,7 +25,7 @@
- #include "timed_output.h"
-
- static struct class *timed_output_class;
--static atomic_t device_count;
-+static atomic_unchecked_t device_count;
-
- static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-@@ -63,7 +63,7 @@ static int create_timed_output_class(void)
- timed_output_class = class_create(THIS_MODULE, "timed_output");
- if (IS_ERR(timed_output_class))
- return PTR_ERR(timed_output_class);
-- atomic_set(&device_count, 0);
-+ atomic_set_unchecked(&device_count, 0);
- timed_output_class->dev_groups = timed_output_groups;
- }
-
-@@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
- if (ret < 0)
- return ret;
+diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
+index 2fa658e..391b768 100644
+--- a/drivers/staging/bcm/Bcmchar.c
++++ b/drivers/staging/bcm/Bcmchar.c
+@@ -1932,6 +1932,7 @@ cntrlEnd:
+
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
+
++ memset(&DevInfo, 0, sizeof(DevInfo));
+ DevInfo.MaxRDMBufferSize = BUFFER_4K;
+ DevInfo.u32DSDStartOffset = EEPROM_CALPARAM_START;
+ DevInfo.u32RxAlignmentCorrection = 0;
+diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
+index 436fe97..4082570 100644
+--- a/drivers/staging/gma500/power.c
++++ b/drivers/staging/gma500/power.c
+@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
+ ret = gma_resume_pci(dev->pdev);
+ if (ret == 0) {
+ /* FIXME: we want to defer this for Medfield/Oaktrail */
+- gma_resume_display(dev);
++ gma_resume_display(dev->pdev);
+ psb_irq_preinstall(dev);
+ psb_irq_postinstall(dev);
+ pm_runtime_get(&dev->pdev->dev);
+diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
+index bafccb3..e3ac78d 100644
+--- a/drivers/staging/hv/rndis_filter.c
++++ b/drivers/staging/hv/rndis_filter.c
+@@ -42,7 +42,7 @@ struct rndis_device {
-- tdev->index = atomic_inc_return(&device_count);
-+ tdev->index = atomic_inc_return_unchecked(&device_count);
- tdev->dev = device_create(timed_output_class, NULL,
- MKDEV(0, tdev->index), NULL, "%s", tdev->name);
- if (IS_ERR(tdev->dev))
-diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
-index 0247a20..cb9595c 100644
---- a/drivers/staging/gdm724x/gdm_tty.c
-+++ b/drivers/staging/gdm724x/gdm_tty.c
-@@ -45,7 +45,7 @@
- #define gdm_tty_send_control(n, r, v, d, l) (\
- n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
-
--#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
-+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
-
- static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
- static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
-diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
-index ef5064e..fce01db 100644
---- a/drivers/staging/lustre/lnet/selftest/brw_test.c
-+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
-@@ -478,13 +478,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
- return 0;
- }
+ enum rndis_device_state state;
+ bool link_state;
+- atomic_t new_req_id;
++ atomic_unchecked_t new_req_id;
--sfw_test_client_ops_t brw_test_client;
--void brw_init_test_client(void)
--{
-- brw_test_client.tso_init = brw_client_init;
-- brw_test_client.tso_fini = brw_client_fini;
-- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
-- brw_test_client.tso_done_rpc = brw_client_done_rpc;
-+sfw_test_client_ops_t brw_test_client = {
-+ .tso_init = brw_client_init,
-+ .tso_fini = brw_client_fini,
-+ .tso_prep_rpc = brw_client_prep_rpc,
-+ .tso_done_rpc = brw_client_done_rpc,
- };
+ spinlock_t request_lock;
+ struct list_head req_list;
+@@ -116,7 +116,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
+ * template
+ */
+ set = &rndis_msg->msg.set_req;
+- set->req_id = atomic_inc_return(&dev->new_req_id);
++ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
- srpc_service_t brw_test_service;
-diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
-index 483c785..e1a2a7b 100644
---- a/drivers/staging/lustre/lnet/selftest/framework.c
-+++ b/drivers/staging/lustre/lnet/selftest/framework.c
-@@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
-
- extern sfw_test_client_ops_t ping_test_client;
- extern srpc_service_t ping_test_service;
--extern void ping_init_test_client(void);
- extern void ping_init_test_service(void);
-
- extern sfw_test_client_ops_t brw_test_client;
- extern srpc_service_t brw_test_service;
--extern void brw_init_test_client(void);
- extern void brw_init_test_service(void);
-
-
-@@ -1684,12 +1682,10 @@ sfw_startup (void)
- INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
- INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
-
-- brw_init_test_client();
- brw_init_test_service();
- rc = sfw_register_test(&brw_test_service, &brw_test_client);
- LASSERT (rc == 0);
-
-- ping_init_test_client();
- ping_init_test_service();
- rc = sfw_register_test(&ping_test_service, &ping_test_client);
- LASSERT (rc == 0);
-diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
-index f0f9194..b589047 100644
---- a/drivers/staging/lustre/lnet/selftest/ping_test.c
-+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
-@@ -210,14 +210,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
- return 0;
- }
+ /* Add to the request list */
+ spin_lock_irqsave(&dev->request_lock, flags);
+@@ -646,7 +646,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
--sfw_test_client_ops_t ping_test_client;
--void ping_init_test_client(void)
--{
-- ping_test_client.tso_init = ping_client_init;
-- ping_test_client.tso_fini = ping_client_fini;
-- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
-- ping_test_client.tso_done_rpc = ping_client_done_rpc;
--}
-+sfw_test_client_ops_t ping_test_client = {
-+ .tso_init = ping_client_init,
-+ .tso_fini = ping_client_fini,
-+ .tso_prep_rpc = ping_client_prep_rpc,
-+ .tso_done_rpc = ping_client_done_rpc,
-+};
+ /* Setup the rndis set */
+ halt = &request->request_msg.msg.halt_req;
+- halt->req_id = atomic_inc_return(&dev->new_req_id);
++ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
- srpc_service_t ping_test_service;
- void ping_init_test_service(void)
-diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
-index 7020d9c..0d3b580 100644
---- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
-+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
-@@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
- ldlm_completion_callback lcs_completion;
- ldlm_blocking_callback lcs_blocking;
- ldlm_glimpse_callback lcs_glimpse;
+ /* Ignore return since this msg is optional. */
+ rndis_filter_send_request(dev, request);
+diff --git a/drivers/staging/iio/buffer_generic.h b/drivers/staging/iio/buffer_generic.h
+index 9e8f010..af9efb56 100644
+--- a/drivers/staging/iio/buffer_generic.h
++++ b/drivers/staging/iio/buffer_generic.h
+@@ -64,7 +64,7 @@ struct iio_buffer_access_funcs {
+
+ int (*is_enabled)(struct iio_buffer *buffer);
+ int (*enable)(struct iio_buffer *buffer);
-};
+} __no_const;
- /* ldlm_lockd.c */
- int ldlm_del_waiting_lock(struct ldlm_lock *lock);
-diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
-index a612255..9a9e2dd 100644
---- a/drivers/staging/lustre/lustre/include/obd.h
-+++ b/drivers/staging/lustre/lustre/include/obd.h
-@@ -1417,7 +1417,7 @@ struct md_ops {
- * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
- * wrapper function in include/linux/obd_class.h.
- */
--};
-+} __no_const;
+ /**
+ * struct iio_buffer_setup_ops - buffer setup related callbacks
+diff --git a/drivers/staging/iio/dac/ad5360.c b/drivers/staging/iio/dac/ad5360.c
+index 72d0f3f..ba3ff3c 100644
+--- a/drivers/staging/iio/dac/ad5360.c
++++ b/drivers/staging/iio/dac/ad5360.c
+@@ -439,8 +439,8 @@ static int __devinit ad5360_alloc_channels(struct iio_dev *indio_dev)
+ struct iio_chan_spec *channels;
+ unsigned int i;
- struct lsm_operations {
- void (*lsm_free)(struct lov_stripe_md *);
-diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
-index fc6c977..df1f956 100644
---- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
-+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
-@@ -219,7 +219,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
- int LL_PROC_PROTO(proc_console_max_delay_cs)
- {
- int rc, max_delay_cs;
-- ctl_table_t dummy = *table;
-+ ctl_table_no_const dummy = *table;
- cfs_duration_t d;
-
- dummy.data = &max_delay_cs;
-@@ -250,7 +250,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
- int LL_PROC_PROTO(proc_console_min_delay_cs)
- {
- int rc, min_delay_cs;
-- ctl_table_t dummy = *table;
-+ ctl_table_no_const dummy = *table;
- cfs_duration_t d;
-
- dummy.data = &min_delay_cs;
-@@ -281,7 +281,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
- int LL_PROC_PROTO(proc_console_backoff)
- {
- int rc, backoff;
-- ctl_table_t dummy = *table;
-+ ctl_table_no_const dummy = *table;
-
- dummy.data = &backoff;
- dummy.proc_handler = &proc_dointvec;
-diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
-index 3675020..e80d92c 100644
---- a/drivers/staging/media/solo6x10/solo6x10-core.c
-+++ b/drivers/staging/media/solo6x10/solo6x10-core.c
-@@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
-
- static int solo_sysfs_init(struct solo_dev *solo_dev)
- {
-- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
-+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
- struct device *dev = &solo_dev->dev;
- const char *driver;
- int i;
-diff --git a/drivers/staging/media/solo6x10/solo6x10-p2m.c b/drivers/staging/media/solo6x10/solo6x10-p2m.c
-index 3335941..2b26186 100644
---- a/drivers/staging/media/solo6x10/solo6x10-p2m.c
-+++ b/drivers/staging/media/solo6x10/solo6x10-p2m.c
-@@ -77,7 +77,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
-
- /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
- if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
-- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
-+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
- if (p2m_id < 0)
- p2m_id = -p2m_id;
- }
-diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
-index 6f91d2e..3f011d2 100644
---- a/drivers/staging/media/solo6x10/solo6x10.h
-+++ b/drivers/staging/media/solo6x10/solo6x10.h
-@@ -238,7 +238,7 @@ struct solo_dev {
-
- /* P2M DMA Engine */
- struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
-- atomic_t p2m_count;
-+ atomic_unchecked_t p2m_count;
- int p2m_jiffies;
- unsigned int p2m_timeouts;
+- channels = kcalloc(sizeof(struct iio_chan_spec),
+- st->chip_info->num_channels, GFP_KERNEL);
++ channels = kcalloc(st->chip_info->num_channels,
++ sizeof(struct iio_chan_spec), GFP_KERNEL);
+
+ if (!channels)
+ return -ENOMEM;
+diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
+index aec9311..ddc3103 100644
+--- a/drivers/staging/iio/industrialio-core.c
++++ b/drivers/staging/iio/industrialio-core.c
+@@ -398,7 +398,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
+ }
+ static
+-int __iio_device_attr_init(struct device_attribute *dev_attr,
++int __iio_device_attr_init(device_attribute_no_const *dev_attr,
+ const char *postfix,
+ struct iio_chan_spec const *chan,
+ ssize_t (*readfunc)(struct device *dev,
+diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
+index 66a34ad..65f6aea 100644
+--- a/drivers/staging/iio/ring_sw.c
++++ b/drivers/staging/iio/ring_sw.c
+@@ -173,7 +173,7 @@ static int iio_read_first_n_sw_rb(struct iio_buffer *r,
+
+ u8 *initial_read_p, *initial_write_p, *current_read_p, *end_read_p;
+ u8 *data;
+- int ret, max_copied, bytes_to_rip, dead_offset;
++ long ret, max_copied, bytes_to_rip, dead_offset;
+
+ /* A userspace program has probably made an error if it tries to
+ * read something that is not a whole number of bpds.
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
-index e14a1bb..9cb9bbe 100644
+index 8b307b4..a97ac91 100644
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
-@@ -419,11 +419,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
/* Increment RX stats for virtual ports */
if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
#ifdef CONFIG_64BIT
@@ -46985,7 +44687,7 @@ index e14a1bb..9cb9bbe 100644
#endif
}
netif_receive_skb(skb);
-@@ -434,9 +434,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
dev->name);
*/
#ifdef CONFIG_64BIT
@@ -46998,10 +44700,10 @@ index e14a1bb..9cb9bbe 100644
dev_kfree_skb_irq(skb);
}
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
-index c3a90e7..023619a 100644
+index 076f866..2308070 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
-@@ -252,11 +252,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
+@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
* since the RX tasklet also increments it.
*/
#ifdef CONFIG_64BIT
@@ -47017,34 +44719,77 @@ index c3a90e7..023619a 100644
#endif
}
-diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
-index 439c3c9..2d74293 100644
---- a/drivers/staging/rtl8188eu/include/hal_intf.h
-+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
-@@ -271,7 +271,7 @@ struct hal_ops {
- s32 (*c2h_handler)(struct adapter *padapter,
- struct c2h_evt_hdr *c2h_evt);
- c2h_id_filter c2h_id_filter_ccx;
--};
-+} __no_const;
+diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
+index 7a19555..466456d 100644
+--- a/drivers/staging/pohmelfs/inode.c
++++ b/drivers/staging/pohmelfs/inode.c
+@@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
+ mutex_init(&psb->mcache_lock);
+ psb->mcache_root = RB_ROOT;
+ psb->mcache_timeout = msecs_to_jiffies(5000);
+- atomic_long_set(&psb->mcache_gen, 0);
++ atomic_long_set_unchecked(&psb->mcache_gen, 0);
+
+ psb->trans_max_pages = 100;
+
+@@ -1876,7 +1876,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
+ INIT_LIST_HEAD(&psb->crypto_ready_list);
+ INIT_LIST_HEAD(&psb->crypto_active_list);
+
+- atomic_set(&psb->trans_gen, 1);
++ atomic_set_unchecked(&psb->trans_gen, 1);
+ atomic_long_set(&psb->total_inodes, 0);
+
+ mutex_init(&psb->state_lock);
+diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
+index e22665c..a2a9390 100644
+--- a/drivers/staging/pohmelfs/mcache.c
++++ b/drivers/staging/pohmelfs/mcache.c
+@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
+ m->data = data;
+ m->start = start;
+ m->size = size;
+- m->gen = atomic_long_inc_return(&psb->mcache_gen);
++ m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
+
+ mutex_lock(&psb->mcache_lock);
+ err = pohmelfs_mcache_insert(psb, m);
+diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
+index 985b6b7..7699e05 100644
+--- a/drivers/staging/pohmelfs/netfs.h
++++ b/drivers/staging/pohmelfs/netfs.h
+@@ -571,14 +571,14 @@ struct pohmelfs_config;
+ struct pohmelfs_sb {
+ struct rb_root mcache_root;
+ struct mutex mcache_lock;
+- atomic_long_t mcache_gen;
++ atomic_long_unchecked_t mcache_gen;
+ unsigned long mcache_timeout;
+
+ unsigned int idx;
+
+ unsigned int trans_retries;
+
+- atomic_t trans_gen;
++ atomic_unchecked_t trans_gen;
+
+ unsigned int crypto_attached_size;
+ unsigned int crypto_align_size;
+diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
+index 06c1a74..866eebc 100644
+--- a/drivers/staging/pohmelfs/trans.c
++++ b/drivers/staging/pohmelfs/trans.c
+@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
+ int err;
+ struct netfs_cmd *cmd = t->iovec.iov_base;
- enum rt_eeprom_type {
- EEPROM_93C46,
-diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
-index eb6f0e5..e6a0958 100644
---- a/drivers/staging/rtl8188eu/include/rtw_io.h
-+++ b/drivers/staging/rtl8188eu/include/rtw_io.h
-@@ -126,7 +126,7 @@ struct _io_ops {
- u32 (*_write_scsi)(struct intf_hdl *pintfhdl,u32 cnt, u8 *pmem);
- void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
- void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
--};
-+} __no_const;
+- t->gen = atomic_inc_return(&psb->trans_gen);
++ t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
- struct io_req {
- struct list_head list;
+ cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
+ t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
-index dc23395..cf7e9b1 100644
+index 86308a0..feaa925 100644
--- a/drivers/staging/rtl8712/rtl871x_io.h
+++ b/drivers/staging/rtl8712/rtl871x_io.h
@@ -108,7 +108,7 @@ struct _io_ops {
@@ -47057,10 +44802,10 @@ index dc23395..cf7e9b1 100644
struct io_req {
struct list_head list;
diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
-index 1f5088b..0e59820 100644
+index c7b5e8b..783d6cb 100644
--- a/drivers/staging/sbe-2t3e3/netdev.c
+++ b/drivers/staging/sbe-2t3e3/netdev.c
-@@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
t3e3_if_config(sc, cmd_2t3e3, (char *)¶m, &resp, &rlen);
if (rlen)
@@ -47070,10 +44815,10 @@ index 1f5088b..0e59820 100644
return 0;
diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
-index a863a98..d272795 100644
+index 88b3298..3783eee 100644
--- a/drivers/staging/usbip/vhci.h
+++ b/drivers/staging/usbip/vhci.h
-@@ -83,7 +83,7 @@ struct vhci_hcd {
+@@ -88,7 +88,7 @@ struct vhci_hcd {
unsigned resuming:1;
unsigned long re_timeout;
@@ -47083,19 +44828,19 @@ index a863a98..d272795 100644
/*
* NOTE:
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
-index d7974cb..d78076b 100644
+index 2ee97e2..0420b86 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
-@@ -441,7 +441,7 @@ static void vhci_tx_urb(struct urb *urb)
-
- spin_lock(&vdev->priv_lock);
+@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
+ return;
+ }
- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
if (priv->seqnum == 0xffff)
dev_info(&urb->dev->dev, "seqnum max\n");
-@@ -687,7 +687,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
return -ENOMEM;
}
@@ -47104,7 +44849,7 @@ index d7974cb..d78076b 100644
if (unlink->seqnum == 0xffff)
pr_info("seqnum max\n");
-@@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
+@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hcd)
vdev->rhport = rhport;
}
@@ -47114,10 +44859,10 @@ index d7974cb..d78076b 100644
hcd->power_budget = 0; /* no limit */
diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
-index d07fcb5..358e1e1 100644
+index 1a7afaa..e7dafbb 100644
--- a/drivers/staging/usbip/vhci_rx.c
+++ b/drivers/staging/usbip/vhci_rx.c
-@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
+@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
if (!urb) {
pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
pr_info("max seqnum %d\n",
@@ -47127,10 +44872,10 @@ index d07fcb5..358e1e1 100644
return;
}
diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
-index 8acff44..bdb2fca 100644
+index 7735027..30eed13 100644
--- a/drivers/staging/vt6655/hostap.c
+++ b/drivers/staging/vt6655/hostap.c
-@@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
+@@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
*
*/
@@ -47138,18 +44883,18 @@ index 8acff44..bdb2fca 100644
+
static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
{
- PSDevice apdev_priv;
+ PSDevice apdev_priv;
struct net_device *dev = pDevice->dev;
int ret;
- const struct net_device_ops apdev_netdev_ops = {
- .ndo_start_xmit = pDevice->tx_80211,
- };
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
-@@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
- *apdev_priv = *pDevice;
- eth_hw_addr_inherit(pDevice->apdev, dev);
+@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
+ *apdev_priv = *pDevice;
+ memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
+ /* only half broken now */
+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
@@ -47157,27 +44902,27 @@ index 8acff44..bdb2fca 100644
pDevice->apdev->type = ARPHRD_IEEE80211;
diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
-index c699a30..b90a5fd 100644
+index df8ea25..47dd9c6 100644
--- a/drivers/staging/vt6656/hostap.c
+++ b/drivers/staging/vt6656/hostap.c
-@@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
+@@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
*
*/
+static net_device_ops_no_const apdev_netdev_ops;
+
- static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
+ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
{
- struct vnt_private *apdev_priv;
+ PSDevice apdev_priv;
struct net_device *dev = pDevice->dev;
int ret;
- const struct net_device_ops apdev_netdev_ops = {
-- .ndo_start_xmit = pDevice->tx_80211,
+- .ndo_start_xmit = pDevice->tx_80211,
- };
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
-@@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
+@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
*apdev_priv = *pDevice;
memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
@@ -47186,140 +44931,217 @@ index c699a30..b90a5fd 100644
pDevice->apdev->netdev_ops = &apdev_netdev_ops;
pDevice->apdev->type = ARPHRD_IEEE80211;
-diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
-index e51b09a..5ebac31 100644
---- a/drivers/target/sbp/sbp_target.c
-+++ b/drivers/target/sbp/sbp_target.c
-@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
-
- #define SESSION_MAINTENANCE_INTERVAL HZ
-
--static atomic_t login_id = ATOMIC_INIT(0);
-+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
-
- static void session_maintenance_work(struct work_struct *);
- static int sbp_run_transaction(struct fw_card *, int, int, int, int,
-@@ -444,7 +444,7 @@ static void sbp_management_request_login(
- login->lun = se_lun;
- login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
- login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
-- login->login_id = atomic_inc_return(&login_id);
-+ login->login_id = atomic_inc_return_unchecked(&login_id);
-
- login->tgt_agt = sbp_target_agent_register(login);
- if (IS_ERR(login->tgt_agt)) {
-diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
-index d90dbb0..6cbe585 100644
---- a/drivers/target/target_core_device.c
-+++ b/drivers/target/target_core_device.c
-@@ -1431,7 +1431,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
- spin_lock_init(&dev->se_tmr_lock);
- spin_lock_init(&dev->qf_cmd_lock);
- sema_init(&dev->caw_sem, 1);
-- atomic_set(&dev->dev_ordered_id, 0);
-+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
- INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
- spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
- INIT_LIST_HEAD(&dev->t10_pr.registration_list);
+diff --git a/drivers/staging/wlags49_h2/wl_priv.c b/drivers/staging/wlags49_h2/wl_priv.c
+index 260d4f0..ed836c2 100644
+--- a/drivers/staging/wlags49_h2/wl_priv.c
++++ b/drivers/staging/wlags49_h2/wl_priv.c
+@@ -570,6 +570,7 @@ int wvlan_uil_put_info( struct uilreq *urq, struct wl_private *lp )
+ ltv_t *pLtv;
+ bool_t ltvAllocated = FALSE;
+ ENCSTRCT sEncryption;
++ size_t len;
+
+ #ifdef USE_WDS
+ hcf_16 hcfPort = HCF_PORT_0;
+@@ -685,9 +686,10 @@ int wvlan_uil_put_info( struct uilreq *urq, struct wl_private *lp )
+ pLtv->u.u16[0] = CNV_INT_TO_LITTLE( pLtv->u.u16[0] );
+ break;
+ case CFG_CNF_OWN_NAME:
+- memset( lp->StationName, 0, sizeof( lp->StationName ));
+- memcpy( (void *)lp->StationName, (void *)&pLtv->u.u8[2], (size_t)pLtv->u.u16[0]);
+- pLtv->u.u16[0] = CNV_INT_TO_LITTLE( pLtv->u.u16[0] );
++ memset(lp->StationName, 0, sizeof(lp->StationName));
++ len = min_t(size_t, pLtv->u.u16[0], sizeof(lp->StationName));
++ strlcpy(lp->StationName, &pLtv->u.u8[2], len);
++ pLtv->u.u16[0] = CNV_INT_TO_LITTLE(pLtv->u.u16[0]);
+ break;
+ case CFG_CNF_LOAD_BALANCING:
+ lp->loadBalancing = pLtv->u.u16[0];
+@@ -1798,9 +1800,10 @@ int wvlan_set_station_nickname(struct net_device *dev,
+ union iwreq_data *wrqu,
+ char *extra)
+ {
+- struct wl_private *lp = wl_priv(dev);
+- unsigned long flags;
+- int ret = 0;
++ struct wl_private *lp = wl_priv(dev);
++ unsigned long flags;
++ size_t len;
++ int ret = 0;
+ /*------------------------------------------------------------------------*/
+
+
+@@ -1809,9 +1812,9 @@ int wvlan_set_station_nickname(struct net_device *dev,
+
+ wl_lock(lp, &flags);
+
+- memset( lp->StationName, 0, sizeof( lp->StationName ));
+-
+- memcpy( lp->StationName, extra, wrqu->data.length);
++ memset(lp->StationName, 0, sizeof(lp->StationName));
++ len = min_t(size_t, wrqu->data.length, sizeof(lp->StationName));
++ strlcpy(lp->StationName, extra, len);
+
+ /* Commit the adapter parameters */
+ wl_apply( lp );
+diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
+index 1ca66ea..76f1343 100644
+--- a/drivers/staging/zcache/tmem.c
++++ b/drivers/staging/zcache/tmem.c
+@@ -39,7 +39,7 @@
+ * A tmem host implementation must use this function to register callbacks
+ * for memory allocation.
+ */
+-static struct tmem_hostops tmem_hostops;
++static tmem_hostops_no_const tmem_hostops;
+
+ static void tmem_objnode_tree_init(void);
+
+@@ -53,7 +53,7 @@ void tmem_register_hostops(struct 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 tmem_pamops_no_const tmem_pamops;
+
+ void tmem_register_pamops(struct tmem_pamops *m)
+ {
+diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
+index ed147c4..94fc3c6 100644
+--- a/drivers/staging/zcache/tmem.h
++++ b/drivers/staging/zcache/tmem.h
+@@ -180,6 +180,7 @@ struct tmem_pamops {
+ void (*new_obj)(struct tmem_obj *);
+ int (*replace_in_obj)(void *, struct tmem_obj *);
+ };
++typedef struct tmem_pamops __no_const tmem_pamops_no_const;
+ extern void tmem_register_pamops(struct tmem_pamops *m);
+
+ /* memory allocation methods provided by the host implementation */
+@@ -189,6 +190,7 @@ struct tmem_hostops {
+ struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
+ void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
+ };
++typedef struct tmem_hostops __no_const tmem_hostops_no_const;
+ extern void tmem_register_hostops(struct tmem_hostops *m);
+
+ /* core tmem accessor functions */
+diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
+index 3effde2..dda7d46 100644
+--- a/drivers/target/iscsi/iscsi_target.c
++++ b/drivers/target/iscsi/iscsi_target.c
+@@ -1351,7 +1351,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
+ * outstanding_r2ts reaches zero, go ahead and send the delayed
+ * TASK_ABORTED status.
+ */
+- if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
++ if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
+ if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
+ if (--cmd->outstanding_r2ts < 1) {
+ iscsit_stop_dataout_timer(cmd);
+diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
+index 6845228..df77141 100644
+--- a/drivers/target/target_core_tmr.c
++++ b/drivers/target/target_core_tmr.c
+@@ -250,7 +250,7 @@ static void core_tmr_drain_task_list(
+ cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
+ cmd->t_task_list_num,
+ atomic_read(&cmd->t_task_cdbs_left),
+- atomic_read(&cmd->t_task_cdbs_sent),
++ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
+ atomic_read(&cmd->t_transport_active),
+ atomic_read(&cmd->t_transport_stop),
+ atomic_read(&cmd->t_transport_sent));
+@@ -281,7 +281,7 @@ static void core_tmr_drain_task_list(
+ pr_debug("LUN_RESET: got t_transport_active = 1 for"
+ " task: %p, t_fe_count: %d dev: %p\n", task,
+ fe_count, dev);
+- atomic_set(&cmd->t_transport_aborted, 1);
++ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
+ spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+
+ core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
+@@ -289,7 +289,7 @@ static void core_tmr_drain_task_list(
+ }
+ pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
+ " t_fe_count: %d dev: %p\n", task, fe_count, dev);
+- atomic_set(&cmd->t_transport_aborted, 1);
++ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
+ spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+
+ core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
-index 81e945e..e40c92f 100644
+index 898c1de..b2ca488 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
-@@ -1137,7 +1137,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
+@@ -1343,7 +1343,7 @@ struct se_device *transport_add_device_to_core_hba(
+
+ dev->queue_depth = dev_limits->queue_depth;
+ atomic_set(&dev->depth_left, dev->queue_depth);
+- atomic_set(&dev->dev_ordered_id, 0);
++ atomic_set_unchecked(&dev->dev_ordered_id, 0);
+
+ se_dev_set_default_attribs(dev, dev_limits);
+
+@@ -1531,7 +1531,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.
*/
-- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
-+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
+- cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
++ cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
smp_mb__after_atomic_inc();
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 33f83fe..d80f8e1 100644
---- a/drivers/tty/cyclades.c
-+++ b/drivers/tty/cyclades.c
-@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
- printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
- info->port.count);
- #endif
-- info->port.count++;
-+ atomic_inc(&info->port.count);
- #ifdef CY_DEBUG_COUNT
- printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
-- current->pid, info->port.count);
-+ current->pid, atomic_read(&info->port.count));
- #endif
-
- /*
-@@ -3972,7 +3972,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];
-
-- if (info->port.count) {
-+ if (atomic_read(&info->port.count)) {
- /* XXX is the ldisc num worth this? */
- 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 9eba119..5070303 100644
---- a/drivers/tty/hvc/hvc_console.c
-+++ b/drivers/tty/hvc/hvc_console.c
-@@ -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. */
-- if (hp->port.count++ > 0) {
-+ if (atomic_inc_return(&hp->port.count) > 1) {
- spin_unlock_irqrestore(&hp->port.lock, flags);
- hvc_kick();
- return 0;
-@@ -393,7 +393,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
-
- spin_lock_irqsave(&hp->port.lock, flags);
-
-- if (--hp->port.count == 0) {
-+ if (atomic_dec_return(&hp->port.count) == 0) {
- spin_unlock_irqrestore(&hp->port.lock, flags);
- /* We are done with the tty pointer now. */
- tty_port_tty_set(&hp->port, NULL);
-@@ -415,9 +415,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
- */
- tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
- } else {
-- if (hp->port.count < 0)
-+ if (atomic_read(&hp->port.count) < 0)
- printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
-- hp->vtermno, hp->port.count);
-+ hp->vtermno, atomic_read(&hp->port.count));
- spin_unlock_irqrestore(&hp->port.lock, flags);
+@@ -1801,7 +1801,7 @@ static void transport_generic_request_failure(struct se_cmd *cmd)
+ " t_transport_active: %d t_transport_stop: %d"
+ " t_transport_sent: %d\n", cmd->t_task_list_num,
+ atomic_read(&cmd->t_task_cdbs_left),
+- atomic_read(&cmd->t_task_cdbs_sent),
++ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
+ atomic_read(&cmd->t_task_cdbs_ex_left),
+ atomic_read(&cmd->t_transport_active),
+ atomic_read(&cmd->t_transport_stop),
+@@ -2091,9 +2091,9 @@ check_depth:
+
+ spin_lock_irqsave(&cmd->t_state_lock, flags);
+ task->task_flags |= (TF_ACTIVE | TF_SENT);
+- atomic_inc(&cmd->t_task_cdbs_sent);
++ atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
+
+- if (atomic_read(&cmd->t_task_cdbs_sent) ==
++ if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
+ cmd->t_task_list_num)
+ atomic_set(&cmd->t_transport_sent, 1);
+
+@@ -4304,7 +4304,7 @@ bool transport_wait_for_tasks(struct se_cmd *cmd)
+ atomic_set(&cmd->transport_lun_stop, 0);
+ }
+ if (!atomic_read(&cmd->t_transport_active) ||
+- atomic_read(&cmd->t_transport_aborted)) {
++ atomic_read_unchecked(&cmd->t_transport_aborted)) {
+ spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+ return false;
}
- }
-@@ -447,12 +447,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.
+@@ -4562,7 +4562,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
+ {
+ int ret = 0;
+
+- if (atomic_read(&cmd->t_transport_aborted) != 0) {
++ if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
+ if (!send_status ||
+ (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
+ return 1;
+@@ -4599,7 +4599,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
*/
-- if (hp->port.count <= 0) {
-+ if (atomic_read(&hp->port.count) <= 0) {
- spin_unlock_irqrestore(&hp->port.lock, flags);
- return;
+ if (cmd->data_direction == DMA_TO_DEVICE) {
+ if (cmd->se_tfo->write_pending_status(cmd) != 0) {
+- atomic_inc(&cmd->t_transport_aborted);
++ atomic_inc_unchecked(&cmd->t_transport_aborted);
+ smp_mb__after_atomic_inc();
+ }
}
-
-- hp->port.count = 0;
-+ atomic_set(&hp->port.count, 0);
- spin_unlock_irqrestore(&hp->port.lock, flags);
- tty_port_tty_set(&hp->port, NULL);
-
-@@ -500,7 +500,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
- return -EPIPE;
-
- /* FIXME what's this (unprotected) check for? */
-- if (hp->port.count <= 0)
-+ if (atomic_read(&hp->port.count) <= 0)
- return -EIO;
-
- spin_lock_irqsave(&hp->lock, flags);
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
-index 81e939e..95ead10 100644
+index b9040be..e3f5aab 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -83,6 +83,7 @@
@@ -47330,96 +45152,105 @@ index 81e939e..95ead10 100644
/*
* 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
-@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
+@@ -270,7 +271,7 @@ struct hvcs_struct {
+ unsigned int index;
+
+ struct tty_struct *tty;
+- int open_count;
++ local_t open_count;
+
+ /*
+ * Used to tell the driver kernel_thread what operations need to take
+@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
spin_lock_irqsave(&hvcsd->lock, flags);
-- if (hvcsd->port.count > 0) {
-+ if (atomic_read(&hvcsd->port.count) > 0) {
+- if (hvcsd->open_count > 0) {
++ if (local_read(&hvcsd->open_count) > 0) {
spin_unlock_irqrestore(&hvcsd->lock, flags);
printk(KERN_INFO "HVCS: vterm state unchanged. "
"The hvcs device node is still in use.\n");
-@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
- }
- }
+@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
+ if ((retval = hvcs_partner_connect(hvcsd)))
+ goto error_release;
-- hvcsd->port.count = 0;
-+ atomic_set(&hvcsd->port.count, 0);
- hvcsd->port.tty = tty;
+- hvcsd->open_count = 1;
++ local_set(&hvcsd->open_count, 1);
+ hvcsd->tty = tty;
tty->driver_data = hvcsd;
-@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
- unsigned long flags;
+@@ -1179,7 +1180,7 @@ fast_open:
spin_lock_irqsave(&hvcsd->lock, flags);
-- hvcsd->port.count++;
-+ atomic_inc(&hvcsd->port.count);
+ kref_get(&hvcsd->kref);
+- hvcsd->open_count++;
++ local_inc(&hvcsd->open_count);
hvcsd->todo_mask |= HVCS_SCHED_READ;
spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
+@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
hvcsd = tty->driver_data;
spin_lock_irqsave(&hvcsd->lock, flags);
-- if (--hvcsd->port.count == 0) {
-+ if (atomic_dec_and_test(&hvcsd->port.count)) {
+- if (--hvcsd->open_count == 0) {
++ if (local_dec_and_test(&hvcsd->open_count)) {
vio_disable_interrupts(hvcsd->vdev);
-@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
-
+@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
free_irq(irq, hvcsd);
+ kref_put(&hvcsd->kref, destroy_hvcs_struct);
return;
-- } else if (hvcsd->port.count < 0) {
-+ } else if (atomic_read(&hvcsd->port.count) < 0) {
+- } else if (hvcsd->open_count < 0) {
++ } else if (local_read(&hvcsd->open_count) < 0) {
printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
" is missmanaged.\n",
-- hvcsd->vdev->unit_address, hvcsd->port.count);
-+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
+- hvcsd->vdev->unit_address, hvcsd->open_count);
++ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
}
spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
+@@ -1268,7 +1269,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 */
-- temp_open_count = hvcsd->port.count;
-+ temp_open_count = atomic_read(&hvcsd->port.count);
+- temp_open_count = hvcsd->open_count;
++ temp_open_count = local_read(&hvcsd->open_count);
/*
* Don't kref put inside the spinlock because the destruction
-@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
- tty->driver_data = NULL;
- hvcsd->port.tty = NULL;
+@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struct * tty)
+ hvcsd->tty->driver_data = NULL;
+ hvcsd->tty = NULL;
-- hvcsd->port.count = 0;
-+ atomic_set(&hvcsd->port.count, 0);
+- hvcsd->open_count = 0;
++ local_set(&hvcsd->open_count, 0);
/* This will drop any buffered data on the floor which is OK in a hangup
* scenario. */
-@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
+@@ -1354,7 +1355,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.
*/
-- if (hvcsd->port.count <= 0) {
-+ if (atomic_read(&hvcsd->port.count) <= 0) {
+- if (hvcsd->open_count <= 0) {
++ if (local_read(&hvcsd->open_count) <= 0) {
spin_unlock_irqrestore(&hvcsd->lock, flags);
return -ENODEV;
}
-@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
+@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_struct *tty)
{
struct hvcs_struct *hvcsd = tty->driver_data;
-- if (!hvcsd || hvcsd->port.count <= 0)
-+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
+- if (!hvcsd || hvcsd->open_count <= 0)
++ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
-index 4190199..48f2920 100644
+index cdfa3e0..37fa165 100644
--- a/drivers/tty/hvc/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
-@@ -85,7 +85,7 @@ struct hvsi_struct {
+@@ -86,7 +86,7 @@ struct hvsi_struct {
int n_outbuf;
uint32_t vtermno;
uint32_t virq;
@@ -47428,7 +45259,7 @@ index 4190199..48f2920 100644
uint16_t mctrl;
uint8_t state; /* HVSI protocol state */
uint8_t flags;
-@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
+@@ -297,7 +297,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
packet.hdr.len = sizeof(struct hvsi_query_response);
@@ -47437,7 +45268,7 @@ index 4190199..48f2920 100644
packet.verb = VSV_SEND_VERSION_NUMBER;
packet.u.version = HVSI_VERSION;
packet.query_seqno = query_seqno+1;
-@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
+@@ -581,7 +581,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
packet.hdr.type = VS_QUERY_PACKET_HEADER;
packet.hdr.len = sizeof(struct hvsi_query);
@@ -47446,7 +45277,7 @@ index 4190199..48f2920 100644
packet.verb = verb;
pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
-@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
+@@ -623,7 +623,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
int wrote;
packet.hdr.type = VS_CONTROL_PACKET_HEADER,
@@ -47455,7 +45286,7 @@ index 4190199..48f2920 100644
packet.hdr.len = sizeof(struct hvsi_control);
packet.verb = VSV_SET_MODEM_CTL;
packet.mask = HVSI_TSDTR;
-@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
+@@ -706,7 +706,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
packet.hdr.type = VS_DATA_PACKET_HEADER;
@@ -47464,7 +45295,7 @@ index 4190199..48f2920 100644
packet.hdr.len = count + sizeof(struct hvsi_header);
memcpy(&packet.data, buf, count);
-@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
+@@ -723,7 +723,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
struct hvsi_control packet __ALIGNED__;
packet.hdr.type = VS_CONTROL_PACKET_HEADER;
@@ -47473,8 +45304,17 @@ index 4190199..48f2920 100644
packet.hdr.len = 6;
packet.verb = VSV_CLOSE_PROTOCOL;
+@@ -755,7 +755,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
+ spin_lock_irqsave(&hp->lock, flags);
+ hp->tty = tty;
+ hp->count++;
+- atomic_set(&hp->seqno, 0);
++ atomic_set_unchecked(&hp->seqno, 0);
+ h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
+ spin_unlock_irqrestore(&hp->lock, flags);
+
diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
-index ac27671..0f627ee 100644
+index 3749688..82c91dc 100644
--- a/drivers/tty/hvc/hvsi_lib.c
+++ b/drivers/tty/hvc/hvsi_lib.c
@@ -9,7 +9,7 @@
@@ -47505,7 +45345,7 @@ index ac27671..0f627ee 100644
rc = hvsi_send_packet(pv, &q.hdr);
if (rc <= 0) {
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
-index 8fd72ff..34a0bed 100644
+index ef92869..f4ebd88 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -29,6 +29,7 @@
@@ -47516,130 +45356,126 @@ index 8fd72ff..34a0bed 100644
#include "tty.h"
#include "network.h"
-@@ -99,10 +100,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
+@@ -51,7 +52,7 @@ struct ipw_tty {
+ int tty_type;
+ struct ipw_network *network;
+ struct tty_struct *linux_tty;
+- int open_count;
++ local_t open_count;
+ unsigned int control_lines;
+ struct mutex ipw_tty_mutex;
+ int tx_bytes_queued;
+@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
mutex_unlock(&tty->ipw_tty_mutex);
return -ENODEV;
}
-- if (tty->port.count == 0)
-+ if (atomic_read(&tty->port.count) == 0)
+- if (tty->open_count == 0)
++ if (local_read(&tty->open_count) == 0)
tty->tx_bytes_queued = 0;
-- tty->port.count++;
-+ atomic_inc(&tty->port.count);
+- tty->open_count++;
++ local_inc(&tty->open_count);
- tty->port.tty = linux_tty;
+ tty->linux_tty = linux_tty;
linux_tty->driver_data = tty;
-@@ -118,9 +119,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
+@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
static void do_ipw_close(struct ipw_tty *tty)
{
-- tty->port.count--;
+- tty->open_count--;
-
-- if (tty->port.count == 0) {
-+ if (atomic_dec_return(&tty->port.count) == 0) {
- struct tty_struct *linux_tty = tty->port.tty;
+- if (tty->open_count == 0) {
++ if (local_dec_return(&tty->open_count) == 0) {
+ struct tty_struct *linux_tty = tty->linux_tty;
if (linux_tty != NULL) {
-@@ -141,7 +140,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
+@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
return;
mutex_lock(&tty->ipw_tty_mutex);
-- if (tty->port.count == 0) {
-+ if (atomic_read(&tty->port.count) == 0) {
+- if (tty->open_count == 0) {
++ if (local_read(&tty->open_count) == 0) {
mutex_unlock(&tty->ipw_tty_mutex);
return;
}
-@@ -164,7 +163,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
-
- mutex_lock(&tty->ipw_tty_mutex);
+@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
+ return;
+ }
-- if (!tty->port.count) {
-+ if (!atomic_read(&tty->port.count)) {
+- if (!tty->open_count) {
++ if (!local_read(&tty->open_count)) {
mutex_unlock(&tty->ipw_tty_mutex);
return;
}
-@@ -206,7 +205,7 @@ static int ipw_write(struct tty_struct *linux_tty,
+@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
return -ENODEV;
mutex_lock(&tty->ipw_tty_mutex);
-- if (!tty->port.count) {
-+ if (!atomic_read(&tty->port.count)) {
+- if (!tty->open_count) {
++ if (!local_read(&tty->open_count)) {
mutex_unlock(&tty->ipw_tty_mutex);
return -EINVAL;
}
-@@ -246,7 +245,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
+@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
if (!tty)
return -ENODEV;
-- if (!tty->port.count)
-+ if (!atomic_read(&tty->port.count))
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
return -EINVAL;
room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
-@@ -288,7 +287,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
+@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
if (!tty)
return 0;
-- if (!tty->port.count)
-+ if (!atomic_read(&tty->port.count))
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
return 0;
return tty->tx_bytes_queued;
-@@ -369,7 +368,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
+@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
if (!tty)
return -ENODEV;
-- if (!tty->port.count)
-+ if (!atomic_read(&tty->port.count))
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
return -EINVAL;
return get_control_lines(tty);
-@@ -385,7 +384,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
+@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
if (!tty)
return -ENODEV;
-- if (!tty->port.count)
-+ if (!atomic_read(&tty->port.count))
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
return -EINVAL;
return set_control_lines(tty, set, clear);
-@@ -399,7 +398,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
+@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
if (!tty)
return -ENODEV;
-- if (!tty->port.count)
-+ if (!atomic_read(&tty->port.count))
+- if (!tty->open_count)
++ if (!local_read(&tty->open_count))
return -EINVAL;
/* FIXME: Exactly how is the tty object locked here .. */
-@@ -555,7 +554,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
- * are gone */
+@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
+ against a parallel ioctl etc */
mutex_lock(&ttyj->ipw_tty_mutex);
}
-- while (ttyj->port.count)
-+ while (atomic_read(&ttyj->port.count))
+- while (ttyj->open_count)
++ while (local_read(&ttyj->open_count))
do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
-diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
-index 1deaca4..c8582d4 100644
---- a/drivers/tty/moxa.c
-+++ b/drivers/tty/moxa.c
-@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
- }
-
- ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
-- ch->port.count++;
-+ atomic_inc(&ch->port.count);
- tty->driver_data = ch;
- 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 c0f76da..d974c32 100644
+index d190269..f59727e 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
-@@ -1632,7 +1632,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
- spin_lock_init(&dlci->lock);
+@@ -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;
- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
@@ -47647,20 +45483,11 @@ index c0f76da..d974c32 100644
kfree(dlci);
return NULL;
}
-@@ -2935,7 +2935,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);
- 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 7a744b6..6aa4aa9 100644
+index 0f8a785..64c35dd 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
-@@ -2498,6 +2498,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
+@@ -2132,6 +2132,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
{
*ops = tty_ldisc_N_TTY;
ops->owner = NULL;
@@ -47670,11 +45497,11 @@ index 7a744b6..6aa4aa9 100644
}
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
-index 25c9bc7..24077b7 100644
+index 4735928..e80860a 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
-@@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
- panic("Couldn't register Unix98 pts driver");
+@@ -775,8 +775,10 @@ static void __init unix98_pty_init(void)
+ register_sysctl_table(pty_root_table);
/* Now create the /dev/ptmx special device */
+ pax_open_kernel();
@@ -47685,42 +45512,11 @@ index 25c9bc7..24077b7 100644
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 354564e..fe50d9a 100644
---- a/drivers/tty/rocket.c
-+++ b/drivers/tty/rocket.c
-@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
- tty->driver_data = info;
- tty_port_tty_set(port, tty);
-
-- if (port->count++ == 0) {
-+ if (atomic_inc_return(&port->count) == 1) {
- atomic_inc(&rp_num_ports_open);
-
- #ifdef ROCKET_DEBUG_OPEN
-@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
- #endif
- }
- #ifdef ROCKET_DEBUG_OPEN
-- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
-+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
- #endif
-
- /*
-@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
- spin_unlock_irqrestore(&info->port.lock, flags);
- return;
- }
-- if (info->port.count)
-+ if (atomic_read(&info->port.count))
- atomic_dec(&rp_num_ports_open);
- 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/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
-index 1274499..f541382 100644
+index 6b36c15..335a4a2 100644
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
-@@ -437,7 +437,7 @@ struct ioc4_soft {
+@@ -438,7 +438,7 @@ struct ioc4_soft {
} is_intr_info[MAX_IOC4_INTR_ENTS];
/* Number of entries active in the above array */
@@ -47729,16 +45525,16 @@ index 1274499..f541382 100644
} is_intr_type[IOC4_NUM_INTR_TYPES];
/* is_ir_lock must be held while
-@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
+@@ -975,7 +975,7 @@ intr_connect(struct ioc4_soft *soft, int type,
BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
|| (type == IOC4_OTHER_INTR_TYPE)));
-- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
+- i = atomic_inc(&soft-> is_intr_type[type].is_num_intrs) - 1;
+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
/* Save off the lower level interrupt handler */
-@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
+@@ -1002,7 +1002,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
soft = arg;
for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
@@ -47748,7 +45544,7 @@ index 1274499..f541382 100644
this_mir = this_ir = pending_intrs(soft, intr_type);
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
-index a260cde..6b2b5ce 100644
+index 2b42a01..32a2ed3 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -24,8 +24,9 @@
@@ -47762,7 +45558,7 @@ index a260cde..6b2b5ce 100644
static int configured = -1;
static char config[MAX_CONFIG_LEN];
-@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
+@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
kgdboc_unregister_kbd();
if (configured == 1)
kgdb_unregister_io_module(&kgdboc_io_ops);
@@ -47771,7 +45567,7 @@ index a260cde..6b2b5ce 100644
}
static int configure_kgdboc(void)
-@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
+@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
int err;
char *cptr = config;
struct console *cons;
@@ -47786,7 +45582,7 @@ index a260cde..6b2b5ce 100644
kgdb_tty_driver = NULL;
kgdboc_use_kms = 0;
-@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
+@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
int idx;
if (cons->device && cons->device(cons, &idx) == p &&
idx == tty_line) {
@@ -47795,7 +45591,7 @@ index a260cde..6b2b5ce 100644
break;
}
cons = cons->next;
-@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
+@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
kgdb_tty_line = tty_line;
do_register:
@@ -47810,16 +45606,12 @@ index a260cde..6b2b5ce 100644
if (err)
goto noconfig;
-@@ -205,8 +214,6 @@ do_register:
- if (err)
- goto nmi_con_failed;
-
- configured = 1;
-
return 0;
- nmi_con_failed:
-@@ -223,7 +230,7 @@ noconfig:
+ noconfig:
+@@ -213,7 +220,7 @@ noconfig:
static int __init init_kgdboc(void)
{
/* Already configured? */
@@ -47828,7 +45620,7 @@ index a260cde..6b2b5ce 100644
return 0;
return configure_kgdboc();
-@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
+@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
if (config[len - 1] == '\n')
config[len - 1] = '\0';
@@ -47837,7 +45629,7 @@ index a260cde..6b2b5ce 100644
cleanup_kgdboc();
/* Go and configure with the new params. */
-@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
+@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
.post_exception = kgdboc_post_exp_handler,
};
@@ -47854,19 +45646,19 @@ index a260cde..6b2b5ce 100644
/* 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/msm_serial.c b/drivers/tty/serial/msm_serial.c
-index b5d779c..3622cfe 100644
+index 8131e2c..b48928a 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
-@@ -897,7 +897,7 @@ static struct uart_driver msm_uart_driver = {
+@@ -857,7 +857,7 @@ static struct uart_driver msm_uart_driver = {
.cons = MSM_CONSOLE,
};
-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
- static const struct of_device_id msm_uartdm_table[] = {
- { .compatible = "qcom,msm-uartdm" },
-@@ -912,7 +912,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
+ static int __init msm_serial_probe(struct platform_device *pdev)
+ {
+@@ -867,7 +867,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
int irq;
if (pdev->id == -1)
@@ -47876,10 +45668,10 @@ index b5d779c..3622cfe 100644
if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
return -ENXIO;
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
-index f3dfa19..342f2ff 100644
+index b31f1c3..1b6b8c4 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
-@@ -456,11 +456,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
+@@ -440,11 +440,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
}
}
@@ -47896,451 +45688,22 @@ index f3dfa19..342f2ff 100644
dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
port->mapbase, port->membase);
-@@ -1127,10 +1132,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
- /* setup info for port */
+@@ -1149,10 +1154,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
port->dev = &platdev->dev;
+ ourport->info = info;
- /* 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 0f02351..07c59c5 100644
---- a/drivers/tty/serial/serial_core.c
-+++ b/drivers/tty/serial/serial_core.c
-@@ -1448,7 +1448,7 @@ static void uart_hangup(struct tty_struct *tty)
- uart_flush_buffer(tty);
- uart_shutdown(tty, state);
- spin_lock_irqsave(&port->lock, flags);
-- port->count = 0;
-+ atomic_set(&port->count, 0);
- clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
- spin_unlock_irqrestore(&port->lock, flags);
- tty_port_tty_set(port, NULL);
-@@ -1544,7 +1544,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
- goto end;
- }
-
-- port->count++;
-+ atomic_inc(&port->count);
- if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
- retval = -ENXIO;
- goto err_dec_count;
-@@ -1572,7 +1572,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
- /*
- * Make sure the device is in D0 state.
- */
-- if (port->count == 1)
-+ if (atomic_read(&port->count) == 1)
- uart_change_pm(state, UART_PM_STATE_ON);
-
- /*
-@@ -1590,7 +1590,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
- end:
- return retval;
- err_dec_count:
-- port->count--;
-+ atomic_inc(&port->count);
- mutex_unlock(&port->mutex);
- goto end;
- }
-diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
-index e1ce141..6d4ed80 100644
---- a/drivers/tty/synclink.c
-+++ b/drivers/tty/synclink.c
-@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
-
- if (debug_level >= DEBUG_LEVEL_INFO)
- printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
-- __FILE__,__LINE__, info->device_name, info->port.count);
-+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
-
- if (tty_port_close_start(&info->port, tty, filp) == 0)
- goto cleanup;
-@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
- cleanup:
- if (debug_level >= DEBUG_LEVEL_INFO)
- printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
-- tty->driver->name, info->port.count);
-+ tty->driver->name, atomic_read(&info->port.count));
-
- } /* end of mgsl_close() */
-
-@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
-
- mgsl_flush_buffer(tty);
- shutdown(info);
--
-- info->port.count = 0;
-+
-+ atomic_set(&info->port.count, 0);
- info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
- info->port.tty = NULL;
+ /* copy the info in from provided structure */
+ ourport->port.fifosize = info->fifosize;
-@@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
-
- if (debug_level >= DEBUG_LEVEL_INFO)
- printk("%s(%d):block_til_ready before block on %s count=%d\n",
-- __FILE__,__LINE__, tty->driver->name, port->count );
-+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
-
- spin_lock_irqsave(&info->irq_spinlock, flags);
- if (!tty_hung_up_p(filp)) {
- extra_count = true;
-- port->count--;
-+ atomic_dec(&port->count);
- }
- spin_unlock_irqrestore(&info->irq_spinlock, flags);
- port->blocked_open++;
-@@ -3331,7 +3331,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
-
- if (debug_level >= DEBUG_LEVEL_INFO)
- printk("%s(%d):block_til_ready blocking on %s count=%d\n",
-- __FILE__,__LINE__, tty->driver->name, port->count );
-+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
-
- tty_unlock(tty);
- schedule();
-@@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
-
- /* FIXME: Racy on hangup during close wait */
- if (extra_count)
-- port->count++;
-+ atomic_inc(&port->count);
- port->blocked_open--;
-
- if (debug_level >= DEBUG_LEVEL_INFO)
- printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
-- __FILE__,__LINE__, tty->driver->name, port->count );
-+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
-
- if (!retval)
- port->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -3400,7 +3400,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",
-- __FILE__,__LINE__,tty->driver->name, info->port.count);
-+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
-
- /* If port is closing, signal caller to try again */
- if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-@@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
- spin_unlock_irqrestore(&info->netlock, flags);
- goto cleanup;
- }
-- info->port.count++;
-+ atomic_inc(&info->port.count);
- spin_unlock_irqrestore(&info->netlock, flags);
-
-- if (info->port.count == 1) {
-+ if (atomic_read(&info->port.count) == 1) {
- /* 1st open on this device, init hardware */
- retval = startup(info);
- if (retval < 0)
-@@ -3446,8 +3446,8 @@ cleanup:
- if (retval) {
- if (tty->count == 1)
- info->port.tty = NULL; /* tty layer will release tty struct */
-- if(info->port.count)
-- info->port.count--;
-+ if (atomic_read(&info->port.count))
-+ atomic_dec(&info->port.count);
- }
-
- return retval;
-@@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
- unsigned short new_crctype;
-
- /* return error if TTY interface open */
-- if (info->port.count)
-+ if (atomic_read(&info->port.count))
- return -EBUSY;
-
- switch (encoding)
-@@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
-
- /* arbitrate between network and tty opens */
- spin_lock_irqsave(&info->netlock, flags);
-- if (info->port.count != 0 || info->netcount != 0) {
-+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
- printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
- spin_unlock_irqrestore(&info->netlock, flags);
- return -EBUSY;
-@@ -7846,7 +7846,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 (info->port.count)
-+ if (atomic_read(&info->port.count))
- return -EBUSY;
-
- if (cmd != SIOCWANDEV)
-diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
-index 1abf946..1ee34fc 100644
---- a/drivers/tty/synclink_gt.c
-+++ b/drivers/tty/synclink_gt.c
-@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
- tty->driver_data = info;
- info->port.tty = tty;
-
-- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
-+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
-
- /* If port is closing, signal caller to try again */
- if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
- mutex_unlock(&info->port.mutex);
- goto cleanup;
- }
-- info->port.count++;
-+ atomic_inc(&info->port.count);
- spin_unlock_irqrestore(&info->netlock, flags);
-
-- if (info->port.count == 1) {
-+ if (atomic_read(&info->port.count) == 1) {
- /* 1st open on this device, init hardware */
- retval = startup(info);
- if (retval < 0) {
-@@ -715,8 +715,8 @@ cleanup:
- if (retval) {
- if (tty->count == 1)
- info->port.tty = NULL; /* tty layer will release tty struct */
-- if(info->port.count)
-- info->port.count--;
-+ if(atomic_read(&info->port.count))
-+ atomic_dec(&info->port.count);
- }
-
- DBGINFO(("%s open rc=%d\n", info->device_name, retval));
-@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
-
- if (sanity_check(info, tty->name, "close"))
- return;
-- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
-+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
-
- if (tty_port_close_start(&info->port, tty, filp) == 0)
- goto cleanup;
-@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
- tty_port_close_end(&info->port, tty);
- info->port.tty = NULL;
- cleanup:
-- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
-+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
- }
-
- static void hangup(struct tty_struct *tty)
-@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
- shutdown(info);
-
- spin_lock_irqsave(&info->port.lock, flags);
-- info->port.count = 0;
-+ atomic_set(&info->port.count, 0);
- info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
- info->port.tty = NULL;
- spin_unlock_irqrestore(&info->port.lock, flags);
-@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
- unsigned short new_crctype;
-
- /* return error if TTY interface open */
-- if (info->port.count)
-+ if (atomic_read(&info->port.count))
- return -EBUSY;
-
- DBGINFO(("%s hdlcdev_attach\n", info->device_name));
-@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
-
- /* arbitrate between network and tty opens */
- spin_lock_irqsave(&info->netlock, flags);
-- if (info->port.count != 0 || info->netcount != 0) {
-+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
- DBGINFO(("%s hdlc_open busy\n", dev->name));
- spin_unlock_irqrestore(&info->netlock, flags);
- return -EBUSY;
-@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
- DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
-
- /* return error if TTY interface open */
-- if (info->port.count)
-+ if (atomic_read(&info->port.count))
- return -EBUSY;
-
- if (cmd != SIOCWANDEV)
-@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
- if (port == NULL)
- continue;
- spin_lock(&port->lock);
-- if ((port->port.count || port->netcount) &&
-+ if ((atomic_read(&port->port.count) || port->netcount) &&
- port->pending_bh && !port->bh_running &&
- !port->bh_requested) {
- DBGISR(("%s bh queued\n", port->device_name));
-@@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
- spin_lock_irqsave(&info->lock, flags);
- if (!tty_hung_up_p(filp)) {
- extra_count = true;
-- port->count--;
-+ atomic_dec(&port->count);
- }
- spin_unlock_irqrestore(&info->lock, flags);
- port->blocked_open++;
-@@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
- remove_wait_queue(&port->open_wait, &wait);
-
- if (extra_count)
-- port->count++;
-+ atomic_inc(&port->count);
- port->blocked_open--;
-
- if (!retval)
-diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
-index dc6e969..5dc8786 100644
---- a/drivers/tty/synclinkmp.c
-+++ b/drivers/tty/synclinkmp.c
-@@ -750,7 +750,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",
-- __FILE__,__LINE__,tty->driver->name, info->port.count);
-+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
-
- /* If port is closing, signal caller to try again */
- if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
-@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
- spin_unlock_irqrestore(&info->netlock, flags);
- goto cleanup;
- }
-- info->port.count++;
-+ atomic_inc(&info->port.count);
- spin_unlock_irqrestore(&info->netlock, flags);
-
-- if (info->port.count == 1) {
-+ if (atomic_read(&info->port.count) == 1) {
- /* 1st open on this device, init hardware */
- retval = startup(info);
- if (retval < 0)
-@@ -796,8 +796,8 @@ cleanup:
- if (retval) {
- if (tty->count == 1)
- info->port.tty = NULL; /* tty layer will release tty struct */
-- if(info->port.count)
-- info->port.count--;
-+ if(atomic_read(&info->port.count))
-+ atomic_dec(&info->port.count);
- }
-
- return retval;
-@@ -815,7 +815,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",
-- __FILE__,__LINE__, info->device_name, info->port.count);
-+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
-
- if (tty_port_close_start(&info->port, tty, filp) == 0)
- goto cleanup;
-@@ -834,7 +834,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__,
-- tty->driver->name, info->port.count);
-+ tty->driver->name, atomic_read(&info->port.count));
- }
-
- /* Called by tty_hangup() when a hangup is signaled.
-@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
- shutdown(info);
-
- spin_lock_irqsave(&info->port.lock, flags);
-- info->port.count = 0;
-+ atomic_set(&info->port.count, 0);
- info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
- info->port.tty = NULL;
- spin_unlock_irqrestore(&info->port.lock, flags);
-@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
- unsigned short new_crctype;
-
- /* return error if TTY interface open */
-- if (info->port.count)
-+ if (atomic_read(&info->port.count))
- return -EBUSY;
-
- switch (encoding)
-@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
-
- /* arbitrate between network and tty opens */
- spin_lock_irqsave(&info->netlock, flags);
-- if (info->port.count != 0 || info->netcount != 0) {
-+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
- printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
- spin_unlock_irqrestore(&info->netlock, flags);
- return -EBUSY;
-@@ -1746,7 +1746,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 (info->port.count)
-+ if (atomic_read(&info->port.count))
- return -EBUSY;
-
- if (cmd != SIOCWANDEV)
-@@ -2620,7 +2620,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.
- */
-- if ( port && (port->port.count || port->netcount) &&
-+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
- port->pending_bh && !port->bh_running &&
- !port->bh_requested ) {
- if ( debug_level >= DEBUG_LEVEL_ISR )
-@@ -3318,12 +3318,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",
-- __FILE__,__LINE__, tty->driver->name, port->count );
-+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
-
- spin_lock_irqsave(&info->lock, flags);
- if (!tty_hung_up_p(filp)) {
- extra_count = true;
-- port->count--;
-+ atomic_dec(&port->count);
- }
- spin_unlock_irqrestore(&info->lock, flags);
- port->blocked_open++;
-@@ -3352,7 +3352,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);
- schedule();
-@@ -3363,12 +3363,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
- remove_wait_queue(&port->open_wait, &wait);
-
- if (extra_count)
-- port->count++;
-+ atomic_inc(&port->count);
- port->blocked_open--;
-
- if (debug_level >= DEBUG_LEVEL_INFO)
- printk("%s(%d):%s block_til_ready() after, count=%d\n",
-- __FILE__,__LINE__, tty->driver->name, port->count );
-+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
-
- if (!retval)
- port->flags |= ASYNC_NORMAL_ACTIVE;
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 40a9fe9..a3f10cc 100644
+index 43db715..82134aa 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
-@@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
+@@ -862,7 +862,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)
{
@@ -48350,10 +45713,19 @@ index 40a9fe9..a3f10cc 100644
if (get_user(c, buf))
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index 3a1a01a..b12cda2 100644
+index 3f35e42..9fed166 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
-@@ -3473,7 +3473,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
+@@ -1089,7 +1089,7 @@ static inline ssize_t do_tty_write(
+ cond_resched();
+ }
+ if (written) {
+- struct inode *inode = file->f_path.dentry->d_inode;
++ struct inode *inode = file->f_path.dentry->d_inode;
+ tty_update_time(&inode->i_mtime);
+ ret = written;
+ }
+@@ -3250,7 +3250,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
void tty_default_fops(struct file_operations *fops)
{
@@ -48363,28 +45735,37 @@ index 3a1a01a..b12cda2 100644
/*
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
-index 6458e11..6cfc218 100644
+index 8e0924f..4204eb4 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
-@@ -72,7 +72,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
- raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
+@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *ld)
+ if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
+ struct tty_ldisc_ops *ldo = ld->ops;
+
+- ldo->refcount--;
++ atomic_dec(&ldo->refcount);
+ module_put(ldo->owner);
+ spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+
+@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
+ spin_lock_irqsave(&tty_ldisc_lock, flags);
tty_ldiscs[disc] = new_ldisc;
new_ldisc->num = disc;
- new_ldisc->refcount = 0;
+ atomic_set(&new_ldisc->refcount, 0);
- raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
+ spin_unlock_irqrestore(&tty_ldisc_lock, flags);
return ret;
-@@ -100,7 +100,7 @@ int tty_unregister_ldisc(int disc)
+@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
return -EINVAL;
- raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
+ spin_lock_irqsave(&tty_ldisc_lock, flags);
- if (tty_ldiscs[disc]->refcount)
+ if (atomic_read(&tty_ldiscs[disc]->refcount))
ret = -EBUSY;
else
tty_ldiscs[disc] = NULL;
-@@ -121,7 +121,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
+@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
if (ldops) {
ret = ERR_PTR(-EAGAIN);
if (try_module_get(ldops->owner)) {
@@ -48393,87 +45774,20 @@ index 6458e11..6cfc218 100644
ret = ldops;
}
}
-@@ -134,7 +134,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
+@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
unsigned long flags;
- raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
+ spin_lock_irqsave(&tty_ldisc_lock, flags);
- ldops->refcount--;
+ atomic_dec(&ldops->refcount);
module_put(ldops->owner);
- raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
+ spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
-index f597e88..b7f68ed 100644
---- a/drivers/tty/tty_port.c
-+++ b/drivers/tty/tty_port.c
-@@ -232,7 +232,7 @@ void tty_port_hangup(struct tty_port *port)
- unsigned long flags;
-
- spin_lock_irqsave(&port->lock, flags);
-- port->count = 0;
-+ atomic_set(&port->count, 0);
- port->flags &= ~ASYNC_NORMAL_ACTIVE;
- tty = port->tty;
- if (tty)
-@@ -390,7 +390,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->count--;
-+ atomic_dec(&port->count);
- port->blocked_open++;
- spin_unlock_irqrestore(&port->lock, flags);
-
-@@ -432,7 +432,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->count++;
-+ atomic_inc(&port->count);
- port->blocked_open--;
- if (retval == 0)
- port->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -466,19 +466,19 @@ int tty_port_close_start(struct tty_port *port,
- return 0;
- }
-
-- if (tty->count == 1 && port->count != 1) {
-+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
- printk(KERN_WARNING
- "tty_port_close_start: tty->count = 1 port count = %d.\n",
-- port->count);
-- port->count = 1;
-+ atomic_read(&port->count));
-+ atomic_set(&port->count, 1);
- }
-- if (--port->count < 0) {
-+ if (atomic_dec_return(&port->count) < 0) {
- printk(KERN_WARNING "tty_port_close_start: count = %d\n",
-- port->count);
-- port->count = 0;
-+ atomic_read(&port->count));
-+ atomic_set(&port->count, 0);
- }
-
-- if (port->count) {
-+ if (atomic_read(&port->count)) {
- spin_unlock_irqrestore(&port->lock, flags);
- if (port->ops->drop)
- port->ops->drop(port);
-@@ -564,7 +564,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
- {
- spin_lock_irq(&port->lock);
- if (!tty_hung_up_p(filp))
-- ++port->count;
-+ atomic_inc(&port->count);
- spin_unlock_irq(&port->lock);
- tty_port_tty_set(port, tty);
-
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
-index d0e3a44..5f8b754 100644
+index a605549..6bd3c96 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
-@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
+@@ -657,6 +657,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 */
@@ -48490,7 +45804,11 @@ index d0e3a44..5f8b754 100644
fn_handler[value](vc);
}
-@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
+diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
+index 65447c5..0526f0a 100644
+--- a/drivers/tty/vt/vt_ioctl.c
++++ b/drivers/tty/vt/vt_ioctl.c
+@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
@@ -48499,9 +45817,9 @@ index d0e3a44..5f8b754 100644
-
switch (cmd) {
case KDGKBENT:
- /* Ensure another thread doesn't free it under us */
-@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
- spin_unlock_irqrestore(&kbd_event_lock, flags);
+ key_map = key_maps[s];
+@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
+ val = (i ? K_HOLE : K_NOSUCHMAP);
return put_user(val, &user_kbe->kb_value);
case KDSKBENT:
+ if (!capable(CAP_SYS_TTY_CONFIG))
@@ -48510,7 +45828,7 @@ index d0e3a44..5f8b754 100644
if (!perm)
return -EPERM;
if (!i && v == K_NOSUCHMAP) {
-@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
int i, j, k;
int ret;
@@ -48520,7 +45838,7 @@ index d0e3a44..5f8b754 100644
kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
if (!kbs) {
ret = -ENOMEM;
-@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
kfree(kbs);
return ((p && *p) ? -EOVERFLOW : 0);
case KDSKBSENT:
@@ -48531,7 +45849,7 @@ index d0e3a44..5f8b754 100644
ret = -EPERM;
goto reterr;
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
-index 0e808cf..26c24ab 100644
+index a783d53..45f96c9 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -25,6 +25,7 @@
@@ -48542,7 +45860,7 @@ index 0e808cf..26c24ab 100644
#define UIO_MAX_DEVICES (1U << MINORBITS)
-@@ -32,7 +33,7 @@ struct uio_device {
+@@ -32,10 +33,10 @@ struct uio_device {
struct module *owner;
struct device *dev;
int minor;
@@ -48550,17 +45868,21 @@ index 0e808cf..26c24ab 100644
+ atomic_unchecked_t event;
struct fasync_struct *async_queue;
wait_queue_head_t wait;
+- int vma_count;
++ local_t vma_count;
struct uio_info *info;
-@@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
+ struct kobject *map_dir;
+ struct kobject *portio_dir;
+@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct uio_device *idev = dev_get_drvdata(dev);
- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
}
- static DEVICE_ATTR_RO(event);
-@@ -401,7 +402,7 @@ void uio_event_notify(struct uio_info *info)
+ static struct device_attribute uio_class_attributes[] = {
+@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
{
struct uio_device *idev = info->uio_dev;
@@ -48569,7 +45891,7 @@ index 0e808cf..26c24ab 100644
wake_up_interruptible(&idev->wait);
kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
}
-@@ -454,7 +455,7 @@ static int uio_open(struct inode *inode, struct file *filep)
+@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
}
listener->dev = idev;
@@ -48578,7 +45900,7 @@ index 0e808cf..26c24ab 100644
filep->private_data = listener;
if (idev->info->open) {
-@@ -505,7 +506,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
+@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
return -EIO;
poll_wait(filep, &idev->wait, wait);
@@ -48587,7 +45909,7 @@ index 0e808cf..26c24ab 100644
return POLLIN | POLLRDNORM;
return 0;
}
-@@ -530,7 +531,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
+@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
do {
set_current_state(TASK_INTERRUPTIBLE);
@@ -48596,7 +45918,7 @@ index 0e808cf..26c24ab 100644
if (event_count != listener->event_count) {
if (copy_to_user(buf, &event_count, count))
retval = -EFAULT;
-@@ -587,9 +588,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
+@@ -594,9 +595,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
static int uio_find_mem_index(struct vm_area_struct *vma)
{
struct uio_device *idev = vma->vm_private_data;
@@ -48611,7 +45933,52 @@ index 0e808cf..26c24ab 100644
return -1;
return (int)vma->vm_pgoff;
}
-@@ -818,7 +823,7 @@ int __uio_register_device(struct module *owner,
+@@ -606,13 +611,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
+ static void uio_vma_open(struct vm_area_struct *vma)
+ {
+ struct uio_device *idev = vma->vm_private_data;
+- idev->vma_count++;
++ local_inc(&idev->vma_count);
+ }
+
+ static void uio_vma_close(struct vm_area_struct *vma)
+ {
+ struct uio_device *idev = vma->vm_private_data;
+- idev->vma_count--;
++ local_dec(&idev->vma_count);
+ }
+
+ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -650,16 +655,27 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
+ {
+ struct uio_device *idev = vma->vm_private_data;
+ int mi = uio_find_mem_index(vma);
++ struct uio_mem *mem;
+ if (mi < 0)
+ return -EINVAL;
++ mem = idev->info->mem + mi;
+
+ vma->vm_flags |= VM_IO | VM_RESERVED;
+
+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
++ /*
++ * We cannot use the vm_iomap_memory() helper here,
++ * because vma->vm_pgoff is the map index we looked
++ * up above in uio_find_mem_index(), rather than an
++ * actual page offset into the mmap.
++ *
++ * So we just do the physical mmap without a page
++ * offset.
++ */
+ return remap_pfn_range(vma,
+ vma->vm_start,
+- idev->info->mem[mi].addr >> PAGE_SHIFT,
++ mem->addr >> PAGE_SHIFT,
+ vma->vm_end - vma->vm_start,
+ vma->vm_page_prot);
+ }
+@@ -821,7 +837,7 @@ int __uio_register_device(struct module *owner,
idev->owner = owner;
idev->info = info;
init_waitqueue_head(&idev->wait);
@@ -48621,7 +45988,7 @@ index 0e808cf..26c24ab 100644
ret = uio_get_minor(idev);
if (ret)
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
-index 8a7eb77..c00402f 100644
+index 9497171..bfeecaf 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
@@ -48634,10 +46001,10 @@ index 8a7eb77..c00402f 100644
pos += tmp;
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
-index 25a7bfc..57f3cf5 100644
+index d3448ca..d2864ca 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
-@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
if (printk_ratelimit())
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
__func__, vpi, vci);
@@ -48646,7 +46013,7 @@ index 25a7bfc..57f3cf5 100644
return;
}
-@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
if (length > ATM_MAX_AAL5_PDU) {
atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
__func__, length, vcc);
@@ -48655,7 +46022,7 @@ index 25a7bfc..57f3cf5 100644
goto out;
}
-@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
if (sarb->len < pdu_length) {
atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
__func__, pdu_length, sarb->len, vcc);
@@ -48672,7 +46039,7 @@ index 25a7bfc..57f3cf5 100644
goto out;
}
-@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -387,7 +387,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);
@@ -48681,7 +46048,7 @@ index 25a7bfc..57f3cf5 100644
goto out;
}
-@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
vcc->push(vcc, skb);
@@ -48690,7 +46057,7 @@ index 25a7bfc..57f3cf5 100644
out:
skb_trim(sarb, 0);
}
-@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
+@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
usbatm_pop(vcc, skb);
@@ -48699,7 +46066,7 @@ index 25a7bfc..57f3cf5 100644
skb = skb_dequeue(&instance->sndqueue);
}
-@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
+@@ -773,11 +773,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",
@@ -48717,7 +46084,7 @@ index 25a7bfc..57f3cf5 100644
if (!left--) {
if (instance->disconnected)
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
-index 2a3bbdf..91d72cf 100644
+index 3440812..2a4ef1f 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -126,7 +126,7 @@ static const char format_endpt[] =
@@ -48738,7 +46105,7 @@ index 2a3bbdf..91d72cf 100644
wake_up(&device_event.wait);
}
-@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
+@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
poll_wait(file, &device_event.wait, wait);
@@ -48748,10 +46115,10 @@ index 2a3bbdf..91d72cf 100644
file->f_version = event_count;
return POLLIN | POLLRDNORM;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index f20a044..d1059aa 100644
+index 032e5a6..bc422e4 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
-@@ -1552,7 +1552,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
+@@ -1475,7 +1475,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
*/
usb_get_urb(urb);
atomic_inc(&urb->use_count);
@@ -48760,7 +46127,7 @@ index f20a044..d1059aa 100644
usbmon_urb_submit(&hcd->self, urb);
/* NOTE requirements on root-hub callers (usbfs and the hub
-@@ -1579,7 +1579,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
+@@ -1502,7 +1502,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);
@@ -48770,53 +46137,52 @@ index f20a044..d1059aa 100644
wake_up(&usb_kill_urb_queue);
usb_put_urb(urb);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 879651c..87e0131 100644
+index a5ea85f..6530989 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -27,6 +27,7 @@
+@@ -25,6 +25,7 @@
+ #include <linux/mutex.h>
#include <linux/freezer.h>
#include <linux/random.h>
- #include <linux/pm_qos.h>
+#include <linux/grsecurity.h>
#include <asm/uaccess.h>
#include <asm/byteorder.h>
-@@ -4435,6 +4436,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
- goto done;
+@@ -3405,6 +3406,9 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
return;
}
-+
+
+ if (gr_handle_new_usb())
+ goto done;
+
- if (hub_is_superspeed(hub->hdev))
- unit_load = 150;
- else
+ for (i = 0; i < SET_CONFIG_TRIES; i++) {
+
+ /* reallocate for each attempt, since references
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
-index 82927e1..4993dbf 100644
+index ab11ca3c..2df783d 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -129,7 +129,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
- * Return: If successful, the number of bytes transferred. Otherwise, a negative
- * error number.
+ * method can wait for it to complete. Since you don't have a handle on the
+ * URB used, you can't cancel the request.
*/
-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
__u8 requesttype, __u16 value, __u16 index, void *data,
__u16 size, int timeout)
{
-@@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
- * If successful, 0. Otherwise a negative error number. The number of actual
- * bytes transferred will be stored in the @actual_length paramater.
+@@ -182,7 +182,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
+ * complete. Since you don't have a handle on the URB used, you can't cancel
+ * the request.
*/
-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
void *data, int len, int *actual_length, int timeout)
{
return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
-@@ -221,7 +221,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
- * bytes transferred will be stored in the @actual_length paramater.
- *
+@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
+ * interrupt endpoints. We will take the liberty of creating an interrupt URB
+ * (with the default interval) if the target is an interrupt endpoint.
*/
-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
@@ -48824,49 +46190,36 @@ index 82927e1..4993dbf 100644
{
struct urb *urb;
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
-index 6d2c8ed..3a794ca 100644
+index 662c0cf..6880fbb 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
-@@ -236,7 +236,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
+@@ -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_RO(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 0a6ee2e..6f8d7e8 100644
+index 73cd900..40502a4 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
-@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
+@@ -396,7 +396,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
+ dev->dev.dma_mask = bus->controller->dma_mask;
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/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
-index 5452c0f..34c9145 100644
---- a/drivers/usb/dwc3/gadget.c
-+++ b/drivers/usb/dwc3/gadget.c
-@@ -532,8 +532,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
- if (!usb_endpoint_xfer_isoc(desc))
- return 0;
-
-- memset(&trb_link, 0, sizeof(trb_link));
--
- /* Link TRB for ISOC. The HWO bit is never reset */
- trb_st_hw = &dep->trb_pool[0];
-
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
-index 5e29dde..eca992f 100644
+index 347bb05..63e1b73 100644
--- a/drivers/usb/early/ehci-dbgp.c
+++ b/drivers/usb/early/ehci-dbgp.c
-@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
+@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
#ifdef CONFIG_KGDB
static struct kgdb_io kgdbdbgp_io_ops;
@@ -48876,7 +46229,7 @@ index 5e29dde..eca992f 100644
#else
#define dbgp_kgdb_mode (0)
#endif
-@@ -1047,6 +1048,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
+@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
.write_char = kgdbdbgp_write_char,
};
@@ -48890,7 +46243,7 @@ index 5e29dde..eca992f 100644
static int kgdbdbgp_wait_time;
static int __init kgdbdbgp_parse_config(char *str)
-@@ -1062,8 +1070,10 @@ static int __init kgdbdbgp_parse_config(char *str)
+@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
ptr++;
kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
}
@@ -48903,115 +46256,63 @@ index 5e29dde..eca992f 100644
return 0;
}
-diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
-index b369292..9f3ba40 100644
---- a/drivers/usb/gadget/u_serial.c
-+++ b/drivers/usb/gadget/u_serial.c
-@@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
- spin_lock_irq(&port->port_lock);
-
- /* already open? Great. */
-- if (port->port.count) {
-+ if (atomic_read(&port->port.count)) {
- status = 0;
-- port->port.count++;
-+ atomic_inc(&port->port.count);
-
- /* currently opening/closing? wait ... */
- } else if (port->openclose) {
-@@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
- tty->driver_data = port;
- port->port.tty = tty;
-
-- port->port.count = 1;
-+ atomic_set(&port->port.count, 1);
- port->openclose = false;
-
- /* if connected, start the I/O stream */
-@@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
-
- spin_lock_irq(&port->port_lock);
-
-- if (port->port.count != 1) {
-- if (port->port.count == 0)
-+ if (atomic_read(&port->port.count) != 1) {
-+ if (atomic_read(&port->port.count) == 0)
- WARN_ON(1);
- else
-- --port->port.count;
-+ atomic_dec(&port->port.count);
- goto exit;
+diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
+index 0e641a1..49e6ac7 100644
+--- a/drivers/usb/gadget/f_fs.c
++++ b/drivers/usb/gadget/f_fs.c
+@@ -1212,6 +1212,7 @@ static struct file_system_type ffs_fs_type = {
+ .mount = ffs_fs_mount,
+ .kill_sb = ffs_fs_kill_sb,
+ };
++MODULE_ALIAS_FS("functionfs");
+
+
+ /* Driver's main init/cleanup functions *************************************/
+diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
+index db2d607..3a25028 100644
+--- a/drivers/usb/gadget/file_storage.c
++++ b/drivers/usb/gadget/file_storage.c
+@@ -3329,18 +3329,20 @@ static int __init fsg_bind(struct usb_gadget *gadget)
+ if ((rc = check_parameters(fsg)) != 0)
+ goto out;
+
++ pax_open_kernel();
+ if (mod_data.removable) { // Enable the store_xxx attributes
+- dev_attr_file.attr.mode = 0644;
+- dev_attr_file.store = fsg_store_file;
++ *(mode_t *)&dev_attr_file.attr.mode = 0644;
++ *(void **)&dev_attr_file.store = fsg_store_file;
+ if (!mod_data.cdrom) {
+- dev_attr_ro.attr.mode = 0644;
+- dev_attr_ro.store = fsg_store_ro;
++ *(mode_t *)&dev_attr_ro.attr.mode = 0644;
++ *(void **)&dev_attr_ro.store = fsg_store_ro;
+ }
}
-@@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
- * and sleep if necessary
- */
- port->openclose = true;
-- port->port.count = 0;
-+ atomic_set(&port->port.count, 0);
-
- gser = port->port_usb;
- if (gser && gser->disconnect)
-@@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
- int cond;
-
- spin_lock_irq(&port->port_lock);
-- cond = (port->port.count == 0) && !port->openclose;
-+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
- spin_unlock_irq(&port->port_lock);
- return cond;
- }
-@@ -1209,7 +1209,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).
- */
-- if (port->port.count) {
-+ if (atomic_read(&port->port.count)) {
- pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
- gs_start_io(port);
- if (gser->connect)
-@@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
-
- port->port_usb = NULL;
- gser->ioport = NULL;
-- if (port->port.count > 0 || port->openclose) {
-+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
- wake_up_interruptible(&port->drain_wait);
- if (port->port.tty)
- tty_hangup(port->port.tty);
-@@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
-
- /* finally, free any unused/unusable I/O buffers */
- spin_lock_irqsave(&port->port_lock, flags);
-- if (port->port.count == 0 && !port->openclose)
-+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
- gs_buf_free(&port->port_write_buf);
- gs_free_requests(gser->out, &port->read_pool, NULL);
- gs_free_requests(gser->out, &port->read_queue, NULL);
-diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
-index 835fc08..f8b22bf 100644
---- a/drivers/usb/host/ehci-hub.c
-+++ b/drivers/usb/host/ehci-hub.c
-@@ -762,7 +762,7 @@ static struct urb *request_single_step_set_feature_urb(
- urb->transfer_flags = URB_DIR_IN;
- usb_get_urb(urb);
- atomic_inc(&urb->use_count);
-- atomic_inc(&urb->dev->urbnum);
-+ atomic_inc_unchecked(&urb->dev->urbnum);
- urb->setup_dma = dma_map_single(
- hcd->self.controller,
- urb->setup_packet,
-@@ -829,7 +829,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
- urb->status = -EINPROGRESS;
- usb_get_urb(urb);
- atomic_inc(&urb->use_count);
-- atomic_inc(&urb->dev->urbnum);
-+ atomic_inc_unchecked(&urb->dev->urbnum);
- retval = submit_single_step_set_feature(hcd, urb, 0);
- if (!retval && !wait_for_completion_timeout(&done,
- msecs_to_jiffies(2000))) {
+ /* Only for removable media? */
+- dev_attr_nofua.attr.mode = 0644;
+- dev_attr_nofua.store = fsg_store_nofua;
++ *(mode_t *)&dev_attr_nofua.attr.mode = 0644;
++ *(void **)&dev_attr_nofua.store = fsg_store_nofua;
++ pax_close_kernel();
+
+ /* Find out how many LUNs there should be */
+ i = mod_data.nluns;
+diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
+index 7138540..2370195 100644
+--- a/drivers/usb/gadget/inode.c
++++ b/drivers/usb/gadget/inode.c
+@@ -2121,6 +2121,7 @@ static struct file_system_type gadgetfs_type = {
+ .mount = gadgetfs_mount,
+ .kill_sb = gadgetfs_kill_sb,
+ };
++MODULE_ALIAS_FS("gadgetfs");
+
+ /*----------------------------------------------------------------------*/
+
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
-index ba6a5d6..f88f7f3 100644
+index 9f7003e..b1db1b6 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -83,7 +83,7 @@ struct appledisplay {
@@ -49033,37 +46334,10 @@ index ba6a5d6..f88f7f3 100644
props.type = BACKLIGHT_RAW;
props.max_brightness = 0xff;
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
-index c69bb50..215ef37 100644
+index 1ee6b2a..523c0ae 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
-@@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options)
-
- info->port = port;
-
-- ++port->port.count;
-+ atomic_inc(&port->port.count);
- if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
- if (serial->type->set_termios) {
- /*
-@@ -170,7 +170,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 */
-- --port->port.count;
-+ atomic_dec(&port->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;
-@@ -183,7 +183,7 @@ static int usb_console_setup(struct console *co, char *options)
- free_tty:
- kfree(tty);
- reset_open_count:
-- port->port.count = 0;
-+ atomic_set(&port->port.count, 0);
- usb_autopm_put_interface(serial->interface);
- error_get_interface:
- usb_serial_put(serial);
-@@ -194,7 +194,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -200,7 +200,7 @@ static int usb_console_setup(struct console *co, char *options)
static void usb_console_write(struct console *co,
const char *buf, unsigned count)
{
@@ -49072,6 +46346,19 @@ index c69bb50..215ef37 100644
struct usb_serial_port *port = info->port;
struct usb_serial *serial;
int retval = -ENODEV;
+diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
+index e39b188..1fffda8 100644
+--- a/drivers/usb/storage/realtek_cr.c
++++ b/drivers/usb/storage/realtek_cr.c
+@@ -430,7 +430,7 @@ static int rts51x_read_status(struct us_data *us,
+
+ buf = kmalloc(len, GFP_NOIO);
+ if (buf == NULL)
+- return USB_STOR_TRANSPORT_ERROR;
++ return -ENOMEM;
+
+ US_DEBUGP("%s, lun = %d\n", __func__, lun);
+
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 75f70f0..d467e1a 100644
--- a/drivers/usb/storage/usb.h
@@ -49086,32 +46373,32 @@ index 75f70f0..d467e1a 100644
/* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
-index cf250c2..ad9d904 100644
+index d6bea3e..60b250e 100644
--- a/drivers/usb/wusbcore/wa-hc.h
+++ b/drivers/usb/wusbcore/wa-hc.h
-@@ -199,7 +199,7 @@ struct wahc {
+@@ -192,7 +192,7 @@ struct wahc {
+ struct list_head xfer_delayed_list;
spinlock_t xfer_list_lock;
- struct work_struct xfer_enqueue_work;
- struct work_struct xfer_error_work;
+ struct work_struct xfer_work;
- atomic_t xfer_id_count;
+ atomic_unchecked_t xfer_id_count;
};
-@@ -255,7 +255,7 @@ static inline void wa_init(struct wahc *wa)
+@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
+ INIT_LIST_HEAD(&wa->xfer_delayed_list);
spin_lock_init(&wa->xfer_list_lock);
- INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
- INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
+ INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
- atomic_set(&wa->xfer_id_count, 1);
+ atomic_set_unchecked(&wa->xfer_id_count, 1);
}
/**
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
-index 6ad02f5..cc52c8b 100644
+index 57c01ab..8a05959 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
-@@ -299,7 +299,7 @@ out:
+@@ -296,7 +296,7 @@ out:
*/
static void wa_xfer_id_init(struct wa_xfer *xfer)
{
@@ -49120,34 +46407,21 @@ index 6ad02f5..cc52c8b 100644
}
/*
-diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
-index 1eab4ac..e21efc9 100644
---- a/drivers/vfio/vfio.c
-+++ b/drivers/vfio/vfio.c
-@@ -488,7 +488,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
- return 0;
-
- /* TODO Prevent device auto probing */
-- WARN("Device %s added to live group %d!\n", dev_name(dev),
-+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
- iommu_group_id(group->iommu_group));
-
- return 0;
-diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
-index 5174eba..86e764a 100644
---- a/drivers/vhost/vringh.c
-+++ b/drivers/vhost/vringh.c
-@@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
-
- static inline int putu16_kern(u16 *p, u16 val)
- {
-- ACCESS_ONCE(*p) = val;
-+ ACCESS_ONCE_RW(*p) = val;
+diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
+index be32b1b..b5f6c08 100644
+--- a/drivers/vhost/vhost.c
++++ b/drivers/vhost/vhost.c
+@@ -631,7 +631,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
return 0;
}
+-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;
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
-index e43401a..dd49b3f 100644
+index c22e8d3..12c48b0 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
@@ -49160,23 +46434,23 @@ index e43401a..dd49b3f 100644
err = -ENOSPC;
}
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
-index a4dfe8c..297ddd9 100644
+index b0b2ac3..89a4399 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
-@@ -149,7 +149,7 @@ enum {
+@@ -148,7 +148,7 @@ enum {
};
/* Must match above enum */
--static char * const r128_family[] = {
-+static const char * const r128_family[] = {
+-static const char *r128_family[] __devinitdata = {
++static const char *r128_family[] __devinitconst = {
"AGP",
"PCI",
"PRO AGP",
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
-index 9b0f12c..024673d 100644
+index 44bdce4..a79c55f 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
-@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
+@@ -1325,10 +1325,14 @@ static int atyfb_set_par(struct fb_info *info)
par->accel_flags = var->accel_flags; /* hack */
if (var->accel_flags) {
@@ -49194,7 +46468,7 @@ index 9b0f12c..024673d 100644
}
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
-index 95ec042..e6affdd 100644
+index 46f72ed..107788d 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -7,6 +7,7 @@
@@ -49205,7 +46479,7 @@ index 95ec042..e6affdd 100644
#ifdef __sparc__
#include <asm/fbio.h>
-@@ -208,7 +209,9 @@ int aty_init_cursor(struct fb_info *info)
+@@ -208,7 +209,9 @@ int __devinit aty_init_cursor(struct fb_info *info)
info->sprite.buf_align = 16; /* and 64 lines tall. */
info->sprite.flags = FB_PIXMAP_IO;
@@ -49216,8 +46490,110 @@ index 95ec042..e6affdd 100644
return 0;
}
+diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
+index 649cb35..1be8b5d 100644
+--- a/drivers/video/au1100fb.c
++++ b/drivers/video/au1100fb.c
+@@ -387,39 +387,13 @@ void au1100fb_fb_rotate(struct fb_info *fbi, int angle)
+ int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
+ {
+ struct au1100fb_device *fbdev;
+- unsigned int len;
+- unsigned long start=0, off;
+
+ fbdev = to_au1100fb_device(fbi);
+
+- if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
+- return -EINVAL;
+- }
+-
+- start = fbdev->fb_phys & PAGE_MASK;
+- len = PAGE_ALIGN((start & ~PAGE_MASK) + fbdev->fb_len);
+-
+- off = vma->vm_pgoff << PAGE_SHIFT;
+-
+- if ((vma->vm_end - vma->vm_start + off) > len) {
+- return -EINVAL;
+- }
+-
+- off += start;
+- vma->vm_pgoff = off >> PAGE_SHIFT;
+-
+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+ pgprot_val(vma->vm_page_prot) |= (6 << 9); //CCA=6
+
+- vma->vm_flags |= VM_IO;
+-
+- if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+- vma->vm_end - vma->vm_start,
+- vma->vm_page_prot)) {
+- return -EAGAIN;
+- }
+-
+- return 0;
++ return vm_iomap_memory(vma, fbdev->fb_phys, fbdev->fb_len);
+ }
+
+ static struct fb_ops au1100fb_ops =
+diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
+index 7200559..5bd7d88 100644
+--- a/drivers/video/au1200fb.c
++++ b/drivers/video/au1200fb.c
+@@ -1216,38 +1216,13 @@ static int au1200fb_fb_blank(int blank_mode, struct fb_info *fbi)
+ * method mainly to allow the use of the TLB streaming flag (CCA=6)
+ */
+ static int au1200fb_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
+-
+ {
+- unsigned int len;
+- unsigned long start=0, off;
+ struct au1200fb_device *fbdev = info->par;
+
+- if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
+- return -EINVAL;
+- }
+-
+- start = fbdev->fb_phys & PAGE_MASK;
+- len = PAGE_ALIGN((start & ~PAGE_MASK) + fbdev->fb_len);
+-
+- off = vma->vm_pgoff << PAGE_SHIFT;
+-
+- if ((vma->vm_end - vma->vm_start + off) > len) {
+- return -EINVAL;
+- }
+-
+- off += start;
+- vma->vm_pgoff = off >> PAGE_SHIFT;
+-
+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+ pgprot_val(vma->vm_page_prot) |= _CACHE_MASK; /* CCA=7 */
+
+- vma->vm_flags |= VM_IO;
+-
+- return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+- vma->vm_end - vma->vm_start,
+- vma->vm_page_prot);
+-
+- return 0;
++ return vm_iomap_memory(vma, fbdev->fb_phys, fbdev->fb_len);
+ }
+
+ static void set_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata)
+diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
+index 7363c1b..b69ad66 100644
+--- a/drivers/video/backlight/backlight.c
++++ b/drivers/video/backlight/backlight.c
+@@ -303,7 +303,7 @@ struct backlight_device *backlight_device_register(const char *name,
+ new_bd->dev.class = backlight_class;
+ new_bd->dev.parent = parent;
+ new_bd->dev.release = bl_device_release;
+- dev_set_name(&new_bd->dev, name);
++ dev_set_name(&new_bd->dev, "%s", name);
+ dev_set_drvdata(&new_bd->dev, devdata);
+
+ /* Set default properties */
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
-index bca6ccc..252107e 100644
+index 72dd555..5f9bfbe 100644
--- a/drivers/video/backlight/kb3886_bl.c
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
@@ -49229,11 +46605,50 @@ index bca6ccc..252107e 100644
{
.ident = "Sahara Touch-iT",
.matches = {
+diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
+index 71a11ca..86afe4b 100644
+--- a/drivers/video/backlight/lcd.c
++++ b/drivers/video/backlight/lcd.c
+@@ -209,7 +209,7 @@ struct lcd_device *lcd_device_register(const char *name, struct device *parent,
+ new_ld->dev.class = lcd_class;
+ new_ld->dev.parent = parent;
+ new_ld->dev.release = lcd_device_release;
+- dev_set_name(&new_ld->dev, name);
++ dev_set_name(&new_ld->dev, "%s", name);
+ dev_set_drvdata(&new_ld->dev, devdata);
+
+ rc = device_register(&new_ld->dev);
+diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
+index e132157..516db70 100644
+--- a/drivers/video/backlight/s6e63m0.c
++++ b/drivers/video/backlight/s6e63m0.c
+@@ -690,7 +690,7 @@ static ssize_t s6e63m0_sysfs_store_gamma_mode(struct device *dev,
+ struct backlight_device *bd = NULL;
+ int brightness, rc;
+
+- rc = strict_strtoul(buf, 0, (unsigned long *)&lcd->gamma_mode);
++ rc = kstrtouint(buf, 0, &lcd->gamma_mode);
+ if (rc < 0)
+ return rc;
+
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index 6b4fb5c..385e560 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -450,7 +450,7 @@ static int __init fb_console_setup(char *this_opt)
+
+ while ((options = strsep(&this_opt, ",")) != NULL) {
+ if (!strncmp(options, "font:", 5))
+- strcpy(fontname, options + 5);
++ strlcpy(fontname, options + 5, sizeof(fontname));
+
+ if (!strncmp(options, "scrollback:", 11)) {
+ options += 11;
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
-index 900aa4e..6d49418 100644
+index c27e153..5beb687 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
-@@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
+@@ -200,7 +200,9 @@ void fb_deferred_io_init(struct fb_info *info)
BUG_ON(!fbdefio);
mutex_init(&fbdefio->lock);
@@ -49244,7 +46659,7 @@ index 900aa4e..6d49418 100644
INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
INIT_LIST_HEAD(&fbdefio->pagelist);
if (fbdefio->delay == 0) /* set a default of 1 s */
-@@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
+@@ -231,7 +233,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
page->mapping = NULL;
}
@@ -49253,11 +46668,25 @@ index 900aa4e..6d49418 100644
mutex_destroy(&fbdefio->lock);
}
EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
+diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
+index 5c3960d..15cf8fc 100644
+--- a/drivers/video/fbcmap.c
++++ b/drivers/video/fbcmap.c
+@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
+ rc = -ENODEV;
+ goto out;
+ }
+- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
+- !info->fbops->fb_setcmap)) {
++ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
+ rc = -EINVAL;
+ goto out1;
+ }
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
-index dacaf74..8478a46 100644
+index 0a22808..130eafe 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
-@@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
+@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
image->dx += image->width + 8;
}
} else if (rotate == FB_ROTATE_UD) {
@@ -49266,7 +46695,7 @@ index dacaf74..8478a46 100644
info->fbops->fb_imageblit(info, image);
image->dx -= image->width + 8;
}
-@@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
+@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
image->dy += image->height + 8;
}
} else if (rotate == FB_ROTATE_CCW) {
@@ -49275,7 +46704,7 @@ index dacaf74..8478a46 100644
info->fbops->fb_imageblit(info, image);
image->dy -= image->height + 8;
}
-@@ -1175,7 +1175,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
+@@ -1143,7 +1143,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
return -EFAULT;
if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
return -EINVAL;
@@ -49284,28 +46713,41 @@ index dacaf74..8478a46 100644
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c
-index 8d456dc..b4fa44b 100644
---- a/drivers/video/hyperv_fb.c
-+++ b/drivers/video/hyperv_fb.c
-@@ -233,7 +233,7 @@ static uint screen_fb_size;
- static inline int synthvid_send(struct hv_device *hdev,
- struct synthvid_msg *msg)
- {
-- static atomic64_t request_id = ATOMIC64_INIT(0);
-+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
- int ret;
-
- msg->pipe_hdr.type = PIPE_MSG_DATA;
-@@ -241,7 +241,7 @@ static inline int synthvid_send(struct hv_device *hdev,
-
- ret = vmbus_sendpacket(hdev->channel, msg,
- msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
-- atomic64_inc_return(&request_id),
-+ atomic64_inc_return_unchecked(&request_id),
- VM_PKT_DATA_INBAND, 0);
+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;
+ }
- if (ret)
+-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
@@ -49318,12 +46760,39 @@ index 7672d2e..b56437f 100644
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 318f6fb..9a389c1 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..2630570 100644
+index 3c14e43..eafa544 100644
--- a/drivers/video/logo/logo_linux_clut224.ppm
+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -2,1603 +2,1123 @@ P3
- # Standard 224-color Linux logo
+@@ -1,1604 +1,1123 @@
+ P3
+-# Standard 224-color Linux logo
80 80
255
- 0 0 0 0 0 0 0 0 0 0 0 0
@@ -52076,7 +49545,7 @@ index fe92eed..106e085 100644
outreg(draw, GDC_REG_DRAW_BASE, 0);
outreg(draw, GDC_REG_MODE_MISC, 0x8000);
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
-index ff22871..b129bed 100644
+index 081dc47..6e20d0b 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
@@ -52111,7 +49580,7 @@ index ff22871..b129bed 100644
info->pixmap.scan_align = 1;
info->flags |= FBINFO_HWACCEL_DISABLED;
info->flags &= ~FBINFO_READS_FAST;
-@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
+@@ -1173,8 +1177,11 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
info->pixmap.size = 8 * 1024;
info->pixmap.flags = FB_PIXMAP_SYSTEM;
@@ -52125,11 +49594,24 @@ index ff22871..b129bed 100644
info->var.accel_flags = (!noaccel);
+diff --git a/drivers/video/output.c b/drivers/video/output.c
+index 0d6f2cd..6285b97 100644
+--- a/drivers/video/output.c
++++ b/drivers/video/output.c
+@@ -97,7 +97,7 @@ struct output_device *video_output_register(const char *name,
+ new_dev->props = op;
+ new_dev->dev.class = &video_output_class;
+ new_dev->dev.parent = dev;
+- dev_set_name(&new_dev->dev, name);
++ dev_set_name(&new_dev->dev, "%s", name);
+ dev_set_drvdata(&new_dev->dev, devdata);
+ ret_code = device_register(&new_dev->dev);
+ if (ret_code) {
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
-index 05c2dc3..ea1f391 100644
+index 28b1c6c..b9939d9 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
-@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
+@@ -883,8 +883,10 @@ s1d13xxxfb_probe(struct platform_device *pdev)
switch(prod_id) {
case S1D13506_PROD_ID: /* activate acceleration */
@@ -52143,10 +49625,10 @@ index 05c2dc3..ea1f391 100644
FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
break;
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
-index e188ada..aac63c8 100644
+index dd9533a..aff3199 100644
--- a/drivers/video/smscufx.c
+++ b/drivers/video/smscufx.c
-@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
+@@ -1172,7 +1172,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
fb_deferred_io_cleanup(info);
kfree(info->fbdefio);
info->fbdefio = NULL;
@@ -52158,10 +49640,10 @@ index e188ada..aac63c8 100644
pr_debug("released /dev/fb%d user=%d count=%d",
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
-index d2e5bc3..4cb05d1 100644
+index cb5988f..439ecb0 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
-@@ -623,11 +623,11 @@ static 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:
@@ -52177,7 +49659,7 @@ index d2e5bc3..4cb05d1 100644
>> 10)), /* Kcycles */
&dev->cpu_kcycles_used);
-@@ -748,11 +748,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:
@@ -52193,7 +49675,7 @@ index d2e5bc3..4cb05d1 100644
>> 10)), /* Kcycles */
&dev->cpu_kcycles_used);
}
-@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
+@@ -986,7 +986,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
fb_deferred_io_cleanup(info);
kfree(info->fbdefio);
info->fbdefio = NULL;
@@ -52204,7 +49686,7 @@ index d2e5bc3..4cb05d1 100644
}
pr_warn("released /dev/fb%d user=%d count=%d\n",
-@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
+@@ -1368,7 +1370,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",
@@ -52213,7 +49695,7 @@ index d2e5bc3..4cb05d1 100644
}
static ssize_t metrics_bytes_identical_show(struct device *fbdev,
-@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
+@@ -1376,7 +1378,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",
@@ -52222,7 +49704,7 @@ index d2e5bc3..4cb05d1 100644
}
static ssize_t metrics_bytes_sent_show(struct device *fbdev,
-@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
+@@ -1384,7 +1386,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",
@@ -52231,7 +49713,7 @@ index d2e5bc3..4cb05d1 100644
}
static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
-@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
+@@ -1392,7 +1394,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",
@@ -52240,7 +49722,7 @@ index d2e5bc3..4cb05d1 100644
}
static ssize_t edid_show(
-@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
+@@ -1449,10 +1451,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;
@@ -52256,7 +49738,7 @@ index d2e5bc3..4cb05d1 100644
return count;
}
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
-index 7aec6f3..e3b2d55 100644
+index 8813588..65454ec 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -19,6 +19,7 @@
@@ -52267,7 +49749,25 @@ index 7aec6f3..e3b2d55 100644
#include <video/edid.h>
#include <video/uvesafb.h>
#ifdef CONFIG_X86
-@@ -566,10 +567,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
+@@ -73,7 +74,7 @@ static void uvesafb_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *ns
+ struct uvesafb_task *utask;
+ struct uvesafb_ktask *task;
+
+- if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN))
+ return;
+
+ if (msg->seq >= UVESAFB_TASKS_MAX)
+@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
+ NULL,
+ };
+
+- return call_usermodehelper(v86d_path, argv, envp, 1);
++ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
+ }
+
+ /*
+@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
par->pmi_setpal = par->ypan = 0;
} else {
@@ -52300,15 +49800,15 @@ index 7aec6f3..e3b2d55 100644
printk(KERN_INFO "uvesafb: protected mode interface info at "
"%04x:%04x\n",
(u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -814,13 +837,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
+@@ -816,13 +839,14 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
par->ypan = ypan;
if (par->pmi_setpal || par->ypan) {
+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
if (__supported_pte_mask & _PAGE_NX) {
par->pmi_setpal = par->ypan = 0;
- printk(KERN_WARNING "uvesafb: NX protection is active, "
- "better not use the PMI.\n");
+ printk(KERN_WARNING "uvesafb: NX protection is actively."
+ "We have better not to use the PMI.\n");
- } else {
+ } else
+#endif
@@ -52317,7 +49817,7 @@ index 7aec6f3..e3b2d55 100644
}
#else
/* The protected mode interface is not available on non-x86. */
-@@ -1454,8 +1478,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
+@@ -1449,8 +1473,11 @@ static void __devinit uvesafb_init_info(struct fb_info *info,
info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
/* Disable blanking if the user requested so. */
@@ -52331,7 +49831,7 @@ index 7aec6f3..e3b2d55 100644
/*
* Find out how much IO memory is required for the mode with
-@@ -1531,8 +1558,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
+@@ -1526,8 +1553,11 @@ static void __devinit uvesafb_init_info(struct fb_info *info,
info->flags = FBINFO_FLAG_DEFAULT |
(par->ypan ? FBINFO_HWACCEL_YPAN : 0);
@@ -52344,8 +49844,8 @@ index 7aec6f3..e3b2d55 100644
+ }
}
- static void uvesafb_init_mtrr(struct fb_info *info)
-@@ -1796,6 +1826,11 @@ out:
+ static void __devinit uvesafb_init_mtrr(struct fb_info *info)
+@@ -1828,6 +1858,11 @@ out:
if (par->vbe_modes)
kfree(par->vbe_modes);
@@ -52357,7 +49857,7 @@ index 7aec6f3..e3b2d55 100644
framebuffer_release(info);
return err;
}
-@@ -1823,6 +1858,12 @@ static int uvesafb_remove(struct platform_device *dev)
+@@ -1854,6 +1889,12 @@ static int uvesafb_remove(struct platform_device *dev)
kfree(par->vbe_state_orig);
if (par->vbe_state_saved)
kfree(par->vbe_state_saved);
@@ -52371,7 +49871,7 @@ index 7aec6f3..e3b2d55 100644
framebuffer_release(info);
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
-index bd83233..7d8a5aa 100644
+index 501b340..d80aa17 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -9,6 +9,7 @@
@@ -52382,8 +49882,8 @@ index bd83233..7d8a5aa 100644
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/string.h>
-@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
- static int vram_total; /* Set total amount of memory */
+@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
+ static int vram_total __initdata; /* Set total amount of memory */
static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
-static void (*pmi_start)(void) __read_mostly;
@@ -52393,15 +49893,15 @@ index bd83233..7d8a5aa 100644
static int depth __read_mostly;
static int vga_compat __read_mostly;
/* --------------------------------------------------------------------- */
-@@ -234,6 +235,7 @@ static int vesafb_probe(struct platform_device *dev)
+@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
+ unsigned int size_vmode;
unsigned int size_remap;
unsigned int size_total;
- char *option = NULL;
+ void *pmi_code = NULL;
- /* ignore error return of fb_get_options */
- fb_get_options("vesafb", &option);
-@@ -280,10 +282,6 @@ static int vesafb_probe(struct platform_device *dev)
+ if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
+ return -ENODEV;
+@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
size_remap = size_total;
vesafb_fix.smem_len = size_remap;
@@ -52412,7 +49912,7 @@ index bd83233..7d8a5aa 100644
if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
printk(KERN_WARNING
"vesafb: cannot reserve video memory at 0x%lx\n",
-@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
+@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
@@ -52436,7 +49936,7 @@ index bd83233..7d8a5aa 100644
}
if (screen_info.vesapm_seg < 0xc000)
-@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
+@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
if (ypan || pmi_setpal) {
unsigned short *pmi_base;
@@ -52464,7 +49964,7 @@ index bd83233..7d8a5aa 100644
printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
if (pmi_base[3]) {
printk(KERN_INFO "vesafb: pmi: ports = ");
-@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
+@@ -472,8 +498,11 @@ static int __init vesafb_probe(struct platform_device *dev)
info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
(ypan ? FBINFO_HWACCEL_YPAN : 0);
@@ -52478,7 +49978,7 @@ index bd83233..7d8a5aa 100644
if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
err = -ENOMEM;
-@@ -493,6 +522,11 @@ static int vesafb_probe(struct platform_device *dev)
+@@ -488,6 +517,11 @@ static int __init vesafb_probe(struct platform_device *dev)
info->node, info->fix.id);
return 0;
err:
@@ -52503,6 +50003,18 @@ index 88714ae..16c2e11 100644
static inline u32 get_pll_internal_frequency(u32 ref_freq,
+diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c
+index 1aa3897..3a6b3f1 100644
+--- a/drivers/xen/xenfs/super.c
++++ b/drivers/xen/xenfs/super.c
+@@ -116,6 +116,7 @@ static struct file_system_type xenfs_type = {
+ .mount = xenfs_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("xenfs");
+
+ static int __init xenfs_init(void)
+ {
diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
index fef20db..d28b1ab 100644
--- a/drivers/xen/xenfs/xenstored.c
@@ -52521,10 +50033,10 @@ index fef20db..d28b1ab 100644
return -ENOMEM;
return 0;
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
-index 9ff073f..05cef23 100644
+index 2524e4c..2962cc6a 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
-@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
+@@ -185,7 +185,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
retval = v9fs_file_write_internal(inode,
v9inode->writeback_fid,
@@ -52534,23 +50046,32 @@ index 9ff073f..05cef23 100644
if (retval > 0)
retval = 0;
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
-index 94de6d1..8d81256 100644
+index 879ed88..bc03a01 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
-@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -1286,7 +1286,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
{
- char *s = nd_get_link(nd);
+ const char *s = nd_get_link(nd);
- p9_debug(P9_DEBUG_VFS, " %s %s\n",
- dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
+ P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
+ IS_ERR(s) ? "<error>" : s);
+diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
+index c70251d..fe305fd 100644
+--- a/fs/9p/vfs_super.c
++++ b/fs/9p/vfs_super.c
+@@ -366,3 +366,4 @@ struct file_system_type v9fs_fs_type = {
+ .owner = THIS_MODULE,
+ .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT,
+ };
++MODULE_ALIAS_FS("9p");
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
-index 370b24c..ff0be7b 100644
+index 79e2ca7..5828ad1 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
-@@ -103,7 +103,7 @@ config HAVE_AOUT
+@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
tristate "Kernel support for a.out and ECOFF binaries"
@@ -52559,8 +50080,32 @@ index 370b24c..ff0be7b 100644
---help---
A.out (Assembler.OUTput) is a set of formats for libraries and
executables used in the earliest versions of UNIX. Linux used
+diff --git a/fs/adfs/super.c b/fs/adfs/super.c
+index c8bf36a..d7b2b33 100644
+--- a/fs/adfs/super.c
++++ b/fs/adfs/super.c
+@@ -516,6 +516,7 @@ static struct file_system_type adfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("adfs");
+
+ static int __init init_adfs_fs(void)
+ {
+diff --git a/fs/affs/super.c b/fs/affs/super.c
+index b31507d..5b42a3b 100644
+--- a/fs/affs/super.c
++++ b/fs/affs/super.c
+@@ -597,6 +597,7 @@ static struct file_system_type affs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("affs");
+
+ static int __init init_affs_fs(void)
+ {
diff --git a/fs/afs/inode.c b/fs/afs/inode.c
-index 789bc25..fafaeea 100644
+index d890ae3..5733a4b 100644
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
@@ -52581,24 +50126,69 @@ index 789bc25..fafaeea 100644
afs_iget5_autocell_test, afs_iget5_set,
&data);
if (!inode) {
+diff --git a/fs/afs/super.c b/fs/afs/super.c
+index 356dcf0..c0046cd 100644
+--- a/fs/afs/super.c
++++ b/fs/afs/super.c
+@@ -43,6 +43,7 @@ struct file_system_type afs_fs_type = {
+ .kill_sb = afs_kill_super,
+ .fs_flags = 0,
+ };
++MODULE_ALIAS_FS("afs");
+
+ static const struct super_operations afs_super_ops = {
+ .statfs = afs_statfs,
diff --git a/fs/aio.c b/fs/aio.c
-index 067e3d3..634a850 100644
+index 8cdd8ea..64197b4 100644
--- a/fs/aio.c
+++ b/fs/aio.c
-@@ -280,7 +280,7 @@ static int aio_setup_ring(struct kioctx *ctx)
+@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx *ctx)
size += sizeof(struct io_event) * nr_events;
+ nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
- nr_pages = PFN_UP(size);
- if (nr_pages < 0)
+ if (nr_pages <= 0)
return -EINVAL;
- file = anon_inode_getfile_private("[aio]", &aio_ring_fops, ctx, O_RDWR);
+ nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
+@@ -1461,18 +1461,19 @@ static ssize_t aio_fsync(struct kiocb *iocb)
+ static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
+ {
+ ssize_t ret;
++ struct iovec iovstack;
+
+ #ifdef CONFIG_COMPAT
+ if (compat)
+ ret = compat_rw_copy_check_uvector(type,
+ (struct compat_iovec __user *)kiocb->ki_buf,
+- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
++ kiocb->ki_nbytes, 1, &iovstack,
+ &kiocb->ki_iovec, 1);
+ else
+ #endif
+ ret = rw_copy_check_uvector(type,
+ (struct iovec __user *)kiocb->ki_buf,
+- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
++ kiocb->ki_nbytes, 1, &iovstack,
+ &kiocb->ki_iovec, 1);
+ if (ret < 0)
+ goto out;
+@@ -1481,6 +1482,10 @@ static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
+ if (ret < 0)
+ goto out;
+
++ if (kiocb->ki_iovec == &iovstack) {
++ kiocb->ki_inline_vec = iovstack;
++ kiocb->ki_iovec = &kiocb->ki_inline_vec;
++ }
+ kiocb->ki_nr_segs = kiocb->ki_nbytes;
+ 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 1449adb..a2038c2 100644
+index b8f55c4..4c2b80c 100644
--- a/fs/attr.c
+++ b/fs/attr.c
-@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
+@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
unsigned long limit;
limit = rlimit(RLIMIT_FSIZE);
@@ -52606,11 +50196,23 @@ index 1449adb..a2038c2 100644
if (limit != RLIM_INFINITY && offset > limit)
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
+diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c
+index c038727..4ba2927 100644
+--- a/fs/autofs4/init.c
++++ b/fs/autofs4/init.c
+@@ -26,6 +26,7 @@ static struct file_system_type autofs_fs_type = {
+ .mount = autofs_mount,
+ .kill_sb = autofs4_kill_sb,
+ };
++MODULE_ALIAS_FS("autofs");
+
+ static int __init init_autofs4_fs(void)
+ {
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
-index 689e40d..515cac5 100644
+index e1fbdee..69291a4 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
-@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
+@@ -60,7 +60,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
{
unsigned long sigpipe, flags;
mm_segment_t fs;
@@ -52618,8 +50220,8 @@ index 689e40d..515cac5 100644
+ const char __user *data = (const char __force_user *)addr;
ssize_t wr = 0;
- sigpipe = sigismember(¤t->pending.signal, SIGPIPE);
-@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
+ /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
+@@ -338,6 +338,10 @@ static int validate_request(struct autofs_wait_queue **wait,
return 1;
}
@@ -52630,7 +50232,7 @@ index 689e40d..515cac5 100644
int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
enum autofs_notify notify)
{
-@@ -373,7 +377,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
+@@ -371,7 +375,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))
@@ -52644,7 +50246,7 @@ index 689e40d..515cac5 100644
qstr.len = autofs4_getpath(sbi, dentry, &name);
if (!qstr.len) {
diff --git a/fs/befs/endian.h b/fs/befs/endian.h
-index 2722387..56059b5 100644
+index 2722387..c8dd2a7 100644
--- a/fs/befs/endian.h
+++ b/fs/befs/endian.h
@@ -11,7 +11,7 @@
@@ -52665,20 +50267,11 @@ index 2722387..56059b5 100644
fs32_to_cpu(const struct super_block *sb, fs32 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
-@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
- return (__force fs32)cpu_to_be32(n);
- }
-
--static inline u16
-+static inline u16 __intentional_overflow(-1)
- fs16_to_cpu(const struct super_block *sb, fs16 n)
- {
- if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
-index e9c75e2..1baece1 100644
+index 8342ca6..a9dca40 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
-@@ -514,7 +514,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
+@@ -503,7 +503,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) {
@@ -52687,8 +50280,28 @@ index e9c75e2..1baece1 100644
if (!IS_ERR(link))
kfree(link);
}
+@@ -937,6 +937,7 @@ static struct file_system_type befs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("befs");
+
+ static int __init
+ init_befs_fs(void)
+diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
+index 697af5b..ab6db36 100644
+--- a/fs/bfs/inode.c
++++ b/fs/bfs/inode.c
+@@ -470,6 +470,7 @@ static struct file_system_type bfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("bfs");
+
+ static int __init init_bfs_fs(void)
+ {
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
-index 89dec7f..361b0d75 100644
+index a6395bd..f1e376a 100644
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -16,6 +16,7 @@
@@ -52699,7 +50312,7 @@ index 89dec7f..361b0d75 100644
#include <linux/stat.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
-@@ -59,6 +60,8 @@ static int aout_core_dump(struct coredump_params *cprm)
+@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
#endif
# define START_STACK(u) ((void __user *)u.start_stack)
@@ -52708,7 +50321,7 @@ index 89dec7f..361b0d75 100644
fs = get_fs();
set_fs(KERNEL_DS);
has_dumped = 1;
-@@ -69,10 +72,12 @@ static int aout_core_dump(struct coredump_params *cprm)
+@@ -97,10 +100,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. */
@@ -52721,7 +50334,7 @@ index 89dec7f..361b0d75 100644
if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
dump.u_ssize = 0;
-@@ -233,6 +238,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
+@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
rlim = rlimit(RLIMIT_DATA);
if (rlim >= RLIM_INFINITY)
rlim = ~0;
@@ -52730,9 +50343,19 @@ index 89dec7f..361b0d75 100644
if (ex.a_data + ex.a_bss > rlim)
return -ENOMEM;
-@@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
+@@ -259,9 +266,37 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
+ current->mm->free_area_cache = current->mm->mmap_base;
+ current->mm->cached_hole_size = 0;
++ retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
++ if (retval < 0) {
++ /* Someone check-me: is this error path enough? */
++ send_sig(SIGKILL, current, 0);
++ return retval;
++ }
++
install_exec_creds(bprm);
+ current->flags &= ~PF_FORKNOEXEC;
+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
+ current->mm->pax_flags = 0UL;
@@ -52758,28 +50381,42 @@ index 89dec7f..361b0d75 100644
if (N_MAGIC(ex) == OMAGIC) {
unsigned long text_addr, map_size;
loff_t pos;
-@@ -322,7 +350,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
- }
+@@ -334,7 +369,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,
+ down_write(¤t->mm->mmap_sem);
+ error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
- PROT_READ | PROT_WRITE | PROT_EXEC,
+ PROT_READ | PROT_WRITE,
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
- if (error != N_DATADDR(ex)) {
+ up_write(¤t->mm->mmap_sem);
+@@ -352,13 +387,6 @@ beyond_if:
+ return retval;
+ }
+
+- retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
+- if (retval < 0) {
+- /* Someone check-me: is this error path enough? */
+- send_sig(SIGKILL, current, 0);
+- return retval;
+- }
+-
+ current->mm->start_stack =
+ (unsigned long) create_aout_tables((char __user *) bprm->p, bprm);
+ #ifdef __alpha__
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 4c94a79..f428019 100644
+index 8dd615c..65b7958 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
-@@ -34,6 +34,7 @@
+@@ -32,6 +32,7 @@
+ #include <linux/elf.h>
#include <linux/utsname.h>
#include <linux/coredump.h>
- #include <linux/sched.h>
+#include <linux/xattr.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-@@ -60,6 +61,14 @@ static int elf_core_dump(struct coredump_params *cprm);
+@@ -51,6 +52,14 @@ static int elf_core_dump(struct coredump_params *cprm);
#define elf_core_dump NULL
#endif
@@ -52794,7 +50431,7 @@ index 4c94a79..f428019 100644
#if ELF_EXEC_PAGESIZE > PAGE_SIZE
#define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
#else
-@@ -79,6 +88,15 @@ static struct linux_binfmt elf_format = {
+@@ -70,6 +79,15 @@ static struct linux_binfmt elf_format = {
.load_binary = load_elf_binary,
.load_shlib = load_elf_library,
.core_dump = elf_core_dump,
@@ -52810,7 +50447,7 @@ index 4c94a79..f428019 100644
.min_coredump = ELF_EXEC_PAGESIZE,
};
-@@ -86,6 +104,8 @@ static struct linux_binfmt elf_format = {
+@@ -77,6 +95,8 @@ static struct linux_binfmt elf_format = {
static int set_brk(unsigned long start, unsigned long end)
{
@@ -52819,7 +50456,7 @@ index 4c94a79..f428019 100644
start = ELF_PAGEALIGN(start);
end = ELF_PAGEALIGN(end);
if (end > start) {
-@@ -94,7 +114,7 @@ static int set_brk(unsigned long start, unsigned long end)
+@@ -87,7 +107,7 @@ static int set_brk(unsigned long start, unsigned long end)
if (BAD_ADDR(addr))
return addr;
}
@@ -52828,7 +50465,7 @@ index 4c94a79..f428019 100644
return 0;
}
-@@ -155,12 +175,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -148,12 +168,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;
@@ -52843,22 +50480,22 @@ index 4c94a79..f428019 100644
/*
* In some cases (e.g. Hyper-Threading), we want to avoid L1
-@@ -202,8 +223,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -195,8 +216,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));
- u_rand_bytes = (elf_addr_t __user *)
- STACK_ALLOC(p, sizeof(k_rand_bytes));
-+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
-+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
-+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
-+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
++ srandom32(k_rand_bytes[0] ^ random32());
++ srandom32(k_rand_bytes[1] ^ random32());
++ srandom32(k_rand_bytes[2] ^ random32());
++ srandom32(k_rand_bytes[3] ^ random32());
+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
+ u_rand_bytes = (elf_addr_t __user *) p;
if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
return -EFAULT;
-@@ -318,9 +343,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -308,9 +333,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
return -EFAULT;
current->mm->env_end = p;
@@ -52871,7 +50508,7 @@ index 4c94a79..f428019 100644
return -EFAULT;
return 0;
}
-@@ -388,15 +415,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
+@@ -376,15 +403,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,
@@ -52890,7 +50527,7 @@ index 4c94a79..f428019 100644
unsigned long total_size;
int retval, i, size;
-@@ -442,6 +468,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -430,6 +456,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
goto out_close;
}
@@ -52902,7 +50539,7 @@ index 4c94a79..f428019 100644
eppnt = elf_phdata;
for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
if (eppnt->p_type == PT_LOAD) {
-@@ -465,8 +496,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -453,8 +484,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;
@@ -52911,7 +50548,7 @@ index 4c94a79..f428019 100644
error = map_addr;
if (BAD_ADDR(map_addr))
goto out_close;
-@@ -485,8 +514,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -473,8 +502,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 ||
@@ -52922,22 +50559,26 @@ index 4c94a79..f428019 100644
error = -ENOMEM;
goto out_close;
}
-@@ -525,9 +554,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -513,11 +542,13 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
/* Map the last of the bss segment */
-- error = vm_brk(elf_bss, last_bss - elf_bss);
+- down_write(¤t->mm->mmap_sem);
+- error = do_brk(elf_bss, last_bss - elf_bss);
+- up_write(¤t->mm->mmap_sem);
- if (BAD_ADDR(error))
- goto out_close;
+ if (last_bss > elf_bss) {
-+ error = vm_brk(elf_bss, last_bss - elf_bss);
++ down_write(¤t->mm->mmap_sem);
++ error = do_brk(elf_bss, last_bss - elf_bss);
++ up_write(¤t->mm->mmap_sem);
+ if (BAD_ADDR(error))
+ goto out_close;
+ }
}
error = load_addr;
-@@ -538,6 +569,315 @@ out:
+@@ -528,6 +559,315 @@ out:
return error;
}
@@ -53253,7 +50894,7 @@ index 4c94a79..f428019 100644
/*
* These are the functions used to load ELF style executables and shared
* libraries. There is no binary dependent code anywhere else.
-@@ -554,6 +894,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
+@@ -544,6 +884,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
{
unsigned int random_variable = 0;
@@ -53265,7 +50906,7 @@ index 4c94a79..f428019 100644
if ((current->flags & PF_RANDOMIZE) &&
!(current->personality & ADDR_NO_RANDOMIZE)) {
random_variable = get_random_int() & STACK_RND_MASK;
-@@ -572,7 +917,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -562,7 +907,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;
@@ -53274,12 +50915,11 @@ index 4c94a79..f428019 100644
struct elf_phdr *elf_ppnt, *elf_phdata;
unsigned long elf_bss, elf_brk;
int retval, i;
-@@ -582,12 +927,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -572,11 +917,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;
- unsigned long def_flags = 0;
- struct pt_regs *regs = current_pt_regs();
struct {
struct elfhdr elf_ex;
struct elfhdr interp_elf_ex;
@@ -53288,10 +50928,10 @@ index 4c94a79..f428019 100644
loc = kmalloc(sizeof(*loc), GFP_KERNEL);
if (!loc) {
-@@ -723,11 +1068,81 @@ static int load_elf_binary(struct linux_binprm *bprm)
- goto out_free_dentry;
+@@ -713,11 +1058,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
/* OK, This is the point of no return */
+ current->flags &= ~PF_FORKNOEXEC;
- current->mm->def_flags = def_flags;
+
+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
@@ -53371,7 +51011,7 @@ index 4c94a79..f428019 100644
if (elf_read_implies_exec(loc->elf_ex, executable_stack))
current->personality |= READ_IMPLIES_EXEC;
-@@ -817,6 +1232,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -808,6 +1223,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
@@ -53392,7 +51032,7 @@ index 4c94a79..f428019 100644
}
error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -849,9 +1278,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -840,9 +1269,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.
*/
@@ -53405,7 +51045,7 @@ index 4c94a79..f428019 100644
/* set_brk can never work. Avoid overflows. */
send_sig(SIGKILL, current, 0);
retval = -EINVAL;
-@@ -890,17 +1319,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -881,17 +1310,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))) {
@@ -53421,13 +51061,12 @@ index 4c94a79..f428019 100644
+#ifdef CONFIG_PAX_RANDMMAP
+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
-+ unsigned long start, size, flags;
-+ vm_flags_t vm_flags;
++ unsigned long start, size, flags, vm_flags;
+
+ start = ELF_PAGEALIGN(elf_brk);
+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
+ flags = MAP_FIXED | MAP_PRIVATE;
-+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
++ vm_flags = VM_DONTEXPAND | VM_RESERVED;
+
+ down_write(¤t->mm->mmap_sem);
+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
@@ -53435,7 +51074,7 @@ index 4c94a79..f428019 100644
+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
+// if (current->personality & ADDR_NO_RANDOMIZE)
+// vm_flags |= VM_READ | VM_MAYREAD;
-+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
++ start = mmap_region(NULL, start, PAGE_ALIGN(size), flags, vm_flags, 0);
+ retval = IS_ERR_VALUE(start) ? start : 0;
+ }
+ up_write(¤t->mm->mmap_sem);
@@ -53449,7 +51088,7 @@ index 4c94a79..f428019 100644
+#endif
+
if (elf_interpreter) {
-- unsigned long interp_map_addr = 0;
+- unsigned long uninitialized_var(interp_map_addr);
-
elf_entry = load_elf_interp(&loc->interp_elf_ex,
interpreter,
@@ -53457,7 +51096,7 @@ index 4c94a79..f428019 100644
load_bias);
if (!IS_ERR((void *)elf_entry)) {
/*
-@@ -1122,7 +1579,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
+@@ -1098,7 +1554,7 @@ out:
* Decide what to dump of a segment, part, all or none.
*/
static unsigned long vma_dump_size(struct vm_area_struct *vma,
@@ -53466,7 +51105,7 @@ index 4c94a79..f428019 100644
{
#define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
-@@ -1160,7 +1617,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
+@@ -1132,7 +1588,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
if (vma->vm_file == NULL)
return 0;
@@ -53475,7 +51114,7 @@ index 4c94a79..f428019 100644
goto whole;
/*
-@@ -1385,9 +1842,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
+@@ -1354,9 +1810,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;
@@ -53487,16 +51126,7 @@ index 4c94a79..f428019 100644
fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
}
-@@ -1396,7 +1853,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
- {
- mm_segment_t old_fs = get_fs();
- set_fs(KERNEL_DS);
-- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
-+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
- set_fs(old_fs);
- fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
- }
-@@ -2023,14 +2480,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
+@@ -1851,14 +2307,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,
@@ -53509,11 +51139,11 @@ index 4c94a79..f428019 100644
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->siginfo->si_signo);
++ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
return size;
}
-@@ -2123,7 +2580,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -1952,7 +2408,7 @@ static int elf_core_dump(struct coredump_params *cprm)
dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
@@ -53522,7 +51152,7 @@ index 4c94a79..f428019 100644
offset += elf_core_extra_data_size();
e_shoff = offset;
-@@ -2137,10 +2594,12 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -1966,10 +2422,12 @@ static int elf_core_dump(struct coredump_params *cprm)
offset = dataoff;
size += sizeof(*elf);
@@ -53535,16 +51165,16 @@ index 4c94a79..f428019 100644
if (size > cprm->limit
|| !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
goto end_coredump;
-@@ -2154,7 +2613,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -1983,7 +2441,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->siginfo->si_signo);
++ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
phdr.p_memsz = vma->vm_end - vma->vm_start;
offset += phdr.p_filesz;
phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -2165,6 +2624,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -1994,6 +2452,7 @@ static int elf_core_dump(struct coredump_params *cprm)
phdr.p_align = ELF_EXEC_PAGESIZE;
size += sizeof(phdr);
@@ -53552,16 +51182,16 @@ index 4c94a79..f428019 100644
if (size > cprm->limit
|| !dump_write(cprm->file, &phdr, sizeof(phdr)))
goto end_coredump;
-@@ -2189,7 +2649,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2018,7 +2477,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->siginfo->si_signo);
++ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
struct page *page;
-@@ -2198,6 +2658,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2027,6 +2486,7 @@ static int elf_core_dump(struct coredump_params *cprm)
page = get_dump_page(addr);
if (page) {
void *kaddr = kmap(page);
@@ -53569,7 +51199,7 @@ index 4c94a79..f428019 100644
stop = ((size += PAGE_SIZE) > cprm->limit) ||
!dump_write(cprm->file, kaddr,
PAGE_SIZE);
-@@ -2215,6 +2676,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2044,6 +2504,7 @@ static int elf_core_dump(struct coredump_params *cprm)
if (e_phnum == PN_XNUM) {
size += sizeof(*shdr4extnum);
@@ -53577,7 +51207,7 @@ index 4c94a79..f428019 100644
if (size > cprm->limit
|| !dump_write(cprm->file, shdr4extnum,
sizeof(*shdr4extnum)))
-@@ -2235,6 +2697,167 @@ out:
+@@ -2064,6 +2525,167 @@ out:
#endif /* CONFIG_ELF_CORE */
@@ -53597,7 +51227,7 @@ index 4c94a79..f428019 100644
+ unsigned long oldflags;
+ bool is_textrel_rw, is_textrel_rx, is_relro;
+
-+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
++ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
+ return;
+
+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
@@ -53605,15 +51235,15 @@ index 4c94a79..f428019 100644
+
+#ifdef CONFIG_PAX_ELFRELOCS
+ /* possible TEXTREL */
-+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
-+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
++ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
++ is_textrel_rx = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
+#else
+ is_textrel_rw = false;
+ is_textrel_rx = false;
+#endif
+
+ /* possible RELRO */
-+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
++ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
+
+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
+ return;
@@ -53744,48 +51374,60 @@ index 4c94a79..f428019 100644
+
static int __init init_elf_binfmt(void)
{
- register_binfmt(&elf_format);
+ return register_binfmt(&elf_format);
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
-index d50bbe5..af3b649 100644
+index 1bffbe0..c8c283e 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
-@@ -566,7 +566,9 @@ static int load_flat_file(struct linux_binprm * bprm,
+@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
(int)-realdatastart);
+ down_write(¤t->mm->mmap_sem);
- vm_munmap(textpos, text_len);
+ do_munmap(current->mm, textpos, text_len);
+ up_write(¤t->mm->mmap_sem);
ret = realdatastart;
goto err;
}
-@@ -590,8 +592,10 @@ static int load_flat_file(struct linux_binprm * bprm,
+@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
}
if (IS_ERR_VALUE(result)) {
printk("Unable to read data+bss, errno %d\n", (int)-result);
+ down_write(¤t->mm->mmap_sem);
- vm_munmap(textpos, text_len);
- vm_munmap(realdatastart, len);
+ do_munmap(current->mm, textpos, text_len);
+ do_munmap(current->mm, realdatastart, len);
+ up_write(¤t->mm->mmap_sem);
ret = result;
goto err;
}
-@@ -653,8 +657,10 @@ static int load_flat_file(struct linux_binprm * bprm,
+@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
}
if (IS_ERR_VALUE(result)) {
printk("Unable to read code+data+bss, errno %d\n",(int)-result);
+ down_write(¤t->mm->mmap_sem);
- vm_munmap(textpos, text_len + data_len + extra +
+ do_munmap(current->mm, textpos, text_len + data_len + extra +
MAX_SHARED_LIBS * sizeof(unsigned long));
+ up_write(¤t->mm->mmap_sem);
ret = result;
goto err;
}
+diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
+index 7423cb9..9379ddd 100644
+--- a/fs/binfmt_misc.c
++++ b/fs/binfmt_misc.c
+@@ -719,6 +719,7 @@ static struct file_system_type bm_fs_type = {
+ .mount = bm_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("binfmt_misc");
+
+ static int __init init_misc_binfmt(void)
+ {
diff --git a/fs/bio.c b/fs/bio.c
-index ea5035d..a2932eb 100644
+index b84d851..0dd5077 100644
--- a/fs/bio.c
+++ b/fs/bio.c
-@@ -1106,7 +1106,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
+@@ -848,7 +848,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
/*
* Overflow, abort
*/
@@ -53794,7 +51436,7 @@ index ea5035d..a2932eb 100644
return ERR_PTR(-EINVAL);
nr_pages += end - start;
-@@ -1240,7 +1240,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
+@@ -982,7 +982,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
/*
* Overflow, abort
*/
@@ -53803,7 +51445,7 @@ index ea5035d..a2932eb 100644
return ERR_PTR(-EINVAL);
nr_pages += end - start;
-@@ -1502,7 +1502,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
+@@ -1244,7 +1244,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;
@@ -53813,10 +51455,10 @@ index ea5035d..a2932eb 100644
bio_for_each_segment_all(bvec, bio, i) {
char *addr = page_address(bvec->bv_page);
diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 1e86823..8e34695 100644
+index c103267..260cbd9 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
-@@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
+@@ -690,7 +690,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 */
@@ -53826,10 +51468,10 @@ index 1e86823..8e34695 100644
else if (whole->bd_holder != NULL)
return false; /* is a partition of a held device */
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
-index 61b5bcd..7eeede8 100644
+index dede441..f2a2507 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
-@@ -1028,9 +1028,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
+@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
free_extent_buffer(buf);
add_root_to_dirty_list(root);
} else {
@@ -53845,64 +51487,24 @@ index 61b5bcd..7eeede8 100644
parent_start = 0;
WARN_ON(trans->transid != btrfs_header_generation(parent));
-diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
-index cbd9523..5cca781 100644
---- a/fs/btrfs/delayed-inode.c
-+++ b/fs/btrfs/delayed-inode.c
-@@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
-
- static void finish_one_item(struct btrfs_delayed_root *delayed_root)
- {
-- int seq = atomic_inc_return(&delayed_root->items_seq);
-+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
- if ((atomic_dec_return(&delayed_root->items) <
- BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
- waitqueue_active(&delayed_root->wait))
-@@ -1378,7 +1378,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
- static int refs_newer(struct btrfs_delayed_root *delayed_root,
- int seq, int count)
- {
-- int val = atomic_read(&delayed_root->items_seq);
-+ int val = atomic_read_unchecked(&delayed_root->items_seq);
-
- if (val < seq || val >= seq + count)
- return 1;
-@@ -1395,7 +1395,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
- if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND)
- return;
-
-- seq = atomic_read(&delayed_root->items_seq);
-+ seq = atomic_read_unchecked(&delayed_root->items_seq);
-
- if (atomic_read(&delayed_root->items) >= BTRFS_DELAYED_WRITEBACK) {
- int ret;
-diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
-index a4b38f9..f86a509 100644
---- a/fs/btrfs/delayed-inode.h
-+++ b/fs/btrfs/delayed-inode.h
-@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
- */
- struct list_head prepare_list;
- atomic_t items; /* for delayed items */
-- atomic_t items_seq; /* for delayed items */
-+ atomic_unchecked_t items_seq; /* for delayed items */
- int nodes; /* for delayed nodes */
- wait_queue_head_t wait;
- };
-@@ -87,7 +87,7 @@ static inline void btrfs_init_delayed_root(
- struct btrfs_delayed_root *delayed_root)
- {
- atomic_set(&delayed_root->items, 0);
-- atomic_set(&delayed_root->items_seq, 0);
-+ atomic_set_unchecked(&delayed_root->items_seq, 0);
- delayed_root->nodes = 0;
- spin_lock_init(&delayed_root->lock);
- init_waitqueue_head(&delayed_root->wait);
+diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
+index 49eefdb..547693e 100644
+--- a/fs/btrfs/extent-tree.c
++++ b/fs/btrfs/extent-tree.c
+@@ -5642,7 +5642,7 @@ again:
+
+ if (ret == -ENOSPC && num_bytes > min_alloc_size) {
+ num_bytes = num_bytes >> 1;
+- num_bytes = num_bytes & ~(root->sectorsize - 1);
++ num_bytes = num_bytes & ~((u64)root->sectorsize - 1);
+ num_bytes = max(num_bytes, min_alloc_size);
+ do_chunk_alloc(trans, root->fs_info->extent_root,
+ num_bytes, data, CHUNK_ALLOC_FORCE);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 9d46f60..a8f09eb 100644
+index 618ae6f..118fe0c 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
-@@ -3464,9 +3464,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -2733,9 +2733,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;
@@ -53915,7 +51517,7 @@ index 9d46f60..a8f09eb 100644
info = NULL;
rcu_read_lock();
list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -3488,10 +3491,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -2757,15 +2760,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
memcpy(dest, &space, sizeof(space));
dest++;
space_args.total_spaces++;
@@ -53926,24 +51528,56 @@ index 9d46f60..a8f09eb 100644
}
up_read(&info->groups_sem);
}
+
+- user_dest = (struct btrfs_ioctl_space_info *)
++ user_dest = (struct btrfs_ioctl_space_info __user *)
+ (arg + sizeof(struct btrfs_ioctl_space_args));
+
+ if (copy_to_user(user_dest, dest_orig, alloc_size))
+diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
+index cfb5543..1ae7347 100644
+--- a/fs/btrfs/relocation.c
++++ b/fs/btrfs/relocation.c
+@@ -1244,7 +1244,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
+ }
+ spin_unlock(&rc->reloc_root_tree.lock);
+
+- BUG_ON((struct btrfs_root *)node->data != root);
++ BUG_ON(!node || (struct btrfs_root *)node->data != root);
+
+ if (!del) {
+ spin_lock(&rc->reloc_root_tree.lock);
+diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
+index ddf2c90..37afd35 100644
+--- a/fs/btrfs/scrub.c
++++ b/fs/btrfs/scrub.c
+@@ -348,7 +348,9 @@ static void scrub_print_warning(const char *errstr, struct scrub_bio *sbio,
+ ret < 0 ? -1 : ref_level,
+ ret < 0 ? -1 : ref_root);
+ } while (ret != 1);
++ btrfs_release_path(path);
+ } else {
++ btrfs_release_path(path);
+ swarn.path = path;
+ iterate_extent_inodes(fs_info, path, found_key.objectid,
+ extent_offset,
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
-index e913328..a34fb36 100644
+index 200f63b..490b833 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
-@@ -266,7 +266,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
- function, line, errstr);
- return;
- }
-- ACCESS_ONCE(trans->transaction->aborted) = errno;
-+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
- /* Wake up anybody who may be waiting on this transaction */
- wake_up(&root->fs_info->transaction_wait);
- wake_up(&root->fs_info->transaction_blocked_wait);
+@@ -1227,6 +1227,7 @@ static struct file_system_type btrfs_fs_type = {
+ .kill_sb = kill_anon_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("btrfs");
+
+ /*
+ * used by btrfsctl to scan devices when no FS is mounted
diff --git a/fs/buffer.c b/fs/buffer.c
-index 6024877..7bd000a 100644
+index 19a4f0b..6638f5c 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
-@@ -3426,7 +3426,7 @@ void __init buffer_init(void)
+@@ -3314,7 +3314,7 @@ void __init buffer_init(void)
bh_cachep = kmem_cache_create("buffer_head",
sizeof(struct buffer_head), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
@@ -54013,10 +51647,10 @@ index 0a1467b..6a53245 100644
cache->bstop_percent = bstop;
diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
-index 5349473..d6c0b93 100644
+index bd6bc1b..b627b53 100644
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
-@@ -59,7 +59,7 @@ struct cachefiles_cache {
+@@ -57,7 +57,7 @@ struct cachefiles_cache {
wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
struct rb_root active_nodes; /* active nodes (can't be culled) */
rwlock_t active_lock; /* lock for active_nodes */
@@ -54025,7 +51659,7 @@ index 5349473..d6c0b93 100644
unsigned frun_percent; /* when to stop culling (% files) */
unsigned fcull_percent; /* when to start culling (% files) */
unsigned fstop_percent; /* when to stop allocating (% files) */
-@@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
+@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
* proc.c
*/
#ifdef CONFIG_CACHEFILES_HISTOGRAM
@@ -54051,10 +51685,10 @@ index 5349473..d6c0b93 100644
#else
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
-index f4a08d7..5aa4599 100644
+index a0358c2..d6137f2 100644
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
-@@ -317,7 +317,7 @@ try_again:
+@@ -318,7 +318,7 @@ try_again:
/* first step is to make up a grave dentry in the graveyard */
sprintf(nbuffer, "%08x%08x",
(uint32_t) get_seconds(),
@@ -54094,10 +51728,10 @@ index eccd339..4c1d995 100644
return 0;
diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
-index ebaff36..7e3ea26 100644
+index b4d2438..0935840 100644
--- a/fs/cachefiles/rdwr.c
+++ b/fs/cachefiles/rdwr.c
-@@ -950,7 +950,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
+@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
old_fs = get_fs();
set_fs(KERNEL_DS);
ret = file->f_op->write(
@@ -54105,25 +51739,34 @@ index ebaff36..7e3ea26 100644
+ file, (const void __force_user *) data, len, &pos);
set_fs(old_fs);
kunmap(page);
- file_end_write(file);
+ if (ret != len)
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
-index 868b61d..58835a5 100644
+index 9895400..78a67e7 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
-@@ -240,7 +240,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
+@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
struct ceph_mds_client *mdsc = fsc->mdsc;
- unsigned frag = fpos_frag(ctx->pos);
-- int off = fpos_off(ctx->pos);
-+ unsigned int off = fpos_off(ctx->pos);
+ unsigned frag = fpos_frag(filp->f_pos);
+- int off = fpos_off(filp->f_pos);
++ unsigned int off = fpos_off(filp->f_pos);
int err;
u32 ftype;
struct ceph_mds_reply_info_parsed *rinfo;
+@@ -598,7 +598,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
+ if (nd &&
+ (nd->flags & LOOKUP_OPEN) &&
+ !(nd->intent.open.flags & O_CREAT)) {
+- int mode = nd->intent.open.create_mode & ~current->fs->umask;
++ int mode = nd->intent.open.create_mode & ~current_umask();
+ return ceph_lookup_open(dir, dentry, nd, mode, 1);
+ }
+
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
-index 6a0951e..03fac6d 100644
+index de268a8..2a158be 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
-@@ -870,7 +870,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
+@@ -785,7 +785,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
/*
* construct our own bdi so we can control readahead, etc.
*/
@@ -54132,20 +51775,28 @@ index 6a0951e..03fac6d 100644
static int ceph_register_bdi(struct super_block *sb,
struct ceph_fs_client *fsc)
-@@ -887,7 +887,7 @@ static int ceph_register_bdi(struct super_block *sb,
+@@ -802,7 +802,7 @@ static int ceph_register_bdi(struct super_block *sb,
default_backing_dev_info.ra_pages;
- err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
+ err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%d",
- atomic_long_inc_return(&bdi_seq));
+ atomic_long_inc_return_unchecked(&bdi_seq));
if (!err)
sb->s_bdi = &fsc->backing_dev_info;
return err;
+@@ -901,6 +901,7 @@ static struct file_system_type ceph_fs_type = {
+ .kill_sb = ceph_kill_sb,
+ .fs_flags = FS_RENAME_DOES_D_MOVE,
+ };
++MODULE_ALIAS_FS("ceph");
+
+ #define _STRINGIFY(x) #x
+ #define STRINGIFY(x) _STRINGIFY(x)
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
-index f3ac415..3d2420c 100644
+index 84e8c07..6170d31 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
-@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
+@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
#ifdef CONFIG_CIFS_STATS2
@@ -54156,16 +51807,52 @@ index f3ac415..3d2420c 100644
#endif /* CONFIG_CIFS_STATS2 */
spin_lock(&cifs_tcp_ses_lock);
list_for_each(tmp1, &cifs_tcp_ses_list) {
-@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
+@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
tcon = list_entry(tmp3,
struct cifs_tcon,
tcon_list);
- atomic_set(&tcon->num_smbs_sent, 0);
+- atomic_set(&tcon->num_writes, 0);
+- atomic_set(&tcon->num_reads, 0);
+- atomic_set(&tcon->num_oplock_brks, 0);
+- atomic_set(&tcon->num_opens, 0);
+- atomic_set(&tcon->num_posixopens, 0);
+- atomic_set(&tcon->num_posixmkdirs, 0);
+- atomic_set(&tcon->num_closes, 0);
+- atomic_set(&tcon->num_deletes, 0);
+- atomic_set(&tcon->num_mkdirs, 0);
+- atomic_set(&tcon->num_rmdirs, 0);
+- atomic_set(&tcon->num_renames, 0);
+- atomic_set(&tcon->num_t2renames, 0);
+- atomic_set(&tcon->num_ffirst, 0);
+- atomic_set(&tcon->num_fnext, 0);
+- atomic_set(&tcon->num_fclose, 0);
+- atomic_set(&tcon->num_hardlinks, 0);
+- atomic_set(&tcon->num_symlinks, 0);
+- atomic_set(&tcon->num_locks, 0);
+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
- if (server->ops->clear_stats)
- server->ops->clear_stats(tcon);
++ atomic_set_unchecked(&tcon->num_writes, 0);
++ atomic_set_unchecked(&tcon->num_reads, 0);
++ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
++ atomic_set_unchecked(&tcon->num_opens, 0);
++ atomic_set_unchecked(&tcon->num_posixopens, 0);
++ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
++ atomic_set_unchecked(&tcon->num_closes, 0);
++ atomic_set_unchecked(&tcon->num_deletes, 0);
++ atomic_set_unchecked(&tcon->num_mkdirs, 0);
++ atomic_set_unchecked(&tcon->num_rmdirs, 0);
++ atomic_set_unchecked(&tcon->num_renames, 0);
++ atomic_set_unchecked(&tcon->num_t2renames, 0);
++ atomic_set_unchecked(&tcon->num_ffirst, 0);
++ atomic_set_unchecked(&tcon->num_fnext, 0);
++ atomic_set_unchecked(&tcon->num_fclose, 0);
++ atomic_set_unchecked(&tcon->num_hardlinks, 0);
++ atomic_set_unchecked(&tcon->num_symlinks, 0);
++ atomic_set_unchecked(&tcon->num_locks, 0);
}
-@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
+ }
+ }
+@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
smBufAllocCount.counter, cifs_min_small);
#ifdef CONFIG_CIFS_STATS2
seq_printf(m, "Total Large %d Small %d Allocations\n",
@@ -54176,29 +51863,90 @@ index f3ac415..3d2420c 100644
#endif /* CONFIG_CIFS_STATS2 */
seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
-@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
+@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
if (tcon->need_reconnect)
seq_puts(m, "\tDISCONNECTED ");
- seq_printf(m, "\nSMBs: %d",
-- atomic_read(&tcon->num_smbs_sent));
-+ atomic_read_unchecked(&tcon->num_smbs_sent));
- if (server->ops->print_stats)
- server->ops->print_stats(m, tcon);
+ seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
+- atomic_read(&tcon->num_smbs_sent),
+- atomic_read(&tcon->num_oplock_brks));
++ atomic_read_unchecked(&tcon->num_smbs_sent),
++ atomic_read_unchecked(&tcon->num_oplock_brks));
+ seq_printf(m, "\nReads: %d Bytes: %lld",
+- atomic_read(&tcon->num_reads),
++ atomic_read_unchecked(&tcon->num_reads),
+ (long long)(tcon->bytes_read));
+ seq_printf(m, "\nWrites: %d Bytes: %lld",
+- atomic_read(&tcon->num_writes),
++ atomic_read_unchecked(&tcon->num_writes),
+ (long long)(tcon->bytes_written));
+ seq_printf(m, "\nFlushes: %d",
+- atomic_read(&tcon->num_flushes));
++ atomic_read_unchecked(&tcon->num_flushes));
+ seq_printf(m, "\nLocks: %d HardLinks: %d "
+ "Symlinks: %d",
+- atomic_read(&tcon->num_locks),
+- atomic_read(&tcon->num_hardlinks),
+- atomic_read(&tcon->num_symlinks));
++ atomic_read_unchecked(&tcon->num_locks),
++ atomic_read_unchecked(&tcon->num_hardlinks),
++ atomic_read_unchecked(&tcon->num_symlinks));
+ seq_printf(m, "\nOpens: %d Closes: %d "
+ "Deletes: %d",
+- atomic_read(&tcon->num_opens),
+- atomic_read(&tcon->num_closes),
+- atomic_read(&tcon->num_deletes));
++ atomic_read_unchecked(&tcon->num_opens),
++ atomic_read_unchecked(&tcon->num_closes),
++ atomic_read_unchecked(&tcon->num_deletes));
+ seq_printf(m, "\nPosix Opens: %d "
+ "Posix Mkdirs: %d",
+- atomic_read(&tcon->num_posixopens),
+- atomic_read(&tcon->num_posixmkdirs));
++ atomic_read_unchecked(&tcon->num_posixopens),
++ atomic_read_unchecked(&tcon->num_posixmkdirs));
+ seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
+- atomic_read(&tcon->num_mkdirs),
+- atomic_read(&tcon->num_rmdirs));
++ atomic_read_unchecked(&tcon->num_mkdirs),
++ atomic_read_unchecked(&tcon->num_rmdirs));
+ seq_printf(m, "\nRenames: %d T2 Renames %d",
+- atomic_read(&tcon->num_renames),
+- atomic_read(&tcon->num_t2renames));
++ atomic_read_unchecked(&tcon->num_renames),
++ atomic_read_unchecked(&tcon->num_t2renames));
+ seq_printf(m, "\nFindFirst: %d FNext %d "
+ "FClose %d",
+- atomic_read(&tcon->num_ffirst),
+- atomic_read(&tcon->num_fnext),
+- atomic_read(&tcon->num_fclose));
++ atomic_read_unchecked(&tcon->num_ffirst),
++ atomic_read_unchecked(&tcon->num_fnext),
++ atomic_read_unchecked(&tcon->num_fclose));
}
+ }
+ }
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
-index 77fc5e1..e3d13e6 100644
+index 25bb97f..a0095de 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
-@@ -1056,7 +1056,7 @@ cifs_init_request_bufs(void)
- */
+@@ -799,6 +799,7 @@ struct file_system_type cifs_fs_type = {
+ .kill_sb = cifs_kill_sb,
+ /* .fs_flags */
+ };
++MODULE_ALIAS_FS("cifs");
+ const struct inode_operations cifs_dir_inode_ops = {
+ .create = cifs_create,
+ .lookup = cifs_lookup,
+@@ -1018,7 +1019,7 @@ cifs_init_request_bufs(void)
cifs_req_cachep = kmem_cache_create("cifs_request",
- CIFSMaxBufSize + max_hdr_size, 0,
+ CIFSMaxBufSize +
+ MAX_CIFS_HDR_SIZE, 0,
- SLAB_HWCACHE_ALIGN, NULL);
+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
if (cifs_req_cachep == NULL)
return -ENOMEM;
-@@ -1083,7 +1083,7 @@ cifs_init_request_bufs(void)
+@@ -1045,7 +1046,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",
@@ -54207,7 +51955,7 @@ index 77fc5e1..e3d13e6 100644
NULL);
if (cifs_sm_req_cachep == NULL) {
mempool_destroy(cifs_req_poolp);
-@@ -1168,8 +1168,8 @@ init_cifs(void)
+@@ -1130,8 +1131,8 @@ init_cifs(void)
atomic_set(&bufAllocCount, 0);
atomic_set(&smBufAllocCount, 0);
#ifdef CONFIG_CIFS_STATS2
@@ -54219,70 +51967,61 @@ index 77fc5e1..e3d13e6 100644
atomic_set(&midCount, 0);
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
-index 52b6f6c..68db1f4 100644
+index 7b68088..17a275b 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
-@@ -758,35 +758,35 @@ struct cifs_tcon {
+@@ -390,28 +390,28 @@ struct cifs_tcon {
__u16 Flags; /* optional support bits */
enum statusEnum tidStatus;
#ifdef CONFIG_CIFS_STATS
- atomic_t num_smbs_sent;
+- atomic_t num_writes;
+- atomic_t num_reads;
+- atomic_t num_flushes;
+- atomic_t num_oplock_brks;
+- atomic_t num_opens;
+- atomic_t num_closes;
+- atomic_t num_deletes;
+- atomic_t num_mkdirs;
+- atomic_t num_posixopens;
+- atomic_t num_posixmkdirs;
+- atomic_t num_rmdirs;
+- atomic_t num_renames;
+- atomic_t num_t2renames;
+- atomic_t num_ffirst;
+- atomic_t num_fnext;
+- atomic_t num_fclose;
+- atomic_t num_hardlinks;
+- atomic_t num_symlinks;
+- atomic_t num_locks;
+- atomic_t num_acl_get;
+- atomic_t num_acl_set;
+ atomic_unchecked_t num_smbs_sent;
- union {
- struct {
-- atomic_t num_writes;
-- atomic_t num_reads;
-- atomic_t num_flushes;
-- atomic_t num_oplock_brks;
-- atomic_t num_opens;
-- atomic_t num_closes;
-- atomic_t num_deletes;
-- atomic_t num_mkdirs;
-- atomic_t num_posixopens;
-- atomic_t num_posixmkdirs;
-- atomic_t num_rmdirs;
-- atomic_t num_renames;
-- atomic_t num_t2renames;
-- atomic_t num_ffirst;
-- atomic_t num_fnext;
-- atomic_t num_fclose;
-- atomic_t num_hardlinks;
-- atomic_t num_symlinks;
-- atomic_t num_locks;
-- atomic_t num_acl_get;
-- atomic_t num_acl_set;
-+ atomic_unchecked_t num_writes;
-+ atomic_unchecked_t num_reads;
-+ atomic_unchecked_t num_flushes;
-+ atomic_unchecked_t num_oplock_brks;
-+ atomic_unchecked_t num_opens;
-+ atomic_unchecked_t num_closes;
-+ atomic_unchecked_t num_deletes;
-+ atomic_unchecked_t num_mkdirs;
-+ atomic_unchecked_t num_posixopens;
-+ atomic_unchecked_t num_posixmkdirs;
-+ atomic_unchecked_t num_rmdirs;
-+ atomic_unchecked_t num_renames;
-+ atomic_unchecked_t num_t2renames;
-+ atomic_unchecked_t num_ffirst;
-+ atomic_unchecked_t num_fnext;
-+ atomic_unchecked_t num_fclose;
-+ atomic_unchecked_t num_hardlinks;
-+ atomic_unchecked_t num_symlinks;
-+ atomic_unchecked_t num_locks;
-+ atomic_unchecked_t num_acl_get;
-+ atomic_unchecked_t num_acl_set;
- } cifs_stats;
- #ifdef CONFIG_CIFS_SMB2
- struct {
-- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
-- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
-+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
-+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
- } smb2_stats;
- #endif /* CONFIG_CIFS_SMB2 */
- } stats;
-@@ -1111,7 +1111,7 @@ convert_delimiter(char *path, char delim)
++ atomic_unchecked_t num_writes;
++ atomic_unchecked_t num_reads;
++ atomic_unchecked_t num_flushes;
++ atomic_unchecked_t num_oplock_brks;
++ atomic_unchecked_t num_opens;
++ atomic_unchecked_t num_closes;
++ atomic_unchecked_t num_deletes;
++ atomic_unchecked_t num_mkdirs;
++ atomic_unchecked_t num_posixopens;
++ atomic_unchecked_t num_posixmkdirs;
++ atomic_unchecked_t num_rmdirs;
++ atomic_unchecked_t num_renames;
++ atomic_unchecked_t num_t2renames;
++ atomic_unchecked_t num_ffirst;
++ atomic_unchecked_t num_fnext;
++ atomic_unchecked_t num_fclose;
++ atomic_unchecked_t num_hardlinks;
++ atomic_unchecked_t num_symlinks;
++ atomic_unchecked_t num_locks;
++ atomic_unchecked_t num_acl_get;
++ atomic_unchecked_t num_acl_set;
+ #ifdef CONFIG_CIFS_STATS2
+ unsigned long long time_writes;
+ unsigned long long time_reads;
+@@ -626,7 +626,7 @@ convert_delimiter(char *path, char delim)
}
#ifdef CONFIG_CIFS_STATS
@@ -54291,7 +52030,7 @@ index 52b6f6c..68db1f4 100644
static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
unsigned int bytes)
-@@ -1477,8 +1477,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
+@@ -983,8 +983,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
/* Various Debug counters */
GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
#ifdef CONFIG_CIFS_STATS2
@@ -54302,11 +52041,32 @@ index 52b6f6c..68db1f4 100644
#endif
GLOBAL_EXTERN atomic_t smBufAllocCount;
GLOBAL_EXTERN atomic_t midCount;
+diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
+index c858a29..969f74f 100644
+--- a/fs/cifs/cifssmb.c
++++ b/fs/cifs/cifssmb.c
+@@ -3437,11 +3437,13 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL,
+ return 0;
+ }
+ cifs_acl->version = cpu_to_le16(1);
+- if (acl_type == ACL_TYPE_ACCESS)
++ if (acl_type == ACL_TYPE_ACCESS) {
+ cifs_acl->access_entry_count = cpu_to_le16(count);
+- else if (acl_type == ACL_TYPE_DEFAULT)
++ cifs_acl->default_entry_count = __constant_cpu_to_le16(0xFFFF);
++ } else if (acl_type == ACL_TYPE_DEFAULT) {
+ cifs_acl->default_entry_count = cpu_to_le16(count);
+- else {
++ cifs_acl->access_entry_count = __constant_cpu_to_le16(0xFFFF);
++ } else {
+ cFYI(1, "unknown ACL type %d", acl_type);
+ return 0;
+ }
diff --git a/fs/cifs/link.c b/fs/cifs/link.c
-index 7e36ceb..109252f 100644
+index 6b0e064..94e6c3c 100644
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
-@@ -624,7 +624,7 @@ symlink_exit:
+@@ -600,7 +600,7 @@ symlink_exit:
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
{
@@ -54316,11 +52076,11 @@ index 7e36ceb..109252f 100644
kfree(p);
}
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
-index 138a011..cf9e13a 100644
+index 703ef5c..2a44ed5 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
-@@ -170,7 +170,7 @@ cifs_buf_get(void)
- memset(ret_buf, 0, buf_size + 3);
+@@ -156,7 +156,7 @@ cifs_buf_get(void)
+ memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
atomic_inc(&bufAllocCount);
#ifdef CONFIG_CIFS_STATS2
- atomic_inc(&totBufAllocCount);
@@ -54328,7 +52088,7 @@ index 138a011..cf9e13a 100644
#endif /* CONFIG_CIFS_STATS2 */
}
-@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
+@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
/* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
atomic_inc(&smBufAllocCount);
#ifdef CONFIG_CIFS_STATS2
@@ -54337,252 +52097,31 @@ index 138a011..cf9e13a 100644
#endif /* CONFIG_CIFS_STATS2 */
}
-diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
-index 8233b17..2b83e95 100644
---- a/fs/cifs/smb1ops.c
-+++ b/fs/cifs/smb1ops.c
-@@ -590,27 +590,27 @@ static void
- cifs_clear_stats(struct cifs_tcon *tcon)
- {
- #ifdef CONFIG_CIFS_STATS
-- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
-- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
-+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
- #endif
- }
-
-@@ -619,36 +619,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
- {
- #ifdef CONFIG_CIFS_STATS
- seq_printf(m, " Oplocks breaks: %d",
-- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
- seq_printf(m, "\nReads: %d Bytes: %llu",
-- atomic_read(&tcon->stats.cifs_stats.num_reads),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
- (long long)(tcon->bytes_read));
- seq_printf(m, "\nWrites: %d Bytes: %llu",
-- atomic_read(&tcon->stats.cifs_stats.num_writes),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
- (long long)(tcon->bytes_written));
- seq_printf(m, "\nFlushes: %d",
-- atomic_read(&tcon->stats.cifs_stats.num_flushes));
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
- seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
-- atomic_read(&tcon->stats.cifs_stats.num_locks),
-- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
-- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
- seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
-- atomic_read(&tcon->stats.cifs_stats.num_opens),
-- atomic_read(&tcon->stats.cifs_stats.num_closes),
-- atomic_read(&tcon->stats.cifs_stats.num_deletes));
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
- seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
-- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
-- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
- seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
-- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
-- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
- seq_printf(m, "\nRenames: %d T2 Renames %d",
-- atomic_read(&tcon->stats.cifs_stats.num_renames),
-- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
- seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
-- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
-- atomic_read(&tcon->stats.cifs_stats.num_fnext),
-- atomic_read(&tcon->stats.cifs_stats.num_fclose));
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
-+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
- #endif
- }
+diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
+index 52a820a..1d8ab03 100644
+--- a/fs/cifs/readdir.c
++++ b/fs/cifs/readdir.c
+@@ -86,14 +86,17 @@ cifs_readdir_lookup(struct dentry *parent, struct qstr *name,
-diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
-index 861b332..5506392 100644
---- a/fs/cifs/smb2ops.c
-+++ b/fs/cifs/smb2ops.c
-@@ -282,8 +282,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
- #ifdef CONFIG_CIFS_STATS
- int i;
- for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
-- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
-- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
-+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
-+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
- }
- #endif
- }
-@@ -311,65 +311,65 @@ static void
- smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
- {
- #ifdef CONFIG_CIFS_STATS
-- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
-- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
-+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
-+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
- seq_printf(m, "\nNegotiates: %d sent %d failed",
-- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
-- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
-+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
-+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
- seq_printf(m, "\nSessionSetups: %d sent %d failed",
-- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
-- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
-+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
-+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
- seq_printf(m, "\nLogoffs: %d sent %d failed",
-- atomic_read(&sent[SMB2_LOGOFF_HE]),
-- atomic_read(&failed[SMB2_LOGOFF_HE]));
-+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
-+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
- seq_printf(m, "\nTreeConnects: %d sent %d failed",
-- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
-- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
-+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
-+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
- seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
-- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
-- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
-+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
-+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
- seq_printf(m, "\nCreates: %d sent %d failed",
-- atomic_read(&sent[SMB2_CREATE_HE]),
-- atomic_read(&failed[SMB2_CREATE_HE]));
-+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
-+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
- seq_printf(m, "\nCloses: %d sent %d failed",
-- atomic_read(&sent[SMB2_CLOSE_HE]),
-- atomic_read(&failed[SMB2_CLOSE_HE]));
-+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
-+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
- seq_printf(m, "\nFlushes: %d sent %d failed",
-- atomic_read(&sent[SMB2_FLUSH_HE]),
-- atomic_read(&failed[SMB2_FLUSH_HE]));
-+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
-+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
- seq_printf(m, "\nReads: %d sent %d failed",
-- atomic_read(&sent[SMB2_READ_HE]),
-- atomic_read(&failed[SMB2_READ_HE]));
-+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
-+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
- seq_printf(m, "\nWrites: %d sent %d failed",
-- atomic_read(&sent[SMB2_WRITE_HE]),
-- atomic_read(&failed[SMB2_WRITE_HE]));
-+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
-+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
- seq_printf(m, "\nLocks: %d sent %d failed",
-- atomic_read(&sent[SMB2_LOCK_HE]),
-- atomic_read(&failed[SMB2_LOCK_HE]));
-+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
-+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
- seq_printf(m, "\nIOCTLs: %d sent %d failed",
-- atomic_read(&sent[SMB2_IOCTL_HE]),
-- atomic_read(&failed[SMB2_IOCTL_HE]));
-+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
-+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
- seq_printf(m, "\nCancels: %d sent %d failed",
-- atomic_read(&sent[SMB2_CANCEL_HE]),
-- atomic_read(&failed[SMB2_CANCEL_HE]));
-+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
-+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
- seq_printf(m, "\nEchos: %d sent %d failed",
-- atomic_read(&sent[SMB2_ECHO_HE]),
-- atomic_read(&failed[SMB2_ECHO_HE]));
-+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
-+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
- seq_printf(m, "\nQueryDirectories: %d sent %d failed",
-- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
-- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
-+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
-+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
- seq_printf(m, "\nChangeNotifies: %d sent %d failed",
-- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
-- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
-+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
-+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
- seq_printf(m, "\nQueryInfos: %d sent %d failed",
-- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
-- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
-+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
-+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
- seq_printf(m, "\nSetInfos: %d sent %d failed",
-- atomic_read(&sent[SMB2_SET_INFO_HE]),
-- atomic_read(&failed[SMB2_SET_INFO_HE]));
-+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
-+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
- seq_printf(m, "\nOplockBreaks: %d sent %d failed",
-- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
-- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
-+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
-+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
- #endif
- }
-
-diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
-index edccb52..16bc6db 100644
---- a/fs/cifs/smb2pdu.c
-+++ b/fs/cifs/smb2pdu.c
-@@ -1957,8 +1957,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
- default:
- cifs_dbg(VFS, "info level %u isn't supported\n",
- srch_inf->info_level);
-- rc = -EINVAL;
-- goto qdir_exit;
-+ return -EINVAL;
+ dentry = d_lookup(parent, name);
+ if (dentry) {
++ int err;
+ inode = dentry->d_inode;
+ /* update inode in place if i_ino didn't change */
+ if (inode && CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
+ cifs_fattr_to_inode(inode, fattr);
+ return dentry;
+ }
+- d_drop(dentry);
++ err = d_invalidate(dentry);
+ dput(dentry);
++ if (err)
++ return NULL;
}
- req->FileIndex = cpu_to_le32(index);
+ /*
diff --git a/fs/coda/cache.c b/fs/coda/cache.c
-index 1da168c..8bc7ff6 100644
+index 6901578..d402eb5 100644
--- a/fs/coda/cache.c
+++ b/fs/coda/cache.c
@@ -24,7 +24,7 @@
@@ -54600,7 +52139,7 @@ index 1da168c..8bc7ff6 100644
spin_lock(&cii->c_lock);
- cii->c_cached_epoch = atomic_read(&permission_epoch);
+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
- if (!uid_eq(cii->c_uid, current_fsuid())) {
+ if (cii->c_uid != current_fsuid()) {
cii->c_uid = current_fsuid();
cii->c_cached_perm = mask;
@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
@@ -54623,26 +52162,38 @@ index 1da168c..8bc7ff6 100644
@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
spin_lock(&cii->c_lock);
hit = (mask & cii->c_cached_perm) == mask &&
- uid_eq(cii->c_uid, current_fsuid()) &&
+ cii->c_uid == current_fsuid() &&
- cii->c_cached_epoch == atomic_read(&permission_epoch);
+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
spin_unlock(&cii->c_lock);
return hit;
+diff --git a/fs/coda/inode.c b/fs/coda/inode.c
+index 871b277..7dcf232 100644
+--- a/fs/coda/inode.c
++++ b/fs/coda/inode.c
+@@ -326,4 +326,5 @@ struct file_system_type coda_fs_type = {
+ .kill_sb = kill_anon_super,
+ .fs_flags = FS_BINARY_MOUNTDATA,
+ };
++MODULE_ALIAS_FS("coda");
+
diff --git a/fs/compat.c b/fs/compat.c
-index 6af20de..fec3fbb 100644
+index 4bf082d..d33d8b7 100644
--- a/fs/compat.c
+++ b/fs/compat.c
-@@ -54,7 +54,7 @@
- #include <asm/ioctls.h>
- #include "internal.h"
-
--int compat_log = 1;
-+int compat_log = 0;
-
- int compat_printk(const char *fmt, ...)
+@@ -132,8 +132,8 @@ asmlinkage long compat_sys_utimes(const char __user *filename, struct compat_tim
+ static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
{
-@@ -488,7 +488,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
+ compat_ino_t ino = stat->ino;
+- typeof(ubuf->st_uid) uid = 0;
+- typeof(ubuf->st_gid) gid = 0;
++ typeof(((struct compat_stat *)0)->st_uid) uid = 0;
++ typeof(((struct compat_stat *)0)->st_gid) gid = 0;
+ int err;
+
+ SET_UID(uid, stat->uid);
+@@ -504,7 +504,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
set_fs(KERNEL_DS);
/* The __user pointer cast is valid because of the set_fs() */
@@ -54651,7 +52202,7 @@ index 6af20de..fec3fbb 100644
set_fs(oldfs);
/* truncating is ok because it's a user address */
if (!ret)
-@@ -546,7 +546,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
+@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
goto out;
ret = -EINVAL;
@@ -54660,15 +52211,15 @@ index 6af20de..fec3fbb 100644
goto out;
if (nr_segs > fast_segs) {
ret = -ENOMEM;
-@@ -834,6 +834,7 @@ struct compat_old_linux_dirent {
+@@ -849,6 +849,7 @@ struct compat_old_linux_dirent {
+
struct compat_readdir_callback {
- struct dir_context ctx;
struct compat_old_linux_dirent __user *dirent;
+ struct file * file;
int result;
};
-@@ -851,6 +852,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
+@@ -866,6 +867,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
buf->result = -EOVERFLOW;
return -EOVERFLOW;
}
@@ -54679,23 +52230,23 @@ index 6af20de..fec3fbb 100644
buf->result++;
dirent = buf->dirent;
if (!access_ok(VERIFY_WRITE, dirent,
-@@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
- if (!f.file)
- return -EBADF;
+@@ -898,6 +903,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
-+ buf.file = f.file;
- error = iterate_dir(f.file, &buf.ctx);
+ buf.result = 0;
+ buf.dirent = dirent;
++ buf.file = file;
+
+ error = vfs_readdir(file, compat_fillonedir, &buf);
if (buf.result)
- error = buf.result;
-@@ -901,6 +907,7 @@ struct compat_getdents_callback {
- struct dir_context ctx;
+@@ -918,6 +924,7 @@ struct compat_linux_dirent {
+ struct compat_getdents_callback {
struct compat_linux_dirent __user *current_dir;
struct compat_linux_dirent __user *previous;
+ struct file * file;
int count;
int error;
};
-@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
+@@ -939,6 +946,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
buf->error = -EOVERFLOW;
return -EOVERFLOW;
}
@@ -54706,23 +52257,23 @@ index 6af20de..fec3fbb 100644
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
- if (!f.file)
- return -EBADF;
+@@ -986,6 +997,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 = iterate_dir(f.file, &buf.ctx);
+ error = vfs_readdir(file, compat_filldir, &buf);
if (error >= 0)
- error = buf.error;
-@@ -987,6 +999,7 @@ struct compat_getdents_callback64 {
- struct dir_context ctx;
+@@ -1007,6 +1019,7 @@ out:
+ struct compat_getdents_callback64 {
struct linux_dirent64 __user *current_dir;
struct linux_dirent64 __user *previous;
+ struct file * file;
int count;
int error;
};
-@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
+@@ -1023,6 +1036,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;
@@ -54733,16 +52284,24 @@ index 6af20de..fec3fbb 100644
dirent = buf->previous;
if (dirent) {
-@@ -1052,6 +1069,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
- if (!f.file)
- return -EBADF;
+@@ -1074,13 +1091,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 = iterate_dir(f.file, &buf.ctx);
+ error = vfs_readdir(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;
+ 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 a81147e..20bf2b5 100644
+index 112e45a..b59845b 100644
--- a/fs/compat_binfmt_elf.c
+++ b/fs/compat_binfmt_elf.c
@@ -30,11 +30,13 @@
@@ -54760,10 +52319,10 @@ index a81147e..20bf2b5 100644
/*
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
-index 5d19acf..9ab093b 100644
+index f854cf9..d513829 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
-@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
+@@ -623,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
return -EFAULT;
if (__get_user(udata, &ss32->iomem_base))
return -EFAULT;
@@ -54772,7 +52331,7 @@ index 5d19acf..9ab093b 100644
if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
__get_user(ss.port_high, &ss32->port_high))
return -EFAULT;
-@@ -702,8 +702,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
+@@ -704,8 +704,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
for (i = 0; i < nmsgs; i++) {
if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
return -EFAULT;
@@ -54783,7 +52342,7 @@ index 5d19acf..9ab093b 100644
return -EFAULT;
}
return sys_ioctl(fd, cmd, (unsigned long)tdata);
-@@ -796,7 +796,7 @@ static int compat_ioctl_preallocate(struct file *file,
+@@ -798,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
@@ -54792,7 +52351,7 @@ index 5d19acf..9ab093b 100644
return -EFAULT;
return ioctl_preallocate(file, p);
-@@ -1616,8 +1616,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
+@@ -1646,8 +1646,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;
@@ -54804,135 +52363,92 @@ index 5d19acf..9ab093b 100644
return 1;
if (a < b)
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
-index 277bd1b..f312c9e 100644
+index 9a37a9b..80968f3 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
-@@ -1546,7 +1546,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
- }
- for (p = q->next; p != &parent_sd->s_children; p = p->next) {
- struct configfs_dirent *next;
-- const char *name;
-+ const unsigned char * name;
-+ char d_name[sizeof(next->s_dentry->d_iname)];
- int len;
- struct inode *inode = NULL;
-
-@@ -1555,7 +1556,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
- continue;
-
- name = configfs_get_name(next);
-- len = strlen(name);
-+ if (next->s_dentry && name == next->s_dentry->d_iname) {
-+ len = next->s_dentry->d_name.len;
-+ memcpy(d_name, name, len);
-+ name = d_name;
-+ } else
-+ len = strlen(name);
-
- /*
- * We'll have a dentry and an inode for
-diff --git a/fs/coredump.c b/fs/coredump.c
-index 9bdeca1..2247b92 100644
---- a/fs/coredump.c
-+++ b/fs/coredump.c
-@@ -438,8 +438,8 @@ static void wait_for_dump_helpers(struct file *file)
- struct pipe_inode_info *pipe = file->private_data;
-
- pipe_lock(pipe);
-- pipe->readers++;
-- pipe->writers--;
-+ atomic_inc(&pipe->readers);
-+ atomic_dec(&pipe->writers);
- wake_up_interruptible_sync(&pipe->wait);
- kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
- pipe_unlock(pipe);
-@@ -448,11 +448,11 @@ static void wait_for_dump_helpers(struct file *file)
- * We actually want wait_event_freezable() but then we need
- * to clear TIF_SIGPENDING and improve dump_interrupted().
- */
-- wait_event_interruptible(pipe->wait, pipe->readers == 1);
-+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
-
- pipe_lock(pipe);
-- pipe->readers--;
-- pipe->writers++;
-+ atomic_dec(&pipe->readers);
-+ atomic_inc(&pipe->writers);
- pipe_unlock(pipe);
- }
-
-@@ -499,7 +499,8 @@ void do_coredump(siginfo_t *siginfo)
- struct files_struct *displaced;
- bool need_nonrelative = false;
- bool core_dumped = 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 = signal_pt_regs(),
-@@ -512,7 +513,10 @@ void do_coredump(siginfo_t *siginfo)
- .mm_flags = mm->flags,
- };
+@@ -1047,10 +1047,11 @@ static int configfs_dump(struct configfs_dirent *sd, int level)
+ static int configfs_depend_prep(struct dentry *origin,
+ struct config_item *target)
+ {
+- struct configfs_dirent *child_sd, *sd = origin->d_fsdata;
++ struct configfs_dirent *child_sd, *sd;
+ int ret = 0;
-- 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);
+- BUG_ON(!origin || !sd);
++ BUG_ON(!origin || !origin->d_fsdata);
++ sd = origin->d_fsdata;
- binfmt = mm->binfmt;
- if (!binfmt || !binfmt->core_dump)
-@@ -536,7 +540,7 @@ void do_coredump(siginfo_t *siginfo)
- need_nonrelative = true;
- }
+ if (sd->s_element == target) /* Boo-yah */
+ goto out;
+@@ -1575,7 +1576,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
+ }
+ for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
+ struct configfs_dirent *next;
+- const char * name;
++ const unsigned char * name;
++ char d_name[sizeof(next->s_dentry->d_iname)];
+ int len;
+ struct inode *inode = NULL;
+
+@@ -1585,7 +1587,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
+ continue;
+
+ name = configfs_get_name(next);
+- len = strlen(name);
++ if (next->s_dentry && name == next->s_dentry->d_iname) {
++ len = next->s_dentry->d_name.len;
++ memcpy(d_name, name, len);
++ name = d_name;
++ } else
++ len = strlen(name);
-- retval = coredump_wait(siginfo->si_signo, &core_state);
-+ retval = coredump_wait(signr, &core_state);
- if (retval < 0)
- goto fail_creds;
+ /*
+ * We'll have a dentry and an inode for
+diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
+index 276e15c..aeac324 100644
+--- a/fs/configfs/mount.c
++++ b/fs/configfs/mount.c
+@@ -117,6 +117,7 @@ static struct file_system_type configfs_fs_type = {
+ .mount = configfs_do_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("configfs");
-@@ -579,7 +583,7 @@ void do_coredump(siginfo_t *siginfo)
- }
- cprm.limit = RLIM_INFINITY;
+ int configfs_pin_fs(void)
+ {
+diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
+index 739fb59..5385976 100644
+--- a/fs/cramfs/inode.c
++++ b/fs/cramfs/inode.c
+@@ -576,6 +576,7 @@ static struct file_system_type cramfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("cramfs");
-- 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);
-@@ -611,6 +615,8 @@ void do_coredump(siginfo_t *siginfo)
- } else {
- struct inode *inode;
+ static int __init init_cramfs_fs(void)
+ {
+diff --git a/fs/dcache.c b/fs/dcache.c
+index d322929..9f4b816 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -103,11 +103,11 @@ static unsigned int d_hash_shift __read_mostly;
-+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
-+
- if (cprm.limit < binfmt->min_coredump)
- goto fail_unlock;
+ static struct hlist_bl_head *dentry_hashtable __read_mostly;
-@@ -669,7 +675,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);
- coredump_finish(mm, core_dumped);
-@@ -689,7 +695,7 @@ int dump_write(struct file *file, const void *addr, int nr)
+-static inline struct hlist_bl_head *d_hash(struct dentry *parent,
+- unsigned long hash)
++static inline struct hlist_bl_head *d_hash(const struct dentry *parent,
++ unsigned int hash)
{
- return !dump_interrupted() &&
- access_ok(VERIFY_READ, addr, nr) &&
-- file->f_op->write(file, addr, nr, &file->f_pos) == nr;
-+ file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
+- hash += ((unsigned long) parent ^ GOLDEN_RATIO_PRIME) / L1_CACHE_BYTES;
+- hash = hash ^ ((hash ^ GOLDEN_RATIO_PRIME) >> D_HASHBITS);
++ hash += (unsigned long) parent / L1_CACHE_BYTES;
++ hash = hash + (hash >> D_HASHBITS);
+ return dentry_hashtable + (hash & D_HASHMASK);
}
- EXPORT_SYMBOL(dump_write);
-diff --git a/fs/dcache.c b/fs/dcache.c
-index ae6ebb8..6e46065 100644
---- a/fs/dcache.c
-+++ b/fs/dcache.c
-@@ -3429,7 +3429,8 @@ void __init vfs_caches_init(unsigned long mempages)
+@@ -3057,7 +3057,8 @@ void __init vfs_caches_init(unsigned long mempages)
mempages -= reserve;
names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -54943,35 +52459,52 @@ index ae6ebb8..6e46065 100644
dcache_init();
inode_init();
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
-index c7c83ff..bda9461 100644
+index fb001cd..95129c3 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
-@@ -415,7 +415,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
- */
+@@ -145,6 +145,7 @@ static struct file_system_type debug_fs_type = {
+ .mount = debug_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("debugfs");
+
+ static int debugfs_create_by_name(const char *name, mode_t mode,
+ struct dentry *parent,
+@@ -261,7 +262,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
{
+ return debugfs_create_file(name,
+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
-+ return __create_file(name, S_IFDIR | S_IRWXU,
++ S_IFDIR | S_IRWXU,
+#else
- return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
+ S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
+#endif
parent, NULL, NULL);
}
EXPORT_SYMBOL_GPL(debugfs_create_dir);
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
-index 67e9b63..a9adb68 100644
+index a9be90d..3cf866c 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
-@@ -674,7 +674,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
+@@ -705,7 +705,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
old_fs = get_fs();
set_fs(get_ds());
rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
- (char __user *)lower_buf,
+ (char __force_user *)lower_buf,
- PATH_MAX);
+ lower_bufsiz);
set_fs(old_fs);
if (rc < 0)
-@@ -706,7 +706,7 @@ out:
+@@ -751,7 +751,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+ }
+ old_fs = get_fs();
+ set_fs(get_ds());
+- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
++ rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
+ set_fs(old_fs);
+ if (rc < 0) {
+ kfree(buf);
+@@ -766,7 +766,7 @@ out:
static void
ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
{
@@ -54980,30 +52513,115 @@ index 67e9b63..a9adb68 100644
if (!IS_ERR(buf)) {
/* Free the char* */
kfree(buf);
+diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
+index ac1ad48..d80e1db 100644
+--- a/fs/ecryptfs/keystore.c
++++ b/fs/ecryptfs/keystore.c
+@@ -1151,8 +1151,8 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
+ struct ecryptfs_msg_ctx *msg_ctx;
+ struct ecryptfs_message *msg = NULL;
+ char *auth_tok_sig;
+- char *payload;
+- size_t payload_len;
++ char *payload = NULL;
++ size_t payload_len = 0;
+ int rc;
+
+ rc = ecryptfs_get_auth_tok_sig(&auth_tok_sig, auth_tok);
+@@ -1204,8 +1204,8 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
+ crypt_stat->key_size);
+ }
+ out:
+- if (msg)
+- kfree(msg);
++ kfree(msg);
++ kfree(payload);
+ return rc;
+ }
+
+diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
+index 94afdfd..bdb8854 100644
+--- a/fs/ecryptfs/main.c
++++ b/fs/ecryptfs/main.c
+@@ -629,6 +629,7 @@ static struct file_system_type ecryptfs_fs_type = {
+ .kill_sb = ecryptfs_kill_block_super,
+ .fs_flags = 0
+ };
++MODULE_ALIAS_FS("ecryptfs");
+
+ /**
+ * inode_info_init_once
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
-index e4141f2..d8263e8 100644
+index de42310..867dddd 100644
--- a/fs/ecryptfs/miscdev.c
+++ b/fs/ecryptfs/miscdev.c
-@@ -304,7 +304,7 @@ check_list:
+@@ -338,7 +338,7 @@ check_list:
goto out_unlock_msg_ctx;
- i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
+ i = 5;
if (msg_ctx->msg) {
- if (copy_to_user(&buf[i], packet_length, packet_length_size))
+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
goto out_unlock_msg_ctx;
i += packet_length_size;
if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
+diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
+index 608c1c3..7d040a8 100644
+--- a/fs/ecryptfs/read_write.c
++++ b/fs/ecryptfs/read_write.c
+@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
+ return -EIO;
+ fs_save = get_fs();
+ set_fs(get_ds());
+- rc = vfs_write(lower_file, data, size, &offset);
++ rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
+ set_fs(fs_save);
+ mark_inode_dirty_sync(ecryptfs_inode);
+ return rc;
+@@ -244,7 +244,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
+ return -EIO;
+ fs_save = get_fs();
+ set_fs(get_ds());
+- rc = vfs_read(lower_file, data, size, &offset);
++ rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
+ set_fs(fs_save);
+ return rc;
+ }
+diff --git a/fs/efs/super.c b/fs/efs/super.c
+index 0f31acb..395ebc9 100644
+--- a/fs/efs/super.c
++++ b/fs/efs/super.c
+@@ -33,6 +33,7 @@ static struct file_system_type efs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("efs");
+
+ static struct pt_types sgi_pt_types[] = {
+ {0x00, "SGI vh"},
+diff --git a/fs/eventpoll.c b/fs/eventpoll.c
+index 451b9b8..12e5a03 100644
+--- a/fs/eventpoll.c
++++ b/fs/eventpoll.c
+@@ -1560,8 +1560,8 @@ SYSCALL_DEFINE1(epoll_create1, int, flags)
+ error = PTR_ERR(file);
+ goto out_free_fd;
+ }
+- fd_install(fd, file);
+ ep->file = file;
++ fd_install(fd, file);
+ return fd;
+
+ out_free_fd:
diff --git a/fs/exec.c b/fs/exec.c
-index 8875dd1..c53682a 100644
+index a2d0e51..8ece03f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -55,8 +55,20 @@
+@@ -55,12 +55,35 @@
#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
@@ -55017,10 +52635,7 @@ index 8875dd1..c53682a 100644
+#include <asm/sections.h>
#include <asm/mmu_context.h>
#include <asm/tlb.h>
-
-@@ -66,19 +78,34 @@
-
- #include <trace/events/sched.h>
+ #include "internal.h"
+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
@@ -55034,7 +52649,17 @@ index 8875dd1..c53682a 100644
+EXPORT_SYMBOL(pax_set_initial_flags_func);
+#endif
+
- int suid_dumpable = 0;
+ int core_uses_pid;
+ char core_pattern[CORENAME_MAX_SIZE] = "core";
+ unsigned int core_pipe_limit;
+@@ -70,20 +93,23 @@ 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 */
static LIST_HEAD(formats);
static DEFINE_RWLOCK(binfmt_lock);
@@ -55042,20 +52667,19 @@ index 8875dd1..c53682a 100644
+extern int gr_process_kernel_exec_ban(void);
+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
+
- void __register_binfmt(struct linux_binfmt * fmt, int insert)
+ int __register_binfmt(struct linux_binfmt * fmt, int insert)
{
- BUG_ON(!fmt);
- if (WARN_ON(!fmt->load_binary))
- return;
+ if (!fmt)
+ return -EINVAL;
write_lock(&binfmt_lock);
- insert ? list_add(&fmt->lh, &formats) :
- list_add_tail(&fmt->lh, &formats);
+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
write_unlock(&binfmt_lock);
+ return 0;
}
-
-@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
+@@ -93,7 +119,7 @@ EXPORT_SYMBOL(__register_binfmt);
void unregister_binfmt(struct linux_binfmt * fmt)
{
write_lock(&binfmt_lock);
@@ -55064,7 +52688,7 @@ index 8875dd1..c53682a 100644
write_unlock(&binfmt_lock);
}
-@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+@@ -188,18 +214,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
int write)
{
struct page *page;
@@ -55086,15 +52710,15 @@ index 8875dd1..c53682a 100644
return NULL;
if (write) {
-@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+@@ -215,6 +233,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
if (size <= ARG_MAX)
return page;
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ // only allow 512KB for argv+env on suid/sgid binaries
+ // to prevent easy ASLR exhaustion
-+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
-+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
++ if (((bprm->cred->euid != current_euid()) ||
++ (bprm->cred->egid != current_egid())) &&
+ (size > (512 * 1024))) {
+ put_page(page);
+ return NULL;
@@ -55104,10 +52728,10 @@ index 8875dd1..c53682a 100644
/*
* Limit to 1/4-th the stack size for the argv+env strings.
* This ensures that:
-@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -274,6 +303,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_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
+ vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
@@ -55116,20 +52740,26 @@ index 8875dd1..c53682a 100644
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
INIT_LIST_HEAD(&vma->anon_vma_chain);
-@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -288,6 +322,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 *);
+
+#ifdef CONFIG_PAX_RANDUSTACK
+ if (randomize_va_space)
-+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
++ bprm->p ^= random32() & ~PAGE_MASK;
+#endif
+
return 0;
err:
up_write(&mm->mmap_sem);
-@@ -399,7 +440,7 @@ struct user_arg_ptr {
+@@ -403,12 +443,12 @@ struct user_arg_ptr {
+ union {
+ const char __user *const __user *native;
+ #ifdef CONFIG_COMPAT
+- compat_uptr_t __user *compat;
++ const compat_uptr_t __user *compat;
+ #endif
} ptr;
};
@@ -55138,7 +52768,7 @@ index 8875dd1..c53682a 100644
{
const char __user *native;
-@@ -408,14 +449,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
+@@ -417,14 +457,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))
@@ -55155,7 +52785,7 @@ index 8875dd1..c53682a 100644
return native;
}
-@@ -434,7 +475,7 @@ static int count(struct user_arg_ptr argv, int max)
+@@ -443,11 +483,12 @@ static int count(struct user_arg_ptr argv, int max)
if (!p)
break;
@@ -55163,8 +52793,14 @@ index 8875dd1..c53682a 100644
+ if (IS_ERR((const char __force_kernel *)p))
return -EFAULT;
- if (i >= max)
-@@ -469,7 +510,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;
+@@ -477,7 +518,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
ret = -EFAULT;
str = get_user_arg_ptr(argv, argc);
@@ -55173,7 +52809,7 @@ index 8875dd1..c53682a 100644
goto out;
len = strnlen_user(str, MAX_ARG_STRLEN);
-@@ -551,7 +592,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
+@@ -559,7 +600,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
int r;
mm_segment_t oldfs = get_fs();
struct user_arg_ptr argv = {
@@ -55182,7 +52818,7 @@ index 8875dd1..c53682a 100644
};
set_fs(KERNEL_DS);
-@@ -586,7 +627,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -594,7 +635,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;
@@ -55192,7 +52828,7 @@ index 8875dd1..c53682a 100644
/*
* ensure there are no vmas between where we want to go
-@@ -595,6 +637,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -603,6 +645,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
if (vma != find_vma(mm, new_start))
return -EFAULT;
@@ -55203,7 +52839,7 @@ index 8875dd1..c53682a 100644
/*
* cover the whole range: [new_start, old_end)
*/
-@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -683,10 +729,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
stack_top = arch_align_stack(stack_top);
stack_top = PAGE_ALIGN(stack_top);
@@ -55214,7 +52850,7 @@ index 8875dd1..c53682a 100644
stack_shift = vma->vm_end - stack_top;
bprm->p -= stack_shift;
-@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -698,8 +740,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
bprm->exec -= stack_shift;
down_write(&mm->mmap_sem);
@@ -55243,7 +52879,7 @@ index 8875dd1..c53682a 100644
/*
* Adjust stack execute permissions; explicitly enable for
* EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -718,13 +780,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
goto out_unlock;
BUG_ON(prev != vma);
@@ -55257,25 +52893,25 @@ index 8875dd1..c53682a 100644
/* mprotect_fixup is overkill to remove the temporary stack flags */
vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
-@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -748,6 +803,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_RANDMMAP)
+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
-+ unsigned long size;
-+ vm_flags_t vm_flags;
++ unsigned long size, flags, vm_flags;
+
+ size = STACK_TOP - vma->vm_end;
-+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
++ flags = MAP_FIXED | MAP_PRIVATE;
++ vm_flags = VM_DONTEXPAND | VM_RESERVED;
+
-+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
++ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, flags, vm_flags, 0);
+
+#ifdef CONFIG_X86
+ if (!ret) {
+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
-+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
++ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), flags, vm_flags, 0);
+ }
+#endif
+
@@ -55285,7 +52921,7 @@ index 8875dd1..c53682a 100644
if (ret)
ret = -EFAULT;
-@@ -776,6 +852,8 @@ struct file *open_exec(const char *name)
+@@ -782,6 +858,8 @@ struct file *open_exec(const char *name)
fsnotify_open(file);
@@ -55294,7 +52930,7 @@ index 8875dd1..c53682a 100644
err = deny_write_access(file);
if (err)
goto exit;
-@@ -799,7 +877,7 @@ int kernel_read(struct file *file, loff_t offset,
+@@ -805,7 +883,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() */
@@ -55303,7 +52939,82 @@ index 8875dd1..c53682a 100644
set_fs(old_fs);
return result;
}
-@@ -1255,7 +1333,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
+@@ -1070,6 +1148,21 @@ void set_task_comm(struct task_struct *tsk, char *buf)
+ perf_event_comm(tsk);
+ }
+
++static void filename_to_taskname(char *tcomm, const char *fn, unsigned int len)
++{
++ int i, ch;
++
++ /* Copies the binary name from after last slash */
++ for (i = 0; (ch = *(fn++)) != '\0';) {
++ if (ch == '/')
++ i = 0; /* overwrite what we wrote */
++ else
++ if (i < len - 1)
++ tcomm[i++] = ch;
++ }
++ tcomm[i] = '\0';
++}
++
+ int flush_old_exec(struct linux_binprm * bprm)
+ {
+ int retval;
+@@ -1084,6 +1177,7 @@ int flush_old_exec(struct linux_binprm * bprm)
+
+ set_mm_exe_file(bprm->mm, bprm->file);
+
++ filename_to_taskname(bprm->tcomm, bprm->filename, sizeof(bprm->tcomm));
+ /*
+ * Release all of the old mmap stuff
+ */
+@@ -1116,10 +1210,6 @@ EXPORT_SYMBOL(would_dump);
+
+ void setup_new_exec(struct linux_binprm * bprm)
+ {
+- int i, ch;
+- const char *name;
+- char tcomm[sizeof(current->comm)];
+-
+ arch_pick_mmap_layout(current->mm);
+
+ /* This is the point of no return */
+@@ -1130,18 +1220,7 @@ void setup_new_exec(struct linux_binprm * bprm)
+ else
+ set_dumpable(current->mm, suid_dumpable);
+
+- name = bprm->filename;
+-
+- /* Copies the binary name from after last slash */
+- for (i=0; (ch = *(name++)) != '\0';) {
+- if (ch == '/')
+- i = 0; /* overwrite what we wrote */
+- else
+- if (i < (sizeof(tcomm) - 1))
+- tcomm[i++] = ch;
+- }
+- tcomm[i] = '\0';
+- set_task_comm(current, tcomm);
++ set_task_comm(current, bprm->tcomm);
+
+ /* Set the new mm task size. We have to do that late because it may
+ * depend on TIF_32BIT which is only updated in flush_thread() on
+@@ -1259,6 +1338,13 @@ int check_unsafe_exec(struct linux_binprm *bprm)
+ bprm->unsafe |= LSM_UNSAFE_PTRACE;
+ }
+
++ /*
++ * This isn't strictly necessary, but it makes it harder for LSMs to
++ * mess up.
++ */
++ if (current->no_new_privs)
++ bprm->unsafe |= LSM_UNSAFE_NO_NEW_PRIVS;
++
+ n_fs = 1;
+ spin_lock(&p->fs->lock);
+ rcu_read_lock();
+@@ -1268,7 +1354,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
}
rcu_read_unlock();
@@ -55312,9 +53023,19 @@ index 8875dd1..c53682a 100644
bprm->unsafe |= LSM_UNSAFE_SHARE;
} else {
res = -EAGAIN;
-@@ -1451,6 +1529,31 @@ static int exec_binprm(struct linux_binprm *bprm)
- return ret;
- }
+@@ -1302,7 +1388,8 @@ int prepare_binprm(struct linux_binprm *bprm)
+ bprm->cred->euid = current_euid();
+ bprm->cred->egid = current_egid();
+
+- if (!(bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)) {
++ if (!(bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID) &&
++ !current->no_new_privs) {
+ /* Set-uid? */
+ if (mode & S_ISUID) {
+ bprm->per_clear |= PER_CLEAR_ON_SETID;
+@@ -1463,6 +1550,31 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
+
+ EXPORT_SYMBOL(search_binary_handler);
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+static DEFINE_PER_CPU(u64, exec_counter);
@@ -55344,9 +53065,9 @@ index 8875dd1..c53682a 100644
/*
* sys_execve() executes a new program.
*/
-@@ -1458,12 +1561,19 @@ static int do_execve_common(const char *filename,
- struct user_arg_ptr argv,
- struct user_arg_ptr envp)
+@@ -1471,6 +1583,11 @@ static int do_execve_common(const char *filename,
+ struct user_arg_ptr envp,
+ struct pt_regs *regs)
{
+#ifdef CONFIG_GRKERNSEC
+ struct file *old_exec_file;
@@ -55356,15 +53077,16 @@ index 8875dd1..c53682a 100644
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
- bool clear_in_exec;
+@@ -1478,6 +1595,8 @@ static int do_execve_common(const char *filename,
int retval;
+ const struct cred *cred = current_cred();
-+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(¤t_user()->processes), 1);
++ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&cred->user->processes), 1);
+
/*
* We move the actual failure in case of RLIMIT_NPROC excess from
* set*uid() to execve() because too many poorly written programs
-@@ -1504,12 +1614,22 @@ static int do_execve_common(const char *filename,
+@@ -1518,12 +1637,22 @@ static int do_execve_common(const char *filename,
if (IS_ERR(file))
goto out_unmark;
@@ -55379,7 +53101,7 @@ index 8875dd1..c53682a 100644
bprm->filename = filename;
bprm->interp = filename;
-+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
++ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
+ retval = -EACCES;
+ goto out_file;
+ }
@@ -55387,7 +53109,7 @@ index 8875dd1..c53682a 100644
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1526,24 +1646,70 @@ static int do_execve_common(const char *filename,
+@@ -1540,24 +1669,70 @@ static int do_execve_common(const char *filename,
if (retval < 0)
goto out;
@@ -55400,9 +53122,9 @@ index 8875dd1..c53682a 100644
+#endif
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ /* limit suid stack to 8MB
-+ * we saved the old limits above and will restore them if this exec fails
-+ */
-+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
++ we saved the old limits above and will restore them if this exec fails
++ */
++ if (((bprm->cred->euid != current_euid()) || (bprm->cred->egid != current_egid())) &&
+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
+#endif
@@ -55422,7 +53144,7 @@ index 8875dd1..c53682a 100644
+ goto out_fail;
+ }
+
-+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
++ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
+ bprm->unsafe);
+ if (retval < 0)
+ goto out_fail;
@@ -55443,11 +53165,11 @@ index 8875dd1..c53682a 100644
- goto out;
+ goto out_fail;
+
-+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
++ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
+
+ gr_handle_exec_args(bprm, argv);
- retval = exec_binprm(bprm);
+ retval = search_binary_handler(bprm,regs);
if (retval < 0)
- goto out;
+ goto out_fail;
@@ -55462,7 +53184,7 @@ index 8875dd1..c53682a 100644
current->fs->in_exec = 0;
current->in_execve = 0;
acct_update_integrals(current);
-@@ -1552,6 +1718,14 @@ static int do_execve_common(const char *filename,
+@@ -1566,6 +1741,14 @@ static int do_execve_common(const char *filename,
put_files_struct(displaced);
return retval;
@@ -55477,11 +53199,28 @@ index 8875dd1..c53682a 100644
out:
if (bprm->mm) {
acct_arg_size(bprm, 0);
-@@ -1700,3 +1874,295 @@ asmlinkage long compat_sys_execve(const char __user * filename,
- return error;
+@@ -1639,7 +1822,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) {
+@@ -1736,7 +1919,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;
+
+@@ -1833,6 +2016,292 @@ out:
+ return ispipe;
}
- #endif
-+
+
+int pax_check_flags(unsigned long *flags)
+{
+ int retval = 0;
@@ -55490,7 +53229,7 @@ index 8875dd1..c53682a 100644
+ if (*flags & MF_PAX_SEGMEXEC)
+ {
+ *flags &= ~MF_PAX_SEGMEXEC;
-+ retval = -EINVAL;
++ retval = -EINVAL;
+ }
+#endif
+
@@ -55515,7 +53254,7 @@ index 8875dd1..c53682a 100644
+ )
+ {
+ *flags &= ~MF_PAX_MPROTECT;
-+ retval = -EINVAL;
++ retval = -EINVAL;
+ }
+
+ if ((*flags & MF_PAX_EMUTRAMP)
@@ -55564,7 +53303,6 @@ index 8875dd1..c53682a 100644
+ 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;
@@ -55572,7 +53310,7 @@ index 8875dd1..c53682a 100644
+ down_read(&mm->mmap_sem);
+ vma = mm->mmap;
+ while (vma && (!vma_exec || !vma_fault)) {
-+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
++ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
+ vma_exec = vma;
+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
+ vma_fault = vma;
@@ -55599,17 +53337,13 @@ index 8875dd1..c53682a 100644
+ 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),
-+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, 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),
++ task_uid(tsk), task_euid(tsk), pc, sp);
+ free_page((unsigned long)buffer_exec);
+ free_page((unsigned long)buffer_fault);
+ pax_report_insns(regs, pc, sp);
-+ info.si_signo = SIGKILL;
-+ info.si_errno = 0;
-+ info.si_code = SI_KERNEL;
-+ info.si_pid = 0;
-+ info.si_uid = 0;
-+ do_coredump(&info);
++ do_coredump(SIGKILL, SIGKILL, regs);
+}
+#endif
+
@@ -55618,11 +53352,10 @@ index 8875dd1..c53682a 100644
+{
+ 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),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
++ ¤t->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
+ else
-+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
-+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
++ 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());
+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
+ preempt_disable();
+ show_regs(regs);
@@ -55679,14 +53412,14 @@ index 8875dd1..c53682a 100644
+#endif
+}
+
-+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
++static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
+{
+ if (current->signal->curr_ip)
+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
-+ ¤t->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
++ ¤t->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
+ else
+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
-+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
++ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
+ dump_stack();
+ gr_handle_kernel_exploit();
+ do_group_exit(SIGKILL);
@@ -55773,28 +53506,193 @@ index 8875dd1..c53682a 100644
+}
+EXPORT_SYMBOL(report_size_overflow);
+#endif
++
+ static int zap_process(struct task_struct *start, int exit_code)
+ {
+ struct task_struct *t;
+@@ -2006,17 +2475,17 @@ static void coredump_finish(struct mm_struct *mm)
+ void set_dumpable(struct mm_struct *mm, int value)
+ {
+ switch (value) {
+- case 0:
++ case SUID_DUMPABLE_DISABLED:
+ clear_bit(MMF_DUMPABLE, &mm->flags);
+ smp_wmb();
+ clear_bit(MMF_DUMP_SECURELY, &mm->flags);
+ break;
+- case 1:
++ case SUID_DUMPABLE_ENABLED:
+ set_bit(MMF_DUMPABLE, &mm->flags);
+ smp_wmb();
+ clear_bit(MMF_DUMP_SECURELY, &mm->flags);
+ break;
+- case 2:
++ case SUID_DUMPABLE_SAFE:
+ set_bit(MMF_DUMP_SECURELY, &mm->flags);
+ smp_wmb();
+ set_bit(MMF_DUMPABLE, &mm->flags);
+@@ -2029,7 +2498,7 @@ static int __get_dumpable(unsigned long mm_flags)
+ int ret;
+
+ ret = mm_flags & MMF_DUMPABLE_MASK;
+- return (ret >= 2) ? 2 : ret;
++ return (ret > SUID_DUMPABLE_ENABLED) ? SUID_DUMPABLE_SAFE : ret;
+ }
+
+ int get_dumpable(struct mm_struct *mm)
+@@ -2044,17 +2513,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);
+
+ }
+@@ -2115,7 +2584,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
+ int retval = 0;
+ int flag = 0;
+ int ispipe;
+- static atomic_t core_dump_count = ATOMIC_INIT(0);
++ bool need_nonrelative = false;
++ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
+ struct coredump_params cprm = {
+ .signr = signr,
+ .regs = regs,
+@@ -2130,6 +2600,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(cprm.mm_flags);
++
+ binfmt = mm->binfmt;
+ if (!binfmt || !binfmt->core_dump)
+ goto fail;
+@@ -2140,14 +2613,16 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
+ if (!cred)
+ goto fail;
+ /*
+- * We cannot trust fsuid as being the "true" uid of the
+- * process nor do we know its entire history. We only know it
+- * was tainted so we dump it as root in mode 2.
++ * We cannot trust fsuid as being the "true" uid of the process
++ * nor do we know its entire history. We only know it was tainted
++ * so we dump it as root in mode 2, and only into a controlled
++ * environment (pipe handler or fully qualified path).
+ */
+- if (__get_dumpable(cprm.mm_flags) == 2) {
++ if (__get_dumpable(cprm.mm_flags) == SUID_DUMPABLE_SAFE) {
+ /* Setuid core dump mode */
+ flag = O_EXCL; /* Stop rewrite attacks */
+ cred->fsuid = 0; /* Dump root private */
++ need_nonrelative = true;
+ }
+
+ retval = coredump_wait(exit_code, &core_state);
+@@ -2197,7 +2672,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);
+@@ -2224,9 +2699,19 @@ 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;
+
++ if (need_nonrelative && cn.corename[0] != '/') {
++ printk(KERN_WARNING "Pid %d(%s) can only dump core "\
++ "to fully qualified path!\n",
++ task_tgid_vnr(current), current->comm);
++ printk(KERN_WARNING "Skipping core dump\n");
++ goto fail_unlock;
++ }
++
+ cprm.file = filp_open(cn.corename,
+ O_CREAT | 2 | O_NOFOLLOW | O_LARGEFILE | flag,
+ 0600);
+@@ -2267,7 +2752,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:
+@@ -2286,7 +2771,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/exofs/super.c b/fs/exofs/super.c
+index 7ed5000..cbe7b49 100644
+--- a/fs/exofs/super.c
++++ b/fs/exofs/super.c
+@@ -1008,6 +1008,7 @@ static struct file_system_type exofs_type = {
+ .mount = exofs_mount,
+ .kill_sb = generic_shutdown_super,
+ };
++MODULE_ALIAS_FS("exofs");
+
+ static int __init init_exofs(void)
+ {
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
-index 9f9992b..8b59411 100644
+index a8cbe1b..fed04cb 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
-@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
+@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
-+ if (free_blocks < root_blocks + 1 &&
- !uid_eq(sbi->s_resuid, current_fsuid()) &&
- (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
-- !in_group_p (sbi->s_resgid))) {
-+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
++ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
+ sbi->s_resuid != current_fsuid() &&
+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
- }
- return 1;
+diff --git a/fs/ext2/super.c b/fs/ext2/super.c
+index bd8ac16..43811b9 100644
+--- a/fs/ext2/super.c
++++ b/fs/ext2/super.c
+@@ -1494,6 +1494,7 @@ static struct file_system_type ext2_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("ext2");
+
+ static int __init init_ext2_fs(void)
+ {
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
-index 2d7557d..14e38f94 100644
+index d27b71f..071b0e1 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
-@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
+@@ -248,7 +248,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
struct buffer_head *bh = NULL;
struct ext2_xattr_entry *entry;
char *end;
@@ -55803,7 +53701,7 @@ index 2d7557d..14e38f94 100644
int error;
ea_idebug(inode, "buffer=%p, buffer_size=%ld",
-@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
+@@ -306,9 +306,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
buffer += size;
}
rest -= size;
@@ -55816,27 +53714,39 @@ index 2d7557d..14e38f94 100644
cleanup:
brelse(bh);
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
-index 22548f5..41521d8 100644
+index a203892..4e64db5 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)
+@@ -1446,9 +1446,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
+ if (free_blocks < root_blocks + 1 &&
- !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
- (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
-- !in_group_p (sbi->s_resgid))) {
-+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
+ !use_reservation && sbi->s_resuid != current_fsuid() &&
+- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
++ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)) &&
++ !capable_nolog(CAP_SYS_RESOURCE)) {
return 0;
}
return 1;
+diff --git a/fs/ext3/super.c b/fs/ext3/super.c
+index b7f314f..ef3b16c 100644
+--- a/fs/ext3/super.c
++++ b/fs/ext3/super.c
+@@ -3065,6 +3065,7 @@ static struct file_system_type ext3_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("ext3");
+
+ static int __init init_ext3_fs(void)
+ {
diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
-index b1fc963..881228c 100644
+index d565759..a1315f2 100644
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
-@@ -330,7 +330,7 @@ static int
+@@ -335,7 +335,7 @@ static int
ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
char *buffer, size_t buffer_size)
{
@@ -55845,7 +53755,7 @@ index b1fc963..881228c 100644
for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
const struct xattr_handler *handler =
-@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
+@@ -352,9 +352,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
buffer += size;
}
rest -= size;
@@ -55858,25 +53768,25 @@ index b1fc963..881228c 100644
static int
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
-index dc5d572..4c21f8e 100644
+index 2845a1f..f29de63 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
-@@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
+@@ -441,8 +441,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
/* Hm, nope. Are (enough) root reserved clusters available? */
- if (uid_eq(sbi->s_resuid, current_fsuid()) ||
- (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
+ if (sbi->s_resuid == current_fsuid() ||
+ ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
- capable(CAP_SYS_RESOURCE) ||
-- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
+- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
+ capable_nolog(CAP_SYS_RESOURCE)) {
- if (free_clusters >= (nclusters + dirty_clusters +
- resv_clusters))
+ if (free_clusters >= (nclusters + dirty_clusters))
+ return 1;
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index af815ea..99294a6 100644
+index 60b6ca5..bfa15a7 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
-@@ -1256,19 +1256,19 @@ struct ext4_sb_info {
+@@ -1206,19 +1206,19 @@ struct ext4_sb_info {
unsigned long s_mb_last_start;
/* stats for buddy allocator */
@@ -55907,10 +53817,10 @@ index af815ea..99294a6 100644
/* locality groups */
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index a41e3ba..e574a00 100644
+index 9b8c131..d469b31 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
-@@ -1880,7 +1880,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
+@@ -1794,7 +1794,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)
@@ -55919,7 +53829,7 @@ index a41e3ba..e574a00 100644
break;
}
-@@ -2189,7 +2189,7 @@ repeat:
+@@ -2092,7 +2092,7 @@ repeat:
ac->ac_status = AC_STATUS_CONTINUE;
ac->ac_flags |= EXT4_MB_HINT_FIRST;
cr = 3;
@@ -55928,7 +53838,7 @@ index a41e3ba..e574a00 100644
goto repeat;
}
}
-@@ -2697,25 +2697,25 @@ int ext4_mb_release(struct super_block *sb)
+@@ -2599,25 +2599,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)",
@@ -55964,7 +53874,7 @@ index a41e3ba..e574a00 100644
}
free_percpu(sbi->s_locality_groups);
-@@ -3169,16 +3169,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
+@@ -3101,16 +3101,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) {
@@ -55987,7 +53897,7 @@ index a41e3ba..e574a00 100644
}
if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
-@@ -3578,7 +3578,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
+@@ -3514,7 +3514,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);
@@ -55996,7 +53906,7 @@ index a41e3ba..e574a00 100644
ei = EXT4_I(ac->ac_inode);
grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
-@@ -3638,7 +3638,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
+@@ -3574,7 +3574,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);
@@ -56005,7 +53915,7 @@ index a41e3ba..e574a00 100644
grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
lg = ac->ac_lg;
-@@ -3727,7 +3727,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
+@@ -3663,7 +3663,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
* from the bitmap and continue.
*/
}
@@ -56014,7 +53924,7 @@ index a41e3ba..e574a00 100644
return err;
}
-@@ -3745,7 +3745,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
+@@ -3681,7 +3681,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);
@@ -56024,10 +53934,10 @@ index a41e3ba..e574a00 100644
return 0;
diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
-index 214461e..3614c89 100644
+index f3358ab..fbb1d90 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
-@@ -113,7 +113,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
+@@ -73,7 +73,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
const char *function, unsigned int line, const char *msg)
{
@@ -56037,10 +53947,28 @@ index 214461e..3614c89 100644
"MMP failure info: last update time: %llu, last update "
"node: %s, last update device: %s\n",
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 2c2e6cb..7c3ee62 100644
+index 84f84bf..a8770cd 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
-@@ -1251,7 +1251,7 @@ static ext4_fsblk_t get_sb_block(void **data)
+@@ -92,6 +92,8 @@ static struct file_system_type ext2_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("ext2");
++MODULE_ALIAS("ext2");
+ #define IS_EXT2_SB(sb) ((sb)->s_bdev->bd_holder == &ext2_fs_type)
+ #else
+ #define IS_EXT2_SB(sb) (0)
+@@ -106,6 +108,8 @@ static struct file_system_type ext3_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("ext3");
++MODULE_ALIAS("ext3");
+ #define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type)
+ #else
+ #define IS_EXT3_SB(sb) (0)
+@@ -1438,7 +1442,7 @@ static ext4_fsblk_t get_sb_block(void **data)
}
#define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
@@ -56049,20 +53977,52 @@ index 2c2e6cb..7c3ee62 100644
"Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
#ifdef CONFIG_QUOTA
-@@ -2431,7 +2431,7 @@ struct ext4_attr {
- int offset;
- int deprecated_val;
- } u;
+@@ -2469,7 +2473,7 @@ struct ext4_attr {
+ ssize_t (*store)(struct ext4_attr *, struct ext4_sb_info *,
+ const char *, size_t);
+ int offset;
-};
+} __do_const;
- static int parse_strtoull(const char *buf,
- unsigned long long max, unsigned long long *value)
+ static int parse_strtoul(const char *buf,
+ unsigned long max, unsigned long *value)
+@@ -3175,7 +3179,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;
+
+@@ -5052,7 +5055,6 @@ static inline int ext2_feature_set_ok(struct super_block *sb)
+ return 0;
+ return 1;
+ }
+-MODULE_ALIAS("ext2");
+ #else
+ static inline void register_as_ext2(void) { }
+ static inline void unregister_as_ext2(void) { }
+@@ -5085,7 +5087,6 @@ static inline int ext3_feature_set_ok(struct super_block *sb)
+ return 0;
+ return 1;
+ }
+-MODULE_ALIAS("ext3");
+ #else
+ static inline void register_as_ext3(void) { }
+ static inline void unregister_as_ext3(void) { }
+@@ -5099,6 +5100,7 @@ static struct file_system_type ext4_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("ext4");
+
+ static int __init ext4_init_feat_adverts(void)
+ {
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
-index 03e9beb..e86ce98 100644
+index d5498b2..14a9eca 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
-@@ -381,7 +381,7 @@ static int
+@@ -328,7 +328,7 @@ static int
ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
char *buffer, size_t buffer_size)
{
@@ -56071,7 +54031,7 @@ index 03e9beb..e86ce98 100644
for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
const struct xattr_handler *handler =
-@@ -398,9 +398,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
+@@ -345,9 +345,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
buffer += size;
}
rest -= size;
@@ -56083,11 +54043,44 @@ index 03e9beb..e86ce98 100644
}
static int
+@@ -1269,6 +1270,8 @@ retry:
+ s_min_extra_isize) {
+ tried_min_extra_isize++;
+ new_extra_isize = s_min_extra_isize;
++ kfree(is); is = NULL;
++ kfree(bs); bs = NULL;
+ goto retry;
+ }
+ error = -1;
+diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c
+index 216b419..350a088 100644
+--- a/fs/fat/namei_msdos.c
++++ b/fs/fat/namei_msdos.c
+@@ -674,6 +674,7 @@ static struct file_system_type msdos_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("msdos");
+
+ static int __init init_msdos_fs(void)
+ {
+diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
+index c25cf15..e5ea08a 100644
+--- a/fs/fat/namei_vfat.c
++++ b/fs/fat/namei_vfat.c
+@@ -1090,6 +1090,7 @@ static struct file_system_type vfat_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("vfat");
+
+ static int __init init_vfat_fs(void)
+ {
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 65343c3..9969dcf 100644
+index 22764c7..86372c9 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -107,6 +107,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
+@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
if (err)
return err;
@@ -56099,25 +54092,111 @@ index 65343c3..9969dcf 100644
f_modown(filp, pid, type, force);
return 0;
}
-diff --git a/fs/fhandle.c b/fs/fhandle.c
-index 999ff5c..41f4109 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;
+@@ -266,7 +271,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;
+@@ -306,7 +311,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;
+
+@@ -348,6 +353,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/fifo.c b/fs/fifo.c
+index cf6f434..3d7942c 100644
+--- a/fs/fifo.c
++++ b/fs/fifo.c
+@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
+ */
+ filp->f_op = &read_pipefifo_fops;
+ pipe->r_counter++;
+- if (pipe->readers++ == 0)
++ if (atomic_inc_return(&pipe->readers) == 1)
+ wake_up_partner(inode);
+
+- if (!pipe->writers) {
++ if (!atomic_read(&pipe->writers)) {
+ if ((filp->f_flags & O_NONBLOCK)) {
+ /* suppress POLLHUP until we have
+ * seen a writer */
+@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
+ * errno=ENXIO when there is no process reading the FIFO.
+ */
+ ret = -ENXIO;
+- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
++ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
+ goto err;
+
+ filp->f_op = &write_pipefifo_fops;
+ pipe->w_counter++;
+- if (!pipe->writers++)
++ if (atomic_inc_return(&pipe->writers) == 1)
+ wake_up_partner(inode);
+
+- if (!pipe->readers) {
++ if (!atomic_read(&pipe->readers)) {
+ if (wait_for_partner(inode, &pipe->r_counter))
+ goto err_wr;
+ }
+@@ -104,11 +104,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
+ */
+ filp->f_op = &rdwr_pipefifo_fops;
+
+- pipe->readers++;
+- pipe->writers++;
++ atomic_inc(&pipe->readers);
++ atomic_inc(&pipe->writers);
+ pipe->r_counter++;
+ pipe->w_counter++;
+- if (pipe->readers == 1 || pipe->writers == 1)
++ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
+ wake_up_partner(inode);
+ break;
+
+@@ -122,19 +122,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
+ return 0;
+
+ err_rd:
+- if (!--pipe->readers)
++ if (atomic_dec_and_test(&pipe->readers))
+ wake_up_interruptible(&pipe->wait);
+ ret = -ERESTARTSYS;
+ goto err;
+
+ err_wr:
+- if (!--pipe->writers)
++ if (atomic_dec_and_test(&pipe->writers))
+ wake_up_interruptible(&pipe->wait);
+ ret = -ERESTARTSYS;
+ goto err;
+
+ err:
+- if (!pipe->readers && !pipe->writers)
++ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
+ free_pipe_info(inode);
+
+ err_nocleanup:
diff --git a/fs/file.c b/fs/file.c
-index 4a78f98..9447397 100644
+index 4c6992d..104cdea 100644
--- a/fs/file.c
+++ b/fs/file.c
-@@ -16,6 +16,7 @@
+@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/file.h>
@@ -56125,48 +54204,55 @@ index 4a78f98..9447397 100644
#include <linux/fdtable.h>
#include <linux/bitops.h>
#include <linux/interrupt.h>
-@@ -828,6 +829,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;
-
-@@ -854,6 +856,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;
+@@ -254,6 +255,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;
-@@ -909,6 +912,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 92567d9..fcd8cbf 100644
+index 0845f84..bf3fd0571 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
-@@ -273,7 +273,11 @@ struct file_system_type *get_fs_type(const char *name)
+@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(const char *name)
int len = dot ? dot - name : strlen(name);
fs = __get_fs_type(name, len);
+- if (!fs && (request_module("%.*s", len, name) == 0))
++
+#ifdef CONFIG_GRKERNSEC_MODHARDEN
+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
+#else
- if (!fs && (request_module("fs-%.*s", len, name) == 0))
++ if (!fs && (request_module("fs-%.*s", len, name) == 0))
+#endif
fs = __get_fs_type(name, len);
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
+diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c
+index 9d1c995..7685971 100644
+--- a/fs/freevxfs/vxfs_super.c
++++ b/fs/freevxfs/vxfs_super.c
+@@ -52,7 +52,6 @@ MODULE_AUTHOR("Christoph Hellwig");
+ MODULE_DESCRIPTION("Veritas Filesystem (VxFS) driver");
+ MODULE_LICENSE("Dual BSD/GPL");
+
+-MODULE_ALIAS("vxfs"); /* makes mount -t vxfs autoload the module */
+
+
+ static void vxfs_put_super(struct super_block *);
+@@ -259,6 +258,8 @@ static struct file_system_type vxfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("vxfs"); /* makes mount -t vxfs autoload the module */
++MODULE_ALIAS("vxfs");
+
+ static int __init
+ vxfs_init(void)
diff --git a/fs/fs_struct.c b/fs/fs_struct.c
-index d8ac61d..79a36f0 100644
+index 78b519c..0386555 100644
--- a/fs/fs_struct.c
+++ b/fs/fs_struct.c
@@ -4,6 +4,7 @@
@@ -56176,37 +54262,40 @@ index d8ac61d..79a36f0 100644
+#include <linux/grsecurity.h>
#include "internal.h"
- /*
-@@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
- write_seqcount_begin(&fs->seq);
+ static inline void path_get_longterm(struct path *path)
+@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
old_root = fs->root;
fs->root = *path;
+ path_get_longterm(path);
+ gr_set_chroot_entries(current, path);
write_seqcount_end(&fs->seq);
spin_unlock(&fs->lock);
if (old_root.dentry)
-@@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
- int hits = 0;
- spin_lock(&fs->lock);
- write_seqcount_begin(&fs->seq);
-+ /* this root replacement is only done by pivot_root,
-+ leave grsec's chroot tagging alone for this task
-+ so that a pivoted root isn't treated as a chroot
-+ */
- hits += replace_path(&fs->root, old_root, new_root);
- hits += replace_path(&fs->pwd, old_root, new_root);
- write_seqcount_end(&fs->seq);
-@@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
- task_lock(tsk);
+@@ -74,6 +76,13 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
+ && fs->root.mnt == old_root->mnt) {
+ path_get_longterm(new_root);
+ fs->root = *new_root;
++ /* This function is only called
++ from pivot_root(). Leave our
++ gr_chroot_dentry and is_chrooted flags
++ as-is, so that a pivoted root isn't treated
++ as a chroot
++ */
++ //gr_set_chroot_entries(p, new_root);
+ count++;
+ }
+ if (fs->pwd.dentry == old_root->dentry
+@@ -109,7 +118,8 @@ void exit_fs(struct task_struct *tsk)
spin_lock(&fs->lock);
+ write_seqcount_begin(&fs->seq);
tsk->fs = NULL;
- kill = !--fs->users;
+ gr_clear_chroot_entries(tsk);
+ kill = !atomic_dec_return(&fs->users);
+ write_seqcount_end(&fs->seq);
spin_unlock(&fs->lock);
task_unlock(tsk);
- if (kill)
-@@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
+@@ -123,7 +133,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
/* We don't need to lock fs - think why ;-) */
if (fs) {
@@ -56215,17 +54304,17 @@ index d8ac61d..79a36f0 100644
fs->in_exec = 0;
spin_lock_init(&fs->lock);
seqcount_init(&fs->seq);
-@@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
+@@ -132,6 +142,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
spin_lock(&old->lock);
fs->root = old->root;
- path_get(&fs->root);
+ path_get_longterm(&fs->root);
+ /* instead of calling gr_set_chroot_entries here,
+ we call it from every caller of this function
+ */
fs->pwd = old->pwd;
- path_get(&fs->pwd);
+ path_get_longterm(&fs->pwd);
spin_unlock(&old->lock);
-@@ -139,8 +149,9 @@ int unshare_fs_struct(void)
+@@ -150,8 +163,9 @@ int unshare_fs_struct(void)
task_lock(current);
spin_lock(&fs->lock);
@@ -56236,7 +54325,7 @@ index d8ac61d..79a36f0 100644
spin_unlock(&fs->lock);
task_unlock(current);
-@@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
+@@ -164,13 +178,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
int current_umask(void)
{
@@ -56252,8 +54341,24 @@ index d8ac61d..79a36f0 100644
.lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
.seq = SEQCNT_ZERO,
.umask = 0022,
+@@ -186,12 +200,13 @@ void daemonize_fs_struct(void)
+ task_lock(current);
+
+ spin_lock(&init_fs.lock);
+- init_fs.users++;
++ atomic_inc(&init_fs.users);
+ spin_unlock(&init_fs.lock);
+
+ spin_lock(&fs->lock);
+ current->fs = &init_fs;
+- kill = !--fs->users;
++ gr_set_chroot_entries(current, ¤t->fs->root);
++ kill = !atomic_dec_return(&fs->users);
+ spin_unlock(&fs->lock);
+
+ task_unlock(current);
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
-index b2a86e3..37f425a 100644
+index 9905350..97ff49a 100644
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
@@ -19,7 +19,7 @@
@@ -56288,7 +54393,7 @@ index b2a86e3..37f425a 100644
_leave(" [ENOMEM]");
return NULL;
}
-@@ -114,13 +114,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
+@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
switch (cookie->def->type) {
case FSCACHE_COOKIE_TYPE_INDEX:
@@ -56305,7 +54410,7 @@ index b2a86e3..37f425a 100644
break;
}
-@@ -131,13 +131,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
+@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
if (fscache_acquire_non_index_cookie(cookie) < 0) {
atomic_dec(&parent->n_children);
__fscache_cookie_put(cookie);
@@ -56321,7 +54426,7 @@ index b2a86e3..37f425a 100644
_leave(" = %p", cookie);
return cookie;
}
-@@ -173,7 +173,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
+@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
cache = fscache_select_cache_for_object(cookie->parent);
if (!cache) {
up_read(&fscache_addremove_sem);
@@ -56330,7 +54435,7 @@ index b2a86e3..37f425a 100644
_leave(" = -ENOMEDIUM [no cache]");
return -ENOMEDIUM;
}
-@@ -259,14 +259,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
+@@ -256,14 +256,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
object = cache->ops->alloc_object(cache, cookie);
fscache_stat_d(&fscache_n_cop_alloc_object);
if (IS_ERR(object)) {
@@ -56348,18 +54453,9 @@ index b2a86e3..37f425a 100644
_debug("ALLOC OBJ%x: %s {%lx}",
object->debug_id, cookie->def->name, object->events);
-@@ -380,7 +380,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
-
- _enter("{%s}", cookie->def->name);
-
-- fscache_stat(&fscache_n_invalidates);
-+ fscache_stat_unchecked(&fscache_n_invalidates);
-
- /* Only permit invalidation of data files. Invalidating an index will
- * require the caller to release all its attachments to the tree rooted
-@@ -438,10 +438,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
- {
+@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
struct fscache_object *object;
+ struct hlist_node *_p;
- fscache_stat(&fscache_n_updates);
+ fscache_stat_unchecked(&fscache_n_updates);
@@ -56370,9 +54466,9 @@ index b2a86e3..37f425a 100644
_leave(" [no cookie]");
return;
}
-@@ -473,12 +473,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
- {
+@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
struct fscache_object *object;
+ unsigned long event;
- fscache_stat(&fscache_n_relinquishes);
+ fscache_stat_unchecked(&fscache_n_relinquishes);
@@ -56386,38 +54482,22 @@ index b2a86e3..37f425a 100644
_leave(" [no cookie]");
return;
}
-@@ -598,7 +598,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
- if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
- goto inconsistent;
+@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
-- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
-+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
-
- atomic_inc(&cookie->n_active);
- if (fscache_submit_op(object, op) < 0)
+ /* wait for the cookie to finish being instantiated (or to fail) */
+ if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
+- fscache_stat(&fscache_n_relinquishes_waitcrt);
++ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
+ wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
+ fscache_wait_bit, TASK_UNINTERRUPTIBLE);
+ }
diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
-index 4226f66..0fb3f45 100644
+index f6aad48..88dcf26 100644
--- a/fs/fscache/internal.h
+++ b/fs/fscache/internal.h
-@@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
- extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
- extern int fscache_wait_for_operation_activation(struct fscache_object *,
- struct fscache_operation *,
-- atomic_t *,
-- atomic_t *,
-+ atomic_unchecked_t *,
-+ atomic_unchecked_t *,
- void (*)(struct fscache_operation *));
- extern void fscache_invalidate_writes(struct fscache_cookie *);
-
-@@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
- * stats.c
- */
- #ifdef CONFIG_FSCACHE_STATS
--extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
--extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
-+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
-+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
+@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
+ extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
+ extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
-extern atomic_t fscache_n_op_pend;
-extern atomic_t fscache_n_op_run;
@@ -56510,12 +54590,10 @@ index 4226f66..0fb3f45 100644
-extern atomic_t fscache_n_store_vmscan_gone;
-extern atomic_t fscache_n_store_vmscan_busy;
-extern atomic_t fscache_n_store_vmscan_cancelled;
--extern atomic_t fscache_n_store_vmscan_wait;
+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
-+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
-extern atomic_t fscache_n_marks;
-extern atomic_t fscache_n_uncaches;
@@ -56535,11 +54613,6 @@ index 4226f66..0fb3f45 100644
+extern atomic_unchecked_t fscache_n_acquires_nobufs;
+extern atomic_unchecked_t fscache_n_acquires_oom;
--extern atomic_t fscache_n_invalidates;
--extern atomic_t fscache_n_invalidates_run;
-+extern atomic_unchecked_t fscache_n_invalidates;
-+extern atomic_unchecked_t fscache_n_invalidates_run;
-
-extern atomic_t fscache_n_updates;
-extern atomic_t fscache_n_updates_null;
-extern atomic_t fscache_n_updates_run;
@@ -56593,7 +54666,7 @@ index 4226f66..0fb3f45 100644
extern atomic_t fscache_n_cop_alloc_object;
extern atomic_t fscache_n_cop_lookup_object;
-@@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
+@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
atomic_inc(stat);
}
@@ -56605,7 +54678,7 @@ index 4226f66..0fb3f45 100644
static inline void fscache_stat_d(atomic_t *stat)
{
atomic_dec(stat);
-@@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
+@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
#define __fscache_stat(stat) (NULL)
#define fscache_stat(stat) do {} while (0)
@@ -56614,73 +54687,91 @@ index 4226f66..0fb3f45 100644
#endif
diff --git a/fs/fscache/object.c b/fs/fscache/object.c
-index 86d75a6..5f3d7a0 100644
+index b6b897c..0ffff9c 100644
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
-@@ -451,7 +451,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
- _debug("LOOKUP \"%s\" in \"%s\"",
- cookie->def->name, object->cache->tag->name);
+@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
+ /* update the object metadata on disk */
+ case FSCACHE_OBJECT_UPDATING:
+ clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
+- fscache_stat(&fscache_n_updates_run);
++ fscache_stat_unchecked(&fscache_n_updates_run);
+ fscache_stat(&fscache_n_cop_update_object);
+ object->cache->ops->update_object(object);
+ fscache_stat_d(&fscache_n_cop_update_object);
+@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
+ spin_lock(&object->lock);
+ object->state = FSCACHE_OBJECT_DEAD;
+ spin_unlock(&object->lock);
+- fscache_stat(&fscache_n_object_dead);
++ fscache_stat_unchecked(&fscache_n_object_dead);
+ goto terminal_transit;
+
+ /* handle the parent cache of this object being withdrawn from
+@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
+ spin_lock(&object->lock);
+ object->state = FSCACHE_OBJECT_DEAD;
+ spin_unlock(&object->lock);
+- fscache_stat(&fscache_n_object_dead);
++ fscache_stat_unchecked(&fscache_n_object_dead);
+ goto terminal_transit;
+
+ /* complain about the object being woken up once it is
+@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
+ parent->cookie->def->name, cookie->def->name,
+ object->cache->tag->name);
- fscache_stat(&fscache_n_object_lookups);
+ fscache_stat_unchecked(&fscache_n_object_lookups);
fscache_stat(&fscache_n_cop_lookup_object);
ret = object->cache->ops->lookup_object(object);
fscache_stat_d(&fscache_n_cop_lookup_object);
-@@ -461,7 +461,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
+@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
if (ret == -ETIMEDOUT) {
/* probably stuck behind another object, so move this one to
* the back of the queue */
- fscache_stat(&fscache_n_object_lookups_timed_out);
+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
- _leave(" [timeout]");
- return NO_TRANSIT;
+ set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
}
-@@ -489,7 +489,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
- _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
- if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
+@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
+
+ spin_lock(&object->lock);
+ if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
- fscache_stat(&fscache_n_object_lookups_negative);
+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
- /* Allow write requests to begin stacking up and read requests to begin
- * returning ENODATA.
-@@ -523,7 +523,7 @@ void fscache_obtained_object(struct fscache_object *object)
- /* if we were still looking up, then we must have a positive lookup
+ /* transit here to allow write requests to begin stacking up
+ * and read requests to begin returning ENODATA */
+@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
* result, in which case there may be data available */
- if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
+ spin_lock(&object->lock);
+ if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
- fscache_stat(&fscache_n_object_lookups_positive);
+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
- /* We do (presumably) have data */
- clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
-@@ -534,7 +534,7 @@ void fscache_obtained_object(struct fscache_object *object)
- clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
- wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
+ clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
+
+@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
+ set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
} else {
+ ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
- fscache_stat(&fscache_n_object_created);
+ fscache_stat_unchecked(&fscache_n_object_created);
- }
- set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
-@@ -570,7 +570,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
- fscache_stat_d(&fscache_n_cop_lookup_complete);
+ object->state = FSCACHE_OBJECT_AVAILABLE;
+ spin_unlock(&object->lock);
+@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
+ fscache_enqueue_dependents(object);
fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
- fscache_stat(&fscache_n_object_avail);
+ fscache_stat_unchecked(&fscache_n_object_avail);
_leave("");
- return transit_to(JUMPSTART_DEPS);
-@@ -716,7 +716,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
-
- /* this just shifts the object release to the work processor */
- fscache_put_object(object);
-- fscache_stat(&fscache_n_object_dead);
-+ fscache_stat_unchecked(&fscache_n_object_dead);
-
- _leave("");
- return transit_to(OBJECT_DEAD);
-@@ -881,7 +881,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
+ }
+@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
enum fscache_checkaux result;
if (!object->cookie->def->check_aux) {
@@ -56689,7 +54780,7 @@ index 86d75a6..5f3d7a0 100644
return FSCACHE_CHECKAUX_OKAY;
}
-@@ -890,17 +890,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
+@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
switch (result) {
/* entry okay as is */
case FSCACHE_CHECKAUX_OKAY:
@@ -56710,26 +54801,8 @@ index 86d75a6..5f3d7a0 100644
break;
default:
-@@ -986,7 +986,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
- {
- const struct fscache_state *s;
-
-- fscache_stat(&fscache_n_invalidates_run);
-+ fscache_stat_unchecked(&fscache_n_invalidates_run);
- fscache_stat(&fscache_n_cop_invalidate_object);
- s = _fscache_invalidate_object(object, event);
- fscache_stat_d(&fscache_n_cop_invalidate_object);
-@@ -1001,7 +1001,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
- {
- _enter("{OBJ%x},%d", object->debug_id, event);
-
-- fscache_stat(&fscache_n_updates_run);
-+ fscache_stat_unchecked(&fscache_n_updates_run);
- fscache_stat(&fscache_n_cop_update_object);
- object->cache->ops->update_object(object);
- fscache_stat_d(&fscache_n_cop_update_object);
diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
-index 318071a..379938b 100644
+index 30afdfa..2256596 100644
--- a/fs/fscache/operation.c
+++ b/fs/fscache/operation.c
@@ -17,7 +17,7 @@
@@ -56741,16 +54814,16 @@ index 318071a..379938b 100644
EXPORT_SYMBOL(fscache_op_debug_id);
/**
-@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
+@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
+ ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
ASSERTCMP(atomic_read(&op->usage), >, 0);
- ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
- fscache_stat(&fscache_n_op_enqueue);
+ fscache_stat_unchecked(&fscache_n_op_enqueue);
switch (op->flags & FSCACHE_OP_TYPE) {
case FSCACHE_OP_ASYNC:
_debug("queue async");
-@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
+@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
if (op->processor)
fscache_enqueue_operation(op);
@@ -56759,8 +54832,8 @@ index 318071a..379938b 100644
}
/*
-@@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
- if (object->n_in_progress > 0) {
+@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
+ if (object->n_ops > 1) {
atomic_inc(&op->usage);
list_add_tail(&op->pend_link, &object->pending_ops);
- fscache_stat(&fscache_n_op_pend);
@@ -56773,7 +54846,7 @@ index 318071a..379938b 100644
fscache_start_operations(object);
} else {
ASSERTCMP(object->n_in_progress, ==, 0);
-@@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
+@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
object->n_exclusive++; /* reads and writes must wait */
atomic_inc(&op->usage);
list_add_tail(&op->pend_link, &object->pending_ops);
@@ -56781,8 +54854,8 @@ index 318071a..379938b 100644
+ fscache_stat_unchecked(&fscache_n_op_pend);
ret = 0;
} else {
- /* If we're in any other state, there must have been an I/O
-@@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
+ /* not allowed to submit ops in any other state */
+@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
if (object->n_exclusive > 0) {
atomic_inc(&op->usage);
list_add_tail(&op->pend_link, &object->pending_ops);
@@ -56796,47 +54869,40 @@ index 318071a..379938b 100644
fscache_start_operations(object);
} else {
ASSERTCMP(object->n_exclusive, ==, 0);
-@@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
+@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
object->n_ops++;
atomic_inc(&op->usage);
list_add_tail(&op->pend_link, &object->pending_ops);
- fscache_stat(&fscache_n_op_pend);
+ fscache_stat_unchecked(&fscache_n_op_pend);
ret = 0;
- } else if (fscache_object_is_dying(object)) {
+ } else if (object->state == FSCACHE_OBJECT_DYING ||
+ object->state == FSCACHE_OBJECT_LC_DYING ||
+ object->state == FSCACHE_OBJECT_WITHDRAWING) {
- fscache_stat(&fscache_n_op_rejected);
+ fscache_stat_unchecked(&fscache_n_op_rejected);
- op->state = FSCACHE_OP_ST_CANCELLED;
ret = -ENOBUFS;
} else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
-@@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
+ fscache_report_unexpected_submission(object, op, ostate);
+@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
+
ret = -EBUSY;
- if (op->state == FSCACHE_OP_ST_PENDING) {
- ASSERT(!list_empty(&op->pend_link));
+ if (!list_empty(&op->pend_link)) {
- fscache_stat(&fscache_n_op_cancelled);
+ fscache_stat_unchecked(&fscache_n_op_cancelled);
list_del_init(&op->pend_link);
- if (do_cancel)
- do_cancel(op);
-@@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
- while (!list_empty(&object->pending_ops)) {
- op = list_entry(object->pending_ops.next,
- struct fscache_operation, pend_link);
-- fscache_stat(&fscache_n_op_cancelled);
-+ fscache_stat_unchecked(&fscache_n_op_cancelled);
- list_del_init(&op->pend_link);
-
- ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
-@@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
- op->state, ==, FSCACHE_OP_ST_CANCELLED);
- op->state = FSCACHE_OP_ST_DEAD;
+ object->n_ops--;
+ if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
+@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
+ if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
+ BUG();
- fscache_stat(&fscache_n_op_release);
+ fscache_stat_unchecked(&fscache_n_op_release);
if (op->release) {
op->release(op);
-@@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
+@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
* lock, and defer it otherwise */
if (!spin_trylock(&object->lock)) {
_debug("defer put");
@@ -56845,7 +54911,7 @@ index 318071a..379938b 100644
cache = object->cache;
spin_lock(&cache->op_gc_list_lock);
-@@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
+@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
_debug("GC DEFERRED REL OBJ%x OP%x",
object->debug_id, op->debug_id);
@@ -56853,12 +54919,12 @@ index 318071a..379938b 100644
+ fscache_stat_unchecked(&fscache_n_op_gc);
ASSERTCMP(atomic_read(&op->usage), ==, 0);
- ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
+
diff --git a/fs/fscache/page.c b/fs/fscache/page.c
-index 73899c1..ae40c58 100644
+index 3f7a59b..cf196cc 100644
--- a/fs/fscache/page.c
+++ b/fs/fscache/page.c
-@@ -61,7 +61,7 @@ try_again:
+@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
val = radix_tree_lookup(&cookie->stores, page->index);
if (!val) {
rcu_read_unlock();
@@ -56867,7 +54933,7 @@ index 73899c1..ae40c58 100644
__fscache_uncache_page(cookie, page);
return true;
}
-@@ -91,11 +91,11 @@ try_again:
+@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
spin_unlock(&cookie->stores_lock);
if (xpage) {
@@ -56882,21 +54948,16 @@ index 73899c1..ae40c58 100644
}
wake_up_bit(&cookie->flags, 0);
-@@ -110,11 +110,11 @@ page_busy:
- * sleeping on memory allocation, so we may need to impose a timeout
- * too. */
- if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
-- fscache_stat(&fscache_n_store_vmscan_busy);
-+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
- return false;
- }
-
-- fscache_stat(&fscache_n_store_vmscan_wait);
-+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
- __fscache_wait_on_page_write(cookie, page);
- gfp &= ~__GFP_WAIT;
- goto try_again;
-@@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
+@@ -107,7 +107,7 @@ page_busy:
+ /* we might want to wait here, but that could deadlock the allocator as
+ * the work threads writing to the cache may all end up sleeping
+ * on memory allocation */
+- fscache_stat(&fscache_n_store_vmscan_busy);
++ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
+ return false;
+ }
+ EXPORT_SYMBOL(__fscache_maybe_release_page);
+@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
FSCACHE_COOKIE_STORING_TAG);
if (!radix_tree_tag_get(&cookie->stores, page->index,
FSCACHE_COOKIE_PENDING_TAG)) {
@@ -56905,16 +54966,16 @@ index 73899c1..ae40c58 100644
xpage = radix_tree_delete(&cookie->stores, page->index);
}
spin_unlock(&cookie->stores_lock);
-@@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
+@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
_enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
- fscache_stat(&fscache_n_attr_changed_calls);
+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
- if (fscache_object_is_active(object) &&
- fscache_use_cookie(object)) {
-@@ -189,11 +189,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+ if (fscache_object_is_active(object)) {
+ fscache_stat(&fscache_n_cop_attr_changed);
+@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
@@ -56928,7 +54989,7 @@ index 73899c1..ae40c58 100644
_leave(" = -ENOMEM");
return -ENOMEM;
}
-@@ -211,7 +211,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
if (fscache_submit_exclusive_op(object, op) < 0)
goto nobufs;
spin_unlock(&cookie->lock);
@@ -56937,7 +54998,7 @@ index 73899c1..ae40c58 100644
fscache_put_operation(op);
_leave(" = 0");
return 0;
-@@ -219,7 +219,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
nobufs:
spin_unlock(&cookie->lock);
kfree(op);
@@ -56946,7 +55007,7 @@ index 73899c1..ae40c58 100644
_leave(" = %d", -ENOBUFS);
return -ENOBUFS;
}
-@@ -258,7 +258,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
+@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
/* allocate a retrieval operation and attempt to submit it */
op = kzalloc(sizeof(*op), GFP_NOIO);
if (!op) {
@@ -56955,7 +55016,7 @@ index 73899c1..ae40c58 100644
return NULL;
}
-@@ -289,13 +289,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
+@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
return 0;
}
@@ -56971,45 +55032,36 @@ index 73899c1..ae40c58 100644
_leave(" = -ERESTARTSYS");
return -ERESTARTSYS;
}
-@@ -324,8 +324,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
+@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
*/
- int fscache_wait_for_operation_activation(struct fscache_object *object,
- struct fscache_operation *op,
-- atomic_t *stat_op_waits,
-- atomic_t *stat_object_dead,
-+ atomic_unchecked_t *stat_op_waits,
-+ atomic_unchecked_t *stat_object_dead,
- void (*do_cancel)(struct fscache_operation *))
+ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
+ struct fscache_retrieval *op,
+- atomic_t *stat_op_waits,
+- atomic_t *stat_object_dead)
++ atomic_unchecked_t *stat_op_waits,
++ atomic_unchecked_t *stat_object_dead)
{
int ret;
-@@ -335,7 +335,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
+
+@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
+ goto check_if_dead;
_debug(">>> WT");
- if (stat_op_waits)
-- fscache_stat(stat_op_waits);
-+ fscache_stat_unchecked(stat_op_waits);
- if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
+- fscache_stat(stat_op_waits);
++ fscache_stat_unchecked(stat_op_waits);
+ if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
fscache_wait_bit_interruptible,
- TASK_INTERRUPTIBLE) != 0) {
-@@ -353,7 +353,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
+ TASK_INTERRUPTIBLE) < 0) {
+@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
+
check_if_dead:
- if (op->state == FSCACHE_OP_ST_CANCELLED) {
- if (stat_object_dead)
-- fscache_stat(stat_object_dead);
-+ fscache_stat_unchecked(stat_object_dead);
- _leave(" = -ENOBUFS [cancelled]");
- return -ENOBUFS;
- }
-@@ -361,7 +361,7 @@ check_if_dead:
- pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
- fscache_cancel_op(op, do_cancel);
- if (stat_object_dead)
-- fscache_stat(stat_object_dead);
-+ fscache_stat_unchecked(stat_object_dead);
+ if (unlikely(fscache_object_is_dead(object))) {
+- fscache_stat(stat_object_dead);
++ fscache_stat_unchecked(stat_object_dead);
return -ENOBUFS;
}
return 0;
-@@ -388,7 +388,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
_enter("%p,%p,,,", cookie, page);
@@ -57018,8 +55070,8 @@ index 73899c1..ae40c58 100644
if (hlist_empty(&cookie->backing_objects))
goto nobufs;
-@@ -428,7 +428,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
- goto nobufs_unlock_dec;
+@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+ goto nobufs_unlock;
spin_unlock(&cookie->lock);
- fscache_stat(&fscache_n_retrieval_ops);
@@ -57027,7 +55079,7 @@ index 73899c1..ae40c58 100644
/* pin the netfs read context in case we need to do the actual netfs
* read because we've encountered a cache read failure */
-@@ -459,15 +459,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
error:
if (ret == -ENOMEM)
@@ -57048,8 +55100,8 @@ index 73899c1..ae40c58 100644
fscache_put_retrieval(op);
_leave(" = %d", ret);
-@@ -480,7 +480,7 @@ nobufs_unlock:
- atomic_dec(&cookie->n_active);
+@@ -429,7 +429,7 @@ nobufs_unlock:
+ spin_unlock(&cookie->lock);
kfree(op);
nobufs:
- fscache_stat(&fscache_n_retrievals_nobufs);
@@ -57057,7 +55109,7 @@ index 73899c1..ae40c58 100644
_leave(" = -ENOBUFS");
return -ENOBUFS;
}
-@@ -518,7 +518,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
_enter("%p,,%d,,,", cookie, *nr_pages);
@@ -57066,8 +55118,8 @@ index 73899c1..ae40c58 100644
if (hlist_empty(&cookie->backing_objects))
goto nobufs;
-@@ -554,7 +554,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
- goto nobufs_unlock_dec;
+@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+ goto nobufs_unlock;
spin_unlock(&cookie->lock);
- fscache_stat(&fscache_n_retrieval_ops);
@@ -57075,7 +55127,7 @@ index 73899c1..ae40c58 100644
/* pin the netfs read context in case we need to do the actual netfs
* read because we've encountered a cache read failure */
-@@ -585,15 +585,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
error:
if (ret == -ENOMEM)
@@ -57096,8 +55148,8 @@ index 73899c1..ae40c58 100644
fscache_put_retrieval(op);
_leave(" = %d", ret);
-@@ -606,7 +606,7 @@ nobufs_unlock:
- atomic_dec(&cookie->n_active);
+@@ -545,7 +545,7 @@ nobufs_unlock:
+ spin_unlock(&cookie->lock);
kfree(op);
nobufs:
- fscache_stat(&fscache_n_retrievals_nobufs);
@@ -57105,7 +55157,7 @@ index 73899c1..ae40c58 100644
_leave(" = -ENOBUFS");
return -ENOBUFS;
}
-@@ -630,7 +630,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
_enter("%p,%p,,,", cookie, page);
@@ -57114,16 +55166,16 @@ index 73899c1..ae40c58 100644
if (hlist_empty(&cookie->backing_objects))
goto nobufs;
-@@ -662,7 +662,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
goto nobufs_unlock;
spin_unlock(&cookie->lock);
- fscache_stat(&fscache_n_alloc_ops);
+ fscache_stat_unchecked(&fscache_n_alloc_ops);
- ret = fscache_wait_for_operation_activation(
- object, &op->op,
-@@ -679,11 +679,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+ ret = fscache_wait_for_retrieval_activation(
+ object, op,
+@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
error:
if (ret == -ERESTARTSYS)
@@ -57138,8 +55190,8 @@ index 73899c1..ae40c58 100644
fscache_put_retrieval(op);
_leave(" = %d", ret);
-@@ -694,7 +694,7 @@ nobufs_unlock:
- atomic_dec(&cookie->n_active);
+@@ -625,7 +625,7 @@ nobufs_unlock:
+ spin_unlock(&cookie->lock);
kfree(op);
nobufs:
- fscache_stat(&fscache_n_allocs_nobufs);
@@ -57147,7 +55199,7 @@ index 73899c1..ae40c58 100644
_leave(" = -ENOBUFS");
return -ENOBUFS;
}
-@@ -770,7 +770,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
spin_lock(&cookie->stores_lock);
@@ -57156,7 +55208,7 @@ index 73899c1..ae40c58 100644
/* find a page to store */
page = NULL;
-@@ -781,7 +781,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
page = results[0];
_debug("gang %d [%lx]", n, page->index);
if (page->index > op->store_limit) {
@@ -57165,7 +55217,7 @@ index 73899c1..ae40c58 100644
goto superseded;
}
-@@ -793,7 +793,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
spin_unlock(&cookie->stores_lock);
spin_unlock(&object->lock);
@@ -57174,16 +55226,16 @@ index 73899c1..ae40c58 100644
fscache_stat(&fscache_n_cop_write_page);
ret = object->cache->ops->write_page(op, page);
fscache_stat_d(&fscache_n_cop_write_page);
-@@ -896,7 +896,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
ASSERT(PageFsCache(page));
- fscache_stat(&fscache_n_stores);
+ fscache_stat_unchecked(&fscache_n_stores);
- if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
- _leave(" = -ENOBUFS [invalidating]");
-@@ -954,7 +954,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+ op = kzalloc(sizeof(*op), GFP_NOIO);
+ if (!op)
+@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
spin_unlock(&cookie->stores_lock);
spin_unlock(&object->lock);
@@ -57191,8 +55243,8 @@ index 73899c1..ae40c58 100644
+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
op->store_limit = object->store_limit;
- atomic_inc(&cookie->n_active);
-@@ -963,8 +963,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+ if (fscache_submit_op(object, &op->op) < 0)
+@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
spin_unlock(&cookie->lock);
radix_tree_preload_end();
@@ -57203,7 +55255,7 @@ index 73899c1..ae40c58 100644
/* the work queue now carries its own ref on the object */
fscache_put_operation(&op->op);
-@@ -972,14 +972,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
return 0;
already_queued:
@@ -57220,7 +55272,7 @@ index 73899c1..ae40c58 100644
_leave(" = 0");
return 0;
-@@ -999,14 +999,14 @@ nobufs:
+@@ -851,14 +851,14 @@ nobufs:
spin_unlock(&cookie->lock);
radix_tree_preload_end();
kfree(op);
@@ -57237,7 +55289,7 @@ index 73899c1..ae40c58 100644
_leave(" = -ENOMEM");
return -ENOMEM;
}
-@@ -1024,7 +1024,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
+@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
ASSERTCMP(page, !=, NULL);
@@ -57246,20 +55298,20 @@ index 73899c1..ae40c58 100644
/* cache withdrawal may beat us to it */
if (!PageFsCache(page))
-@@ -1075,7 +1075,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
- struct fscache_cookie *cookie = op->op.object->cookie;
+@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
+ unsigned long loop;
#ifdef CONFIG_FSCACHE_STATS
-- atomic_inc(&fscache_n_marks);
-+ atomic_inc_unchecked(&fscache_n_marks);
+- atomic_add(pagevec->nr, &fscache_n_marks);
++ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
#endif
- _debug("- mark %p{%lx}", page, page->index);
+ for (loop = 0; loop < pagevec->nr; loop++) {
diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
-index 40d13c7..ddf52b9 100644
+index 73c0bd7..adb2f79 100644
--- a/fs/fscache/stats.c
+++ b/fs/fscache/stats.c
-@@ -18,99 +18,99 @@
+@@ -18,95 +18,95 @@
/*
* operation counters
*/
@@ -57356,12 +55408,10 @@ index 40d13c7..ddf52b9 100644
-atomic_t fscache_n_store_vmscan_gone;
-atomic_t fscache_n_store_vmscan_busy;
-atomic_t fscache_n_store_vmscan_cancelled;
--atomic_t fscache_n_store_vmscan_wait;
+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
+atomic_unchecked_t fscache_n_store_vmscan_gone;
+atomic_unchecked_t fscache_n_store_vmscan_busy;
+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
-+atomic_unchecked_t fscache_n_store_vmscan_wait;
-atomic_t fscache_n_marks;
-atomic_t fscache_n_uncaches;
@@ -57381,11 +55431,6 @@ index 40d13c7..ddf52b9 100644
+atomic_unchecked_t fscache_n_acquires_nobufs;
+atomic_unchecked_t fscache_n_acquires_oom;
--atomic_t fscache_n_invalidates;
--atomic_t fscache_n_invalidates_run;
-+atomic_unchecked_t fscache_n_invalidates;
-+atomic_unchecked_t fscache_n_invalidates_run;
-
-atomic_t fscache_n_updates;
-atomic_t fscache_n_updates_null;
-atomic_t fscache_n_updates_run;
@@ -57439,7 +55484,7 @@ index 40d13c7..ddf52b9 100644
atomic_t fscache_n_cop_alloc_object;
atomic_t fscache_n_cop_lookup_object;
-@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
+@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
seq_puts(m, "FS-Cache statistics\n");
seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
@@ -57502,12 +55547,6 @@ index 40d13c7..ddf52b9 100644
+ atomic_read_unchecked(&fscache_n_object_created),
+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
- seq_printf(m, "Invals : n=%u run=%u\n",
-- atomic_read(&fscache_n_invalidates),
-- atomic_read(&fscache_n_invalidates_run));
-+ atomic_read_unchecked(&fscache_n_invalidates),
-+ atomic_read_unchecked(&fscache_n_invalidates_run));
-
seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
- atomic_read(&fscache_n_updates),
- atomic_read(&fscache_n_updates_null),
@@ -57604,17 +55643,15 @@ index 40d13c7..ddf52b9 100644
+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
- seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
+ seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
- atomic_read(&fscache_n_store_vmscan_not_storing),
- atomic_read(&fscache_n_store_vmscan_gone),
- atomic_read(&fscache_n_store_vmscan_busy),
-- atomic_read(&fscache_n_store_vmscan_cancelled),
-- atomic_read(&fscache_n_store_vmscan_wait));
+- atomic_read(&fscache_n_store_vmscan_cancelled));
+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
-+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
-+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
++ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
- atomic_read(&fscache_n_op_pend),
@@ -57637,11 +55674,23 @@ index 40d13c7..ddf52b9 100644
seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
atomic_read(&fscache_n_cop_alloc_object),
+diff --git a/fs/fuse/control.c b/fs/fuse/control.c
+index 42593c5..0c6d731 100644
+--- a/fs/fuse/control.c
++++ b/fs/fuse/control.c
+@@ -347,6 +347,7 @@ static struct file_system_type fuse_ctl_fs_type = {
+ .mount = fuse_ctl_mount,
+ .kill_sb = fuse_ctl_kill_sb,
+ };
++MODULE_ALIAS_FS("fusectl");
+
+ int __init fuse_ctl_init(void)
+ {
diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
-index adbfd66..4b25822 100644
+index 3426521..3b75162 100644
--- a/fs/fuse/cuse.c
+++ b/fs/fuse/cuse.c
-@@ -603,10 +603,12 @@ static int __init cuse_init(void)
+@@ -587,10 +587,12 @@ static int __init cuse_init(void)
INIT_LIST_HEAD(&cuse_conntbl[i]);
/* inherit and extend fuse_dev_operations */
@@ -57659,10 +55708,10 @@ index adbfd66..4b25822 100644
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 ef74ad5..c9ac759e 100644
+index 5c029fb..96e676c 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
-@@ -1339,7 +1339,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
+@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
ret = 0;
pipe_lock(pipe);
@@ -57671,20 +55720,11 @@ index ef74ad5..c9ac759e 100644
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -1364,7 +1364,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
- page_nr++;
- ret += buf->len;
-
-- if (pipe->files)
-+ if (atomic_read(&pipe->files))
- do_wakeup = 1;
- }
-
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index b7989f2..1f72ec4 100644
+index 06e2f73..e6c5fc8 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
-@@ -1438,7 +1438,7 @@ static char *read_link(struct dentry *dentry)
+@@ -1150,7 +1150,7 @@ static char *read_link(struct dentry *dentry)
return link;
}
@@ -57693,11 +55733,31 @@ index b7989f2..1f72ec4 100644
{
if (!IS_ERR(link))
free_page((unsigned long) link);
+diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
+index 912c250..f0aee59 100644
+--- a/fs/fuse/inode.c
++++ b/fs/fuse/inode.c
+@@ -1094,6 +1094,7 @@ static struct file_system_type fuse_fs_type = {
+ .mount = fuse_mount,
+ .kill_sb = fuse_kill_sb_anon,
+ };
++MODULE_ALIAS_FS("fuse");
+
+ #ifdef CONFIG_BLOCK
+ static struct dentry *fuse_mount_blk(struct file_system_type *fs_type,
+@@ -1123,6 +1124,7 @@ static struct file_system_type fuseblk_fs_type = {
+ .kill_sb = fuse_kill_sb_blk,
+ .fs_flags = FS_REQUIRES_DEV | FS_HAS_SUBTYPE,
+ };
++MODULE_ALIAS_FS("fuseblk");
+
+ static inline int register_fuseblk(void)
+ {
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
-index ced3257..b5c3b942 100644
+index cfd4959..a780959 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
-@@ -1508,7 +1508,7 @@ out:
+@@ -1490,7 +1490,7 @@ out:
static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
{
@@ -57706,32 +55766,105 @@ index ced3257..b5c3b942 100644
if (!IS_ERR(s))
kfree(s);
}
+diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
+index cb23c2b..2fa1ea5 100644
+--- a/fs/gfs2/ops_fstype.c
++++ b/fs/gfs2/ops_fstype.c
+@@ -19,6 +19,7 @@
+ #include <linux/mount.h>
+ #include <linux/gfs2_ondisk.h>
+ #include <linux/quotaops.h>
++#include <linux/module.h>
+
+ #include "gfs2.h"
+ #include "incore.h"
+@@ -1395,6 +1396,7 @@ struct file_system_type gfs2_fs_type = {
+ .kill_sb = gfs2_kill_sb,
+ .owner = THIS_MODULE,
+ };
++MODULE_ALIAS_FS("gfs2");
+
+ struct file_system_type gfs2meta_fs_type = {
+ .name = "gfs2meta",
+@@ -1402,4 +1404,4 @@ struct file_system_type gfs2meta_fs_type = {
+ .mount = gfs2_mount_meta,
+ .owner = THIS_MODULE,
+ };
+-
++MODULE_ALIAS_FS("gfs2meta");
+diff --git a/fs/hfs/super.c b/fs/hfs/super.c
+index 1b55f70..bd6c289 100644
+--- a/fs/hfs/super.c
++++ b/fs/hfs/super.c
+@@ -460,6 +460,7 @@ static struct file_system_type hfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("hfs");
+
+ static void hfs_init_once(void *p)
+ {
+diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
+index d24a9b6..b398147 100644
+--- a/fs/hfsplus/super.c
++++ b/fs/hfsplus/super.c
+@@ -582,6 +582,7 @@ static struct file_system_type hfsplus_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("hfsplus");
+
+ static void hfsplus_init_once(void *p)
+ {
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
-index 2543728..14d7bd4 100644
+index 2f72da5..7ee87b1 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
-@@ -904,7 +904,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -999,6 +999,7 @@ static struct file_system_type hostfs_type = {
+ .kill_sb = hostfs_kill_sb,
+ .fs_flags = 0,
+ };
++MODULE_ALIAS_FS("hostfs");
- static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
+ static int __init init_hostfs(void)
+ {
+diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
+index f760c15..61b7191 100644
+--- a/fs/hpfs/super.c
++++ b/fs/hpfs/super.c
+@@ -691,6 +691,7 @@ static struct file_system_type hpfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("hpfs");
+
+ static int __init init_hpfs_fs(void)
+ {
+diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c
+index f590b11..414cf4b 100644
+--- a/fs/hppfs/hppfs.c
++++ b/fs/hppfs/hppfs.c
+@@ -758,6 +758,7 @@ static struct file_system_type hppfs_type = {
+ .kill_sb = kill_anon_super,
+ .fs_flags = 0,
+ };
++MODULE_ALIAS_FS("hppfs");
+
+ static int __init init_hppfs(void)
{
-- char *s = nd_get_link(nd);
-+ const char *s = nd_get_link(nd);
- if (!IS_ERR(s))
- __putname(s);
- }
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
-index d19b30a..ef89c36 100644
+index 0aa424a..c5563a6 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
-@@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
- struct mm_struct *mm = current->mm;
+@@ -134,6 +134,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);
- struct vm_unmapped_area_info info;
if (len & ~huge_page_mask(h))
-@@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+ return -EINVAL;
+@@ -146,18 +147,21 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
return addr;
}
@@ -57748,32 +55881,51 @@ index d19b30a..ef89c36 100644
return addr;
}
- info.flags = 0;
- info.length = len;
- info.low_limit = TASK_UNMAPPED_BASE;
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap;
-+#endif
-+
- info.high_limit = TASK_SIZE;
- info.align_mask = PAGE_MASK & ~huge_page_mask(h);
- info.align_offset = 0;
-@@ -908,7 +918,7 @@ static struct file_system_type hugetlbfs_fs_type = {
+ start_addr = mm->free_area_cache;
+
+ if (len <= mm->cached_hole_size)
+- start_addr = TASK_UNMAPPED_BASE;
++ start_addr = mm->mmap_base;
+
+ full_search:
+ addr = ALIGN(start_addr, huge_page_size(h));
+@@ -169,15 +173,17 @@ 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;
+ 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;
++ }
+ addr = ALIGN(vma->vm_end, huge_page_size(h));
+ }
+ }
+@@ -896,8 +902,9 @@ static struct file_system_type hugetlbfs_fs_type = {
+ .mount = hugetlbfs_mount,
+ .kill_sb = kill_litter_super,
};
- MODULE_ALIAS_FS("hugetlbfs");
++MODULE_ALIAS_FS("hugetlbfs");
--static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
-+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
+-static struct vfsmount *hugetlbfs_vfsmount;
++struct vfsmount *hugetlbfs_vfsmount;
static int can_do_hugetlb_shm(void)
{
diff --git a/fs/inode.c b/fs/inode.c
-index b33ba8e..3c79a47 100644
+index e2d3633..e6f3833 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -849,8 +849,8 @@ unsigned int get_next_ino(void)
+@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
#ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
@@ -57784,11 +55936,48 @@ index b33ba8e..3c79a47 100644
res = next - LAST_INO_BATCH;
}
+@@ -855,8 +855,7 @@ void lockdep_annotate_inode_mutex_key(struct inode *inode)
+ struct file_system_type *type = inode->i_sb->s_type;
+
+ /* Set new key only if filesystem hasn't already changed it */
+- if (!lockdep_match_class(&inode->i_mutex,
+- &type->i_mutex_key)) {
++ if (lockdep_match_class(&inode->i_mutex, &type->i_mutex_key)) {
+ /*
+ * ensure nobody is actually holding i_mutex
+ */
+@@ -883,6 +882,7 @@ void unlock_new_inode(struct inode *inode)
+ spin_lock(&inode->i_lock);
+ WARN_ON(!(inode->i_state & I_NEW));
+ inode->i_state &= ~I_NEW;
++ smp_mb();
+ wake_up_bit(&inode->i_state, __I_NEW);
+ spin_unlock(&inode->i_lock);
+ }
+diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
+index a5f25a7..8ac9cc8 100644
+--- a/fs/isofs/inode.c
++++ b/fs/isofs/inode.c
+@@ -1539,6 +1539,8 @@ static struct file_system_type iso9660_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("iso9660");
++MODULE_ALIAS("iso9660");
+
+ static int __init init_iso9660_fs(void)
+ {
+@@ -1576,5 +1578,3 @@ static void __exit exit_iso9660_fs(void)
+ module_init(init_iso9660_fs)
+ module_exit(exit_iso9660_fs)
+ MODULE_LICENSE("GPL");
+-/* Actual filesystem name is iso9660, as requested in filesystems.c */
+-MODULE_ALIAS("iso9660");
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
-index 4a6cf28..d3a29d3 100644
+index e513f19..2ab1351 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
-@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
+@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
.nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
@@ -57798,11 +55987,23 @@ index 4a6cf28..d3a29d3 100644
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
+diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
+index e7e9744..0de4fd9 100644
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
+@@ -357,6 +357,7 @@ static struct file_system_type jffs2_fs_type = {
+ .mount = jffs2_mount,
+ .kill_sb = jffs2_kill_sb,
+ };
++MODULE_ALIAS_FS("jffs2");
+
+ static int __init init_jffs2_fs(void)
+ {
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
-index a6597d6..41b30ec 100644
+index 464cd76..3a3ed7e 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
-@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
+@@ -1011,7 +1011,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
.nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
@@ -57813,10 +56014,18 @@ index a6597d6..41b30ec 100644
/*
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
-index 6669aa2..36b033d 100644
+index a44eff076..a4bf76a 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
-@@ -882,7 +882,7 @@ static int __init init_jfs_fs(void)
+@@ -780,6 +780,7 @@ static struct file_system_type jfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("jfs");
+
+ static void init_once(void *foo)
+ {
+@@ -802,7 +803,7 @@ static int __init init_jfs_fs(void)
jfs_inode_cachep =
kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
@@ -57826,35 +56035,35 @@ index 6669aa2..36b033d 100644
if (jfs_inode_cachep == NULL)
return -ENOMEM;
diff --git a/fs/libfs.c b/fs/libfs.c
-index 3a3a9b5..3a9b074 100644
+index f6d411e..e82a08d 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
-@@ -150,6 +150,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
-
- for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
- struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
-+ char d_name[sizeof(next->d_iname)];
-+ const unsigned char *name;
-+
- spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
- if (!simple_positive(next)) {
- spin_unlock(&next->d_lock);
-@@ -158,7 +161,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
-
- spin_unlock(&next->d_lock);
- spin_unlock(&dentry->d_lock);
-- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
-+ name = next->d_name.name;
-+ if (name == next->d_iname) {
-+ memcpy(d_name, name, next->d_name.len);
-+ name = d_name;
-+ }
-+ if (!dir_emit(ctx, name, next->d_name.len,
- next->d_inode->i_ino, dt_type(next->d_inode)))
- return 0;
- spin_lock(&dentry->d_lock);
+@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
+
+ for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
+ struct dentry *next;
++ char d_name[sizeof(next->d_iname)];
++ const unsigned char *name;
++
+ next = list_entry(p, struct dentry, d_u.d_child);
+ spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
+ if (!simple_positive(next)) {
+@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
+
+ spin_unlock(&next->d_lock);
+ spin_unlock(&dentry->d_lock);
+- if (filldir(dirent, next->d_name.name,
++ name = next->d_name.name;
++ if (name == next->d_iname) {
++ memcpy(d_name, name, next->d_name.len);
++ name = d_name;
++ }
++ if (filldir(dirent, name,
+ next->d_name.len, filp->f_pos,
+ next->d_inode->i_ino,
+ dt_type(next->d_inode)) < 0)
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
-index acd3947..1f896e2 100644
+index 8392cb8..80d6193 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
@@ -57871,11 +56080,24 @@ index acd3947..1f896e2 100644
memcpy(c->data, &cookie, 4);
c->len=4;
+diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
+index 2444780..2544030 100644
+--- a/fs/lockd/svc.c
++++ b/fs/lockd/svc.c
+@@ -295,7 +295,7 @@ int lockd_up(void)
+ svc_sock_update_bufs(serv);
+ serv->sv_maxconn = nlm_max_connections;
+
+- nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, serv->sv_name);
++ nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, "%s", serv->sv_name);
+ if (IS_ERR(nlmsvc_task)) {
+ error = PTR_ERR(nlmsvc_task);
+ svc_exit_thread(nlmsvc_rqst);
diff --git a/fs/locks.c b/fs/locks.c
-index b27a300..4156d0b 100644
+index fcc50ab..c3dacf26 100644
--- a/fs/locks.c
+++ b/fs/locks.c
-@@ -2183,16 +2183,16 @@ void locks_remove_flock(struct file *filp)
+@@ -2075,16 +2075,16 @@ void locks_remove_flock(struct file *filp)
return;
if (filp->f_op && filp->f_op->flock) {
@@ -57895,12 +56117,36 @@ index b27a300..4156d0b 100644
+ flock.fl_ops->fl_release_private(&flock);
}
- spin_lock(&inode->i_lock);
+ lock_flocks();
+diff --git a/fs/logfs/super.c b/fs/logfs/super.c
+index e795c234..136932a 100644
+--- a/fs/logfs/super.c
++++ b/fs/logfs/super.c
+@@ -609,6 +609,7 @@ static struct file_system_type logfs_fs_type = {
+ .fs_flags = FS_REQUIRES_DEV,
+
+ };
++MODULE_ALIAS_FS("logfs");
+
+ static int __init logfs_init(void)
+ {
+diff --git a/fs/minix/inode.c b/fs/minix/inode.c
+index 4d46a6a..dee1cdf 100644
+--- a/fs/minix/inode.c
++++ b/fs/minix/inode.c
+@@ -653,6 +653,7 @@ static struct file_system_type minix_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("minix");
+
+ static int __init init_minix_fs(void)
+ {
diff --git a/fs/namei.c b/fs/namei.c
-index caa2805..c9d3edc 100644
+index 9680cef..36c9152 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask)
+@@ -279,16 +279,32 @@ int generic_permission(struct inode *inode, int mask)
if (ret != -EACCES)
return ret;
@@ -57912,14 +56158,14 @@ index caa2805..c9d3edc 100644
+
if (S_ISDIR(inode->i_mode)) {
/* DACs are overridable for directories */
-- if (inode_capable(inode, CAP_DAC_OVERRIDE))
+- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
- return 0;
if (!(mask & MAY_WRITE))
-- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
-+ if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
-+ inode_capable(inode, CAP_DAC_READ_SEARCH))
+- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
++ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
++ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
return 0;
-+ if (inode_capable(inode, CAP_DAC_OVERRIDE))
++ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
+ return 0;
return -EACCES;
}
@@ -57928,16 +56174,16 @@ index caa2805..c9d3edc 100644
+ */
+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
+ if (mask == MAY_READ)
-+ if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
-+ inode_capable(inode, CAP_DAC_READ_SEARCH))
++ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
++ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
+ return 0;
+
+ /*
* Read/write DACs are always overridable.
* Executable DACs are overridable when there is
* at least one exec bit set.
-@@ -337,14 +353,6 @@ int generic_permission(struct inode *inode, int mask)
- if (inode_capable(inode, CAP_DAC_OVERRIDE))
+@@ -297,14 +313,6 @@ int generic_permission(struct inode *inode, int mask)
+ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
return 0;
- /*
@@ -57945,62 +56191,52 @@ index caa2805..c9d3edc 100644
- */
- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
- if (mask == MAY_READ)
-- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
+- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
- return 0;
-
return -EACCES;
}
-@@ -821,7 +829,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
- {
- struct dentry *dentry = link->dentry;
- int error;
-- char *s;
-+ const char *s;
-
- BUG_ON(nd->flags & LOOKUP_RCU);
-
-@@ -842,6 +850,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
- if (error)
- goto out_put_nd_path;
+@@ -653,11 +661,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+ return error;
+ }
+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
+ dentry->d_inode, dentry, nd->path.mnt)) {
+ error = -EACCES;
-+ goto out_put_nd_path;
-+ }
++ *p = ERR_PTR(error); /* no ->put_link(), please */
++ path_put(&nd->path);
++ return error;
++ }
+
nd->last_type = LAST_BIND;
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(*p);
-@@ -1602,6 +1616,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
- if (res)
- break;
- res = walk_component(nd, path, LOOKUP_FOLLOW);
+ if (!IS_ERR(*p)) {
+- char *s = nd_get_link(nd);
++ const char *s = nd_get_link(nd);
+ error = 0;
+ if (s)
+ error = __vfs_follow_link(nd, s);
+@@ -1345,6 +1361,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
+ if (!res)
+ res = walk_component(nd, path, &nd->last,
+ nd->last_type, LOOKUP_FOLLOW);
+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
+ res = -EACCES;
put_link(nd, &link, cookie);
} while (res > 0);
-@@ -1700,7 +1716,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;
-- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
-+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
-
- hash = a = 0;
- len = -sizeof(unsigned long);
-@@ -1981,6 +1997,8 @@ static int path_lookupat(int dfd, const char *name,
- if (err)
- break;
- err = lookup_last(nd, &path);
+@@ -1617,6 +1635,8 @@ static int path_lookupat(int dfd, const char *name,
+ err = follow_link(&link, nd, &cookie);
+ if (!err)
+ err = lookup_last(nd, &path);
+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
+ err = -EACCES;
put_link(nd, &link, cookie);
}
}
-@@ -1988,6 +2006,13 @@ static int path_lookupat(int dfd, const char *name,
+@@ -1624,6 +1644,13 @@ static int path_lookupat(int dfd, const char *name,
if (!err)
err = complete_walk(nd);
@@ -58012,26 +56248,36 @@ index caa2805..c9d3edc 100644
+ }
+
if (!err && nd->flags & LOOKUP_DIRECTORY) {
- if (!can_lookup(nd->inode)) {
+ if (!nd->inode->i_op->lookup) {
path_put(&nd->path);
-@@ -2015,8 +2040,15 @@ static int filename_lookup(int dfd, struct filename *name,
- retval = path_lookupat(dfd, name->name,
- flags | LOOKUP_REVAL, nd);
-
-- if (likely(!retval))
-+ if (likely(!retval)) {
- audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
-+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
+@@ -1655,6 +1682,12 @@ static int do_path_lookup(int dfd, const char *name,
+ if (nd->path.dentry && nd->inode)
+ audit_inode(name, nd->path.dentry);
+ }
++ if (*name != '/' && nd->path.dentry && nd->inode) {
+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
+ path_put(&nd->path);
+ return -ENOENT;
+ }
+ }
-+ }
+ }
return retval;
}
+@@ -1784,7 +1817,13 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
+ if (!len)
+ return ERR_PTR(-EACCES);
-@@ -2586,6 +2618,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
++ if (unlikely(name[0] == '.')) {
++ if (len < 2 || (len == 2 && name[1] == '.'))
++ return ERR_PTR(-EACCES);
++ }
++
+ hash = init_name_hash();
++
+ while (len--) {
+ c = *(const unsigned char *)name++;
+ if (c == '/' || c == '\0')
+@@ -2048,6 +2087,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
if (flag & O_NOATIME && !inode_owner_or_capable(inode))
return -EPERM;
@@ -58045,188 +56291,204 @@ index caa2805..c9d3edc 100644
return 0;
}
-@@ -2817,7 +2856,7 @@ looked_up:
- * cleared otherwise prior to returning.
+@@ -2083,7 +2129,7 @@ static inline int open_to_namei_flags(int flag)
+ /*
+ * Handle the last step of open()
*/
- static int lookup_open(struct nameidata *nd, struct path *path,
-- struct file *file,
-+ struct path *link, struct file *file,
- const struct open_flags *op,
- bool got_write, int *opened)
+-static struct file *do_last(struct nameidata *nd, struct path *path,
++static struct file *do_last(struct nameidata *nd, struct path *path, struct path *link,
+ const struct open_flags *op, const char *pathname)
{
-@@ -2852,6 +2891,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+ struct dentry *dir = nd->path.dentry;
+@@ -2109,16 +2155,32 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ error = complete_walk(nd);
+ if (error)
+ return ERR_PTR(error);
++ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++ error = -ENOENT;
++ goto exit;
++ }
+ audit_inode(pathname, nd->path.dentry);
+ if (open_flag & O_CREAT) {
+ error = -EISDIR;
+ goto exit;
+ }
++ if (link && gr_handle_symlink_owner(link, nd->inode)) {
++ error = -EACCES;
++ goto exit;
++ }
+ goto ok;
+ case LAST_BIND:
+ error = complete_walk(nd);
+ if (error)
+ return ERR_PTR(error);
++ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
++ error = -ENOENT;
++ goto exit;
++ }
++ if (link && gr_handle_symlink_owner(link, nd->inode)) {
++ error = -EACCES;
++ goto exit;
++ }
+ audit_inode(pathname, dir);
+ goto ok;
+ }
+@@ -2134,18 +2196,31 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ !symlink_ok);
+ if (error < 0)
+ return ERR_PTR(error);
+- if (error) /* symlink */
++ if (error) /* symlink */ {
++ if (link && gr_handle_symlink_owner(link, nd->inode)) {
++ error = -EACCES;
++ goto exit;
++ }
+ return NULL;
++ }
+ /* sayonara */
+ error = complete_walk(nd);
+ if (error)
+ return ERR_PTR(error);
++ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++ error = -ENOENT;
++ goto exit;
++ }
+
+ error = -ENOTDIR;
+ if (nd->flags & LOOKUP_DIRECTORY) {
+ if (!nd->inode->i_op->lookup)
+ goto exit;
+ }
++ if (link && gr_handle_symlink_owner(link, nd->inode)) {
++ error = -EACCES;
++ goto exit;
++ }
+ audit_inode(pathname, nd->path.dentry);
+ goto ok;
+ }
+@@ -2180,6 +2255,17 @@ static struct file *do_last(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 (!dentry->d_inode) {
+ int mode = op->mode;
+
+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
+ error = -EACCES;
-+ goto out_dput;
++ goto exit_mutex_unlock;
+ }
+
-+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
++ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
+ error = -EACCES;
-+ goto out_dput;
++ goto exit_mutex_unlock;
+ }
+
if (!IS_POSIXACL(dir->d_inode))
mode &= ~current_umask();
/*
-@@ -2873,6 +2923,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
- nd->flags & LOOKUP_EXCL);
+@@ -2203,6 +2289,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ error = vfs_create(dir->d_inode, dentry, mode, nd);
if (error)
- goto out_dput;
+ goto exit_mutex_unlock;
+ else
-+ gr_handle_create(dentry, nd->path.mnt);
- }
- out_no_open:
- path->dentry = dentry;
-@@ -2887,7 +2939,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, struct filename *name)
- {
-@@ -2937,6 +2989,15 @@ static int do_last(struct nameidata *nd, struct path *path,
- if (error)
- return error;
-
-+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
-+ error = -ENOENT;
-+ goto out;
-+ }
-+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
-+ error = -EACCES;
-+ goto out;
-+ }
++ gr_handle_create(path->dentry, path->mnt);
+ mutex_unlock(&dir->d_inode->i_mutex);
+ dput(nd->path.dentry);
+ nd->path.dentry = dentry;
+@@ -2212,6 +2300,19 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ /*
+ * It already exists.
+ */
+
- audit_inode(name, dir, LOOKUP_PARENT);
- error = -EISDIR;
- /* trailing slashes? */
-@@ -2956,7 +3017,7 @@ retry_lookup:
- */
- }
- mutex_lock(&dir->d_inode->i_mutex);
-- error = lookup_open(nd, path, file, op, got_write, opened);
-+ error = lookup_open(nd, path, link, file, op, got_write, opened);
- mutex_unlock(&dir->d_inode->i_mutex);
-
- if (error <= 0) {
-@@ -2980,11 +3041,28 @@ retry_lookup:
- goto finish_open_created;
- }
-
-+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
++ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
+ error = -ENOENT;
-+ goto exit_dput;
++ goto exit_mutex_unlock;
+ }
-+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
++
++ /* only check if O_CREAT is specified, all other checks need to go
++ into may_open */
++ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
+ error = -EACCES;
-+ goto exit_dput;
++ goto exit_mutex_unlock;
+ }
+
- /*
- * create/update audit record if it already exists.
- */
-- if (path->dentry->d_inode)
-+ if (path->dentry->d_inode) {
-+ /* only check if O_CREAT is specified, all other checks need to go
-+ into may_open */
-+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
-+ error = -EACCES;
-+ goto exit_dput;
-+ }
-+
- audit_inode(name, path->dentry, 0);
-+ }
+ mutex_unlock(&dir->d_inode->i_mutex);
+ audit_inode(pathname, path->dentry);
- /*
- * If atomic_open() acquired write access it is dropped now due to
-@@ -3025,6 +3103,11 @@ finish_lookup:
- }
- }
- BUG_ON(inode != path->dentry->d_inode);
-+ /* if we're resolving a symlink to another symlink */
-+ if (link && gr_handle_symlink_owner(link, inode)) {
+@@ -2230,11 +2331,17 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ if (!path->dentry->d_inode)
+ goto exit_dput;
+
+- if (path->dentry->d_inode->i_op->follow_link)
++ if (path->dentry->d_inode->i_op->follow_link) {
++ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
+ error = -EACCES;
-+ goto out;
++ goto exit;
+ }
- return 1;
- }
+ return NULL;
++ }
-@@ -3034,7 +3117,6 @@ finish_lookup:
- save_parent.dentry = nd->path.dentry;
- save_parent.mnt = mntget(path->mnt);
- nd->path.dentry = path->dentry;
--
- }
- nd->inode = inode;
+ path_to_nameidata(path, nd);
+ nd->inode = path->dentry->d_inode;
++
/* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
-@@ -3044,7 +3126,18 @@ finish_open:
- path_put(&save_parent);
- return error;
- }
+ error = complete_walk(nd);
+ if (error)
+@@ -2242,6 +2349,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ error = -EISDIR;
+ if (S_ISDIR(nd->inode->i_mode))
+ goto exit;
+
-+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
-+ error = -ENOENT;
-+ goto out;
-+ }
+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
+ error = -EACCES;
-+ goto out;
++ goto exit;
+ }
+
- audit_inode(name, nd->path.dentry, 0);
-+
- error = -EISDIR;
- if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
- goto out;
-@@ -3207,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
+ ok:
+ if (!S_ISREG(nd->inode->i_mode))
+ will_truncate = 0;
+@@ -2314,7 +2427,7 @@ static struct file *path_openat(int dfd, const char *pathname,
if (unlikely(error))
- goto out;
+ goto out_filp;
-- error = do_last(nd, &path, file, op, &opened, pathname);
-+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
- while (unlikely(error > 0)) { /* trailing symlink */
+- filp = do_last(nd, &path, op, pathname);
++ filp = do_last(nd, &path, NULL, op, pathname);
+ while (unlikely(!filp)) { /* trailing symlink */
struct path link = path;
void *cookie;
-@@ -3225,7 +3318,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
+@@ -2329,8 +2442,9 @@ static struct file *path_openat(int dfd, const char *pathname,
error = follow_link(&link, nd, &cookie);
if (unlikely(error))
- break;
-- error = do_last(nd, &path, file, op, &opened, pathname);
-+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
+ filp = ERR_PTR(error);
+- else
+- filp = do_last(nd, &path, op, pathname);
++ else {
++ filp = do_last(nd, &path, &link, op, pathname);
++ }
put_link(nd, &link, cookie);
}
out:
-@@ -3325,8 +3418,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
- goto unlock;
-
- error = -EEXIST;
-- if (dentry->d_inode)
-+ if (dentry->d_inode) {
-+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
-+ error = -ENOENT;
-+ }
- goto fail;
+@@ -2424,6 +2538,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
+ *path = nd.path;
+ return dentry;
+ eexist:
++ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
++ dput(dentry);
++ dentry = ERR_PTR(-ENOENT);
++ goto fail;
+ }
- /*
- * Special case - lookup gave negative, but... we had foo/bar/
- * From the vfs_mknod() POV we just have a negative dentry -
-@@ -3378,6 +3475,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
+ dput(dentry);
+ dentry = ERR_PTR(-EEXIST);
+ fail:
+@@ -2446,6 +2565,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, struct filename **to, unsigned int lookup_flags)
++static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
+{
-+ struct filename *tmp = getname(pathname);
++ char *tmp = getname(pathname);
+ struct dentry *res;
+ if (IS_ERR(tmp))
+ return ERR_CAST(tmp);
-+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
++ res = kern_path_create(dfd, tmp, path, is_dir);
+ if (IS_ERR(res))
+ putname(tmp);
+ else
@@ -58234,63 +56496,69 @@ index caa2805..c9d3edc 100644
+ return res;
+}
+
- int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
+ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
{
int error = may_create(dir, dentry);
-@@ -3440,6 +3551,17 @@ retry:
-
- if (!IS_POSIXACL(path.dentry->d_inode))
- mode &= ~current_umask();
+@@ -2513,6 +2646,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
+ error = mnt_want_write(path.mnt);
+ if (error)
+ goto out_dput;
+
+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
+ error = -EPERM;
-+ goto out;
++ goto out_drop_write;
+ }
+
+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
+ error = -EACCES;
-+ goto out;
++ goto out_drop_write;
+ }
+
error = security_path_mknod(&path, dentry, mode, dev);
if (error)
- goto out;
-@@ -3456,6 +3578,8 @@ retry:
- break;
+ goto out_drop_write;
+@@ -2530,6 +2674,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
}
- out:
+ out_drop_write:
+ mnt_drop_write(path.mnt);
++
+ if (!error)
+ gr_handle_create(dentry, path.mnt);
- done_path_create(&path, dentry);
- if (retry_estale(error, lookup_flags)) {
- lookup_flags |= LOOKUP_REVAL;
-@@ -3508,9 +3632,16 @@ retry:
-
- if (!IS_POSIXACL(path.dentry->d_inode))
- mode &= ~current_umask();
+ out_dput:
+ dput(dentry);
+ mutex_unlock(&path.dentry->d_inode->i_mutex);
+@@ -2579,12 +2726,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
+ error = mnt_want_write(path.mnt);
+ if (error)
+ goto out_dput;
++
+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
+ error = -EACCES;
-+ goto out;
++ goto out_drop_write;
+ }
++
error = security_path_mkdir(&path, dentry, mode);
- if (!error)
- error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
+ if (error)
+ goto out_drop_write;
+ error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
+ out_drop_write:
+ mnt_drop_write(path.mnt);
++
+ if (!error)
+ gr_handle_create(dentry, path.mnt);
-+out:
- done_path_create(&path, dentry);
- if (retry_estale(error, lookup_flags)) {
- lookup_flags |= LOOKUP_REVAL;
-@@ -3591,6 +3722,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
- struct filename *name;
+ out_dput:
+ dput(dentry);
+ mutex_unlock(&path.dentry->d_inode->i_mutex);
+@@ -2664,6 +2820,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
+ char * name;
struct dentry *dentry;
struct nameidata nd;
+ ino_t saved_ino = 0;
+ dev_t saved_dev = 0;
- unsigned int lookup_flags = 0;
- retry:
- name = user_path_parent(dfd, pathname, &nd, lookup_flags);
-@@ -3623,10 +3756,21 @@ retry:
+
+ error = user_path_parent(dfd, pathname, &nd, &name);
+ if (error)
+@@ -2692,6 +2850,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
error = -ENOENT;
goto exit3;
}
@@ -58303,25 +56571,28 @@ index caa2805..c9d3edc 100644
+ goto exit3;
+ }
+
- error = security_path_rmdir(&nd.path, dentry);
+ error = mnt_want_write(nd.path.mnt);
if (error)
goto exit3;
+@@ -2699,6 +2866,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
+ if (error)
+ goto exit4;
error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
+ if (!error && (saved_dev || saved_ino))
+ gr_handle_delete(saved_ino, saved_dev);
+ exit4:
+ mnt_drop_write(nd.path.mnt);
exit3:
- dput(dentry);
- exit2:
-@@ -3692,6 +3836,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+@@ -2761,6 +2930,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;
- unsigned int lookup_flags = 0;
- retry:
- name = user_path_parent(dfd, pathname, &nd, lookup_flags);
-@@ -3718,10 +3864,22 @@ retry:
+
+ error = user_path_parent(dfd, pathname, &nd, &name);
+ if (error)
+@@ -2783,6 +2954,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
if (!inode)
goto slashes;
ihold(inode);
@@ -58335,80 +56606,86 @@ index caa2805..c9d3edc 100644
+ goto exit2;
+ }
+
- error = security_path_unlink(&nd.path, dentry);
+ error = mnt_want_write(nd.path.mnt);
if (error)
goto exit2;
+@@ -2790,6 +2971,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+ if (error)
+ goto exit3;
error = vfs_unlink(nd.path.dentry->d_inode, dentry);
+ if (!error && (saved_ino || saved_dev))
+ gr_handle_delete(saved_ino, saved_dev);
- exit2:
- dput(dentry);
- }
-@@ -3799,9 +3957,17 @@ retry:
- if (IS_ERR(dentry))
- goto out_putname;
-
+ exit3:
+ mnt_drop_write(nd.path.mnt);
+ exit2:
+@@ -2865,10 +3048,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
+ error = mnt_want_write(path.mnt);
+ if (error)
+ goto out_dput;
++
+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
+ error = -EACCES;
-+ goto out;
++ goto out_drop_write;
+ }
+
- error = security_path_symlink(&path, dentry, from->name);
- if (!error)
- error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
+ error = security_path_symlink(&path, dentry, from);
+ if (error)
+ goto out_drop_write;
+ error = vfs_symlink(path.dentry->d_inode, dentry, from);
+ if (!error)
+ gr_handle_create(dentry, path.mnt);
-+out:
- done_path_create(&path, dentry);
- if (retry_estale(error, lookup_flags)) {
- lookup_flags |= LOOKUP_REVAL;
-@@ -3881,6 +4047,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+ out_drop_write:
+ mnt_drop_write(path.mnt);
+ out_dput:
+@@ -2940,6 +3131,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
{
struct dentry *new_dentry;
struct path old_path, new_path;
-+ struct filename *to = NULL;
++ char *to = NULL;
int how = 0;
int error;
-@@ -3904,7 +4071,7 @@ retry:
+@@ -2963,7 +3155,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
if (error)
return error;
-- new_dentry = user_path_create(newdfd, newname, &new_path,
-+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
- (how & LOOKUP_REVAL));
+- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
++ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
-@@ -3916,11 +4083,28 @@ retry:
- error = may_linkat(&old_path);
- if (unlikely(error))
+ goto out;
+@@ -2974,13 +3166,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+ error = mnt_want_write(new_path.mnt);
+ if (error)
goto out_dput;
+
+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
+ old_path.dentry->d_inode,
+ old_path.dentry->d_inode->i_mode, to)) {
+ error = -EACCES;
-+ goto out_dput;
++ goto out_drop_write;
+ }
+
+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
+ old_path.dentry, old_path.mnt, to)) {
+ error = -EACCES;
-+ goto out_dput;
++ goto out_drop_write;
+ }
+
error = security_path_link(old_path.dentry, &new_path, new_dentry);
if (error)
- goto out_dput;
+ goto out_drop_write;
error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
+ if (!error)
+ gr_handle_create(new_dentry, new_path.mnt);
+ out_drop_write:
+ mnt_drop_write(new_path.mnt);
out_dput:
+ putname(to);
- done_path_create(&new_path, new_dentry);
- if (retry_estale(error, how)) {
- how |= LOOKUP_REVAL;
-@@ -4166,12 +4350,21 @@ retry:
+ dput(new_dentry);
+ mutex_unlock(&new_path.dentry->d_inode->i_mutex);
+ path_put(&new_path);
+@@ -3208,6 +3417,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
if (new_dentry == trap)
goto exit5;
@@ -58418,19 +56695,20 @@ index caa2805..c9d3edc 100644
+ if (error)
+ goto exit5;
+
- error = security_path_rename(&oldnd.path, old_dentry,
- &newnd.path, new_dentry);
+ error = mnt_want_write(oldnd.path.mnt);
if (error)
goto exit5;
+@@ -3217,6 +3432,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
+ goto exit6;
error = vfs_rename(old_dir->d_inode, old_dentry,
new_dir->d_inode, new_dentry);
+ if (!error)
+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
+ exit6:
+ mnt_drop_write(oldnd.path.mnt);
exit5:
- dput(new_dentry);
- exit4:
-@@ -4203,6 +4396,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
+@@ -3242,6 +3460,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)
{
@@ -58439,7 +56717,7 @@ index caa2805..c9d3edc 100644
int len;
len = PTR_ERR(link);
-@@ -4212,7 +4407,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
+@@ -3251,7 +3471,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
len = strlen(link);
if (len > (unsigned) buflen)
len = buflen;
@@ -58456,10 +56734,10 @@ index caa2805..c9d3edc 100644
out:
return len;
diff --git a/fs/namespace.c b/fs/namespace.c
-index da5c494..a755a54 100644
+index ca4913a..8eb2439 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1268,6 +1268,9 @@ static int do_umount(struct mount *mnt, int flags)
+@@ -1327,6 +1327,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
up_write(&sb->s_umount);
@@ -58469,17 +56747,17 @@ index da5c494..a755a54 100644
return retval;
}
-@@ -1286,6 +1289,9 @@ static int do_umount(struct mount *mnt, int flags)
- }
- br_write_unlock(&vfsmount_lock);
- namespace_unlock();
+@@ -1346,6 +1349,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
+ br_write_unlock(vfsmount_lock);
+ up_write(&namespace_sem);
+ release_mounts(&umount_list);
+
+ gr_log_unmount(mnt->mnt_devname, retval);
+
return retval;
}
-@@ -1305,7 +1311,7 @@ static inline bool may_mount(void)
+@@ -1357,7 +1363,7 @@ static int do_umount(struct vfsmount *mnt, int flags)
* unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
*/
@@ -58487,8 +56765,8 @@ index da5c494..a755a54 100644
+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
{
struct path path;
- struct mount *mnt;
-@@ -1347,7 +1353,7 @@ out:
+ int retval;
+@@ -1396,7 +1402,7 @@ out:
/*
* The 2.0 compatible umount. No flags.
*/
@@ -58497,7 +56775,7 @@ index da5c494..a755a54 100644
{
return sys_umount(name, 0);
}
-@@ -2358,6 +2364,16 @@ long do_mount(const char *dev_name, const char *dir_name,
+@@ -2337,6 +2343,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
MS_STRICTATIME);
@@ -58514,7 +56792,7 @@ index da5c494..a755a54 100644
if (flags & MS_REMOUNT)
retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
data_page);
-@@ -2372,6 +2388,9 @@ long do_mount(const char *dev_name, const char *dir_name,
+@@ -2351,6 +2367,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
dev_name, data_page);
dput_out:
path_put(&path);
@@ -58524,34 +56802,16 @@ index da5c494..a755a54 100644
return retval;
}
-@@ -2389,7 +2408,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
- * number incrementing at 10Ghz will take 12,427 years to wrap which
- * is effectively never, so we can ignore the possibility.
- */
--static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
-+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
-
- static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
- {
-@@ -2404,7 +2423,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
- kfree(new_ns);
- return ERR_PTR(ret);
- }
-- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
-+ new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
- atomic_set(&new_ns->count, 1);
- new_ns->root = NULL;
- INIT_LIST_HEAD(&new_ns->list);
-@@ -2418,7 +2437,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
+@@ -2389,7 +2408,7 @@ void mnt_make_shortterm(struct vfsmount *mnt)
* Allocate a new namespace structure and populate it with contents
* copied from the namespace of the passed in task structure.
*/
-static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
+static __latent_entropy struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
- struct user_namespace *user_ns, struct fs_struct *fs)
+ struct fs_struct *fs)
{
struct mnt_namespace *new_ns;
-@@ -2549,8 +2568,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
+@@ -2518,8 +2537,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
}
EXPORT_SYMBOL(mount_subtree);
@@ -58562,7 +56822,7 @@ index da5c494..a755a54 100644
{
int ret;
char *kernel_type;
-@@ -2663,6 +2682,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
+@@ -2606,6 +2625,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
if (error)
goto out2;
@@ -58572,22 +56832,49 @@ index da5c494..a755a54 100644
+ }
+
get_fs_root(current->fs, &root);
- old_mp = lock_mount(&old);
- error = PTR_ERR(old_mp);
-@@ -2932,7 +2956,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
- !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
- return -EPERM;
+ error = lock_mount(&old);
+ if (error)
+diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
+index cbd1a61..b43f68b 100644
+--- a/fs/ncpfs/inode.c
++++ b/fs/ncpfs/inode.c
+@@ -1041,6 +1041,7 @@ static struct file_system_type ncp_fs_type = {
+ .kill_sb = kill_anon_super,
+ .fs_flags = FS_BINARY_MOUNTDATA,
+ };
++MODULE_ALIAS_FS("ncpfs");
+
+ static int __init init_ncp_fs(void)
+ {
+diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
+index 516f337..82a82df 100644
+--- a/fs/nfs/callback.c
++++ b/fs/nfs/callback.c
+@@ -250,7 +250,6 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
+ struct svc_rqst *rqstp;
+ int (*callback_svc)(void *vrqstp);
+ struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
+- char svc_name[12];
+ int ret = 0;
+ int minorversion_setup;
-- if (fs->users != 1)
-+ if (atomic_read(&fs->users) != 1)
- return -EINVAL;
+@@ -280,10 +279,9 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
+
+ svc_sock_update_bufs(serv);
- get_mnt_ns(mnt_ns);
+- sprintf(svc_name, "nfsv4.%u-svc", minorversion);
+ cb_info->serv = serv;
+ cb_info->rqst = rqstp;
+- cb_info->task = kthread_run(callback_svc, cb_info->rqst, svc_name);
++ cb_info->task = kthread_run(callback_svc, cb_info->rqst, "nfsv4.%u-svc", minorversion);
+ if (IS_ERR(cb_info->task)) {
+ ret = PTR_ERR(cb_info->task);
+ svc_exit_thread(cb_info->rqst);
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
-index f4ccfe6..a5cf064 100644
+index 3fde055..de27202 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
-@@ -51,7 +51,7 @@ struct callback_op {
+@@ -50,7 +50,7 @@ struct callback_op {
callback_decode_arg_t decode_args;
callback_encode_res_t encode_res;
long res_maxsize;
@@ -58596,11 +56883,43 @@ index f4ccfe6..a5cf064 100644
static struct callback_op callback_ops[];
+diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
+index 756f4df..8bd49ca 100644
+--- a/fs/nfs/dir.c
++++ b/fs/nfs/dir.c
+@@ -500,7 +500,8 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
+ nfs_refresh_inode(dentry->d_inode, entry->fattr);
+ goto out;
+ } else {
+- d_drop(dentry);
++ if (d_invalidate(dentry) != 0)
++ goto out;
+ dput(dentry);
+ }
+ }
+@@ -1164,6 +1165,8 @@ out_set_verifier:
+ out_zap_parent:
+ nfs_zap_caches(dir);
+ out_bad:
++ nfs_free_fattr(fattr);
++ nfs_free_fhandle(fhandle);
+ nfs_mark_for_revalidate(dir);
+ if (inode && S_ISDIR(inode->i_mode)) {
+ /* Purge readdir caches. */
+@@ -1176,8 +1179,6 @@ out_zap_parent:
+ shrink_dcache_parent(dentry);
+ }
+ d_drop(dentry);
+- nfs_free_fattr(fattr);
+- nfs_free_fhandle(fhandle);
+ dput(parent);
+ dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is invalid\n",
+ __func__, dentry->d_parent->d_name.name,
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index eda8879..bfc6837 100644
+index b78b5b6..c64d84f 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
-@@ -1150,16 +1150,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
+@@ -1002,16 +1002,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);
}
@@ -58620,45 +56939,65 @@ index eda8879..bfc6837 100644
}
void nfs_fattr_init(struct nfs_fattr *fattr)
-diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
-index cc14cbb..6021bb6 100644
---- a/fs/nfs/nfs4state.c
-+++ b/fs/nfs/nfs4state.c
-@@ -1881,10 +1881,15 @@ again:
- nfs4_root_machine_cred(clp);
- goto again;
- }
-- if (i > 2)
-+ if (clnt->cl_auth->au_flavor == RPC_AUTH_UNIX)
- break;
- case -NFS4ERR_CLID_INUSE:
- case -NFS4ERR_WRONGSEC:
-+ /* No point in retrying if we already used RPC_AUTH_UNIX */
-+ if (clnt->cl_auth->au_flavor == RPC_AUTH_UNIX) {
-+ status = -EPERM;
-+ break;
-+ }
- clnt = rpc_clone_client_set_auth(clnt, RPC_AUTH_UNIX);
- if (IS_ERR(clnt)) {
- status = PTR_ERR(clnt);
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index 5639efd..4531174 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -1037,7 +1037,7 @@ static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata)
+ struct nfs4_state *state = opendata->state;
+ struct nfs_inode *nfsi = NFS_I(state->inode);
+ struct nfs_delegation *delegation;
+- int open_mode = opendata->o_arg.open_flags & O_EXCL;
++ int open_mode = opendata->o_arg.open_flags;
+ fmode_t fmode = opendata->o_arg.fmode;
+ nfs4_stateid stateid;
+ int ret = -EAGAIN;
+diff --git a/fs/nfs/super.c b/fs/nfs/super.c
+index 1943898..396c460 100644
+--- a/fs/nfs/super.c
++++ b/fs/nfs/super.c
+@@ -282,6 +282,7 @@ static struct file_system_type nfs_fs_type = {
+ .kill_sb = nfs_kill_super,
+ .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
+ };
++MODULE_ALIAS_FS("nfs");
+
+ struct file_system_type nfs_xdev_fs_type = {
+ .owner = THIS_MODULE,
+@@ -338,6 +339,8 @@ static struct file_system_type nfs4_remote_fs_type = {
+ .kill_sb = nfs4_kill_super,
+ .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
+ };
++MODULE_ALIAS_FS("nfs4");
++MODULE_ALIAS("nfs4");
+
+ struct file_system_type nfs4_xdev_fs_type = {
+ .owner = THIS_MODULE,
+@@ -3089,6 +3092,4 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type,
+ return res;
+ }
+
+-MODULE_ALIAS("nfs4");
+-
+ #endif /* CONFIG_NFS_V4 */
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
-index 419572f..5414a23 100644
+index e065497..258fa11 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
-@@ -1168,7 +1168,7 @@ struct nfsd4_operation {
+@@ -1048,7 +1048,7 @@ struct nfsd4_operation {
+ char *op_name;
+ /* Try to get response size before operation */
nfsd4op_rsize op_rsize_bop;
- stateid_getter op_get_currentstateid;
- stateid_setter op_set_currentstateid;
-};
+} __do_const;
static struct nfsd4_operation nfsd4_ops[];
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index d9454fe..855c9d1 100644
+index 99625b8..7e04dea 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
-@@ -1498,7 +1498,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
+@@ -1445,7 +1445,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
@@ -58667,7 +57006,7 @@ index d9454fe..855c9d1 100644
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
[OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
[OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
-@@ -1538,7 +1538,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
+@@ -1485,7 +1485,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
[OP_RELEASE_LOCKOWNER] = (nfsd4_dec)nfsd4_decode_release_lockowner,
};
@@ -58676,7 +57015,7 @@ index d9454fe..855c9d1 100644
[OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
[OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
[OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
-@@ -1600,7 +1600,7 @@ static nfsd4_dec nfsd41_dec_ops[] = {
+@@ -1547,7 +1547,7 @@ static nfsd4_dec nfsd41_dec_ops[] = {
};
struct nfsd4_minorversion_ops {
@@ -58686,18 +57025,17 @@ index d9454fe..855c9d1 100644
};
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
-index 9186c7c..3fdde3e 100644
+index 2cbac34..21c9120 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
-@@ -540,14 +540,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
+@@ -259,13 +259,16 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
{
- struct svc_cacherep *rp = rqstp->rq_cacherep;
+ struct svc_cacherep *rp;
struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
- int len;
+ long len;
- size_t bufsize = 0;
- if (!rp)
+ if (!(rp = rqstp->rq_cacherep) || cache_disabled)
return;
- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
@@ -58710,11 +57048,23 @@ index 9186c7c..3fdde3e 100644
/* Don't cache excessive amounts of data and XDR failures */
if (!statp || len > (256 >> 2)) {
+diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
+index c45a2ea..1a6bd66 100644
+--- a/fs/nfsd/nfsctl.c
++++ b/fs/nfsd/nfsctl.c
+@@ -1102,6 +1102,7 @@ static struct file_system_type nfsd_fs_type = {
+ .mount = nfsd_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("nfsd");
+
+ #ifdef CONFIG_PROC_FS
+ static int create_proc_exports_entry(void)
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index c827acb..b253b77 100644
+index 561a3dc..9c46c5e 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
-@@ -968,7 +968,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
+@@ -915,7 +915,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
} else {
oldfs = get_fs();
set_fs(KERNEL_DS);
@@ -58723,26 +57073,55 @@ index c827acb..b253b77 100644
set_fs(oldfs);
}
-@@ -1055,7 +1055,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
+@@ -1019,7 +1019,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
/* Write the data. */
oldfs = get_fs(); set_fs(KERNEL_DS);
-- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
-+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
+- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
++ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
set_fs(oldfs);
if (host_err < 0)
goto out_nfserr;
-@@ -1601,7 +1601,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
+@@ -1560,7 +1560,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, (char __user *)buf, *lenp);
-+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
+- host_err = inode->i_op->readlink(dentry, buf, *lenp);
++ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
set_fs(oldfs);
if (host_err < 0)
+diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
+index 97bfbdd..e7f644a 100644
+--- a/fs/nilfs2/super.c
++++ b/fs/nilfs2/super.c
+@@ -1370,6 +1370,7 @@ struct file_system_type nilfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("nilfs2");
+
+ static void nilfs_inode_init_once(void *obj)
+ {
+diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
+index 1c98f53..41e6a04 100644
+--- a/fs/nilfs2/the_nilfs.c
++++ b/fs/nilfs2/the_nilfs.c
+@@ -410,6 +410,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
+ nilfs->ns_first_data_block = le64_to_cpu(sbp->s_first_data_block);
+ nilfs->ns_r_segments_percentage =
+ le32_to_cpu(sbp->s_r_segments_percentage);
++ if (nilfs->ns_r_segments_percentage < 1 ||
++ nilfs->ns_r_segments_percentage > 99) {
++ printk(KERN_ERR "NILFS: invalid reserved segments percentage.\n");
++ return -EINVAL;
++ }
++
+ nilfs_set_nsegments(nilfs, le64_to_cpu(sbp->s_nsegments));
+ nilfs->ns_crc_seed = le32_to_cpu(sbp->s_crc_seed);
+ return 0;
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
-index fea6bd5..8ee9d81 100644
+index 0eb059ec..e086089 100644
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -234,20 +234,22 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
@@ -58825,22 +57204,21 @@ index e7bc1d7..06bd4bb 100644
}
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
-index e44cb64..4807084 100644
+index 9860f6b..55df672 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
-@@ -253,8 +253,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
+@@ -277,7 +277,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
+ goto out_close_fd;
- 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_close_fd;
++ copy_to_user(buf, &fanotify_event_metadata,
+ fanotify_event_metadata.event_len))
+ goto out_kill_access_response;
- ret = prepare_for_access_response(group, event, fd);
diff --git a/fs/notify/notification.c b/fs/notify/notification.c
-index 7b51b05..5ea5ef6 100644
+index ee18815..7aa5d01 100644
--- a/fs/notify/notification.c
+++ b/fs/notify/notification.c
@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
@@ -58862,10 +57240,10 @@ index 7b51b05..5ea5ef6 100644
EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
-index 9e38daf..5727cae 100644
+index 99e3610..02c1068 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
-@@ -1310,7 +1310,7 @@ find_next_index_buffer:
+@@ -1329,7 +1329,7 @@ find_next_index_buffer:
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
~(s64)(ndir->itype.index.block_size - 1)));
/* Bounds checks. */
@@ -58875,10 +57253,10 @@ index 9e38daf..5727cae 100644
"inode 0x%lx or driver bug.", vdir->i_ino);
goto err_out;
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
-index ea4ba9d..1e13d34 100644
+index c587e2d..48a16cd 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
-@@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
+@@ -1281,7 +1281,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
char *addr;
size_t total = 0;
unsigned len;
@@ -58888,10 +57266,10 @@ index ea4ba9d..1e13d34 100644
do {
len = PAGE_CACHE_SIZE - ofs;
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
-index 82650d5..db37dcf 100644
+index b52706d..b9a9f9d 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
-@@ -685,7 +685,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+@@ -661,7 +661,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
if (!silent)
ntfs_error(sb, "Primary boot sector is invalid.");
} else if (!silent)
@@ -58900,7 +57278,7 @@ index 82650d5..db37dcf 100644
if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
if (bh_primary)
brelse(bh_primary);
-@@ -701,7 +701,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+@@ -677,7 +677,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
goto hotfix_primary_boot_sector;
brelse(bh_backup);
} else if (!silent)
@@ -58909,7 +57287,7 @@ index 82650d5..db37dcf 100644
/* Try to read NT3.51- backup boot sector. */
if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
-@@ -712,7 +712,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
+@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
"sector.");
brelse(bh_backup);
} else if (!silent)
@@ -58918,11 +57296,31 @@ index 82650d5..db37dcf 100644
/* We failed. Cleanup and return. */
if (bh_primary)
brelse(bh_primary);
+@@ -3072,6 +3072,7 @@ static struct file_system_type ntfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("ntfs");
+
+ /* Stable names for the slab caches. */
+ static const char ntfs_index_ctx_cache_name[] = "ntfs_index_ctx_cache";
+diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
+index b420767..bbf1094 100644
+--- a/fs/ocfs2/dlmfs/dlmfs.c
++++ b/fs/ocfs2/dlmfs/dlmfs.c
+@@ -662,6 +662,7 @@ static struct file_system_type dlmfs_fs_type = {
+ .mount = dlmfs_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("ocfs2_dlmfs");
+
+ static int __init init_dlmfs_fs(void)
+ {
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
-index cd5496b..26a1055 100644
+index 210c352..a174f83 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
-@@ -1278,7 +1278,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
+@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
goto bail;
}
@@ -58932,7 +57330,7 @@ index cd5496b..26a1055 100644
bail:
if (handle)
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
-index 3a90347..c40bef8 100644
+index d355e6e..578d905 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -235,11 +235,11 @@ enum ocfs2_vol_state
@@ -58953,7 +57351,7 @@ index 3a90347..c40bef8 100644
enum ocfs2_local_alloc_state
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
-index 5397c07..54afc55 100644
+index b7e74b5..19c6536 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
@@ -58965,7 +57363,7 @@ index 5397c07..54afc55 100644
/* You should never ask for this much metadata */
BUG_ON(bits_wanted >
-@@ -2000,7 +2000,7 @@ int ocfs2_claim_metadata(handle_t *handle,
+@@ -2007,7 +2007,7 @@ int ocfs2_claim_metadata(handle_t *handle,
mlog_errno(status);
goto bail;
}
@@ -58974,7 +57372,7 @@ index 5397c07..54afc55 100644
*suballoc_loc = res.sr_bg_blkno;
*suballoc_bit_start = res.sr_bit_offset;
-@@ -2164,7 +2164,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
+@@ -2171,7 +2171,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
res->sr_bits);
@@ -58983,7 +57381,7 @@ index 5397c07..54afc55 100644
BUG_ON(res->sr_bits != 1);
-@@ -2206,7 +2206,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
+@@ -2213,7 +2213,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
mlog_errno(status);
goto bail;
}
@@ -58992,7 +57390,7 @@ index 5397c07..54afc55 100644
BUG_ON(res.sr_bits != 1);
-@@ -2310,7 +2310,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
+@@ -2317,7 +2317,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
cluster_start,
num_clusters);
if (!status)
@@ -59001,7 +57399,7 @@ index 5397c07..54afc55 100644
} else {
if (min_clusters > (osb->bitmap_cpg - 1)) {
/* The only paths asking for contiguousness
-@@ -2336,7 +2336,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
+@@ -2343,7 +2343,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
res.sr_bg_blkno,
res.sr_bit_offset);
@@ -59011,10 +57409,10 @@ index 5397c07..54afc55 100644
}
}
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
-index d4e81e4..ad89f5f 100644
+index 4994f8b..04a9180 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
-@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
+@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
"Stats",
@@ -59031,7 +57429,15 @@ index d4e81e4..ad89f5f 100644
out += snprintf(buf + out, len - out,
"%10s => State: %u Descriptor: %llu Size: %u bits "
-@@ -2121,11 +2121,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
+@@ -1270,6 +1270,7 @@ static struct file_system_type ocfs2_fs_type = {
+ .fs_flags = FS_REQUIRES_DEV|FS_RENAME_DOES_D_MOVE,
+ .next = NULL
+ };
++MODULE_ALIAS_FS("ocfs2");
+
+ static int ocfs2_check_set_options(struct super_block *sb,
+ struct mount_options *options)
+@@ -2119,11 +2120,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
spin_lock_init(&osb->osb_xattr_lock);
ocfs2_init_steal_slots(osb);
@@ -59048,38 +57454,56 @@ index d4e81e4..ad89f5f 100644
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
+diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
+index 5d22872..523db20 100644
+--- a/fs/ocfs2/symlink.c
++++ b/fs/ocfs2/symlink.c
+@@ -142,7 +142,7 @@ bail:
+
+ static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
+ {
+- char *link = nd_get_link(nd);
++ const char *link = nd_get_link(nd);
+ if (!IS_ERR(link))
+ kfree(link);
+ }
+diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
+index e043c4c..f99d456 100644
+--- a/fs/omfs/inode.c
++++ b/fs/omfs/inode.c
+@@ -570,6 +570,7 @@ static struct file_system_type omfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("omfs");
+
+ static int __init init_omfs_fs(void)
+ {
diff --git a/fs/open.c b/fs/open.c
-index d420331..2dbb3fd 100644
+index b8485d3..e18561a 100644
--- a/fs/open.c
+++ b/fs/open.c
-@@ -32,6 +32,8 @@
+@@ -31,6 +31,8 @@
+ #include <linux/ima.h>
#include <linux/dnotify.h>
- #include <linux/compat.h>
+#define CREATE_TRACE_POINTS
+#include <trace/events/fs.h>
#include "internal.h"
int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
-@@ -102,6 +104,8 @@ long vfs_truncate(struct path *path, loff_t length)
+@@ -112,6 +114,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
error = locks_verify_truncate(inode, NULL, length);
if (!error)
- error = security_path_truncate(path);
-+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
+ error = security_path_truncate(&path);
++
++ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
+ error = -EACCES;
++
if (!error)
- error = do_truncate(path->dentry, length, 0, NULL);
+ error = do_truncate(path.dentry, length, 0, NULL);
-@@ -186,6 +190,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
- error = locks_verify_truncate(inode, f.file, length);
- if (!error)
- error = security_path_truncate(&f.file->f_path);
-+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
-+ error = -EACCES;
- if (!error)
- error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
- sb_end_write(inode->i_sb);
-@@ -360,6 +366,9 @@ retry:
+@@ -358,6 +364,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
if (__mnt_is_readonly(path.mnt))
res = -EROFS;
@@ -59088,8 +57512,8 @@ index d420331..2dbb3fd 100644
+
out_path_release:
path_put(&path);
- if (retry_estale(res, lookup_flags)) {
-@@ -391,6 +400,8 @@ retry:
+ out:
+@@ -384,6 +393,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
if (error)
goto dput_and_out;
@@ -59098,21 +57522,21 @@ index d420331..2dbb3fd 100644
set_fs_pwd(current->fs, &path);
dput_and_out:
-@@ -420,6 +431,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
+@@ -410,6 +421,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
goto out_putf;
error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
+
-+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
++ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
+ error = -EPERM;
+
+ if (!error)
-+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
++ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
+
if (!error)
- set_fs_pwd(current->fs, &f.file->f_path);
+ set_fs_pwd(current->fs, &file->f_path);
out_putf:
-@@ -449,7 +467,13 @@ retry:
+@@ -438,7 +456,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
if (error)
goto dput_and_out;
@@ -59126,7 +57550,7 @@ index d420331..2dbb3fd 100644
error = 0;
dput_and_out:
path_put(&path);
-@@ -471,6 +495,16 @@ static int chmod_common(struct path *path, umode_t mode)
+@@ -456,6 +480,16 @@ static int chmod_common(struct path *path, umode_t mode)
if (error)
return error;
mutex_lock(&inode->i_mutex);
@@ -59140,50 +57564,82 @@ index d420331..2dbb3fd 100644
+ goto out_unlock;
+ }
+
- error = security_path_chmod(path, mode);
+ error = security_path_chmod(path->dentry, path->mnt, mode);
if (error)
goto out_unlock;
-@@ -530,6 +564,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);
+@@ -506,6 +540,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
+ int error;
+ struct iattr newattrs;
+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
+ return -EACCES;
+
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
- if (!uid_valid(uid))
-@@ -974,6 +1011,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->name, flags, mode);
+ newattrs.ia_valid |= ATTR_UID;
+@@ -988,6 +1025,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
+ } else {
+ fsnotify_open(f);
+ fd_install(fd, f);
++ trace_do_sys_open(tmp, flags, mode);
+ }
}
- }
- putname(tmp);
-diff --git a/fs/pipe.c b/fs/pipe.c
-index d2c45e1..009fe1c 100644
---- a/fs/pipe.c
-+++ b/fs/pipe.c
-@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
+ putname(tmp);
+diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
+index e4e0ff7..458929b 100644
+--- a/fs/openpromfs/inode.c
++++ b/fs/openpromfs/inode.c
+@@ -434,6 +434,7 @@ static struct file_system_type openprom_fs_type = {
+ .mount = openprom_mount,
+ .kill_sb = kill_anon_super,
+ };
++MODULE_ALIAS_FS("openpromfs");
- static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
+ static void op_inode_init_once(void *data)
{
-- if (pipe->files)
-+ if (atomic_read(&pipe->files))
- mutex_lock_nested(&pipe->mutex, subclass);
- }
+diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
+index 6296b40..417c00f 100644
+--- a/fs/partitions/efi.c
++++ b/fs/partitions/efi.c
+@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
+ if (!gpt)
+ return NULL;
-@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
++ if (!le32_to_cpu(gpt->num_partition_entries))
++ return NULL;
++ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
++ if (!pte)
++ return NULL;
++
+ count = le32_to_cpu(gpt->num_partition_entries) *
+ le32_to_cpu(gpt->sizeof_partition_entry);
+- if (!count)
+- return NULL;
+- pte = kzalloc(count, GFP_KERNEL);
+- if (!pte)
+- return NULL;
+-
+ if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
+ (u8 *) pte,
+ count) < count) {
+diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
+index bd8ae78..539d250 100644
+--- a/fs/partitions/ldm.c
++++ b/fs/partitions/ldm.c
+@@ -1324,7 +1324,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
+ goto found;
+ }
- void pipe_unlock(struct pipe_inode_info *pipe)
- {
-- if (pipe->files)
-+ if (atomic_read(&pipe->files))
- mutex_unlock(&pipe->mutex);
- }
- EXPORT_SYMBOL(pipe_unlock);
-@@ -449,9 +449,9 @@ redo:
+- f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
++ f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
+ if (!f) {
+ ldm_crit ("Out of memory.");
+ return false;
+diff --git a/fs/pipe.c b/fs/pipe.c
+index 8ca88fc..d1f8b8a 100644
+--- a/fs/pipe.c
++++ b/fs/pipe.c
+@@ -437,9 +437,9 @@ redo:
}
if (bufs) /* More to do? */
continue;
@@ -59195,16 +57651,16 @@ index d2c45e1..009fe1c 100644
/* syscall merging: Usually we must not sleep
* if O_NONBLOCK is set, or if we got some data.
* But if a writer sleeps in kernel space, then
-@@ -513,7 +513,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
- ret = 0;
- __pipe_lock(pipe);
+@@ -503,7 +503,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
+ mutex_lock(&inode->i_mutex);
+ pipe = inode->i_pipe;
- if (!pipe->readers) {
+ if (!atomic_read(&pipe->readers)) {
send_sig(SIGPIPE, current, 0);
ret = -EPIPE;
goto out;
-@@ -562,7 +562,7 @@ redo1:
+@@ -552,7 +552,7 @@ redo1:
for (;;) {
int bufs;
@@ -59213,7 +57669,7 @@ index d2c45e1..009fe1c 100644
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -653,9 +653,9 @@ redo2:
+@@ -643,9 +643,9 @@ redo2:
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
do_wakeup = 0;
}
@@ -59224,8 +57680,8 @@ index d2c45e1..009fe1c 100644
+ atomic_dec(&pipe->waiting_writers);
}
out:
- __pipe_unlock(pipe);
-@@ -709,7 +709,7 @@ pipe_poll(struct file *filp, poll_table *wait)
+ mutex_unlock(&inode->i_mutex);
+@@ -712,7 +712,7 @@ pipe_poll(struct file *filp, poll_table *wait)
mask = 0;
if (filp->f_mode & FMODE_READ) {
mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
@@ -59234,7 +57690,7 @@ index d2c45e1..009fe1c 100644
mask |= POLLHUP;
}
-@@ -719,7 +719,7 @@ pipe_poll(struct file *filp, poll_table *wait)
+@@ -722,7 +722,7 @@ pipe_poll(struct file *filp, poll_table *wait)
* Most Unices do not set POLLERR for FIFOs but on Linux they
* behave exactly like pipes for poll().
*/
@@ -59243,30 +57699,52 @@ index d2c45e1..009fe1c 100644
mask |= POLLERR;
}
-@@ -734,17 +734,17 @@ pipe_release(struct inode *inode, struct file *file)
-
- __pipe_lock(pipe);
- if (file->f_mode & FMODE_READ)
-- pipe->readers--;
-+ atomic_dec(&pipe->readers);
- if (file->f_mode & FMODE_WRITE)
-- pipe->writers--;
-+ atomic_dec(&pipe->writers);
+@@ -736,10 +736,10 @@ pipe_release(struct inode *inode, int decr, int decw)
-- if (pipe->readers || pipe->writers) {
-+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
+ mutex_lock(&inode->i_mutex);
+ pipe = inode->i_pipe;
+- pipe->readers -= decr;
+- pipe->writers -= decw;
++ atomic_sub(decr, &pipe->readers);
++ atomic_sub(decw, &pipe->writers);
+
+- if (!pipe->readers && !pipe->writers) {
++ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
+ free_pipe_info(inode);
+ } else {
wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
- kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
- kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
+@@ -829,7 +829,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
+
+ if (inode->i_pipe) {
+ ret = 0;
+- inode->i_pipe->readers++;
++ atomic_inc(&inode->i_pipe->readers);
}
- spin_lock(&inode->i_lock);
-- if (!--pipe->files) {
-+ if (atomic_dec_and_test(&pipe->files)) {
- inode->i_pipe = NULL;
- kill = 1;
+
+ mutex_unlock(&inode->i_mutex);
+@@ -846,7 +846,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
+
+ if (inode->i_pipe) {
+ ret = 0;
+- inode->i_pipe->writers++;
++ atomic_inc(&inode->i_pipe->writers);
}
-@@ -811,7 +811,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
- kfree(pipe);
+
+ mutex_unlock(&inode->i_mutex);
+@@ -867,9 +867,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
+ if (inode->i_pipe) {
+ ret = 0;
+ if (filp->f_mode & FMODE_READ)
+- inode->i_pipe->readers++;
++ atomic_inc(&inode->i_pipe->readers);
+ if (filp->f_mode & FMODE_WRITE)
+- inode->i_pipe->writers++;
++ atomic_inc(&inode->i_pipe->writers);
+ }
+
+ mutex_unlock(&inode->i_mutex);
+@@ -961,7 +961,7 @@ void free_pipe_info(struct inode *inode)
+ inode->i_pipe = NULL;
}
-static struct vfsmount *pipe_mnt __read_mostly;
@@ -59274,109 +57752,16 @@ index d2c45e1..009fe1c 100644
/*
* pipefs_dname() is called from d_path().
-@@ -841,8 +841,9 @@ static struct inode * get_pipe_inode(void)
+@@ -991,7 +991,8 @@ static struct inode * get_pipe_inode(void)
goto fail_iput;
-
inode->i_pipe = pipe;
-- pipe->files = 2;
+
- pipe->readers = pipe->writers = 1;
-+ atomic_set(&pipe->files, 2);
+ atomic_set(&pipe->readers, 1);
+ atomic_set(&pipe->writers, 1);
- inode->i_fop = &pipefifo_fops;
+ inode->i_fop = &rdwr_pipefifo_fops;
/*
-@@ -1022,17 +1023,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
- spin_lock(&inode->i_lock);
- if (inode->i_pipe) {
- pipe = inode->i_pipe;
-- pipe->files++;
-+ atomic_inc(&pipe->files);
- spin_unlock(&inode->i_lock);
- } else {
- spin_unlock(&inode->i_lock);
- pipe = alloc_pipe_info();
- if (!pipe)
- return -ENOMEM;
-- pipe->files = 1;
-+ atomic_set(&pipe->files, 1);
- spin_lock(&inode->i_lock);
- if (unlikely(inode->i_pipe)) {
-- inode->i_pipe->files++;
-+ atomic_inc(&inode->i_pipe->files);
- spin_unlock(&inode->i_lock);
- free_pipe_info(pipe);
- pipe = inode->i_pipe;
-@@ -1057,10 +1058,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
- * opened, even when there is no process writing the FIFO.
- */
- pipe->r_counter++;
-- if (pipe->readers++ == 0)
-+ if (atomic_inc_return(&pipe->readers) == 1)
- wake_up_partner(pipe);
-
-- if (!is_pipe && !pipe->writers) {
-+ if (!is_pipe && !atomic_read(&pipe->writers)) {
- if ((filp->f_flags & O_NONBLOCK)) {
- /* suppress POLLHUP until we have
- * seen a writer */
-@@ -1079,14 +1080,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
- * errno=ENXIO when there is no process reading the FIFO.
- */
- ret = -ENXIO;
-- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
-+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
- goto err;
-
- pipe->w_counter++;
-- if (!pipe->writers++)
-+ if (atomic_inc_return(&pipe->writers) == 1)
- wake_up_partner(pipe);
-
-- if (!is_pipe && !pipe->readers) {
-+ if (!is_pipe && !atomic_read(&pipe->readers)) {
- if (wait_for_partner(pipe, &pipe->r_counter))
- goto err_wr;
- }
-@@ -1100,11 +1101,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
- * the process can at least talk to itself.
- */
-
-- pipe->readers++;
-- pipe->writers++;
-+ atomic_inc(&pipe->readers);
-+ atomic_inc(&pipe->writers);
- pipe->r_counter++;
- pipe->w_counter++;
-- if (pipe->readers == 1 || pipe->writers == 1)
-+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
- wake_up_partner(pipe);
- break;
-
-@@ -1118,20 +1119,20 @@ static int fifo_open(struct inode *inode, struct file *filp)
- return 0;
-
- err_rd:
-- if (!--pipe->readers)
-+ if (atomic_dec_and_test(&pipe->readers))
- wake_up_interruptible(&pipe->wait);
- ret = -ERESTARTSYS;
- goto err;
-
- err_wr:
-- if (!--pipe->writers)
-+ if (atomic_dec_and_test(&pipe->writers))
- wake_up_interruptible(&pipe->wait);
- ret = -ERESTARTSYS;
- goto err;
-
- err:
- spin_lock(&inode->i_lock);
-- if (!--pipe->files) {
-+ if (atomic_dec_and_test(&pipe->files)) {
- inode->i_pipe = NULL;
- kill = 1;
- }
diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
index 15af622..0e9f4467 100644
--- a/fs/proc/Kconfig
@@ -59409,7 +57794,7 @@ index 15af622..0e9f4467 100644
help
Various /proc files exist to monitor process memory utilization:
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index cbd0f1b..adec3f0 100644
+index 439b5a1..61db155 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -60,6 +60,7 @@
@@ -59420,7 +57805,7 @@ index cbd0f1b..adec3f0 100644
#include <linux/proc_fs.h>
#include <linux/ioport.h>
#include <linux/uaccess.h>
-@@ -363,6 +364,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
+@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
seq_putc(m, '\n');
}
@@ -59442,7 +57827,7 @@ index cbd0f1b..adec3f0 100644
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -381,9 +397,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
task_cpus_allowed(m, task);
cpuset_task_status_allowed(m, task);
task_context_switch_counts(m, task);
@@ -59467,7 +57852,7 @@ index cbd0f1b..adec3f0 100644
static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task, int whole)
{
-@@ -405,6 +436,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -378,6 +409,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
char tcomm[sizeof(task->comm)];
unsigned long flags;
@@ -59480,9 +57865,9 @@ index cbd0f1b..adec3f0 100644
+
state = *get_task_state(task);
vsize = eip = esp = 0;
- permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
-@@ -476,6 +514,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
- gtime = task_gtime(task);
+ permitted = ptrace_may_access(task, PTRACE_MODE_READ);
+@@ -449,6 +487,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+ gtime = task->gtime;
}
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
@@ -59501,36 +57886,23 @@ index cbd0f1b..adec3f0 100644
/* scale priority and nice values from timeslices to -20..20 */
/* to make it look like a "normal" Unix priority/nice value */
priority = task_prio(task);
-@@ -512,9 +563,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
- seq_put_decimal_ull(m, ' ', vsize);
- seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
- seq_put_decimal_ull(m, ' ', rsslim);
+@@ -489,9 +540,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+ vsize,
+ mm ? get_mm_rss(mm) : 0,
+ rsslim,
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
-+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
-+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
++ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
++ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
++ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
+#else
- seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
- seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
- seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
-+#endif
- seq_put_decimal_ull(m, ' ', esp);
- seq_put_decimal_ull(m, ' ', eip);
- /* The signal information here is obsolete.
-@@ -536,7 +593,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
- seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
- seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
-
-- if (mm && permitted) {
-+ if (mm && permitted
-+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+ && !PAX_RAND_FLAGS(mm)
-+#endif
-+ ) {
- seq_put_decimal_ull(m, ' ', mm->start_data);
- seq_put_decimal_ull(m, ' ', mm->end_data);
- seq_put_decimal_ull(m, ' ', mm->start_brk);
-@@ -574,8 +635,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+ mm ? (permitted ? mm->start_code : 1) : 0,
+ mm ? (permitted ? mm->end_code : 1) : 0,
+ (permitted && mm) ? mm->start_stack : 0,
++#endif
+ esp,
+ eip,
+ /* The signal information here is obsolete.
+@@ -533,8 +590,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
@@ -59547,25 +57919,22 @@ index cbd0f1b..adec3f0 100644
if (mm) {
size = task_statm(mm, &shared, &text, &data, &resident);
mmput(mm);
-@@ -598,6 +666,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+@@ -544,3 +608,10 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+
return 0;
}
-
++
+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
+{
+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
+}
+#endif
-+
- #ifdef CONFIG_CHECKPOINT_RESTORE
- 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 1485e38..8ad4236 100644
+index 1ace83d..83b9247 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
-@@ -113,6 +113,14 @@ struct pid_entry {
+@@ -107,6 +107,22 @@ struct pid_entry {
union proc_op op;
};
@@ -59577,10 +57946,50 @@ index 1485e38..8ad4236 100644
+ int error;
+};
+
++static int gr_fake_filldir(void * __buf, const char *name, int namlen,
++ loff_t offset, u64 ino, unsigned int d_type)
++{
++ struct getdents_callback * buf = (struct getdents_callback *) __buf;
++ buf->error = -EINVAL;
++ return 0;
++}
++
#define NOD(NAME, MODE, IOP, FOP, OP) { \
.name = (NAME), \
.len = sizeof(NAME) - 1, \
-@@ -210,6 +218,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+@@ -194,31 +210,6 @@ static int proc_root_link(struct inode *inode, struct path *path)
+ return result;
+ }
+
+-static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
+-{
+- struct mm_struct *mm;
+- int err;
+-
+- err = mutex_lock_killable(&task->signal->cred_guard_mutex);
+- if (err)
+- return ERR_PTR(err);
+-
+- mm = get_task_mm(task);
+- if (mm && mm != current->mm &&
+- !ptrace_may_access(task, mode)) {
+- mmput(mm);
+- mm = ERR_PTR(-EACCES);
+- }
+- mutex_unlock(&task->signal->cred_guard_mutex);
+-
+- return mm;
+-}
+-
+-struct mm_struct *mm_for_maps(struct task_struct *task)
+-{
+- return mm_access(task, PTRACE_MODE_READ);
+-}
+-
+ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+ {
+ int res = 0;
+@@ -229,6 +220,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 */
@@ -59590,7 +57999,7 @@ index 1485e38..8ad4236 100644
len = mm->arg_end - mm->arg_start;
if (len > PAGE_SIZE)
-@@ -237,12 +248,28 @@ out:
+@@ -256,12 +250,28 @@ out:
return res;
}
@@ -59602,7 +58011,8 @@ index 1485e38..8ad4236 100644
+
static int proc_pid_auxv(struct task_struct *task, char *buffer)
{
- struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
+- struct mm_struct *mm = mm_for_maps(task);
++ struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
int res = PTR_ERR(mm);
if (mm && !IS_ERR(mm)) {
unsigned int nwords = 0;
@@ -59619,7 +58029,7 @@ index 1485e38..8ad4236 100644
do {
nwords += 2;
} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -256,7 +283,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
+@@ -275,7 +285,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
}
@@ -59628,7 +58038,7 @@ index 1485e38..8ad4236 100644
/*
* 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.
-@@ -295,7 +322,7 @@ static void unlock_trace(struct task_struct *task)
+@@ -314,7 +324,7 @@ static void unlock_trace(struct task_struct *task)
mutex_unlock(&task->signal->cred_guard_mutex);
}
@@ -59637,7 +58047,7 @@ index 1485e38..8ad4236 100644
#define MAX_STACK_TRACE_DEPTH 64
-@@ -518,7 +545,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
+@@ -505,7 +515,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
return count;
}
@@ -59646,7 +58056,7 @@ index 1485e38..8ad4236 100644
static int proc_pid_syscall(struct task_struct *task, char *buffer)
{
long nr;
-@@ -547,7 +574,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
+@@ -534,7 +544,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
/************************************************************************/
/* permission checks */
@@ -59655,90 +58065,69 @@ index 1485e38..8ad4236 100644
{
struct task_struct *task;
int allowed = 0;
-@@ -557,7 +584,10 @@ static int proc_fd_access_allowed(struct inode *inode)
+@@ -544,7 +554,10 @@ static int proc_fd_access_allowed(struct inode *inode)
*/
task = get_proc_task(inode);
if (task) {
- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
+ if (log)
-+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
++ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
+ else
-+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
++ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
put_task_struct(task);
}
return allowed;
-@@ -588,10 +618,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
- struct task_struct *task,
- int hide_pid_min)
- {
-+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
-+ return false;
-+
-+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+ rcu_read_lock();
-+ {
-+ const struct cred *tmpcred = current_cred();
-+ const struct cred *cred = __task_cred(task);
-+
-+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
-+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
-+ || in_group_p(grsec_proc_gid)
-+#endif
-+ ) {
-+ rcu_read_unlock();
-+ return true;
-+ }
-+ }
-+ rcu_read_unlock();
-+
-+ if (!pid->hide_pid)
-+ return false;
-+#endif
-+
- if (pid->hide_pid < hide_pid_min)
- return true;
- if (in_group_p(pid->pid_gid))
- return true;
-+
- return ptrace_may_access(task, PTRACE_MODE_READ);
- }
-
-@@ -609,7 +664,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
- put_task_struct(task);
+@@ -761,7 +774,7 @@ static const struct file_operations proc_single_file_operations = {
+ .release = single_release,
+ };
- if (!has_perms) {
-+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+ {
-+#else
- if (pid->hide_pid == 2) {
-+#endif
- /*
- * Let's make getdents(), stat(), and open()
- * consistent with each other. If a process
-@@ -707,6 +766,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
+-static int mem_open(struct inode* inode, struct file* file)
++static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
+ {
+ struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
+ struct mm_struct *mm;
+@@ -769,7 +782,12 @@ static int mem_open(struct inode* inode, struct file* file)
if (!task)
return -ESRCH;
+- mm = mm_access(task, PTRACE_MODE_ATTACH);
+ if (gr_acl_handle_procpidmem(task)) {
+ put_task_struct(task);
+ return -EPERM;
+ }
+
- mm = mm_access(task, mode);
++ mm = mm_access(task, mode);
put_task_struct(task);
-@@ -722,6 +786,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
-
- file->private_data = mm;
+ if (IS_ERR(mm))
+@@ -782,11 +800,24 @@ static int mem_open(struct inode* inode, struct file* file)
+ mmput(mm);
+ }
++ file->private_data = mm;
++
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ file->f_version = current->exec_id;
+#endif
+
- return 0;
++ return 0;
++}
++
++static int mem_open(struct inode *inode, struct file *file)
++{
++ int ret;
++ ret = __mem_open(inode, file, PTRACE_MODE_ATTACH);
++
+ /* OK to pass negative loff_t, we can catch out-of-range */
+ file->f_mode |= FMODE_UNSIGNED_OFFSET;
+- file->private_data = mm;
+
+- return 0;
++ return ret;
}
-@@ -743,6 +811,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
+ static ssize_t mem_rw(struct file *file, char __user *buf,
+@@ -797,6 +828,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
ssize_t copied;
char *page;
@@ -59756,7 +58145,7 @@ index 1485e38..8ad4236 100644
if (!mm)
return 0;
-@@ -755,7 +834,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
+@@ -809,7 +851,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
goto free;
while (count > 0) {
@@ -59765,39 +58154,110 @@ index 1485e38..8ad4236 100644
if (write && copy_from_user(page, buf, this_len)) {
copied = -EFAULT;
-@@ -847,6 +926,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
- if (!mm)
- return 0;
+@@ -885,42 +927,49 @@ static const struct file_operations proc_mem_operations = {
+ .release = mem_release,
+ };
++static int environ_open(struct inode *inode, struct file *file)
++{
++ return __mem_open(inode, file, PTRACE_MODE_READ);
++}
++
+ static ssize_t environ_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+ {
+- struct task_struct *task = get_proc_task(file->f_dentry->d_inode);
+ char *page;
+ unsigned long src = *ppos;
+- int ret = -ESRCH;
+- struct mm_struct *mm;
++ ssize_t ret = -ESRCH;
++ struct mm_struct *mm = file->private_data;
+
+- if (!task)
+- goto out_no_task;
++ if (!mm)
++ return 0;
++
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ if (file->f_version != current->exec_id) {
+ gr_log_badprocpid("environ");
+ return 0;
+ }
+#endif
-+
+
+- ret = -ENOMEM;
page = (char *)__get_free_page(GFP_TEMPORARY);
if (!page)
- return -ENOMEM;
-@@ -856,7 +942,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
- goto free;
+- goto out;
+-
+-
+- mm = mm_for_maps(task);
+- ret = PTR_ERR(mm);
+- if (!mm || IS_ERR(mm))
+- goto out_free;
++ return -ENOMEM;
+
+ ret = 0;
++ if (!atomic_inc_not_zero(&mm->mm_users))
++ goto free;
while (count > 0) {
- size_t this_len, max_len;
-- int retval;
-+ ssize_t retval;
+- int this_len, retval, max_len;
++ size_t this_len, max_len;
++ int retval;
++
++ if (src >= (mm->env_end - mm->env_start))
++ break;
- if (src >= (mm->env_end - mm->env_start))
- break;
-@@ -1461,7 +1547,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
- int error = -EACCES;
+ this_len = mm->env_end - (mm->env_start + src);
+
+- if (this_len <= 0)
+- break;
++ max_len = min_t(size_t, PAGE_SIZE, count);
++ this_len = min(max_len, this_len);
+
+- max_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
+- this_len = (this_len > max_len) ? max_len : this_len;
+-
+- retval = access_process_vm(task, (mm->env_start + src),
++ retval = access_remote_vm(mm, (mm->env_start + src),
+ page, this_len, 0);
+
+ if (retval <= 0) {
+@@ -939,19 +988,18 @@ static ssize_t environ_read(struct file *file, char __user *buf,
+ count -= retval;
+ }
+ *ppos = src;
+-
+ mmput(mm);
+-out_free:
++
++free:
+ free_page((unsigned long) page);
+-out:
+- put_task_struct(task);
+-out_no_task:
+ return ret;
+ }
+
+ static const struct file_operations proc_environ_operations = {
++ .open = environ_open,
+ .read = environ_read,
+ .llseek = generic_file_llseek,
++ .release = mem_release,
+ };
+
+ static ssize_t oom_adjust_read(struct file *file, char __user *buf,
+@@ -1519,7 +1567,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
+ path_put(&nd->path);
/* Are we allowed to snoop on the tasks file descriptors? */
- if (!proc_fd_access_allowed(inode))
-+ if (!proc_fd_access_allowed(inode, 0))
++ if (!proc_fd_access_allowed(inode,0))
goto out;
- error = PROC_I(inode)->op.proc_get_link(dentry, &path);
-@@ -1505,8 +1591,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
+ error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
+@@ -1558,8 +1606,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? */
@@ -59816,9 +58276,9 @@ index 1485e38..8ad4236 100644
+ goto out;
+ }
- error = PROC_I(inode)->op.proc_get_link(dentry, &path);
+ error = PROC_I(inode)->op.proc_get_link(inode, &path);
if (error)
-@@ -1556,7 +1652,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
+@@ -1624,7 +1682,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;
@@ -59830,9 +58290,35 @@ index 1485e38..8ad4236 100644
rcu_read_unlock();
}
security_task_to_inode(task, inode);
-@@ -1592,10 +1692,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
- return -ENOENT;
- }
+@@ -1642,6 +1704,9 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+ struct inode *inode = dentry->d_inode;
+ struct task_struct *task;
+ const struct cred *cred;
++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++ const struct cred *tmpcred = current_cred();
++#endif
+
+ generic_fillattr(inode, stat);
+
+@@ -1649,13 +1714,41 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+ stat->uid = 0;
+ stat->gid = 0;
+ task = pid_task(proc_pid(inode), PIDTYPE_PID);
++
++ if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
++ rcu_read_unlock();
++ return -ENOENT;
++ }
++
+ if (task) {
++ cred = __task_cred(task);
++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
++#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
++ || in_group_p(grsec_proc_gid)
++#endif
++ ) {
++#endif
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
+#ifdef CONFIG_GRKERNSEC_PROC_USER
+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
@@ -59840,7 +58326,7 @@ index 1485e38..8ad4236 100644
+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
+#endif
task_dumpable(task)) {
- cred = __task_cred(task);
+- cred = __task_cred(task);
stat->uid = cred->euid;
+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
+ stat->gid = grsec_proc_gid;
@@ -59848,9 +58334,16 @@ index 1485e38..8ad4236 100644
stat->gid = cred->egid;
+#endif
}
++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++ } else {
++ rcu_read_unlock();
++ return -ENOENT;
++ }
++#endif
}
rcu_read_unlock();
-@@ -1633,11 +1742,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
+ return 0;
+@@ -1692,11 +1785,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -59870,8 +58363,42 @@ index 1485e38..8ad4236 100644
+#endif
rcu_read_unlock();
} else {
- inode->i_uid = GLOBAL_ROOT_UID;
-@@ -2166,6 +2284,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
+ inode->i_uid = 0;
+@@ -1814,7 +1916,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) {
+@@ -2082,11 +2185,21 @@ static const struct file_operations proc_fd_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;
+ }
+
+@@ -2196,6 +2309,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
if (!task)
goto out_no_task;
@@ -59881,17 +58408,26 @@ index 1485e38..8ad4236 100644
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2196,6 +2317,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
+@@ -2240,6 +2356,9 @@ static int proc_pident_readdir(struct file *filp,
if (!task)
- return -ENOENT;
+ goto out_no_task;
+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
+ goto out;
+
- if (!dir_emit_dots(file, ctx))
- goto out;
-
-@@ -2585,7 +2709,7 @@ static const struct pid_entry tgid_base_stuff[] = {
+ ret = 0;
+ i = filp->f_pos;
+ switch (i) {
+@@ -2510,7 +2629,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);
+ }
+@@ -2708,7 +2827,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),
@@ -59900,7 +58436,7 @@ index 1485e38..8ad4236 100644
INF("syscall", S_IRUGO, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2610,10 +2734,10 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2733,10 +2852,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
@@ -59913,17 +58449,17 @@ index 1485e38..8ad4236 100644
ONE("stack", S_IRUGO, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-@@ -2647,6 +2771,9 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2770,6 +2889,9 @@ static const struct pid_entry tgid_base_stuff[] = {
#ifdef CONFIG_HARDWALL
INF("hardwall", S_IRUGO, proc_pid_hardwall),
#endif
+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
-+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
++ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
+#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),
-@@ -2777,7 +2904,14 @@ static int proc_pid_instantiate(struct inode *dir,
+ };
+
+ static int proc_tgid_base_readdir(struct file * filp,
+@@ -2895,7 +3017,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
if (!inode)
goto out;
@@ -59938,7 +58474,7 @@ index 1485e38..8ad4236 100644
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -2815,7 +2949,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
+@@ -2937,7 +3066,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
if (!task)
goto out;
@@ -59949,8 +58485,49 @@ index 1485e38..8ad4236 100644
+out_put_task:
put_task_struct(task);
out:
- return ERR_PTR(result);
-@@ -2921,7 +3059,7 @@ static const struct pid_entry tid_base_stuff[] = {
+ return result;
+@@ -3002,6 +3135,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
+ {
+ unsigned int nr;
+ struct task_struct *reaper;
++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++ const struct cred *tmpcred = current_cred();
++ const struct cred *itercred;
++#endif
++ filldir_t __filldir = filldir;
+ struct tgid_iter iter;
+ struct pid_namespace *ns;
+
+@@ -3025,8 +3163,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
+ for (iter = next_tgid(ns, iter);
+ iter.task;
+ iter.tgid += 1, iter = next_tgid(ns, iter)) {
++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++ rcu_read_lock();
++ itercred = __task_cred(iter.task);
++#endif
++ if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++ || (tmpcred->uid && (itercred->uid != tmpcred->uid)
++#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
++ && !in_group_p(grsec_proc_gid)
++#endif
++ )
++#endif
++ )
++ __filldir = &gr_fake_filldir;
++ else
++ __filldir = filldir;
++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++ rcu_read_unlock();
++#endif
+ filp->f_pos = iter.tgid + TGID_OFFSET;
+- if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
++ if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
+ put_task_struct(iter.task);
+ goto out;
+ }
+@@ -3054,7 +3211,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),
@@ -59959,7 +58536,7 @@ index 1485e38..8ad4236 100644
INF("syscall", S_IRUGO, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2948,10 +3086,10 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -3078,10 +3235,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
@@ -60004,54 +58581,17 @@ index b143471..bb105e5 100644
return 0;
}
module_init(proc_devices_init);
-diff --git a/fs/proc/fd.c b/fs/proc/fd.c
-index 985ea88..d118a0a 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) {
-@@ -283,11 +284,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_tgid(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 8eaa1ba..cc6ff42 100644
+index 00f08b3..2f14f30 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
-@@ -23,11 +23,17 @@
+@@ -18,12 +18,18 @@
+ #include <linux/module.h>
+ #include <linux/sysctl.h>
#include <linux/slab.h>
- #include <linux/mount.h>
- #include <linux/magic.h>
+#include <linux/grsecurity.h>
+ #include <asm/system.h>
#include <asm/uaccess.h>
#include "internal.h"
@@ -60064,10 +58604,10 @@ index 8eaa1ba..cc6ff42 100644
static void proc_evict_inode(struct inode *inode)
{
struct proc_dir_entry *de;
-@@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
- ns = PROC_I(inode)->ns.ns;
- if (ns_ops && ns)
- ns_ops->put(ns);
+@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
+ ns_ops = PROC_I(inode)->ns_ops;
+ if (ns_ops && ns_ops->put)
+ ns_ops->put(PROC_I(inode)->ns);
+
+#ifdef CONFIG_PROC_SYSCTL
+ if (inode->i_op == &proc_sys_inode_operations ||
@@ -60078,7 +58618,7 @@ index 8eaa1ba..cc6ff42 100644
}
static struct kmem_cache * proc_inode_cachep;
-@@ -405,7 +418,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
+@@ -438,7 +451,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;
@@ -60091,24 +58631,33 @@ index 8eaa1ba..cc6ff42 100644
if (de->size)
inode->i_size = de->size;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
-index 651d09a..60c73ae 100644
+index 7838e5c..29697de 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
-@@ -155,6 +155,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
- struct pid *, struct task_struct *);
- extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
- struct pid *, struct task_struct *);
+@@ -28,8 +28,6 @@ struct vmalloc_info {
+ unsigned long largest_chunk;
+ };
+
+-extern struct mm_struct *mm_for_maps(struct task_struct *);
+-
+ #ifdef CONFIG_MMU
+ #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
+ extern void get_vmalloc_info(struct vmalloc_info *vmi);
+@@ -51,6 +49,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);
+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
+#endif
+ extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
- /*
- * base.c
+ extern const struct file_operations proc_maps_operations;
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
-index 06ea155..9a798c7 100644
+index d245cb2..f4e8498 100644
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
-@@ -484,9 +484,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
+@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
* the addresses in the elf_phdr on our list.
*/
start = kc_offset_to_vaddr(*fpos - elf_buflen);
@@ -60121,7 +58670,7 @@ index 06ea155..9a798c7 100644
while (buflen) {
struct kcore_list *m;
-@@ -515,20 +516,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
+@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
kfree(elf_buf);
} else {
if (kern_addr_valid(start)) {
@@ -60131,7 +58680,7 @@ index 06ea155..9a798c7 100644
- n = copy_to_user(buffer, (char *)start, tsz);
- /*
-- * We cannot distinguish between fault on source
+- * We cannot distingush between fault on source
- * and fault on destination. When this happens
- * we clear too and hope it will trigger the
- * EFAULT again.
@@ -60156,7 +58705,7 @@ index 06ea155..9a798c7 100644
} else {
if (clear_user(buffer, tsz))
return -EFAULT;
-@@ -548,6 +552,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
+@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
static int open_kcore(struct inode *inode, struct file *filp)
{
@@ -60167,20 +58716,20 @@ index 06ea155..9a798c7 100644
return -EPERM;
if (kcore_need_update)
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
-index 59d85d6..ac6fc05 100644
+index 80e4645..53e5fcf 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
-@@ -153,7 +153,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
+@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
vmi.used >> 10,
vmi.largest_chunk >> 10
#ifdef CONFIG_MEMORY_FAILURE
-- ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
-+ ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
+- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
++ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
#endif
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index ccfd99b..1b7e255 100644
+index b1822dd..df622cb 100644
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
@@ -60193,7 +58742,7 @@ index ccfd99b..1b7e255 100644
seq_putc(m, '\n');
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
-index 4677bb7..408e936 100644
+index f738024..226e98e 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -23,6 +23,7 @@
@@ -60204,7 +58753,7 @@ index 4677bb7..408e936 100644
#include "internal.h"
-@@ -109,6 +110,17 @@ static struct net *get_proc_task_net(struct inode *dir)
+@@ -105,6 +106,17 @@ static struct net *get_proc_task_net(struct inode *dir)
struct task_struct *task;
struct nsproxy *ns;
struct net *net = NULL;
@@ -60213,32 +58762,36 @@ index 4677bb7..408e936 100644
+#endif
+
+#ifdef CONFIG_GRKERNSEC_PROC_USER
-+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
++ if (cred->fsuid)
+ return net;
+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
++ if (cred->fsuid && !in_group_p(grsec_proc_gid))
+ return net;
+#endif
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
+@@ -228,7 +240,7 @@ static __net_exit void proc_net_ns_exit(struct net *net)
+ kfree(net->proc_net);
+ }
+
+-static struct pernet_operations __net_initdata proc_net_ns_ops = {
++static struct pernet_operations __net_initconst proc_net_ns_ops = {
+ .init = proc_net_ns_init,
+ .exit = proc_net_ns_exit,
+ };
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index 7129046..6914844 100644
+index 0be1aa4..21298e5 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
-@@ -11,13 +11,21 @@
+@@ -7,13 +7,16 @@
+ #include <linux/proc_fs.h>
+ #include <linux/security.h>
#include <linux/namei.h>
- #include <linux/mm.h>
- #include <linux/module.h>
+#include <linux/nsproxy.h>
-+#ifdef CONFIG_GRKERNSEC
-+#include <net/net_namespace.h>
-+#endif
#include "internal.h"
-+extern int gr_handle_chroot_sysctl(const int op);
-+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
-+ const int op);
++extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
+
static const struct dentry_operations proc_sys_dentry_operations;
static const struct file_operations proc_sys_file_operations;
@@ -60250,7 +58803,7 @@ index 7129046..6914844 100644
void proc_sys_poll_notify(struct ctl_table_poll *poll)
{
-@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
+@@ -128,8 +131,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
err = NULL;
d_set_d_op(dentry, &proc_sys_dentry_operations);
@@ -60259,45 +58812,23 @@ index 7129046..6914844 100644
+
d_add(dentry, inode);
++ if (gr_handle_sysctl(p, MAY_EXEC))
++ err = ERR_PTR(-ENOENT);
++
out:
-@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
- struct inode *inode = file_inode(filp);
- struct ctl_table_header *head = grab_header(inode);
- struct ctl_table *table = PROC_I(inode)->sysctl_entry;
-+ int op = write ? MAY_WRITE : MAY_READ;
- ssize_t error;
- size_t res;
-
-@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
- * and won't be until we finish.
- */
- error = -EPERM;
-- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
-+ if (sysctl_perm(head, table, op))
- goto out;
-
- /* if that can happen at all, it should be -EINVAL, not -EISDIR */
-@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
+ if (h)
+ sysctl_head_finish(h);
+@@ -162,6 +171,17 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
if (!table->proc_handler)
goto out;
+#ifdef CONFIG_GRKERNSEC
+ error = -EPERM;
-+ if (gr_handle_chroot_sysctl(op))
-+ goto out;
-+ dget(filp->f_path.dentry);
-+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
-+ dput(filp->f_path.dentry);
-+ goto out;
-+ }
-+ dput(filp->f_path.dentry);
-+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
-+ goto out;
+ if (write) {
+ if (current->nsproxy->net_ns != table->extra2) {
+ if (!capable(CAP_SYS_ADMIN))
+ goto out;
-+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
++ } else if (!nsown_capable(CAP_NET_ADMIN))
+ goto out;
+ }
+#endif
@@ -60305,8 +58836,8 @@ index 7129046..6914844 100644
/* careful: calling conventions are nasty here */
res = count;
error = table->proc_handler(table, write, buf, &res, ppos);
-@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
- return false;
+@@ -259,6 +279,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
+ return -ENOMEM;
} else {
d_set_d_op(child, &proc_sys_dentry_operations);
+
@@ -60315,27 +58846,27 @@ index 7129046..6914844 100644
d_add(child, inode);
}
} else {
-@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
- if ((*pos)++ < ctx->pos)
- return true;
+@@ -287,6 +310,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
+ if (*pos < file->f_pos)
+ continue;
-+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
-+ return 0;
++ if (gr_handle_sysctl(table, 0))
++ continue;
+
- if (unlikely(S_ISLNK(table->mode)))
- res = proc_sys_link_fill_cache(file, ctx, head, table);
- else
-@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
+ res = proc_sys_fill_cache(file, dirent, filldir, head, table);
+ if (res)
+ return res;
+@@ -412,6 +438,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
if (IS_ERR(head))
return PTR_ERR(head);
-+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
++ if (table && gr_handle_sysctl(table, MAY_EXEC))
+ return -ENOENT;
+
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
+@@ -434,13 +463,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
.llseek = generic_file_llseek,
};
@@ -60351,80 +58882,11 @@ index 7129046..6914844 100644
.lookup = proc_sys_lookup,
.permission = proc_sys_permission,
.setattr = proc_sys_setattr,
-@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
- static struct ctl_dir *new_dir(struct ctl_table_set *set,
- const char *name, int namelen)
- {
-- struct ctl_table *table;
-+ ctl_table_no_const *table;
- struct ctl_dir *new;
- struct ctl_node *node;
- char *new_name;
-@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
- return NULL;
-
- node = (struct ctl_node *)(new + 1);
-- table = (struct ctl_table *)(node + 1);
-+ table = (ctl_table_no_const *)(node + 1);
- new_name = (char *)(table + 2);
- memcpy(new_name, name, namelen);
- new_name[namelen] = '\0';
-@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
- static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
- struct ctl_table_root *link_root)
- {
-- struct ctl_table *link_table, *entry, *link;
-+ ctl_table_no_const *link_table, *link;
-+ struct ctl_table *entry;
- struct ctl_table_header *links;
- struct ctl_node *node;
- char *link_name;
-@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
- return NULL;
-
- node = (struct ctl_node *)(links + 1);
-- link_table = (struct ctl_table *)(node + nr_entries);
-+ link_table = (ctl_table_no_const *)(node + nr_entries);
- link_name = (char *)&link_table[nr_entries + 1];
-
- for (link = link_table, entry = table; entry->procname; link++, entry++) {
-@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
- struct ctl_table_header ***subheader, struct ctl_table_set *set,
- struct ctl_table *table)
- {
-- struct ctl_table *ctl_table_arg = NULL;
-- struct ctl_table *entry, *files;
-+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
-+ struct ctl_table *entry;
- int nr_files = 0;
- int nr_dirs = 0;
- int err = -ENOMEM;
-@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
- nr_files++;
- }
-
-- files = table;
- /* If there are mixed files and directories we need a new table */
- if (nr_dirs && nr_files) {
-- struct ctl_table *new;
-+ ctl_table_no_const *new;
- files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
- GFP_KERNEL);
- if (!files)
-@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
- /* Register everything except a directory full of subdirectories */
- if (nr_files || !nr_dirs) {
- struct ctl_table_header *header;
-- header = __register_sysctl_table(set, path, files);
-+ header = __register_sysctl_table(set, path, files ? files : table);
- if (!header) {
- kfree(ctl_table_arg);
- goto out;
diff --git a/fs/proc/root.c b/fs/proc/root.c
-index 87dbcbe..55e1b4d 100644
+index 03102d9..4ae347e 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
-@@ -186,7 +186,15 @@ void __init proc_root_init(void)
+@@ -121,7 +121,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
#endif
@@ -60440,27 +58902,14 @@ index 87dbcbe..55e1b4d 100644
proc_sys_init();
}
-diff --git a/fs/proc/self.c b/fs/proc/self.c
-index 6b6a993..807cccc 100644
---- a/fs/proc/self.c
-+++ b/fs/proc/self.c
-@@ -39,7 +39,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))
- kfree(s);
- }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 390bdab..83c1e8a 100644
+index ef1740d..9a18b87 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
-@@ -12,12 +12,19 @@
+@@ -11,12 +11,19 @@
+ #include <linux/rmap.h>
#include <linux/swap.h>
#include <linux/swapops.h>
- #include <linux/mmu_notifier.h>
+#include <linux/grsecurity.h>
#include <asm/elf.h>
@@ -60477,7 +58926,7 @@ index 390bdab..83c1e8a 100644
void task_mem(struct seq_file *m, struct mm_struct *mm)
{
unsigned long data, text, lib, swap;
-@@ -53,8 +60,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
+@@ -52,8 +59,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
"VmPTE:\t%8lu kB\n"
@@ -60490,10 +58939,10 @@ index 390bdab..83c1e8a 100644
+#endif
+
+ ,hiwater_vm << (PAGE_SHIFT-10),
- total_vm << (PAGE_SHIFT-10),
+ (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
mm->locked_vm << (PAGE_SHIFT-10),
mm->pinned_vm << (PAGE_SHIFT-10),
-@@ -63,7 +75,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
+@@ -62,7 +74,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
data << (PAGE_SHIFT-10),
mm->stack_vm << (PAGE_SHIFT-10), text, lib,
(PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
@@ -60514,7 +58963,16 @@ index 390bdab..83c1e8a 100644
}
unsigned long task_vsize(struct mm_struct *mm)
-@@ -278,13 +302,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -125,7 +149,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
+ if (!priv->task)
+ return ERR_PTR(-ESRCH);
+
+- mm = mm_for_maps(priv->task);
++ mm = mm_access(priv->task, PTRACE_MODE_READ);
+ if (!mm || IS_ERR(mm))
+ return mm;
+ down_read(&mm->mmap_sem);
+@@ -227,13 +251,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
}
@@ -60533,7 +58991,7 @@ index 390bdab..83c1e8a 100644
seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
start,
-@@ -293,7 +317,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -242,7 +266,11 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
flags & VM_WRITE ? 'w' : '-',
flags & VM_EXEC ? 'x' : '-',
flags & VM_MAYSHARE ? 's' : 'p',
@@ -60545,28 +59003,28 @@ index 390bdab..83c1e8a 100644
MAJOR(dev), MINOR(dev), ino, &len);
/*
-@@ -302,7 +330,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -251,7 +279,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
*/
if (file) {
pad_len_spaces(m, len);
- seq_path(m, &file->f_path, "\n");
+ seq_path(m, &file->f_path, "\n\\");
- goto done;
- }
-
-@@ -328,8 +356,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.
- */
-- if (!is_pid || (vma->vm_start <= mm->start_stack &&
-- vma->vm_end >= mm->start_stack)) {
-+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
-+ (vma->vm_start <= mm->start_stack &&
-+ vma->vm_end >= mm->start_stack)) {
- name = "[stack]";
+ } else {
+ const char *name = arch_vma_name(vma);
+ if (!name) {
+@@ -259,8 +287,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+ if (vma->vm_start <= mm->brk &&
+ vma->vm_end >= mm->start_brk) {
+ name = "[heap]";
+- } else if (vma->vm_start <= mm->start_stack &&
+- vma->vm_end >= mm->start_stack) {
++ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
++ (vma->vm_start <= mm->start_stack &&
++ vma->vm_end >= mm->start_stack)) {
+ name = "[stack]";
+ }
} else {
- /* Thread stack in /proc/PID/maps */
-@@ -353,6 +382,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
+@@ -281,6 +310,13 @@ static int show_map(struct seq_file *m, void *v)
struct proc_maps_private *priv = m->private;
struct task_struct *task = priv->task;
@@ -60577,10 +59035,10 @@ index 390bdab..83c1e8a 100644
+ }
+#endif
+
- show_map_vma(m, vma, is_pid);
+ show_map_vma(m, vma);
if (m->count < m->size) /* vma is copied successfully */
-@@ -590,12 +626,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -437,12 +473,23 @@ static int show_smap(struct seq_file *m, void *v)
.private = &mss,
};
@@ -60606,10 +59064,10 @@ index 390bdab..83c1e8a 100644
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ }
+#endif
- show_map_vma(m, vma, is_pid);
+ show_map_vma(m, vma);
seq_printf(m,
-@@ -613,7 +660,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -460,7 +507,11 @@ static int show_smap(struct seq_file *m, void *v)
"KernelPageSize: %8lu kB\n"
"MMUPageSize: %8lu kB\n"
"Locked: %8lu kB\n",
@@ -60621,7 +59079,16 @@ index 390bdab..83c1e8a 100644
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-@@ -1390,6 +1441,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -798,7 +849,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
+ if (!pm.buffer)
+ goto out_task;
+
+- mm = mm_for_maps(task);
++ mm = mm_access(task, PTRACE_MODE_READ);
+ ret = PTR_ERR(mm);
+ if (!mm || IS_ERR(mm))
+ goto out_free;
+@@ -1024,6 +1075,13 @@ static int show_numa_map(struct seq_file *m, void *v)
int n;
char buffer[50];
@@ -60635,9 +59102,9 @@ index 390bdab..83c1e8a 100644
if (!mm)
return 0;
-@@ -1409,11 +1467,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
- if (n < 0)
- return n;
+@@ -1041,11 +1099,15 @@ static int show_numa_map(struct seq_file *m, void *v)
+ mpol_to_str(buffer, sizeof(buffer), pol, 0);
+ mpol_cond_put(pol);
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
@@ -60651,9 +59118,9 @@ index 390bdab..83c1e8a 100644
+ seq_path(m, &file->f_path, "\n\t\\= ");
} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
seq_printf(m, " heap");
- } else {
+ } else if (vma->vm_start <= mm->start_stack &&
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 56123a6..5a2f6ec 100644
+index 980de54..78b2faa 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
@@ -60665,20 +59132,29 @@ index 56123a6..5a2f6ec 100644
sbytes += kobjsize(current->fs);
else
bytes += kobjsize(current->fs);
-@@ -168,7 +168,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
+@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
if (file) {
pad_len_spaces(m, len);
- seq_path(m, &file->f_path, "");
+ seq_path(m, &file->f_path, "\n\\");
} else if (mm) {
- pid_t tid = vm_is_stack(priv->task, vma, is_pid);
-
+ if (vma->vm_start <= mm->start_stack &&
+ vma->vm_end >= mm->start_stack) {
+@@ -201,7 +201,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
+ if (!priv->task)
+ return ERR_PTR(-ESRCH);
+
+- mm = mm_for_maps(priv->task);
++ mm = mm_access(priv->task, PTRACE_MODE_READ);
+ if (!mm || IS_ERR(mm)) {
+ put_task_struct(priv->task);
+ priv->task = NULL;
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
-index 9100d69..f1f9fc9 100644
+index b0f450a..8ba3e5d 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
-@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
+@@ -97,9 +97,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
nr_bytes = count;
/* If pfn is not ram, return zeros for sparse dump files */
@@ -60695,43 +59171,33 @@ index 9100d69..f1f9fc9 100644
tmp = copy_oldmem_page(pfn, buf, nr_bytes,
offset, userbuf);
if (tmp < 0)
-@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
- if (*fpos < m->offset + m->size) {
- tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
- start = m->paddr + *fpos - m->offset;
-- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
-+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
- if (tmp < 0)
- return tmp;
- buflen -= tsz;
-diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
-index b00fcc9..e0c6381 100644
---- a/fs/qnx6/qnx6.h
-+++ b/fs/qnx6/qnx6.h
-@@ -74,7 +74,7 @@ enum {
- BYTESEX_BE,
- };
+@@ -184,7 +188,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer,
+ tsz = nr_bytes;
--static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
-+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
- {
- if (sbi->s_bytesex == BYTESEX_LE)
- return le64_to_cpu((__force __le64)n);
-@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
- return (__force __fs64)cpu_to_be64(n);
- }
+ while (buflen) {
+- tmp = read_from_oldmem(buffer, tsz, &start, 1);
++ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, 1);
+ if (tmp < 0)
+ return tmp;
+ buflen -= tsz;
+diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
+index 3bdd214..e570832 100644
+--- a/fs/qnx4/inode.c
++++ b/fs/qnx4/inode.c
+@@ -473,6 +473,7 @@ static struct file_system_type qnx4_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("qnx4");
--static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
-+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
+ static int __init init_qnx4_fs(void)
{
- if (sbi->s_bytesex == BYTESEX_LE)
- return le32_to_cpu((__force __le32)n);
diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
-index 16e8abb..2dcf914 100644
+index d67908b..d13f6a6 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(struct kqid qid, dev_t dev,
+ void quota_send_warning(short type, unsigned int id, dev_t dev,
const char warntype)
{
- static atomic_t seq;
@@ -60739,7 +59205,7 @@ index 16e8abb..2dcf914 100644
struct sk_buff *skb;
void *msg_head;
int ret;
-@@ -49,7 +49,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
+@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
"VFS: Not enough memory to send quota warning.\n");
return;
}
@@ -60749,20 +59215,20 @@ index 16e8abb..2dcf914 100644
if (!msg_head) {
printk(KERN_ERR
diff --git a/fs/read_write.c b/fs/read_write.c
-index e3cd280..a378473 100644
+index 5ad4248..492b277 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
-@@ -438,7 +438,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
+@@ -956,6 +956,8 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
+ if (retval > 0) {
+ add_rchar(current, retval);
+ add_wchar(current, retval);
++ fsnotify_access(in_file);
++ fsnotify_modify(out_file);
+ }
- old_fs = get_fs();
- set_fs(get_ds());
-- p = (__force const char __user *)buf;
-+ p = (const char __force_user *)buf;
- if (count > MAX_RW_COUNT)
- count = MAX_RW_COUNT;
- if (file->f_op->write)
+ inc_syscr(current);
diff --git a/fs/readdir.c b/fs/readdir.c
-index 93d71e5..6a14be8 100644
+index 356f715..c918d38 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -17,6 +17,7 @@
@@ -60773,15 +59239,15 @@ index 93d71e5..6a14be8 100644
#include <asm/uaccess.h>
-@@ -69,6 +70,7 @@ struct old_linux_dirent {
+@@ -67,6 +68,7 @@ struct old_linux_dirent {
+
struct readdir_callback {
- struct dir_context ctx;
struct old_linux_dirent __user * dirent;
+ struct file * file;
int result;
};
-@@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
+@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
buf->result = -EOVERFLOW;
return -EOVERFLOW;
}
@@ -60792,16 +59258,16 @@ index 93d71e5..6a14be8 100644
buf->result++;
dirent = buf->dirent;
if (!access_ok(VERIFY_WRITE, dirent,
-@@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
- if (!f.file)
- return -EBADF;
+@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
+
+ buf.result = 0;
+ buf.dirent = dirent;
++ buf.file = file;
-+ buf.file = f.file;
- error = iterate_dir(f.file, &buf.ctx);
+ error = vfs_readdir(file, fillonedir, &buf);
if (buf.result)
- error = buf.result;
-@@ -142,6 +149,7 @@ struct getdents_callback {
- struct dir_context ctx;
+@@ -142,6 +149,7 @@ struct linux_dirent {
+ struct getdents_callback {
struct linux_dirent __user * current_dir;
struct linux_dirent __user * previous;
+ struct file * file;
@@ -60819,23 +59285,23 @@ index 93d71e5..6a14be8 100644
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
- if (!f.file)
- return -EBADF;
+@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
+ buf.previous = NULL;
+ buf.count = count;
+ buf.error = 0;
++ buf.file = file;
-+ buf.file = f.file;
- error = iterate_dir(f.file, &buf.ctx);
+ error = vfs_readdir(file, filldir, &buf);
if (error >= 0)
- error = buf.error;
-@@ -226,6 +239,7 @@ struct getdents_callback64 {
- struct dir_context ctx;
+@@ -229,6 +242,7 @@ out:
+ struct getdents_callback64 {
struct linux_dirent64 __user * current_dir;
struct linux_dirent64 __user * previous;
+ struct file *file;
int count;
int error;
};
-@@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -244,6 +258,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;
@@ -60846,16 +59312,38 @@ index 93d71e5..6a14be8 100644
dirent = buf->previous;
if (dirent) {
if (__put_user(offset, &dirent->d_off))
-@@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
- if (!f.file)
- return -EBADF;
+@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
-+ buf.file = f.file;
- error = iterate_dir(f.file, &buf.ctx);
- if (error >= 0)
+ buf.current_dir = dirent;
+ buf.previous = NULL;
++ buf.file = file;
+ buf.count = count;
+ buf.error = 0;
+
+@@ -299,7 +318,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;
+ if (__put_user(d_off, &lastdirent->d_off))
+ error = -EFAULT;
+ else
+diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
+index 133e935..77359db 100644
+--- a/fs/reiserfs/dir.c
++++ b/fs/reiserfs/dir.c
+@@ -204,6 +204,8 @@ int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent,
+ next_pos = deh_offset(deh) + 1;
+
+ if (item_moved(&tmp_ih, &path_to_entry)) {
++ set_cpu_key_k_offset(&pos_key,
++ next_pos);
+ goto research;
+ }
+ } /* for */
diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
-index 2b7882b..1c5ef48 100644
+index 60c0804..d814f98 100644
--- a/fs/reiserfs/do_balan.c
+++ b/fs/reiserfs/do_balan.c
@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
@@ -60867,11 +59355,34 @@ index 2b7882b..1c5ef48 100644
do_balance_starts(tb);
/* balance leaf returns 0 except if combining L R and S into
+diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
+index fe677c0..2a15fb2 100644
+--- a/fs/reiserfs/inode.c
++++ b/fs/reiserfs/inode.c
+@@ -1816,11 +1816,16 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
+ TYPE_STAT_DATA, SD_SIZE, MAX_US_INT);
+ memcpy(INODE_PKEY(inode), &(ih.ih_key), KEY_SIZE);
+ args.dirid = le32_to_cpu(ih.ih_key.k_dir_id);
+- if (insert_inode_locked4(inode, args.objectid,
+- reiserfs_find_actor, &args) < 0) {
++
++ reiserfs_write_unlock(inode->i_sb);
++ err = insert_inode_locked4(inode, args.objectid,
++ reiserfs_find_actor, &args);
++ reiserfs_write_lock(inode->i_sb);
++ if (err) {
+ err = -EINVAL;
+ goto out_bad_inode;
+ }
++
+ if (old_format_only(sb))
+ /* not a perfect generation count, as object ids can be reused, but
+ ** this is as good as reiserfs can do right now.
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
-index a958444..42b2323 100644
+index 7a99811..a7c96c4 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
-@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
+@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
convert_reiserfs(sb) ? "CONV " : "",
@@ -60880,41 +59391,82 @@ index a958444..42b2323 100644
SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
SF(s_do_balance), SF(s_unneeded_left_neighbor),
SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
-index f8adaee..0eeeeca 100644
---- a/fs/reiserfs/reiserfs.h
-+++ b/fs/reiserfs/reiserfs.h
-@@ -453,7 +453,7 @@ struct reiserfs_sb_info {
- /* Comment? -Hans */
- wait_queue_head_t s_wait;
- /* To be obsoleted soon by per buffer seals.. -Hans */
-- atomic_t s_generation_counter; // increased by one every time the
-+ atomic_unchecked_t s_generation_counter; // increased by one every time the
- // tree gets re-balanced
- unsigned long s_properties; /* File system properties. Currently holds
- on-disk FS format */
-@@ -1982,7 +1982,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
- #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
+diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
+index 569498a..0886e50f 100644
+--- a/fs/reiserfs/super.c
++++ b/fs/reiserfs/super.c
+@@ -2295,6 +2295,7 @@ struct file_system_type reiserfs_fs_type = {
+ .kill_sb = reiserfs_kill_sb,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("reiserfs");
+
+ MODULE_DESCRIPTION("ReiserFS journaled filesystem");
+ MODULE_AUTHOR("Hans Reiser <reiser@namesys.com>");
+diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
+index 04eecc4..33f74d0 100644
+--- a/fs/reiserfs/xattr.c
++++ b/fs/reiserfs/xattr.c
+@@ -318,7 +318,19 @@ static int delete_one_xattr(struct dentry *dentry, void *data)
+ static int chown_one_xattr(struct dentry *dentry, void *data)
+ {
+ struct iattr *attrs = data;
+- return reiserfs_setattr(dentry, attrs);
++ int ia_valid = attrs->ia_valid;
++ int err;
++
++ /*
++ * We only want the ownership bits. Otherwise, we'll do
++ * things like change a directory to a regular file if
++ * ATTR_MODE is set.
++ */
++ attrs->ia_valid &= (ATTR_UID|ATTR_GID);
++ err = reiserfs_setattr(dentry, attrs);
++ attrs->ia_valid = ia_valid;
++
++ return err;
+ }
- #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
--#define get_generation(s) atomic_read (&fs_generation(s))
-+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
- #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
- #define __fs_changed(gen,s) (gen != get_generation (s))
- #define fs_changed(gen,s) \
+ /* No i_mutex, but the inode is unconnected. */
+diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
+index 6da0396..fc338f3 100644
+--- a/fs/reiserfs/xattr_acl.c
++++ b/fs/reiserfs/xattr_acl.c
+@@ -429,6 +429,9 @@ int reiserfs_acl_chmod(struct inode *inode)
+ int depth;
+ int error;
+
++ if (IS_PRIVATE(inode))
++ return 0;
++
+ if (S_ISLNK(inode->i_mode))
+ return -EOPNOTSUPP;
+
+diff --git a/fs/romfs/super.c b/fs/romfs/super.c
+index 8b4089f..2575128 100644
+--- a/fs/romfs/super.c
++++ b/fs/romfs/super.c
+@@ -602,6 +602,7 @@ static struct file_system_type romfs_fs_type = {
+ .kill_sb = romfs_kill_sb,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("romfs");
+
+ /*
+ * inode storage initialiser
diff --git a/fs/select.c b/fs/select.c
-index dfd5cb1..1754d57 100644
+index d33418f..2a5345e 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -20,6 +20,7 @@
- #include <linux/export.h>
+ #include <linux/module.h>
#include <linux/slab.h>
#include <linux/poll.h>
+#include <linux/security.h>
#include <linux/personality.h> /* for STICKY_TIMEOUTS */
#include <linux/file.h>
#include <linux/fdtable.h>
-@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
+@@ -837,6 +838,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
struct poll_list *walk = head;
unsigned long todo = nfds;
@@ -60923,46 +59475,52 @@ index dfd5cb1..1754d57 100644
return -EINVAL;
diff --git a/fs/seq_file.c b/fs/seq_file.c
-index a290157..ec3211a 100644
+index dba43c3..4e25536 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
-@@ -10,6 +10,7 @@
+@@ -9,6 +9,7 @@
+ #include <linux/module.h>
#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>
-@@ -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
+@@ -40,6 +41,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
+ memset(p, 0, sizeof(*p));
+ mutex_init(&p->lock);
+ p->op = op;
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ p->exec_id = current->exec_id;
+#endif
/*
* Wrappers around seq_open(e.g. swaps_open) need to be
-@@ -96,7 +100,7 @@ static int traverse(struct seq_file *m, loff_t offset)
+@@ -76,7 +80,11 @@ static int traverse(struct seq_file *m, loff_t offset)
return 0;
}
if (!m->buf) {
-- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
++#ifdef CONFIG_GRKERNSEC_HIDESYM
+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
++#else
+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
++#endif
if (!m->buf)
return -ENOMEM;
}
-@@ -136,7 +140,7 @@ static int traverse(struct seq_file *m, loff_t offset)
+@@ -116,7 +124,11 @@ static int traverse(struct seq_file *m, loff_t offset)
Eoverflow:
m->op->stop(m, p);
kfree(m->buf);
-- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
++#ifdef CONFIG_GRKERNSEC_HIDESYM
+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
++#else
+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
++#endif
return !m->buf ? -ENOMEM : -EAGAIN;
}
-@@ -152,7 +156,7 @@ Eoverflow:
+@@ -132,7 +144,7 @@ Eoverflow:
ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
{
struct seq_file *m = file->private_data;
@@ -60971,25 +59529,31 @@ index a290157..ec3211a 100644
loff_t pos;
size_t n;
void *p;
-@@ -191,7 +195,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
-
+@@ -169,7 +181,11 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
+ m->version = file->f_version;
/* grab buffer if we didn't have one */
if (!m->buf) {
-- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
++#ifdef CONFIG_GRKERNSEC_HIDESYM
+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
++#else
+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
++#endif
if (!m->buf)
goto Enomem;
}
-@@ -232,7 +236,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
+@@ -210,7 +226,11 @@ 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);
-- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
++#ifdef CONFIG_GRKERNSEC_HIDESYM
+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
++#else
+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
++#endif
if (!m->buf)
goto Enomem;
m->count = 0;
-@@ -583,7 +587,7 @@ static void single_stop(struct seq_file *p, void *v)
+@@ -549,7 +569,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)
{
@@ -60999,10 +59563,10 @@ index a290157..ec3211a 100644
if (op) {
diff --git a/fs/splice.c b/fs/splice.c
-index 3b7ee65..87fc2e4 100644
+index 58ab918..24425c2 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
+@@ -195,7 +195,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
pipe_lock(pipe);
for (;;) {
@@ -61011,16 +59575,7 @@ index 3b7ee65..87fc2e4 100644
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -219,7 +219,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
- page_nr++;
- ret += buf->len;
-
-- if (pipe->files)
-+ if (atomic_read(&pipe->files))
- do_wakeup = 1;
-
- if (!--spd->nr_pages)
-@@ -250,9 +250,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
+@@ -249,9 +249,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
do_wakeup = 0;
}
@@ -61032,7 +59587,7 @@ index 3b7ee65..87fc2e4 100644
}
pipe_unlock(pipe);
-@@ -565,7 +565,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
+@@ -564,7 +564,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
@@ -61041,16 +59596,16 @@ index 3b7ee65..87fc2e4 100644
set_fs(old_fs);
return res;
-@@ -580,7 +580,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
+@@ -579,7 +579,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
-- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
+- res = vfs_write(file, (const char __user *)buf, count, &pos);
+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
set_fs(old_fs);
return res;
-@@ -633,7 +633,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
+@@ -631,7 +631,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
goto err;
this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
@@ -61059,16 +59614,7 @@ index 3b7ee65..87fc2e4 100644
vec[i].iov_len = this_len;
spd.pages[i] = page;
spd.nr_pages++;
-@@ -829,7 +829,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
- ops->release(pipe, buf);
- pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
- pipe->nrbufs--;
-- if (pipe->files)
-+ if (atomic_read(&pipe->files))
- sd->need_wakeup = true;
- }
-
-@@ -854,10 +854,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -855,10 +855,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
{
while (!pipe->nrbufs) {
@@ -61081,7 +59627,7 @@ index 3b7ee65..87fc2e4 100644
return 0;
if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1179,7 +1179,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+@@ -1191,7 +1191,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.
*/
@@ -61090,7 +59636,7 @@ index 3b7ee65..87fc2e4 100644
current->splice_pipe = pipe;
}
-@@ -1475,6 +1475,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
+@@ -1459,6 +1459,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
partial[buffers].offset = off;
partial[buffers].len = plen;
@@ -61098,7 +59644,7 @@ index 3b7ee65..87fc2e4 100644
off = 0;
len -= plen;
-@@ -1777,9 +1778,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1744,9 +1745,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
ret = -ERESTARTSYS;
break;
}
@@ -61110,7 +59656,7 @@ index 3b7ee65..87fc2e4 100644
if (flags & SPLICE_F_NONBLOCK) {
ret = -EAGAIN;
break;
-@@ -1811,7 +1812,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1778,7 +1779,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
pipe_lock(pipe);
while (pipe->nrbufs >= pipe->buffers) {
@@ -61119,7 +59665,7 @@ index 3b7ee65..87fc2e4 100644
send_sig(SIGPIPE, current, 0);
ret = -EPIPE;
break;
-@@ -1824,9 +1825,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1791,9 +1792,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
ret = -ERESTARTSYS;
break;
}
@@ -61131,7 +59677,7 @@ index 3b7ee65..87fc2e4 100644
}
pipe_unlock(pipe);
-@@ -1862,14 +1863,14 @@ retry:
+@@ -1829,14 +1830,14 @@ retry:
pipe_double_lock(ipipe, opipe);
do {
@@ -61148,7 +59694,7 @@ index 3b7ee65..87fc2e4 100644
break;
/*
-@@ -1966,7 +1967,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1933,7 +1934,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
pipe_double_lock(ipipe, opipe);
do {
@@ -61157,7 +59703,7 @@ index 3b7ee65..87fc2e4 100644
send_sig(SIGPIPE, current, 0);
if (!ret)
ret = -EPIPE;
-@@ -2011,7 +2012,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1978,7 +1979,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
*/
@@ -61166,8 +59712,20 @@ index 3b7ee65..87fc2e4 100644
ret = -EAGAIN;
pipe_unlock(ipipe);
+diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
+index 4619247..e3910db 100644
+--- a/fs/squashfs/super.c
++++ b/fs/squashfs/super.c
+@@ -481,6 +481,7 @@ static struct file_system_type squashfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV
+ };
++MODULE_ALIAS_FS("squashfs");
+
+ static const struct super_operations squashfs_super_ops = {
+ .alloc_inode = squashfs_alloc_inode,
diff --git a/fs/stat.c b/fs/stat.c
-index d0ea7ef..f463f9d 100644
+index 7b21801..ee8fe9b 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
@@ -61186,14 +59744,14 @@ index d0ea7ef..f463f9d 100644
stat->ctime = inode->i_ctime;
stat->blksize = (1 << inode->i_blkbits);
stat->blocks = inode->i_blocks;
-@@ -46,8 +51,14 @@ int vfs_getattr(struct path *path, struct kstat *stat)
+@@ -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(path->mnt, path->dentry, stat);
+- return inode->i_op->getattr(mnt, dentry, stat);
+ if (inode->i_op->getattr) {
-+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
++ 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;
@@ -61203,11 +59761,68 @@ index d0ea7ef..f463f9d 100644
generic_fillattr(inode, stat);
return 0;
+diff --git a/fs/super.c b/fs/super.c
+index 2a698f6..056eff7 100644
+--- a/fs/super.c
++++ b/fs/super.c
+@@ -295,19 +295,19 @@ EXPORT_SYMBOL(deactivate_super);
+ * and want to turn it into a full-blown active reference. grab_super()
+ * is called with sb_lock held and drops it. Returns 1 in case of
+ * success, 0 if we had failed (superblock contents was already dead or
+- * dying when grab_super() had been called).
++ * dying when grab_super() had been called). Note that this is only
++ * called for superblocks not in rundown mode (== ones still on ->fs_supers
++ * of their type), so increment of ->s_count is OK here.
+ */
+ static int grab_super(struct super_block *s) __releases(sb_lock)
+ {
+- if (atomic_inc_not_zero(&s->s_active)) {
+- spin_unlock(&sb_lock);
+- return 1;
+- }
+- /* it's going away */
+ s->s_count++;
+ spin_unlock(&sb_lock);
+- /* wait for it to die */
+ down_write(&s->s_umount);
++ if ((s->s_flags & MS_BORN) && atomic_inc_not_zero(&s->s_active)) {
++ put_super(s);
++ return 1;
++ }
+ up_write(&s->s_umount);
+ put_super(s);
+ return 0;
+@@ -436,11 +436,6 @@ retry:
+ destroy_super(s);
+ s = NULL;
+ }
+- down_write(&old->s_umount);
+- if (unlikely(!(old->s_flags & MS_BORN))) {
+- deactivate_locked_super(old);
+- goto retry;
+- }
+ return old;
+ }
+ }
+@@ -650,10 +645,10 @@ restart:
+ if (list_empty(&sb->s_instances))
+ continue;
+ if (sb->s_bdev == bdev) {
+- if (grab_super(sb)) /* drops sb_lock */
+- return sb;
+- else
++ if (!grab_super(sb))
+ goto restart;
++ up_write(&sb->s_umount);
++ return sb;
+ }
+ }
+ spin_unlock(&sb_lock);
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
-index c590cab..6dfd6fc 100644
+index a475983..3aab767 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
-@@ -234,13 +234,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -233,13 +233,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
return ret;
}
@@ -61225,19 +59840,10 @@ index c590cab..6dfd6fc 100644
if (!bb->vm_ops)
return -EINVAL;
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
-index 4d83ced..049dc45 100644
+index e756bc4..684ab5b71 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
-@@ -40,7 +40,7 @@ static DEFINE_IDA(sysfs_ino_ida);
- *
- * Returns 31 bit hash of ns + name (so it fits in an off_t )
- */
--static unsigned int sysfs_name_hash(const void *ns, const char *name)
-+static unsigned int sysfs_name_hash(const void *ns, const unsigned char *name)
- {
- unsigned long hash = init_name_hash();
- unsigned int len = strlen(name);
-@@ -675,6 +675,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
+@@ -642,6 +642,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
struct sysfs_dirent *sd;
int rc;
@@ -61257,7 +59863,7 @@ index 4d83ced..049dc45 100644
sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
if (!sd)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
-index 15ef5eb..e474372 100644
+index 779789a..f58193c 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
@@ -61269,7 +59875,7 @@ index 15ef5eb..e474372 100644
wait_queue_head_t poll;
struct list_head buffers; /* goes through sysfs_buffer.list */
};
-@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry *dentry, struct sysfs_buffer *buffer)
+@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
if (!sysfs_get_active(attr_sd))
return -ENODEV;
@@ -61278,7 +59884,7 @@ index 15ef5eb..e474372 100644
count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
sysfs_put_active(attr_sd);
-@@ -284,7 +284,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
+@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
return -ENOMEM;
atomic_set(&new_od->refcnt, 0);
@@ -61287,7 +59893,7 @@ index 15ef5eb..e474372 100644
init_waitqueue_head(&new_od->poll);
INIT_LIST_HEAD(&new_od->buffers);
goto retry;
-@@ -430,7 +430,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
+@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
sysfs_put_active(attr_sd);
@@ -61296,33 +59902,60 @@ index 15ef5eb..e474372 100644
goto trigger;
return DEFAULT_POLLMASK;
-@@ -450,7 +450,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
- if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) {
- od = sd->s_attr.open;
- if (od) {
-- atomic_inc(&od->event);
-+ atomic_inc_unchecked(&od->event);
- wake_up_interruptible(&od->poll);
- }
+@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
+
+ od = sd->s_attr.open;
+ if (od) {
+- atomic_inc(&od->event);
++ atomic_inc_unchecked(&od->event);
+ wake_up_interruptible(&od->poll);
}
+
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
-index 2dd4507..62a215a 100644
+index a7ac78f..02158e1 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
-@@ -308,7 +308,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
- static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd,
- void *cookie)
+@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+
+ static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
{
- char *page = nd_get_link(nd);
+ const char *page = nd_get_link(nd);
if (!IS_ERR(page))
free_page((unsigned long)page);
}
+diff --git a/fs/sysv/super.c b/fs/sysv/super.c
+index f60c196..b2d8fdc 100644
+--- a/fs/sysv/super.c
++++ b/fs/sysv/super.c
+@@ -545,6 +545,7 @@ static struct file_system_type sysv_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("sysv");
+
+ static struct file_system_type v7_fs_type = {
+ .owner = THIS_MODULE,
+@@ -553,6 +554,8 @@ static struct file_system_type v7_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("v7");
++MODULE_ALIAS("v7");
+
+ static int __init init_sysv_fs(void)
+ {
+@@ -586,5 +589,4 @@ static void __exit exit_sysv_fs(void)
+
+ module_init(init_sysv_fs)
+ module_exit(exit_sysv_fs)
+-MODULE_ALIAS("v7");
+ MODULE_LICENSE("GPL");
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
-index 69d4889..a810bd4 100644
+index bb55cdb..e9ebb8a 100644
--- a/fs/sysv/sysv.h
+++ b/fs/sysv/sysv.h
-@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
+@@ -189,7 +189,7 @@ static inline u32 PDP_swab(u32 x)
#endif
}
@@ -61332,10 +59965,10 @@ index 69d4889..a810bd4 100644
if (sbi->s_bytesex == BYTESEX_PDP)
return PDP_swab((__force __u32)n);
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
-index e18b988..f1d4ad0f 100644
+index 9228950..bbad895 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
-@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
+@@ -156,7 +156,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len,
return err;
}
@@ -61344,6 +59977,18 @@ index e18b988..f1d4ad0f 100644
{
int err;
+diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
+index 2f467e5..3222f9b 100644
+--- a/fs/ubifs/super.c
++++ b/fs/ubifs/super.c
+@@ -2192,6 +2192,7 @@ static struct file_system_type ubifs_fs_type = {
+ .mount = ubifs_mount,
+ .kill_sb = kill_ubifs_super,
+ };
++MODULE_ALIAS_FS("ubifs");
+
+ /*
+ * Inode slab cache constructor.
diff --git a/fs/udf/misc.c b/fs/udf/misc.c
index c175b4d..8f36a16 100644
--- a/fs/udf/misc.c
@@ -61357,8 +60002,32 @@ index c175b4d..8f36a16 100644
u8 checksum = 0;
int i;
for (i = 0; i < sizeof(struct tag); ++i)
+diff --git a/fs/udf/super.c b/fs/udf/super.c
+index f66439e..9af489f 100644
+--- a/fs/udf/super.c
++++ b/fs/udf/super.c
+@@ -116,6 +116,7 @@ static struct file_system_type udf_fstype = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("udf");
+
+ static struct kmem_cache *udf_inode_cachep;
+
+diff --git a/fs/ufs/super.c b/fs/ufs/super.c
+index 3915ade..00fcbf4 100644
+--- a/fs/ufs/super.c
++++ b/fs/ufs/super.c
+@@ -1484,6 +1484,7 @@ static struct file_system_type ufs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("ufs");
+
+ static int __init init_ufs_fs(void)
+ {
diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
-index 8d974c4..b82f6ec 100644
+index 8d974c4..4c19a7b 100644
--- a/fs/ufs/swab.h
+++ b/fs/ufs/swab.h
@@ -22,7 +22,7 @@ enum {
@@ -61379,8 +60048,17 @@ index 8d974c4..b82f6ec 100644
fs32_to_cpu(struct super_block *sbp, __fs32 n)
{
if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
+@@ -76,7 +76,7 @@ fs32_sub(struct super_block *sbp, __fs32 *n, int d)
+ be32_add_cpu((__be32 *)n, -d);
+ }
+
+-static inline u16
++static inline u16 __intentional_overflow(-1)
+ fs16_to_cpu(struct super_block *sbp, __fs16 n)
+ {
+ if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
diff --git a/fs/utimes.c b/fs/utimes.c
-index f4fb7ec..3fe03c0 100644
+index ba653f3..06ea4b1 100644
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -1,6 +1,7 @@
@@ -61405,10 +60083,10 @@ index f4fb7ec..3fe03c0 100644
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
diff --git a/fs/xattr.c b/fs/xattr.c
-index 3377dff..4d074d9 100644
+index 67583de..21dfff7 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
-@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
+@@ -225,6 +225,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
return rc;
}
@@ -61436,7 +60114,7 @@ index 3377dff..4d074d9 100644
ssize_t
vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
{
-@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
+@@ -315,7 +336,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
* Extended attribute SET operations
*/
static long
@@ -61445,8 +60123,8 @@ index 3377dff..4d074d9 100644
size_t size, int flags)
{
int error;
-@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
- posix_acl_fix_xattr_from_user(kvalue, size);
+@@ -339,7 +360,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
+ return PTR_ERR(kvalue);
}
- error = vfs_setxattr(d, kname, kvalue, size, flags);
@@ -61456,10 +60134,11 @@ index 3377dff..4d074d9 100644
+ }
+
+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
- out:
- if (vvalue)
- vfree(vvalue);
-@@ -377,7 +403,7 @@ retry:
++out:
+ kfree(kvalue);
+ return error;
+ }
+@@ -356,7 +383,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
return error;
error = mnt_want_write(path.mnt);
if (!error) {
@@ -61468,7 +60147,7 @@ index 3377dff..4d074d9 100644
mnt_drop_write(path.mnt);
}
path_put(&path);
-@@ -401,7 +427,7 @@ retry:
+@@ -375,7 +402,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
return error;
error = mnt_want_write(path.mnt);
if (!error) {
@@ -61477,32 +60156,33 @@ index 3377dff..4d074d9 100644
mnt_drop_write(path.mnt);
}
path_put(&path);
-@@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
+@@ -386,17 +413,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
const void __user *,value, size_t, size, int, flags)
{
- struct fd f = fdget(fd);
+ struct file *f;
- struct dentry *dentry;
int error = -EBADF;
- if (!f.file)
+ f = fget(fd);
+ if (!f)
return error;
-- 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);
+- dentry = f->f_path.dentry;
+- audit_inode(NULL, dentry);
++ audit_inode(NULL, f->f_path.dentry);
+ error = mnt_want_write_file(f);
if (!error) {
- error = setxattr(dentry, name, value, size, flags);
-+ error = setxattr(&f.file->f_path, name, value, size, flags);
- mnt_drop_write_file(f.file);
++ error = setxattr(&f->f_path, name, value, size, flags);
+ mnt_drop_write(f->f_path.mnt);
}
- fdput(f);
+ fput(f);
diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
-index 9fbea87..6b19972 100644
+index 8d5a506..7f62712 100644
--- a/fs/xattr_acl.c
+++ b/fs/xattr_acl.c
-@@ -76,8 +76,8 @@ struct posix_acl *
- posix_acl_from_xattr(struct user_namespace *user_ns,
- const void *value, size_t size)
+@@ -17,8 +17,8 @@
+ struct posix_acl *
+ posix_acl_from_xattr(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;
@@ -61512,41 +60192,44 @@ index 9fbea87..6b19972 100644
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 f47e65c..e7125d9 100644
+index d0ab788..827999b 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
-@@ -586,7 +586,7 @@ xfs_bmap_validate_ret(
-
+@@ -190,7 +190,7 @@ xfs_bmap_validate_ret(
+ int nmap,
+ int ret_nmap);
#else
- #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
-+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
++#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
#endif /* DEBUG */
- /*
-diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
-index 8f84153..7ce60d0 100644
---- a/fs/xfs/xfs_dir2_readdir.c
-+++ b/fs/xfs/xfs_dir2_readdir.c
-@@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
- ino = xfs_dir3_sfe_get_ino(mp, sfp, sfep);
- filetype = xfs_dir3_sfe_get_ftype(mp, sfp, sfep);
- ctx->pos = off & 0x7fffffff;
-- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
+ STATIC int
+diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
+index 79d05e8..e3e5861 100644
+--- a/fs/xfs/xfs_dir2_sf.c
++++ b/fs/xfs/xfs_dir2_sf.c
+@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
+ }
+
+ ino = xfs_dir2_sfe_get_ino(sfp, sfep);
+- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
+ char name[sfep->namelen];
+ memcpy(name, sfep->name, sfep->namelen);
-+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
++ if (filldir(dirent, name, sfep->namelen,
++ off & 0x7fffffff, ino, DT_UNKNOWN)) {
++ *offset = off & 0x7fffffff;
+ return 0;
-+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
- xfs_dir3_get_dtype(mp, filetype)))
++ }
++ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
+ *offset = off & 0x7fffffff;
return 0;
- sfep = xfs_dir3_sf_nextentry(mp, sfp, sfep);
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
-index 668e8f4..9d38104 100644
+index d99a905..9f88202 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
-@@ -127,7 +127,7 @@ xfs_find_handle(
+@@ -128,7 +128,7 @@ xfs_find_handle(
}
error = -EFAULT;
@@ -61556,10 +60239,10 @@ index 668e8f4..9d38104 100644
goto out_put;
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
-index 2b8952d..a60c6be 100644
+index bd2fb43..86fd3e8d 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
-@@ -401,7 +401,7 @@ xfs_vn_put_link(
+@@ -447,7 +447,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
{
@@ -61568,12 +60251,37 @@ index 2b8952d..a60c6be 100644
if (!IS_ERR(s))
kfree(s);
+diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
+index 87323f1..dab9d00 100644
+--- a/fs/xfs/xfs_rtalloc.c
++++ b/fs/xfs/xfs_rtalloc.c
+@@ -858,7 +858,7 @@ xfs_rtbuf_get(
+ xfs_buf_t *bp; /* block buffer, result */
+ xfs_inode_t *ip; /* bitmap or summary inode */
+ xfs_bmbt_irec_t map;
+- int nmap;
++ int nmap = 1;
+ int error; /* error value */
+
+ ip = issum ? mp->m_rsumip : mp->m_rbmip;
+diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
+index 8a89949..6776861 100644
+--- a/fs/xfs/xfs_super.c
++++ b/fs/xfs/xfs_super.c
+@@ -1474,6 +1474,7 @@ static struct file_system_type xfs_fs_type = {
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };
++MODULE_ALIAS_FS("xfs");
+
+ STATIC int __init
+ xfs_init_zones(void)
diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
new file mode 100644
-index 0000000..6d22fbe
+index 0000000..7e54fd7
--- /dev/null
+++ b/grsecurity/Kconfig
-@@ -0,0 +1,1112 @@
+@@ -0,0 +1,1080 @@
+#
+# grecurity configuration
+#
@@ -61764,8 +60472,8 @@ index 0000000..6d22fbe
+
+config GRKERNSEC_HIDESYM
+ bool "Hide kernel symbols"
-+ default y if GRKERNSEC_CONFIG_AUTO
+ select PAX_USERCOPY_SLABS
++ default y if GRKERNSEC_CONFIG_AUTO
+ help
+ If you say Y here, getting information on loaded modules, and
+ displaying all kernel symbols through a syscall will be restricted
@@ -61810,20 +60518,6 @@ index 0000000..6d22fbe
+ This deters repeated kernel exploitation/bruteforcing attempts
+ and is useful for later forensics.
+
-+config GRKERNSEC_OLD_ARM_USERLAND
-+ bool "Old ARM userland compatibility"
-+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
-+ help
-+ If you say Y here, stubs of executable code to perform such operations
-+ as "compare-exchange" will be placed at fixed locations in the ARM vector
-+ table. This is unfortunately needed for old ARM userland meant to run
-+ across a wide range of processors. Without this option enabled,
-+ the get_tls and data memory barrier stubs will be emulated by the kernel,
-+ which is enough for Linaro userlands or other userlands designed for v6
-+ and newer ARM CPUs. It's recommended that you try without this option enabled
-+ first, and only enable it if your userland does not boot (it will likely fail
-+ at init time).
-+
+endmenu
+menu "Role Based Access Control Options"
+depends on GRKERNSEC
@@ -62368,24 +61062,6 @@ index 0000000..6d22fbe
+ running with root privileges. If the sysctl option is enabled,
+ a sysctl option with name "consistent_setxid" is created.
+
-+config GRKERNSEC_HARDEN_IPC
-+ bool "Disallow access to world-accessible IPC objects"
-+ default y if GRKERNSEC_CONFIG_AUTO
-+ depends on SYSVIPC
-+ help
-+ If you say Y here, access to overly-permissive IPC (shared memory,
-+ message queues, and semaphores) will be denied for processes whose
-+ effective user or group would not grant them permission. It's a
-+ common error to grant too much permission to these objects, with
-+ impact ranging from denial of service and information leaking to
-+ privilege escalation. This feature was developed in response to
-+ research by Tim Brown:
-+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
-+ who found hundreds of such insecure usages. Processes with
-+ CAP_IPC_OWNER are still permitted to access these IPC objects.
-+ If the sysctl option is enabled, a sysctl option with name
-+ "harden_ipc" is created.
-+
+config GRKERNSEC_TPE
+ bool "Trusted Path Execution (TPE)"
+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
@@ -62688,7 +61364,7 @@ index 0000000..6d22fbe
+endmenu
diff --git a/grsecurity/Makefile b/grsecurity/Makefile
new file mode 100644
-index 0000000..85beb79
+index 0000000..2f8793f
--- /dev/null
+++ b/grsecurity/Makefile
@@ -0,0 +1,43 @@
@@ -62705,7 +61381,7 @@ index 0000000..85beb79
+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
-+ grsec_usb.o grsec_ipc.o
++ grsec_usb.o
+
+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
@@ -62737,10 +61413,10 @@ index 0000000..85beb79
+endif
diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
new file mode 100644
-index 0000000..857c960
+index 0000000..9b1fbce
--- /dev/null
+++ b/grsecurity/gracl.c
-@@ -0,0 +1,2623 @@
+@@ -0,0 +1,2825 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -62766,8 +61442,6 @@ index 0000000..857c960
+#include <linux/stop_machine.h>
+#include <linux/fdtable.h>
+#include <linux/percpu.h>
-+#include <linux/lglock.h>
-+#include <linux/hugetlb.h>
+#include <linux/posix-timers.h>
+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
+#include <linux/magic.h>
@@ -62776,7 +61450,6 @@ index 0000000..857c960
+#include "../fs/btrfs/ctree.h"
+#include "../fs/btrfs/btrfs_inode.h"
+#endif
-+#include "../fs/mount.h"
+
+#include <asm/uaccess.h>
+#include <asm/errno.h>
@@ -62790,8 +61463,6 @@ index 0000000..857c960
+ role = role->prev; \
+ }
+
-+extern struct lglock vfsmount_lock;
-+
+extern struct path gr_real_root;
+
+static struct gr_policy_state running_polstate;
@@ -62799,21 +61470,28 @@ index 0000000..857c960
+extern struct gr_alloc_state *current_alloc_state;
+
+extern char *gr_shared_page[4];
++static DEFINE_MUTEX(gr_dev_mutex);
+DEFINE_RWLOCK(gr_inode_lock);
+
+static unsigned int gr_status __read_only = GR_STATUS_INIT;
+
++#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
++
+#ifdef CONFIG_NET
+extern struct vfsmount *sock_mnt;
+#endif
+
+extern struct vfsmount *pipe_mnt;
+extern struct vfsmount *shm_mnt;
-+
+#ifdef CONFIG_HUGETLBFS
-+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
++extern struct vfsmount *hugetlbfs_vfsmount;
+#endif
+
++DECLARE_BRLOCK(vfsmount_lock);
++
+extern u16 acl_sp_role_value;
+extern struct acl_object_label *fakefs_obj_rw;
+extern struct acl_object_label *fakefs_obj_rwx;
@@ -62832,11 +61510,11 @@ index 0000000..857c960
+
+int gr_rbac_disable(void *unused)
+{
-+ pax_open_kernel();
-+ gr_status &= ~GR_READY;
-+ pax_close_kernel();
++ pax_open_kernel();
++ gr_status &= ~GR_READY;
++ pax_close_kernel();
+
-+ return 0;
++ return 0;
+}
+
+static inline dev_t __get_dev(const struct dentry *dentry)
@@ -62929,7 +61607,6 @@ index 0000000..857c960
+{
+ struct dentry *dentry = path->dentry;
+ struct vfsmount *vfsmnt = path->mnt;
-+ struct mount *mnt = real_mount(vfsmnt);
+ bool slash = false;
+ int error = 0;
+
@@ -62938,12 +61615,11 @@ index 0000000..857c960
+
+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
+ /* Global root? */
-+ if (!mnt_has_parent(mnt)) {
++ if (vfsmnt->mnt_parent == vfsmnt) {
+ goto out;
+ }
-+ dentry = mnt->mnt_mountpoint;
-+ mnt = mnt->mnt_parent;
-+ vfsmnt = &mnt->mnt;
++ dentry = vfsmnt->mnt_mountpoint;
++ vfsmnt = vfsmnt->mnt_parent;
+ continue;
+ }
+ parent = dentry->d_parent;
@@ -63021,7 +61697,7 @@ index 0000000..857c960
+ char *res;
+ struct path path;
+ struct path root;
-+ struct task_struct *reaper = init_pid_ns.child_reaper;
++ struct task_struct *reaper = &init_task;
+
+ path.dentry = (struct dentry *)dentry;
+ path.mnt = (struct vfsmount *)vfsmnt;
@@ -63029,11 +61705,11 @@ index 0000000..857c960
+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
+ get_fs_root(reaper->fs, &root);
+
-+ br_read_lock(&vfsmount_lock);
++ br_read_lock(vfsmount_lock);
+ write_seqlock(&rename_lock);
+ res = gen_full_path(&path, &root, buf, buflen);
+ write_sequnlock(&rename_lock);
-+ br_read_unlock(&vfsmount_lock);
++ br_read_unlock(vfsmount_lock);
+
+ path_put(&root);
+ return res;
@@ -63043,12 +61719,12 @@ index 0000000..857c960
+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
+{
+ char *ret;
-+ br_read_lock(&vfsmount_lock);
++ br_read_lock(vfsmount_lock);
+ write_seqlock(&rename_lock);
+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
+ PAGE_SIZE);
+ write_sequnlock(&rename_lock);
-+ br_read_unlock(&vfsmount_lock);
++ br_read_unlock(vfsmount_lock);
+ return ret;
+}
+
@@ -63059,7 +61735,7 @@ index 0000000..857c960
+ char *buf;
+ int buflen;
+
-+ br_read_lock(&vfsmount_lock);
++ br_read_lock(vfsmount_lock);
+ write_seqlock(&rename_lock);
+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
@@ -63069,7 +61745,7 @@ index 0000000..857c960
+ else
+ ret = strcpy(buf, "<path too long>");
+ write_sequnlock(&rename_lock);
-+ br_read_unlock(&vfsmount_lock);
++ br_read_unlock(vfsmount_lock);
+ return ret;
+}
+
@@ -63608,31 +62284,16 @@ index 0000000..857c960
+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
+}
+
-+#ifdef CONFIG_HUGETLBFS
-+static inline bool
-+is_hugetlbfs_mnt(const struct vfsmount *mnt)
-+{
-+ int i;
-+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
-+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
-+ return true;
-+ }
-+
-+ return false;
-+}
-+#endif
-+
+static struct acl_object_label *
+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
+ const struct acl_subject_label *subj, char *path, const int checkglob)
+{
+ struct dentry *dentry = (struct dentry *) l_dentry;
+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
-+ struct mount *real_mnt = real_mount(mnt);
+ struct acl_object_label *retval;
+ struct dentry *parent;
+
-+ br_read_lock(&vfsmount_lock);
++ br_read_lock(vfsmount_lock);
+ write_seqlock(&rename_lock);
+
+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
@@ -63640,7 +62301,7 @@ index 0000000..857c960
+ mnt == sock_mnt ||
+#endif
+#ifdef CONFIG_HUGETLBFS
-+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
++ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
+#endif
+ /* ignore Eric Biederman */
+ IS_PRIVATE(l_dentry->d_inode))) {
@@ -63653,16 +62314,15 @@ index 0000000..857c960
+ break;
+
+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
-+ if (!mnt_has_parent(real_mnt))
++ if (mnt->mnt_parent == mnt)
+ break;
+
+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
+ if (retval != NULL)
+ goto out;
+
-+ dentry = real_mnt->mnt_mountpoint;
-+ real_mnt = real_mnt->mnt_parent;
-+ mnt = &real_mnt->mnt;
++ dentry = mnt->mnt_mountpoint;
++ mnt = mnt->mnt_parent;
+ continue;
+ }
+
@@ -63681,7 +62341,7 @@ index 0000000..857c960
+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
+out:
+ write_sequnlock(&rename_lock);
-+ br_read_unlock(&vfsmount_lock);
++ br_read_unlock(vfsmount_lock);
+
+ BUG_ON(retval == NULL);
+
@@ -63717,18 +62377,17 @@ index 0000000..857c960
+{
+ struct dentry *dentry = (struct dentry *) l_dentry;
+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
-+ struct mount *real_mnt = real_mount(mnt);
+ struct acl_subject_label *retval;
+ struct dentry *parent;
+
-+ br_read_lock(&vfsmount_lock);
++ br_read_lock(vfsmount_lock);
+ write_seqlock(&rename_lock);
+
+ for (;;) {
+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
+ break;
+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
-+ if (!mnt_has_parent(real_mnt))
++ if (mnt->mnt_parent == mnt)
+ break;
+
+ spin_lock(&dentry->d_lock);
@@ -63741,9 +62400,8 @@ index 0000000..857c960
+ if (retval != NULL)
+ goto out;
+
-+ dentry = real_mnt->mnt_mountpoint;
-+ real_mnt = real_mnt->mnt_parent;
-+ mnt = &real_mnt->mnt;
++ dentry = mnt->mnt_mountpoint;
++ mnt = mnt->mnt_parent;
+ continue;
+ }
+
@@ -63777,7 +62435,7 @@ index 0000000..857c960
+ }
+out:
+ write_sequnlock(&rename_lock);
-+ br_read_unlock(&vfsmount_lock);
++ br_read_unlock(vfsmount_lock);
+
+ BUG_ON(retval == NULL);
+
@@ -63851,7 +62509,7 @@ index 0000000..857c960
+ const struct cred *cred = current_cred();
+
+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
-+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
++ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
+
@@ -63859,29 +62517,30 @@ index 0000000..857c960
+}
+
+static void
-+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
++gr_log_learn_sysctl(const char *path, const __u32 mode)
+{
+ struct task_struct *task = current;
+ const struct cred *cred = current_cred();
+
-+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
-+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
++ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
++ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
-+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
++ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
+
+ return;
+}
+
+static void
-+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
++gr_log_learn_id_change(const char type, const unsigned int real,
++ const unsigned int effective, const unsigned int fs)
+{
+ struct task_struct *task = current;
+ const struct cred *cred = current_cred();
+
+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
-+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
++ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
-+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
++ type, real, effective, fs, &task->signal->saved_ip);
+
+ return;
+}
@@ -63917,6 +62576,59 @@ index 0000000..857c960
+ read_lock(&grsec_exec_file_lock);
+*/
+
++struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
++{
++ char *tmpname;
++ struct acl_subject_label *tmpsubj;
++ struct file *filp;
++ struct name_entry *nmatch;
++
++ filp = task->exec_file;
++ if (filp == NULL)
++ return NULL;
++
++ /* the following is to apply the correct subject
++ on binaries running when the RBAC system
++ is enabled, when the binaries have been
++ replaced or deleted since their execution
++ -----
++ when the RBAC system starts, the inode/dev
++ from exec_file will be one the RBAC system
++ is unaware of. It only knows the inode/dev
++ of the present file on disk, or the absence
++ of it.
++ */
++
++ if (filename)
++ nmatch = __lookup_name_entry(state, filename);
++ else {
++ preempt_disable();
++ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
++
++ nmatch = __lookup_name_entry(state, tmpname);
++ preempt_enable();
++ }
++ tmpsubj = NULL;
++ if (nmatch) {
++ if (nmatch->deleted)
++ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
++ else
++ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
++ }
++ /* this also works for the reload case -- if we don't match a potentially inherited subject
++ then we fall back to a normal lookup based on the binary's ino/dev
++ */
++ if (tmpsubj == NULL)
++ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
++
++ return tmpsubj;
++}
++
++static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
++{
++ return __gr_get_subject_for_task(&running_polstate, task, filename);
++}
++
+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
+{
+ struct acl_object_label *obj;
@@ -63971,12 +62683,15 @@ index 0000000..857c960
+ struct task_struct *task = init_pid_ns.child_reaper;
+
+ if (task->role != current->role) {
++ struct acl_subject_label *subj;
++
+ task->acl_sp_role = 0;
+ task->acl_role_id = current->acl_role_id;
+ task->role = current->role;
+ rcu_read_lock();
+ read_lock(&grsec_exec_file_lock);
-+ gr_apply_subject_to_task(task, NULL);
++ subj = gr_get_subject_for_task(task, NULL);
++ gr_apply_subject_to_task(task, subj);
+ read_unlock(&grsec_exec_file_lock);
+ rcu_read_unlock();
+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
@@ -64196,28 +62911,23 @@ index 0000000..857c960
+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
+
+int
-+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
++gr_check_user_change(int real, int effective, int fs)
+{
+ unsigned int i;
+ __u16 num;
+ uid_t *uidlist;
-+ uid_t curuid;
++ int curuid;
+ int realok = 0;
+ int effectiveok = 0;
+ int fsok = 0;
-+ uid_t globalreal, globaleffective, globalfs;
+
+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
+ struct user_struct *user;
+
-+ if (!uid_valid(real))
++ if (real == -1)
+ goto skipit;
+
-+ /* find user based on global namespace */
-+
-+ globalreal = GR_GLOBAL_UID(real);
-+
-+ user = find_user(make_kuid(&init_user_ns, globalreal));
++ user = find_user(real);
+ if (user == NULL)
+ goto skipit;
+
@@ -64237,7 +62947,7 @@ index 0000000..857c960
+ return 0;
+
+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
-+ gr_log_learn_uid_change(real, effective, fs);
++ gr_log_learn_id_change('u', real, effective, fs);
+
+ num = current->acl->user_trans_num;
+ uidlist = current->acl->user_transitions;
@@ -64245,43 +62955,31 @@ index 0000000..857c960
+ if (uidlist == NULL)
+ return 0;
+
-+ if (!uid_valid(real)) {
++ if (real == -1)
+ realok = 1;
-+ globalreal = (uid_t)-1;
-+ } else {
-+ globalreal = GR_GLOBAL_UID(real);
-+ }
-+ if (!uid_valid(effective)) {
++ if (effective == -1)
+ effectiveok = 1;
-+ globaleffective = (uid_t)-1;
-+ } else {
-+ globaleffective = GR_GLOBAL_UID(effective);
-+ }
-+ if (!uid_valid(fs)) {
++ if (fs == -1)
+ fsok = 1;
-+ globalfs = (uid_t)-1;
-+ } else {
-+ globalfs = GR_GLOBAL_UID(fs);
-+ }
+
+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
+ for (i = 0; i < num; i++) {
-+ curuid = uidlist[i];
-+ if (globalreal == curuid)
++ curuid = (int)uidlist[i];
++ if (real == curuid)
+ realok = 1;
-+ if (globaleffective == curuid)
++ if (effective == curuid)
+ effectiveok = 1;
-+ if (globalfs == curuid)
++ if (fs == curuid)
+ fsok = 1;
+ }
+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
+ for (i = 0; i < num; i++) {
-+ curuid = uidlist[i];
-+ if (globalreal == curuid)
++ curuid = (int)uidlist[i];
++ if (real == curuid)
+ break;
-+ if (globaleffective == curuid)
++ if (effective == curuid)
+ break;
-+ if (globalfs == curuid)
++ if (fs == curuid)
+ break;
+ }
+ /* not in deny list */
@@ -64295,28 +62993,27 @@ index 0000000..857c960
+ if (realok && effectiveok && fsok)
+ return 0;
+ else {
-+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
++ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
+ return 1;
+ }
+}
+
+int
-+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
++gr_check_group_change(int real, int effective, int fs)
+{
+ unsigned int i;
+ __u16 num;
+ gid_t *gidlist;
-+ gid_t curgid;
++ int curgid;
+ int realok = 0;
+ int effectiveok = 0;
+ int fsok = 0;
-+ gid_t globalreal, globaleffective, globalfs;
+
+ if (unlikely(!(gr_status & GR_READY)))
+ return 0;
+
+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
-+ gr_log_learn_gid_change(real, effective, fs);
++ gr_log_learn_id_change('g', real, effective, fs);
+
+ num = current->acl->group_trans_num;
+ gidlist = current->acl->group_transitions;
@@ -64324,43 +63021,31 @@ index 0000000..857c960
+ if (gidlist == NULL)
+ return 0;
+
-+ if (!gid_valid(real)) {
++ if (real == -1)
+ realok = 1;
-+ globalreal = (gid_t)-1;
-+ } else {
-+ globalreal = GR_GLOBAL_GID(real);
-+ }
-+ if (!gid_valid(effective)) {
++ if (effective == -1)
+ effectiveok = 1;
-+ globaleffective = (gid_t)-1;
-+ } else {
-+ globaleffective = GR_GLOBAL_GID(effective);
-+ }
-+ if (!gid_valid(fs)) {
++ if (fs == -1)
+ fsok = 1;
-+ globalfs = (gid_t)-1;
-+ } else {
-+ globalfs = GR_GLOBAL_GID(fs);
-+ }
+
+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
+ for (i = 0; i < num; i++) {
-+ curgid = gidlist[i];
-+ if (globalreal == curgid)
++ curgid = (int)gidlist[i];
++ if (real == curgid)
+ realok = 1;
-+ if (globaleffective == curgid)
++ if (effective == curgid)
+ effectiveok = 1;
-+ if (globalfs == curgid)
++ if (fs == curgid)
+ fsok = 1;
+ }
+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
+ for (i = 0; i < num; i++) {
-+ curgid = gidlist[i];
-+ if (globalreal == curgid)
++ curgid = (int)gidlist[i];
++ if (real == curgid)
+ break;
-+ if (globaleffective == curgid)
++ if (effective == curgid)
+ break;
-+ if (globalfs == curgid)
++ if (fs == curgid)
+ break;
+ }
+ /* not in deny list */
@@ -64374,7 +63059,7 @@ index 0000000..857c960
+ if (realok && effectiveok && fsok)
+ return 0;
+ else {
-+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
++ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
+ return 1;
+ }
+}
@@ -64382,21 +63067,16 @@ index 0000000..857c960
+extern int gr_acl_is_capable(const int cap);
+
+void
-+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
++gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
+{
+ struct acl_role_label *role = task->role;
+ struct acl_subject_label *subj = NULL;
+ struct acl_object_label *obj;
+ struct file *filp;
-+ uid_t uid;
-+ gid_t gid;
+
+ if (unlikely(!(gr_status & GR_READY)))
+ return;
+
-+ uid = GR_GLOBAL_UID(kuid);
-+ gid = GR_GLOBAL_GID(kgid);
-+
+ filp = task->exec_file;
+
+ /* kernel process, we'll give them the kernel role */
@@ -64448,7 +63128,7 @@ index 0000000..857c960
+ task->is_writable = 1;
+
+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename);
++ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
+#endif
+
+ gr_set_proc_res(task);
@@ -64527,7 +63207,7 @@ index 0000000..857c960
+ gr_set_proc_res(task);
+
+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename);
++ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
+#endif
+ return 0;
+}
@@ -64830,26 +63510,6 @@ index 0000000..857c960
+ return;
+}
+
-+#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)
@@ -64861,8 +63521,10 @@ index 0000000..857c960
+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
+ goto skip_reslog;
+
++#ifdef CONFIG_GRKERNSEC_RESLOG
+ gr_log_resource(task, res, wanted, gt);
-+skip_reslog:
++#endif
++ skip_reslog:
+
+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
+ return;
@@ -64876,7 +63538,57 @@ index 0000000..857c960
+ if (wanted >= acl->res[res].rlim_cur) {
+ unsigned long res_add;
+
-+ res_add = wanted + res_learn_bumps[res];
++ 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;
++ }
+
+ acl->res[res].rlim_cur = res_add;
+
@@ -64888,7 +63600,7 @@ index 0000000..857c960
+ rcu_read_lock();
+ cred = __task_cred(task);
+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
-+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
++ task->role->roletype, cred->uid, cred->gid, acl->filename,
+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
+ "", (unsigned long) res, &task->signal->saved_ip);
+ rcu_read_unlock();
@@ -64896,8 +63608,6 @@ index 0000000..857c960
+
+ return;
+}
-+EXPORT_SYMBOL(gr_learn_resource);
-+#endif
+
+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
+void
@@ -64942,6 +63652,173 @@ index 0000000..857c960
+}
+#endif
+
++#ifdef CONFIG_SYSCTL
++/* Eric Biederman likes breaking userland ABI and every inode-based security
++ system to save 35kb of memory */
++
++/* we modify the passed in filename, but adjust it back before returning */
++static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
++{
++ struct name_entry *nmatch;
++ char *p, *lastp = NULL;
++ struct acl_object_label *obj = NULL, *tmp;
++ struct acl_subject_label *tmpsubj;
++ char c = '\0';
++
++ read_lock(&gr_inode_lock);
++
++ p = name + len - 1;
++ do {
++ nmatch = lookup_name_entry(name);
++ if (lastp != NULL)
++ *lastp = c;
++
++ if (nmatch == NULL)
++ goto next_component;
++ tmpsubj = current->acl;
++ do {
++ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
++ if (obj != NULL) {
++ tmp = obj->globbed;
++ while (tmp) {
++ if (!glob_match(tmp->filename, name)) {
++ obj = tmp;
++ goto found_obj;
++ }
++ tmp = tmp->next;
++ }
++ goto found_obj;
++ }
++ } while ((tmpsubj = tmpsubj->parent_subject));
++next_component:
++ /* end case */
++ if (p == name)
++ break;
++
++ while (*p != '/')
++ p--;
++ if (p == name)
++ lastp = p + 1;
++ else {
++ lastp = p;
++ p--;
++ }
++ c = *lastp;
++ *lastp = '\0';
++ } while (1);
++found_obj:
++ read_unlock(&gr_inode_lock);
++ /* obj returned will always be non-null */
++ return obj;
++}
++
++/* returns 0 when allowing, non-zero on error
++ op of 0 is used for readdir, so we don't log the names of hidden files
++*/
++__u32
++gr_handle_sysctl(const struct ctl_table *table, const int op)
++{
++ struct ctl_table *tmp;
++ const char *proc_sys = "/proc/sys";
++ char *path;
++ struct acl_object_label *obj;
++ unsigned short len = 0, pos = 0, depth = 0, i;
++ __u32 err = 0;
++ __u32 mode = 0;
++
++ if (unlikely(!(gr_status & GR_READY)))
++ return 0;
++
++ /* for now, ignore operations on non-sysctl entries if it's not a
++ readdir*/
++ if (table->child != NULL && op != 0)
++ return 0;
++
++ mode |= GR_FIND;
++ /* it's only a read if it's an entry, read on dirs is for readdir */
++ if (op & MAY_READ)
++ mode |= GR_READ;
++ if (op & MAY_WRITE)
++ mode |= GR_WRITE;
++
++ preempt_disable();
++
++ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
++
++ /* it's only a read/write if it's an actual entry, not a dir
++ (which are opened for readdir)
++ */
++
++ /* convert the requested sysctl entry into a pathname */
++
++ for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
++ len += strlen(tmp->procname);
++ len++;
++ depth++;
++ }
++
++ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
++ /* deny */
++ goto out;
++ }
++
++ memset(path, 0, PAGE_SIZE);
++
++ memcpy(path, proc_sys, strlen(proc_sys));
++
++ pos += strlen(proc_sys);
++
++ for (; depth > 0; depth--) {
++ path[pos] = '/';
++ pos++;
++ for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
++ if (depth == i) {
++ memcpy(path + pos, tmp->procname,
++ strlen(tmp->procname));
++ pos += strlen(tmp->procname);
++ }
++ i++;
++ }
++ }
++
++ obj = gr_lookup_by_name(path, pos);
++ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
++
++ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
++ ((err & mode) != mode))) {
++ __u32 new_mode = mode;
++
++ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
++
++ err = 0;
++ gr_log_learn_sysctl(path, new_mode);
++ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
++ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
++ err = -ENOENT;
++ } else if (!(err & GR_FIND)) {
++ err = -ENOENT;
++ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
++ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
++ path, (mode & GR_READ) ? " reading" : "",
++ (mode & GR_WRITE) ? " writing" : "");
++ err = -EACCES;
++ } else if ((err & mode) != mode) {
++ err = -EACCES;
++ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
++ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
++ path, (mode & GR_READ) ? " reading" : "",
++ (mode & GR_WRITE) ? " writing" : "");
++ err = 0;
++ } else
++ err = 0;
++
++ out:
++ preempt_enable();
++
++ return err;
++}
++#endif
++
+int
+gr_handle_proc_ptrace(struct task_struct *task)
+{
@@ -64959,13 +63836,13 @@ index 0000000..857c960
+ read_lock(&grsec_exec_file_lock);
+ filp = task->exec_file;
+
-+ while (task_pid_nr(tmp) > 0) {
++ while (tmp->pid > 0) {
+ if (tmp == curtemp)
+ break;
+ tmp = tmp->real_parent;
+ }
+
-+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
++ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
+ read_unlock(&grsec_exec_file_lock);
+ read_unlock(&tasklist_lock);
@@ -64989,7 +63866,7 @@ index 0000000..857c960
+
+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
+ && (current->acl != task->acl || (current->acl != current->role->root_label
-+ && task_pid_nr(current) != task_pid_nr(task))))
++ && current->pid != task->pid)))
+ return 1;
+
+ return 0;
@@ -65021,13 +63898,13 @@ index 0000000..857c960
+#endif
+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
+ read_lock(&tasklist_lock);
-+ while (task_pid_nr(tmp) > 0) {
++ while (tmp->pid > 0) {
+ if (tmp == curtemp)
+ break;
+ tmp = tmp->real_parent;
+ }
+
-+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
++ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
+ read_unlock(&tasklist_lock);
+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
@@ -65230,10 +64107,10 @@ index 0000000..857c960
+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
+ cred = __task_cred(task);
+#ifdef CONFIG_GRKERNSEC_PROC_USER
-+ if (gr_is_global_nonroot(cred->uid))
++ if (cred->uid != 0)
+ ret = -EACCES;
+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
++ if (cred->uid != 0 && !groups_search(cred->group_info, grsec_proc_gid))
+ ret = -EACCES;
+#endif
+#endif
@@ -65359,6 +64236,7 @@ index 0000000..857c960
+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
+EXPORT_SYMBOL(gr_acl_is_enabled);
+#endif
++EXPORT_SYMBOL(gr_learn_resource);
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
@@ -65477,10 +64355,10 @@ index 0000000..18ffbbd
+}
diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
new file mode 100644
-index 0000000..bdd51ea
+index 0000000..955ddfb
--- /dev/null
+++ b/grsecurity/gracl_cap.c
-@@ -0,0 +1,110 @@
+@@ -0,0 +1,101 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -65491,8 +64369,11 @@ index 0000000..bdd51ea
+extern const char *captab_log[];
+extern int captab_log_entries;
+
-+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
++int
++gr_acl_is_capable(const int cap)
+{
++ struct task_struct *task = current;
++ const struct cred *cred = current_cred();
+ struct acl_subject_label *curracl;
+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
+ kernel_cap_t cap_audit = __cap_empty_set;
@@ -65532,8 +64413,8 @@ index 0000000..bdd51ea
+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
+ && cap_raised(cred->cap_effective, cap)) {
+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
-+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
-+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
++ task->role->roletype, cred->uid,
++ cred->gid, task->exec_file ?
+ gr_to_filename(task->exec_file->f_path.dentry,
+ task->exec_file->f_path.mnt) : curracl->filename,
+ curracl->filename, 0UL,
@@ -65543,17 +64424,11 @@ index 0000000..bdd51ea
+
+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
-+
+ return 0;
+}
+
+int
-+gr_acl_is_capable(const int cap)
-+{
-+ return gr_task_acl_is_capable(current, current_cred(), cap);
-+}
-+
-+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
++gr_acl_is_capable_nolog(const int cap)
+{
+ struct acl_subject_label *curracl;
+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
@@ -65561,7 +64436,7 @@ index 0000000..bdd51ea
+ if (!gr_acl_is_enabled())
+ return 1;
+
-+ curracl = task->acl;
++ curracl = current->acl;
+
+ cap_drop = curracl->cap_lower;
+ cap_mask = curracl->cap_mask;
@@ -65585,12 +64460,6 @@ index 0000000..bdd51ea
+ return 0;
+}
+
-+int
-+gr_acl_is_capable_nolog(const int cap)
-+{
-+ return gr_task_acl_is_capable_nolog(current, cap);
-+}
-+
diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
new file mode 100644
index 0000000..ca25605
@@ -65869,7 +64738,7 @@ index 0000000..ca25605
+
diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
new file mode 100644
-index 0000000..a340c17
+index 0000000..b20f6e9
--- /dev/null
+++ b/grsecurity/gracl_fs.c
@@ -0,0 +1,431 @@
@@ -66135,7 +65004,7 @@ index 0000000..a340c17
+ const struct dentry * parent_dentry,
+ const struct vfsmount * parent_mnt,
+ const struct dentry * old_dentry,
-+ const struct vfsmount * old_mnt, const struct filename *to)
++ const struct vfsmount * old_mnt, const char *to)
+{
+ __u32 mode;
+ __u32 needmode = GR_CREATE | GR_LINK;
@@ -66146,10 +65015,10 @@ index 0000000..a340c17
+ 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->name);
++ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
+ 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->name);
++ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
+ return 0;
+ } else if (unlikely((mode & needmode) != needmode))
+ return 0;
@@ -66160,7 +65029,7 @@ index 0000000..a340c17
+__u32
+gr_acl_handle_symlink(const struct dentry * new_dentry,
+ const struct dentry * parent_dentry,
-+ const struct vfsmount * parent_mnt, const struct filename *from)
++ const struct vfsmount * parent_mnt, const char *from)
+{
+ __u32 needmode = GR_WRITE | GR_CREATE;
+ __u32 mode;
@@ -66171,10 +65040,10 @@ index 0000000..a340c17
+ 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->name, new_dentry, parent_mnt);
++ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, 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->name, new_dentry, parent_mnt);
++ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
+ return 0;
+ } else if (unlikely((mode & needmode) != needmode))
+ return 0;
@@ -66233,7 +65102,7 @@ index 0000000..a340c17
+ const struct vfsmount *parent_mnt,
+ struct dentry *old_dentry,
+ struct inode *old_parent_inode,
-+ struct vfsmount *old_mnt, const struct filename *newname)
++ struct vfsmount *old_mnt, const char *newname)
+{
+ __u32 comp1, comp2;
+ int error = 0;
@@ -66264,10 +65133,10 @@ index 0000000..a340c17
+
+ 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->name);
++ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
+ 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->name);
++ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
+ error = -EACCES;
+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
+ error = -EACCES;
@@ -66306,7 +65175,7 @@ index 0000000..a340c17
+}
diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
new file mode 100644
-index 0000000..f056b81
+index 0000000..35f8064
--- /dev/null
+++ b/grsecurity/gracl_ip.c
@@ -0,0 +1,386 @@
@@ -66428,8 +65297,8 @@ index 0000000..f056b81
+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
+ __u32 fakeip = 0;
+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
-+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
-+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
++ current->role->roletype, cred->uid,
++ cred->gid, current->exec_file ?
+ gr_to_filename(current->exec_file->f_path.dentry,
+ current->exec_file->f_path.mnt) :
+ curr->filename, curr->filename,
@@ -66456,8 +65325,8 @@ index 0000000..f056b81
+ if (type == SOCK_RAW || type == SOCK_PACKET) {
+ __u32 fakeip = 0;
+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
-+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
-+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
++ current->role->roletype, cred->uid,
++ cred->gid, current->exec_file ?
+ gr_to_filename(current->exec_file->f_path.dentry,
+ current->exec_file->f_path.mnt) :
+ curr->filename, curr->filename,
@@ -66466,8 +65335,8 @@ index 0000000..f056b81
+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
+ __u32 fakeip = 0;
+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
-+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
-+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
++ current->role->roletype, cred->uid,
++ cred->gid, current->exec_file ?
+ gr_to_filename(current->exec_file->f_path.dentry,
+ current->exec_file->f_path.mnt) :
+ curr->filename, curr->filename,
@@ -66563,8 +65432,8 @@ index 0000000..f056b81
+
+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
-+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
-+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
++ current->role->roletype, cred->uid,
++ cred->gid, current->exec_file ?
+ gr_to_filename(current->exec_file->f_path.dentry,
+ current->exec_file->f_path.mnt) :
+ curr->filename, curr->filename,
@@ -66911,10 +65780,10 @@ index 0000000..25f54ef
+};
diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
new file mode 100644
-index 0000000..d409f33
+index 0000000..b1f3247
--- /dev/null
+++ b/grsecurity/gracl_policy.c
-@@ -0,0 +1,1825 @@
+@@ -0,0 +1,1776 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -66943,7 +65812,6 @@ index 0000000..d409f33
+#include <linux/lglock.h>
+#include <linux/hugetlb.h>
+#include <linux/posix-timers.h>
-+#include "../fs/mount.h"
+
+#include <asm/uaccess.h>
+#include <asm/errno.h>
@@ -66985,6 +65853,7 @@ index 0000000..d409f33
+extern void gr_remove_uid(uid_t uid);
+extern int gr_find_uid(uid_t uid);
+
++extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
@@ -68048,55 +66917,6 @@ index 0000000..d409f33
+ return err;
+}
+
-+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
-+{
-+ char *tmpname;
-+ struct acl_subject_label *tmpsubj;
-+ struct file *filp;
-+ struct name_entry *nmatch;
-+
-+ filp = task->exec_file;
-+ if (filp == NULL)
-+ return NULL;
-+
-+ /* the following is to apply the correct subject
-+ on binaries running when the RBAC system
-+ is enabled, when the binaries have been
-+ replaced or deleted since their execution
-+ -----
-+ when the RBAC system starts, the inode/dev
-+ from exec_file will be one the RBAC system
-+ is unaware of. It only knows the inode/dev
-+ of the present file on disk, or the absence
-+ of it.
-+ */
-+
-+ if (filename)
-+ nmatch = __lookup_name_entry(polstate, filename);
-+ else {
-+ preempt_disable();
-+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
-+
-+ nmatch = __lookup_name_entry(polstate, tmpname);
-+ preempt_enable();
-+ }
-+ tmpsubj = NULL;
-+ if (nmatch) {
-+ if (nmatch->deleted)
-+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
-+ else
-+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
-+ }
-+ /* this also works for the reload case -- if we don't match a potentially inherited subject
-+ then we fall back to a normal lookup based on the binary's ino/dev
-+ */
-+ if (tmpsubj == NULL)
-+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
-+ task->role);
-+
-+ return tmpsubj;
-+}
-+
+static int gracl_reload_apply_policies(void *reload)
+{
+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
@@ -68107,7 +66927,7 @@ index 0000000..d409f33
+ int role_applied;
+ int ret = 0;
+
-+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_reload_state));
++ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
+
+ /* first make sure we'll be able to apply the new policy cleanly */
@@ -68129,12 +66949,12 @@ index 0000000..d409f33
+ if (!role_applied) {
+ cred = __task_cred(task);
+ rtmp = task->role;
-+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
++ task->role = __lookup_acl_role_label(polstate, task, cred->uid, cred->gid);
+ }
+ /* this handles non-nested inherited subjects, nested subjects will still
+ be dropped currently */
-+ subj = gr_get_subject_for_task(task, task->acl->filename);
-+ task->tmpacl = gr_get_subject_for_task(task, NULL);
++ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
++ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
+ /* change the role back so that we've made no modifications to the policy */
+ task->role = rtmp;
+
@@ -68161,12 +66981,12 @@ index 0000000..d409f33
+ }
+ if (!role_applied) {
+ cred = __task_cred(task);
-+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
++ task->role = __lookup_acl_role_label(polstate, task, cred->uid, cred->gid);
+ }
+ /* this handles non-nested inherited subjects, nested subjects will still
+ be dropped currently */
+ if (!reload_state->oldmode && task->inherited)
-+ subj = gr_get_subject_for_task(task, task->acl->filename);
++ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
+ else {
+ /* looked up and tagged to the task previously */
+ subj = task->tmpacl;
@@ -68503,7 +67323,7 @@ index 0000000..d409f33
+
+ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS &&
+ gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM &&
-+ gr_is_global_nonroot(current_uid())) {
++ current_uid()) {
+ error = -EPERM;
+ goto out;
+ }
@@ -68714,8 +67534,8 @@ index 0000000..d409f33
+
+ if (task->exec_file) {
+ cred = __task_cred(task);
-+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
-+ subj = gr_get_subject_for_task(task, NULL);
++ task->role = __lookup_acl_role_label(polstate, task, cred->uid, cred->gid);
++ subj = __gr_get_subject_for_task(polstate, task, NULL);
+ if (subj == NULL) {
+ ret = -EINVAL;
+ read_unlock(&grsec_exec_file_lock);
@@ -68816,10 +67636,10 @@ index 0000000..39645c9
+}
diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
new file mode 100644
-index 0000000..2040e61
+index 0000000..266766a
--- /dev/null
+++ b/grsecurity/gracl_segv.c
-@@ -0,0 +1,313 @@
+@@ -0,0 +1,309 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <asm/uaccess.h>
@@ -68931,10 +67751,9 @@ index 0000000..2040e61
+}
+
+static __inline__ void
-+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
++gr_insert_uid(const uid_t uid, const unsigned long expires)
+{
+ int loc;
-+ uid_t uid = GR_GLOBAL_UID(kuid);
+
+ if (uid_used == GR_UIDTABLE_MAX)
+ return;
@@ -68969,17 +67788,14 @@ index 0000000..2040e61
+}
+
+int
-+gr_check_crash_uid(const kuid_t kuid)
++gr_check_crash_uid(const uid_t uid)
+{
+ int loc;
+ int ret = 0;
-+ uid_t uid;
+
+ if (unlikely(!gr_acl_is_enabled()))
+ return 0;
+
-+ uid = GR_GLOBAL_UID(kuid);
-+
+ spin_lock(&gr_uid_lock);
+ loc = gr_find_uid(uid);
+
@@ -68999,11 +67815,11 @@ index 0000000..2040e61
+static __inline__ int
+proc_is_setxid(const struct cred *cred)
+{
-+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
-+ !uid_eq(cred->uid, cred->fsuid))
++ if (cred->uid != cred->euid || cred->uid != cred->suid ||
++ cred->uid != cred->fsuid)
+ return 1;
-+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
-+ !gid_eq(cred->gid, cred->fsgid))
++ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
++ cred->gid != cred->fsgid)
+ return 1;
+
+ return 0;
@@ -69044,7 +67860,7 @@ index 0000000..2040e61
+ time_after(curr->expires, get_seconds())) {
+ rcu_read_lock();
+ cred = __task_cred(task);
-+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
++ if (cred->uid && proc_is_setxid(cred)) {
+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
+ spin_lock(&gr_uid_lock);
+ gr_insert_uid(cred->uid, curr->expires);
@@ -69054,7 +67870,7 @@ index 0000000..2040e61
+ read_lock(&tasklist_lock);
+ do_each_thread(tsk2, tsk) {
+ cred2 = __task_cred(tsk);
-+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
++ if (tsk != task && cred2->uid == cred->uid)
+ gr_fake_force_sig(SIGKILL, tsk);
+ } while_each_thread(tsk2, tsk);
+ read_unlock(&tasklist_lock);
@@ -69135,7 +67951,7 @@ index 0000000..2040e61
+}
diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
new file mode 100644
-index 0000000..98011b0
+index 0000000..9d83a69
--- /dev/null
+++ b/grsecurity/gracl_shm.c
@@ -0,0 +1,40 @@
@@ -69150,7 +67966,7 @@ index 0000000..98011b0
+
+int
+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
++ const time_t shm_createtime, const uid_t cuid, const int shmid)
+{
+ struct task_struct *task;
+
@@ -69166,12 +67982,12 @@ index 0000000..98011b0
+ task = find_task_by_vpid(shm_lapid);
+
+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
-+ (task_pid_nr(task) == shm_lapid)) &&
++ (task->pid == shm_lapid)) &&
+ (task->acl->mode & GR_PROTSHM) &&
+ (task->acl != current->acl))) {
+ read_unlock(&tasklist_lock);
+ rcu_read_unlock();
-+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
++ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
+ return 0;
+ }
+ read_unlock(&tasklist_lock);
@@ -69206,10 +68022,10 @@ index 0000000..bc0be01
+}
diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
new file mode 100644
-index 0000000..e10b319
+index 0000000..6b654b0
--- /dev/null
+++ b/grsecurity/grsec_chroot.c
-@@ -0,0 +1,370 @@
+@@ -0,0 +1,353 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -69217,7 +68033,7 @@ index 0000000..e10b319
+#include <linux/fs.h>
+#include <linux/mount.h>
+#include <linux/types.h>
-+#include "../fs/mount.h"
++#include <linux/pid_namespace.h>
+#include <linux/grsecurity.h>
+#include <linux/grinternal.h>
+
@@ -69225,11 +68041,11 @@ index 0000000..e10b319
+int gr_init_ran;
+#endif
+
-+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
++void gr_set_chroot_entries(struct task_struct *task, struct path *path)
+{
+#ifdef CONFIG_GRKERNSEC
-+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
-+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
++ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
++ path->dentry != task->nsproxy->mnt_ns->root->mnt_root
+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
+ && gr_init_ran
+#endif
@@ -69237,7 +68053,7 @@ index 0000000..e10b319
+ task->gr_is_chrooted = 1;
+ else {
+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
-+ if (task_pid_nr(task) == 1 && !gr_init_ran)
++ if (task->pid == 1 && !gr_init_ran)
+ gr_init_ran = 1;
+#endif
+ task->gr_is_chrooted = 0;
@@ -69302,7 +68118,7 @@ index 0000000..e10b319
+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
+ && proc_is_chrooted(current)) {
-+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
++ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
+ return -EACCES;
+ }
+#endif
@@ -69496,14 +68312,15 @@ index 0000000..e10b319
+extern int captab_log_entries;
+
+int
-+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
++gr_chroot_is_capable(const int cap)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
-+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
++ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
+ if (cap_raised(chroot_caps, cap)) {
-+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
-+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
++ const struct cred *creds = current_cred();
++ if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
++ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
+ }
+ return 0;
+ }
@@ -69513,19 +68330,10 @@ index 0000000..e10b319
+}
+
+int
-+gr_chroot_is_capable(const int cap)
-+{
-+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
-+ return gr_task_chroot_is_capable(current, current_cred(), cap);
-+#endif
-+ return 1;
-+}
-+
-+int
-+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
++gr_chroot_is_capable_nolog(const int cap)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
-+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
++ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
+ if (cap_raised(chroot_caps, cap)) {
+ return 0;
@@ -69536,15 +68344,6 @@ index 0000000..e10b319
+}
+
+int
-+gr_chroot_is_capable_nolog(const int cap)
-+{
-+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
-+ return gr_task_chroot_is_capable_nolog(current, cap);
-+#endif
-+ return 1;
-+}
-+
-+int
+gr_handle_chroot_sysctl(const int op)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
@@ -69556,7 +68355,7 @@ index 0000000..e10b319
+}
+
+void
-+gr_handle_chroot_chdir(const struct path *path)
++gr_handle_chroot_chdir(struct path *path)
+{
+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
+ if (grsec_enable_chroot_chdir)
@@ -69582,10 +68381,10 @@ index 0000000..e10b319
+}
diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
new file mode 100644
-index 0000000..0866ab2
+index 0000000..583586a
--- /dev/null
+++ b/grsecurity/grsec_disabled.c
-@@ -0,0 +1,427 @@
+@@ -0,0 +1,435 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -69657,6 +68456,13 @@ index 0000000..0866ab2
+ 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)
+{
@@ -69725,7 +68531,7 @@ index 0000000..0866ab2
+}
+
+int
-+gr_check_crash_uid(const kuid_t uid)
++gr_check_crash_uid(const uid_t uid)
+{
+ return 0;
+}
@@ -69867,7 +68673,7 @@ index 0000000..0866ab2
+__u32
+gr_acl_handle_symlink(const struct dentry * new_dentry,
+ const struct dentry * parent_dentry,
-+ const struct vfsmount * parent_mnt, const struct filename *from)
++ const struct vfsmount * parent_mnt, const char *from)
+{
+ return 1;
+}
@@ -69877,7 +68683,7 @@ index 0000000..0866ab2
+ const struct dentry * parent_dentry,
+ const struct vfsmount * parent_mnt,
+ const struct dentry * old_dentry,
-+ const struct vfsmount * old_mnt, const struct filename *to)
++ const struct vfsmount * old_mnt, const char *to)
+{
+ return 1;
+}
@@ -69888,7 +68694,7 @@ index 0000000..0866ab2
+ const struct vfsmount *parent_mnt,
+ const struct dentry *old_dentry,
+ const struct inode *old_parent_inode,
-+ const struct vfsmount *old_mnt, const struct filename *newname)
++ const struct vfsmount *old_mnt, const char *newname)
+{
+ return 0;
+}
@@ -69902,7 +68708,7 @@ index 0000000..0866ab2
+
+int
+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
++ const time_t shm_createtime, const uid_t cuid, const int shmid)
+{
+ return 1;
+}
@@ -69959,7 +68765,7 @@ index 0000000..0866ab2
+}
+
+void
-+gr_set_role_label(const kuid_t uid, const kgid_t gid)
++gr_set_role_label(const uid_t uid, const gid_t gid)
+{
+ return;
+}
@@ -69983,13 +68789,13 @@ index 0000000..0866ab2
+}
+
+int
-+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
++gr_check_user_change(int real, int effective, int fs)
+{
+ return 0;
+}
+
+int
-+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
++gr_check_group_change(int real, int effective, int fs)
+{
+ return 0;
+}
@@ -70009,16 +68815,17 @@ index 0000000..0866ab2
+ return;
+}
+
++EXPORT_SYMBOL(gr_learn_resource);
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
new file mode 100644
-index 0000000..387032b
+index 0000000..ee1f60f
--- /dev/null
+++ b/grsecurity/grsec_exec.c
-@@ -0,0 +1,187 @@
+@@ -0,0 +1,159 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/file.h>
@@ -70109,12 +68916,8 @@ index 0000000..387032b
+#ifdef CONFIG_GRKERNSEC
+extern int gr_acl_is_capable(const int cap);
+extern int gr_acl_is_capable_nolog(const int cap);
-+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
-+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
+extern int gr_chroot_is_capable(const int cap);
+extern int gr_chroot_is_capable_nolog(const int cap);
-+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
-+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
+#endif
+
+const char *captab_log[] = {
@@ -70169,17 +68972,6 @@ index 0000000..387032b
+#endif
+}
+
-+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
-+ return 1;
-+ return 0;
-+#else
-+ return 1;
-+#endif
-+}
-+
+int gr_is_capable_nolog(const int cap)
+{
+#ifdef CONFIG_GRKERNSEC
@@ -70191,24 +68983,11 @@ index 0000000..387032b
+#endif
+}
+
-+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
-+ return 1;
-+ return 0;
-+#else
-+ return 1;
-+#endif
-+}
-+
+EXPORT_SYMBOL(gr_is_capable);
+EXPORT_SYMBOL(gr_is_capable_nolog);
-+EXPORT_SYMBOL(gr_task_is_capable);
-+EXPORT_SYMBOL(gr_task_is_capable_nolog);
diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
new file mode 100644
-index 0000000..06cc6ea
+index 0000000..d3ee748
--- /dev/null
+++ b/grsecurity/grsec_fifo.c
@@ -0,0 +1,24 @@
@@ -70227,10 +69006,10 @@ index 0000000..06cc6ea
+
+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
-+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
-+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
++ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
++ (cred->fsuid != dentry->d_inode->i_uid)) {
+ if (!inode_permission(dentry->d_inode, acc_mode))
-+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, GR_GLOBAL_UID(dentry->d_inode->i_uid), GR_GLOBAL_GID(dentry->d_inode->i_gid));
++ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
+ return -EACCES;
+ }
+#endif
@@ -70267,10 +69046,10 @@ index 0000000..8ca18bf
+}
diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
new file mode 100644
-index 0000000..a88e901
+index 0000000..264a9f3
--- /dev/null
+++ b/grsecurity/grsec_init.c
-@@ -0,0 +1,272 @@
+@@ -0,0 +1,268 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
@@ -70283,12 +69062,11 @@ index 0000000..a88e901
+int grsec_enable_ptrace_readexec;
+int grsec_enable_setxid;
+int grsec_enable_symlinkown;
-+kgid_t grsec_symlinkown_gid;
++int grsec_symlinkown_gid;
+int grsec_enable_brute;
+int grsec_enable_link;
+int grsec_enable_dmesg;
+int grsec_enable_harden_ptrace;
-+int grsec_enable_harden_ipc;
+int grsec_enable_fifo;
+int grsec_enable_execlog;
+int grsec_enable_signal;
@@ -70296,7 +69074,7 @@ index 0000000..a88e901
+int grsec_enable_audit_ptrace;
+int grsec_enable_time;
+int grsec_enable_group;
-+kgid_t grsec_audit_gid;
++int grsec_audit_gid;
+int grsec_enable_chdir;
+int grsec_enable_mount;
+int grsec_enable_rofs;
@@ -70316,7 +69094,7 @@ index 0000000..a88e901
+int grsec_enable_chroot_sysctl;
+int grsec_enable_chroot_unix;
+int grsec_enable_tpe;
-+kgid_t grsec_tpe_gid;
++int grsec_tpe_gid;
+int grsec_enable_blackhole;
+#ifdef CONFIG_IPV6_MODULE
+EXPORT_SYMBOL(grsec_enable_blackhole);
@@ -70325,11 +69103,11 @@ index 0000000..a88e901
+int grsec_enable_tpe_all;
+int grsec_enable_tpe_invert;
+int grsec_enable_socket_all;
-+kgid_t grsec_socket_all_gid;
++int grsec_socket_all_gid;
+int grsec_enable_socket_client;
-+kgid_t grsec_socket_client_gid;
++int grsec_socket_client_gid;
+int grsec_enable_socket_server;
-+kgid_t grsec_socket_server_gid;
++int grsec_socket_server_gid;
+int grsec_resource_logging;
+int grsec_disable_privio;
+int grsec_enable_log_rwxmaps;
@@ -70417,7 +69195,7 @@ index 0000000..a88e901
+#endif
+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
+ grsec_enable_group = 1;
-+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
++ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
+#endif
+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
+ grsec_enable_ptrace_readexec = 1;
@@ -70428,9 +69206,6 @@ index 0000000..a88e901
+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
+ grsec_enable_harden_ptrace = 1;
+#endif
-+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
-+ grsec_enable_harden_ipc = 1;
-+#endif
+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
+ grsec_enable_mount = 1;
+#endif
@@ -70515,26 +69290,26 @@ index 0000000..a88e901
+#endif
+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
+ grsec_enable_symlinkown = 1;
-+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
++ grsec_symlinkown_gid = CONFIG_GRKERNSEC_SYMLINKOWN_GID;
+#endif
+#ifdef CONFIG_GRKERNSEC_TPE
+ grsec_enable_tpe = 1;
-+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
++ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
+#ifdef CONFIG_GRKERNSEC_TPE_ALL
+ grsec_enable_tpe_all = 1;
+#endif
+#endif
+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
+ grsec_enable_socket_all = 1;
-+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
++ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
+#endif
+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
+ grsec_enable_socket_client = 1;
-+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
++ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
+#endif
+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
+ grsec_enable_socket_server = 1;
-+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
++ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
+#endif
+#endif
+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
@@ -70543,37 +69318,9 @@ index 0000000..a88e901
+
+ return;
+}
-diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
-new file mode 100644
-index 0000000..f365de0
---- /dev/null
-+++ b/grsecurity/grsec_ipc.c
-@@ -0,0 +1,22 @@
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/sched.h>
-+#include <linux/file.h>
-+#include <linux/ipc.h>
-+#include <linux/ipc_namespace.h>
-+#include <linux/grsecurity.h>
-+#include <linux/grinternal.h>
-+
-+int
-+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
-+{
-+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
-+ int write = (requested_mode & 00002);
-+
-+ if (grsec_enable_harden_ipc && !(requested_mode & ~granted_mode & 0007) && !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
-+ gr_log_str2_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", write ? "writ" : "read", GR_GLOBAL_UID(ipcp->cuid));
-+ return 0;
-+ }
-+#endif
-+ return 1;
-+}
diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
new file mode 100644
-index 0000000..5e05e20
+index 0000000..8598e7f
--- /dev/null
+++ b/grsecurity/grsec_link.c
@@ -0,0 +1,58 @@
@@ -70590,8 +69337,8 @@ index 0000000..5e05e20
+
+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
+ /* ignore root-owned links, e.g. /proc/self */
-+ gr_is_global_nonroot(link_inode->i_uid) && target &&
-+ !uid_eq(link_inode->i_uid, target->i_uid)) {
++ link_inode->i_uid && target &&
++ link_inode->i_uid != target->i_uid) {
+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
+ return 1;
+ }
@@ -70608,8 +69355,8 @@ index 0000000..5e05e20
+ const struct cred *cred = current_cred();
+
+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
-+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
-+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
++ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
++ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
+ return -EACCES;
+ }
@@ -70620,16 +69367,16 @@ index 0000000..5e05e20
+int
+gr_handle_hardlink(const struct dentry *dentry,
+ const struct vfsmount *mnt,
-+ struct inode *inode, const int mode, const struct filename *to)
++ struct inode *inode, const int mode, const char *to)
+{
+#ifdef CONFIG_GRKERNSEC_LINK
+ const struct cred *cred = current_cred();
+
-+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
++ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
-+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
-+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
++ !capable(CAP_FOWNER) && cred->uid) {
++ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
+ return -EPERM;
+ }
+#endif
@@ -70637,10 +69384,10 @@ index 0000000..5e05e20
+}
diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
new file mode 100644
-index 0000000..dbe0a6b
+index 0000000..56b5e9d
--- /dev/null
+++ b/grsecurity/grsec_log.c
-@@ -0,0 +1,341 @@
+@@ -0,0 +1,337 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/file.h>
@@ -70766,14 +69513,10 @@ index 0000000..dbe0a6b
+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, 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));
++ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
+ }
+
+ printk("%s\n", buf);
@@ -70807,7 +69550,7 @@ index 0000000..dbe0a6b
+ 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_nr(task), gr_parent_task_fullpath0(task), task->real_parent->comm, task_pid_nr(task->real_parent));
++ 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);
+ break;
+ case GR_SYSCTL_HIDDEN:
+ str1 = va_arg(ap, char *);
@@ -70885,7 +69628,7 @@ index 0000000..dbe0a6b
+ 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_nr(task));
++ 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);
+ break;
+ case GR_RESOURCE:
+ task = va_arg(ap, struct task_struct *);
@@ -70894,14 +69637,14 @@ index 0000000..dbe0a6b
+ 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_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_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);
+ 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_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_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);
+ break;
+ case GR_SIG:
+ str1 = va_arg(ap, char *);
@@ -70913,21 +69656,21 @@ index 0000000..dbe0a6b
+ 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_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));
++ 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);
+ 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_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);
++ 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);
+ 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_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);
++ 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);
+ break;
+ case GR_RWXMAP:
+ file = va_arg(ap, struct file *);
@@ -70968,7 +69711,7 @@ index 0000000..dbe0a6b
+ cred = __task_cred(task);
+ pcred = __task_cred(task->real_parent);
+
-+ 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));
++ 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);
+ }
+ break;
+ default:
@@ -71185,13 +69928,12 @@ index 0000000..f7f29aa
+}
diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
new file mode 100644
-index 0000000..4e29cc7
+index 0000000..3752208
--- /dev/null
+++ b/grsecurity/grsec_sig.c
-@@ -0,0 +1,246 @@
+@@ -0,0 +1,244 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
-+#include <linux/fs.h>
+#include <linux/delay.h>
+#include <linux/grsecurity.h>
+#include <linux/grinternal.h>
@@ -71210,7 +69952,7 @@ index 0000000..4e29cc7
+#ifdef CONFIG_GRKERNSEC_SIGNAL
+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
+ (sig == SIGABRT) || (sig == SIGBUS))) {
-+ if (task_pid_nr(t) == task_pid_nr(current)) {
++ if (t->pid == current->pid) {
+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
+ } else {
+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
@@ -71225,7 +69967,7 @@ index 0000000..4e29cc7
+{
+#ifdef CONFIG_GRKERNSEC
+ /* ignore the 0 signal for protected task checks */
-+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
++ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
+ return -EPERM;
+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
@@ -71282,7 +70024,7 @@ index 0000000..4e29cc7
+{
+#ifdef CONFIG_GRKERNSEC_BRUTE
+ struct task_struct *p = current;
-+ kuid_t uid = GLOBAL_ROOT_UID;
++ uid_t uid = 0;
+ int daemon = 0;
+
+ if (!grsec_enable_brute)
@@ -71299,7 +70041,7 @@ index 0000000..4e29cc7
+ const struct cred *cred = __task_cred(p), *cred2;
+ struct task_struct *tsk, *tsk2;
+
-+ if (!__get_dumpable(mm_flags) && gr_is_global_nonroot(cred->uid)) {
++ if (!__get_dumpable(mm_flags) && cred->uid) {
+ struct user_struct *user;
+
+ uid = cred->uid;
@@ -71316,7 +70058,7 @@ index 0000000..4e29cc7
+ /* only kill other threads of the same binary, from the same user */
+ do_each_thread(tsk2, tsk) {
+ cred2 = __task_cred(tsk);
-+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
++ if (tsk != p && cred2->uid == uid && gr_is_same_file(tsk->exec_file, p->exec_file))
+ gr_fake_force_sig(SIGKILL, tsk);
+ } while_each_thread(tsk2, tsk);
+ }
@@ -71326,8 +70068,8 @@ index 0000000..4e29cc7
+ read_unlock(&tasklist_lock);
+ rcu_read_unlock();
+
-+ if (gr_is_global_nonroot(uid))
-+ gr_log_fs_int2(GR_DONT_AUDIT, GR_BRUTE_SUID_MSG, p->exec_file->f_path.dentry, p->exec_file->f_path.mnt, GR_GLOBAL_UID(uid), GR_USER_BAN_TIME / 60);
++ if (uid)
++ gr_log_fs_int2(GR_DONT_AUDIT, GR_BRUTE_SUID_MSG, p->exec_file->f_path.dentry, p->exec_file->f_path.mnt, uid, GR_USER_BAN_TIME / 60);
+ else if (daemon)
+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
+
@@ -71356,22 +70098,21 @@ index 0000000..4e29cc7
+ const struct cred *cred;
+ struct task_struct *tsk, *tsk2;
+ struct user_struct *user;
-+ kuid_t uid;
++ uid_t uid;
+
+ if (in_irq() || in_serving_softirq() || in_nmi())
+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
+
+ uid = current_uid();
+
-+ if (gr_is_global_root(uid))
++ if (uid == 0)
+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
+ else {
+ /* kill all the processes of this user, hold a reference
+ to their creds struct, and prevent them from creating
+ another process until system reset
+ */
-+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
-+ GR_GLOBAL_UID(uid));
++ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
+ /* we intentionally leak this ref */
+ user = get_uid(current->cred->user);
+ if (user)
@@ -71381,7 +70122,7 @@ index 0000000..4e29cc7
+ read_lock(&tasklist_lock);
+ do_each_thread(tsk2, tsk) {
+ cred = __task_cred(tsk);
-+ if (uid_eq(cred->uid, uid))
++ if (cred->uid == uid)
+ gr_fake_force_sig(SIGKILL, tsk);
+ } while_each_thread(tsk2, tsk);
+ read_unlock(&tasklist_lock);
@@ -71429,7 +70170,7 @@ index 0000000..4e29cc7
+ if (suid_ban_expired(user))
+ return 0;
+ /* disallow execution of suid binaries only */
-+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
++ else if (bprm->cred->euid != current->cred->uid)
+ return -EPERM;
+ }
+#endif
@@ -71687,10 +70428,10 @@ index 0000000..4030d57
+}
diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
new file mode 100644
-index 0000000..8159888
+index 0000000..6314062
--- /dev/null
+++ b/grsecurity/grsec_sysctl.c
-@@ -0,0 +1,479 @@
+@@ -0,0 +1,468 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/sysctl.h>
@@ -71701,8 +70442,6 @@ index 0000000..8159888
+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
+{
+#ifdef CONFIG_GRKERNSEC_SYSCTL
-+ if (dirname == NULL || name == NULL)
-+ return 0;
+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
+ return -EACCES;
@@ -72130,15 +70869,6 @@ index 0000000..8159888
+ .proc_handler = &proc_dointvec,
+ },
+#endif
-+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
-+ {
-+ .procname = "harden_ipc",
-+ .data = &grsec_enable_harden_ipc,
-+ .maxlen = sizeof(int),
-+ .mode = 0600,
-+ .proc_handler = &proc_dointvec,
-+ },
-+#endif
+ {
+ .procname = "grsec_lock",
+ .data = &grsec_lock,
@@ -72194,7 +70924,7 @@ index 0000000..0dc13c3
+EXPORT_SYMBOL(gr_log_timechange);
diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
new file mode 100644
-index 0000000..ee57dcf
+index 0000000..07e0dc0
--- /dev/null
+++ b/grsecurity/grsec_tpe.c
@@ -0,0 +1,73 @@
@@ -72216,7 +70946,7 @@ index 0000000..ee57dcf
+ char *msg2 = NULL;
+
+ // never restrict root
-+ if (gr_is_global_root(cred->uid))
++ if (!cred->uid)
+ return 1;
+
+ if (grsec_enable_tpe) {
@@ -72237,7 +70967,7 @@ index 0000000..ee57dcf
+ if (!msg)
+ goto next_check;
+
-+ if (gr_is_global_nonroot(inode->i_uid))
++ if (inode->i_uid)
+ msg2 = "file in non-root-owned directory";
+ else if (inode->i_mode & S_IWOTH)
+ msg2 = "file in world-writable directory";
@@ -72256,7 +70986,7 @@ index 0000000..ee57dcf
+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
+ return 1;
+
-+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
++ if (inode->i_uid && (inode->i_uid != cred->uid))
+ msg = "directory not owned by user";
+ else if (inode->i_mode & S_IWOTH)
+ msg = "file in world-writable directory";
@@ -72720,10 +71450,10 @@ index b7babf0..04ad282 100644
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
-index 33bd2de..f31bff97 100644
+index e37963c..6f5b60b 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
-@@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
+@@ -158,7 +158,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
* Atomically clears the bits set in @mask from @v
*/
#ifndef atomic_clear_mask
@@ -72788,21 +71518,22 @@ index 0d68a1e..b74a761 100644
machine_restart(NULL);
}
diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
-index 90f99c7..00ce236 100644
+index 0232ccb..13d9165 100644
--- a/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
-@@ -2,9 +2,9 @@
- #define _ASM_GENERIC_KMAP_TYPES_H
-
- #ifdef __WITH_KM_FENCE
--# define KM_TYPE_NR 41
-+# define KM_TYPE_NR 42
- #else
--# define KM_TYPE_NR 20
-+# define KM_TYPE_NR 21
- #endif
+@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
+ KMAP_D(17) KM_NMI,
+ KMAP_D(18) KM_NMI_PTE,
+ KMAP_D(19) KM_KDB,
++KMAP_D(20) KM_CLEARPAGE,
+ /*
+ * Remember to update debug_kmap_atomic() when adding new kmap types!
+ */
+-KMAP_D(20) KM_TYPE_NR
++KMAP_D(21) KM_TYPE_NR
+ };
- #endif
+ #undef KMAP_D
diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
index 9ceb03b..62b0b8f 100644
--- a/include/asm-generic/local.h
@@ -72928,12 +71659,12 @@ index 810431d..0ec4804f 100644
* (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 f330d28..83ce28f 100644
+index bc00876..9aa9b1f 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
-@@ -737,6 +737,22 @@ static inline pmd_t pmd_mknuma(pmd_t pmd)
+@@ -530,6 +530,22 @@ static inline int pmd_trans_unstable(pmd_t *pmd)
+ #endif
}
- #endif /* CONFIG_NUMA_BALANCING */
+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
+#ifdef CONFIG_PAX_KERNEXEC
@@ -72954,36 +71685,98 @@ index f330d28..83ce28f 100644
#endif /* CONFIG_MMU */
#endif /* !__ASSEMBLY__ */
-diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
-index dc1269c..48a4f51 100644
---- a/include/asm-generic/uaccess.h
-+++ b/include/asm-generic/uaccess.h
-@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
- return __clear_user(to, n);
- }
+diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
+index 0dd4e87..af5d035 100644
+--- a/include/asm-generic/siginfo.h
++++ b/include/asm-generic/siginfo.h
+@@ -90,9 +90,18 @@ typedef struct siginfo {
+ __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
+ int _fd;
+ } _sigpoll;
++
++ /* SIGSYS */
++ struct {
++ void __user *_call_addr; /* calling user insn */
++ int _syscall; /* triggering system call number */
++ unsigned int _arch; /* AUDIT_ARCH_* of syscall */
++ } _sigsys;
+ } _sifields;
+ } siginfo_t;
+
++/* If the arch shares siginfo, then it has SIGSYS. */
++#define __ARCH_SIGSYS
+ #endif
-+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+#error UDEREF requires pax_open_userland
-+#else
-+static inline unsigned long pax_open_userland(void) { return 0; }
-+#endif
-+#endif
-+
-+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+#error UDEREF requires pax_close_userland
-+#else
-+static inline unsigned long pax_close_userland(void) { return 0; }
-+#endif
+ /*
+@@ -116,6 +125,11 @@ typedef struct siginfo {
+ #define si_addr_lsb _sifields._sigfault._addr_lsb
+ #define si_band _sifields._sigpoll._band
+ #define si_fd _sifields._sigpoll._fd
++#ifdef __ARCH_SIGSYS
++#define si_call_addr _sifields._sigsys._call_addr
++#define si_syscall _sifields._sigsys._syscall
++#define si_arch _sifields._sigsys._arch
+#endif
+
+ #ifdef __KERNEL__
+ #define __SI_MASK 0xffff0000u
+@@ -126,6 +140,7 @@ typedef struct siginfo {
+ #define __SI_CHLD (4 << 16)
+ #define __SI_RT (5 << 16)
+ #define __SI_MESGQ (6 << 16)
++#define __SI_SYS (7 << 16)
+ #define __SI_CODE(T,N) ((T) | ((N) & 0xffff))
+ #else
+ #define __SI_KILL 0
+@@ -135,6 +150,7 @@ typedef struct siginfo {
+ #define __SI_CHLD 0
+ #define __SI_RT 0
+ #define __SI_MESGQ 0
++#define __SI_SYS 0
+ #define __SI_CODE(T,N) (N)
+ #endif
+
+@@ -232,6 +248,12 @@ typedef struct siginfo {
+ #define NSIGPOLL 6
+
+ /*
++ * SIGSYS si_codes
++ */
++#define SYS_SECCOMP (__SI_SYS|1) /* seccomp triggered */
++#define NSIGSYS 1
+
- #endif /* __ASM_GENERIC_UACCESS_H */
++/*
+ * sigevent definitions
+ *
+ * It seems likely that SIGEV_THREAD will have to be handled from
+diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h
+index 5c122ae..a2c13dc 100644
+--- a/include/asm-generic/syscall.h
++++ b/include/asm-generic/syscall.h
+@@ -142,4 +142,18 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
+ unsigned int i, unsigned int n,
+ const unsigned long *args);
+
++/**
++ * syscall_get_arch - return the AUDIT_ARCH for the current system call
++ * @task: task of interest, must be in system call entry tracing
++ * @regs: task_pt_regs() of @task
++ *
++ * Returns the AUDIT_ARCH_* based on the system call convention in use.
++ *
++ * It's only valid to call this when @task is stopped on entry to a system
++ * call, due to %TIF_SYSCALL_TRACE, %TIF_SYSCALL_AUDIT, or %TIF_SECCOMP.
++ *
++ * Note, at present this function is only required with
++ * CONFIG_HAVE_ARCH_SECCOMP_FILTER.
++ */
++int syscall_get_arch(struct task_struct *task, struct pt_regs *regs);
+ #endif /* _ASM_SYSCALL_H */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index 83e2c31..eeb4a04 100644
+index b5e2e4c..6a5373e 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
-@@ -232,6 +232,7 @@
+@@ -217,6 +217,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
*(.rodata) *(.rodata.*) \
@@ -72991,7 +71784,7 @@ index 83e2c31..eeb4a04 100644
*(__vermagic) /* Kernel version magic */ \
. = ALIGN(8); \
VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
-@@ -715,17 +716,18 @@
+@@ -722,17 +723,18 @@
* section in the linker script will go there too. @phdr should have
* a leading colon.
*
@@ -73015,7 +71808,7 @@ index 83e2c31..eeb4a04 100644
/**
* 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
+index ecc721d..029cf5a 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -34,7 +34,7 @@ struct crypto_type {
@@ -73028,18 +71821,18 @@ index 418d270..bfd2794 100644
struct crypto_instance {
struct crypto_alg alg;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index b46fb45..b30d6d5 100644
+index bf4b2dc..2df6e61 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
-@@ -66,6 +66,7 @@
+@@ -72,6 +72,7 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
#include <asm/pgalloc.h>
+#include <asm/local.h>
- #include <drm/drm.h>
- #include <drm/drm_sarea.h>
- #include <drm/drm_vma_manager.h>
-@@ -277,10 +278,12 @@ do { \
+ #include "drm.h"
+
+ #include <linux/idr.h>
+@@ -284,10 +285,12 @@ do { \
* \param cmd command.
* \param arg argument.
*/
@@ -73054,20 +71847,19 @@ index b46fb45..b30d6d5 100644
unsigned long arg);
#define DRM_IOCTL_NR(n) _IOC_NR(n)
-@@ -296,10 +299,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
+@@ -302,9 +305,9 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
struct drm_ioctl_desc {
unsigned int cmd;
int flags;
- drm_ioctl_t *func;
+ drm_ioctl_t func;
unsigned int cmd_drv;
- const char *name;
-};
+} __do_const;
/**
* Creates a driver or general drm_ioctl_desc array entry for the given
-@@ -1027,7 +1030,7 @@ struct drm_info_list {
+@@ -965,7 +968,7 @@ struct drm_info_list {
int (*show)(struct seq_file*, void*); /** show callback */
u32 driver_features; /**< Required driver features for this entry */
void *data;
@@ -73076,7 +71868,7 @@ index b46fb45..b30d6d5 100644
/**
* debugfs node structure. This structure represents a debugfs file.
-@@ -1098,7 +1101,7 @@ struct drm_device {
+@@ -1038,7 +1041,7 @@ struct drm_device {
/** \name Usage Counters */
/*@{ */
@@ -73085,7 +71877,7 @@ index b46fb45..b30d6d5 100644
atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
atomic_t vma_count; /**< Outstanding vma areas open */
int buf_use; /**< Buffers in use -- cannot alloc */
-@@ -1109,7 +1112,7 @@ struct drm_device {
+@@ -1049,7 +1052,7 @@ struct drm_device {
/*@{ */
unsigned long counters;
enum drm_stat_type types[15];
@@ -73095,36 +71887,45 @@ index b46fb45..b30d6d5 100644
struct list_head filelist;
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index f43d556..94d9343 100644
+index 73b0712..2e581af 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
-@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
+@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
struct drm_connector *connector);
/* disable encoder when not in use - more explicit than dpms off */
void (*disable)(struct drm_encoder *encoder);
-};
+} __no_const;
- /**
- * drm_connector_helper_funcs - helper operations for connectors
-diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
-index 8a10f5c..5de7f5c 100644
---- a/include/drm/i915_pciids.h
-+++ b/include/drm/i915_pciids.h
-@@ -37,7 +37,7 @@
- */
- #define INTEL_VGA_DEVICE(id, info) { \
- 0x8086, id, \
-- ~0, ~0, \
-+ PCI_ANY_ID, PCI_ANY_ID, \
- 0x030000, 0xff0000, \
- (unsigned long) info }
+ struct drm_connector_helper_funcs {
+ int (*get_modes)(struct drm_connector *connector);
+diff --git a/include/drm/drm_mem_util.h b/include/drm/drm_mem_util.h
+index 6bd325f..19a2404 100644
+--- a/include/drm/drm_mem_util.h
++++ b/include/drm/drm_mem_util.h
+@@ -31,7 +31,7 @@
+
+ static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
+ {
+- if (size != 0 && nmemb > ULONG_MAX / size)
++ if (size != 0 && nmemb > SIZE_MAX / size)
+ return NULL;
+ if (size * nmemb <= PAGE_SIZE)
+@@ -44,7 +44,7 @@ static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
+ /* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */
+ static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size)
+ {
+- if (size != 0 && nmemb > ULONG_MAX / size)
++ if (size != 0 && nmemb > SIZE_MAX / size)
+ return NULL;
+
+ if (size * nmemb <= PAGE_SIZE)
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
-index 72dcbe8..8db58d7 100644
+index 26c1f78..6722682 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
-@@ -48,7 +48,7 @@
+@@ -47,7 +47,7 @@
struct ttm_mem_shrink {
int (*do_shrink) (struct ttm_mem_shrink *);
@@ -73133,24 +71934,42 @@ index 72dcbe8..8db58d7 100644
/**
* struct ttm_mem_global - Global memory accounting structure.
-diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
-index 4b840e8..155d235 100644
---- a/include/keys/asymmetric-subtype.h
-+++ b/include/keys/asymmetric-subtype.h
-@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
- /* Verify the signature on a key of this subtype (optional) */
- int (*verify_signature)(const struct key *key,
- const struct public_key_signature *sig);
--};
-+} __do_const;
+diff --git a/include/linux/Kbuild b/include/linux/Kbuild
+index a3ce901..fd50c75 100644
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -329,6 +329,7 @@ header-y += scc.h
+ header-y += sched.h
+ header-y += screen_info.h
+ header-y += sdla.h
++header-y += seccomp.h
+ header-y += securebits.h
+ header-y += selinux_netlink.h
+ header-y += sem.h
+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 */
+ };
- /**
- * asymmetric_key_subtype - Get the subtype from an asymmetric key
++/* 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 c1da539..1dcec55 100644
+index 49a83ca..d0a847e 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
-@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
+@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
struct k_atm_aal_stats {
@@ -73159,7 +71978,7 @@ index c1da539..1dcec55 100644
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
+@@ -406,7 +406,7 @@ struct atmdev_ops { /* only send is required */
int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
struct module *owner;
@@ -73169,24 +71988,62 @@ index c1da539..1dcec55 100644
struct atmphy_ops {
int (*start)(struct atm_dev *dev);
diff --git a/include/linux/audit.h b/include/linux/audit.h
-index 729a4d1..9b304ae 100644
+index 2f81c6f..225b4e4 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
-@@ -193,7 +193,7 @@ static inline void audit_ptrace(struct task_struct *t)
- extern unsigned int audit_serial(void);
- extern int auditsc_get_stamp(struct audit_context *ctx,
- struct timespec *t, unsigned int *serial);
--extern int audit_set_loginuid(kuid_t loginuid);
-+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
+@@ -430,6 +430,7 @@ extern void audit_putname(const char *name);
+ extern void __audit_inode(const char *name, const struct dentry *dentry);
+ extern void __audit_inode_child(const struct dentry *dentry,
+ const struct inode *parent);
++extern void __audit_seccomp(unsigned long syscall, long signr, int code);
+ extern void __audit_ptrace(struct task_struct *t);
- static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
+ static inline int audit_dummy_context(void)
+@@ -453,6 +454,12 @@ static inline void audit_inode_child(const struct dentry *dentry,
+ }
+ void audit_core_dumps(long signr);
+
++static inline void audit_seccomp(unsigned long syscall, long signr, int code)
++{
++ if (unlikely(!audit_dummy_context()))
++ __audit_seccomp(syscall, signr, code);
++}
++
+ static inline void audit_ptrace(struct task_struct *t)
{
+ if (unlikely(!audit_dummy_context()))
+@@ -558,6 +565,8 @@ extern int audit_signals;
+ #define audit_inode(n,d) do { (void)(d); } while (0)
+ #define audit_inode_child(i,p) do { ; } while (0)
+ #define audit_core_dumps(i) do { ; } while (0)
++#define audit_seccomp(i,s,c) do { ; } while (0)
++#define __audit_seccomp(i,s,c) do { ; } while (0)
+ #define auditsc_get_stamp(c,t,s) (0)
+ #define audit_get_loginuid(t) (-1)
+ #define audit_get_sessionid(t) (-1)
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
-index e8112ae..05b8e7f 100644
+index acd8d4b..f2defe2 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
-@@ -73,8 +73,10 @@ struct linux_binfmt {
- int (*load_binary)(struct linux_binprm *);
+@@ -18,7 +18,7 @@ struct pt_regs;
+ #define BINPRM_BUF_SIZE 128
+
+ #ifdef __KERNEL__
+-#include <linux/list.h>
++#include <linux/sched.h>
+
+ #define CORENAME_MAX_SIZE 128
+
+@@ -58,6 +58,7 @@ struct linux_binprm {
+ unsigned interp_flags;
+ unsigned interp_data;
+ unsigned long loader, exec;
++ char tcomm[TASK_COMM_LEN];
+ };
+
+ #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
+@@ -86,8 +87,10 @@ 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);
+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
@@ -73195,13 +72052,13 @@ index e8112ae..05b8e7f 100644
-};
+} __do_const;
- extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
+ extern int __register_binfmt(struct linux_binfmt *fmt, int insert);
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
-index a3b6b82..cd8f69c 100644
+index fc8a3ff..e48401e 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
-@@ -91,7 +91,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
+@@ -74,7 +74,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
* @word: value to rotate
* @shift: bits to roll
*/
@@ -73210,7 +72067,7 @@ index a3b6b82..cd8f69c 100644
{
return (word << shift) | (word >> (32 - shift));
}
-@@ -101,7 +101,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
+@@ -84,7 +84,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
* @word: value to rotate
* @shift: bits to roll
*/
@@ -73220,10 +72077,10 @@ index a3b6b82..cd8f69c 100644
return (word >> shift) | (word << (32 - shift));
}
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index 0e6f765..885bb2b 100644
+index ff039f0..cdf89ae 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
-@@ -1537,7 +1537,7 @@ struct block_device_operations {
+@@ -1316,7 +1316,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;
@@ -73233,10 +72090,10 @@ index 0e6f765..885bb2b 100644
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 7c2e030..b72475d 100644
+index 4d1a074..88f929a 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
-@@ -23,7 +23,7 @@ struct blk_trace {
+@@ -162,7 +162,7 @@ struct blk_trace {
struct dentry *dir;
struct dentry *dropped_file;
struct dentry *msg_file;
@@ -73245,6 +72102,76 @@ index 7c2e030..b72475d 100644
};
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..46fe38f 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)
++static inline __u64 __intentional_overflow(-1) __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)
++static inline __u32 __intentional_overflow(-1) __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..40346da 100644
--- a/include/linux/cache.h
@@ -73265,28 +72192,31 @@ index 4c57065..40346da 100644
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
diff --git a/include/linux/capability.h b/include/linux/capability.h
-index a6ee1f9..e1ca49d 100644
+index a63d13d..f15d415 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
-@@ -212,8 +212,13 @@ extern bool capable(int cap);
+@@ -548,10 +548,16 @@ extern bool capable(int cap);
extern bool ns_capable(struct user_namespace *ns, int cap);
- extern bool inode_capable(const struct inode *inode, int cap);
- extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
-+extern bool capable_nolog(int cap);
+ extern bool task_ns_capable(struct task_struct *t, int cap);
+ extern bool nsown_capable(int cap);
++extern bool task_ns_capable_nolog(struct task_struct *t, int cap);
+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
-+extern bool inode_capable_nolog(const struct inode *inode, int cap);
++extern bool capable_nolog(int cap);
/* audit system wants to get cap info from files as well */
extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
+extern int is_privileged_binary(const struct dentry *dentry);
++extern int is_root_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
+index 35eae4b..5673e99 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
-@@ -87,7 +87,6 @@ struct cdrom_device_ops {
+@@ -985,7 +985,6 @@ struct cdrom_device_ops {
/* driver specifications */
const int capability; /* capability flags */
@@ -73295,68 +72225,48 @@ index 8609d57..86e4d79 100644
int (*generic_packet) (struct cdrom_device_info *,
struct packet_command *);
diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
-index 4ce9056..86caac6 100644
+index 04ffb2e..6799180 100644
--- a/include/linux/cleancache.h
+++ b/include/linux/cleancache.h
@@ -31,7 +31,7 @@ struct cleancache_ops {
- void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
- void (*invalidate_inode)(int, struct cleancache_filekey);
- void (*invalidate_fs)(int);
+ void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
+ void (*flush_inode)(int, struct cleancache_filekey);
+ void (*flush_fs)(int);
-};
+} __no_const;
- extern struct cleancache_ops *
+ 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 73bdb69..d66d47a 100644
---- a/include/linux/clk-provider.h
-+++ b/include/linux/clk-provider.h
-@@ -141,6 +141,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/compat.h b/include/linux/compat.h
-index 345da00..b6eff26 100644
+index d42bd48..554dcd5 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
-@@ -313,7 +313,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
- compat_size_t __user *len_ptr);
-
- asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
--asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
-+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
- asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
- asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
- compat_ssize_t msgsz, int msgflg);
-@@ -420,7 +420,7 @@ extern int compat_ptrace_request(struct task_struct *child,
+@@ -240,7 +240,7 @@ long compat_sys_msgrcv(int first, int second, int msgtyp, int third,
+ int version, void __user *uptr);
+ long compat_sys_msgctl(int first, int second, void __user *uptr);
+ long compat_sys_shmat(int first, int second, compat_uptr_t third, int version,
+- void __user *uptr);
++ void __user *uptr) __intentional_overflow(0);
+ long compat_sys_shmctl(int first, int second, void __user *uptr);
+ long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
+ unsigned nsems, const struct compat_timespec __user *timeout);
+@@ -334,7 +334,7 @@ extern int compat_ptrace_request(struct task_struct *child,
extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
compat_ulong_t addr, compat_ulong_t data);
asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
- compat_long_t addr, compat_long_t data);
+ compat_ulong_t addr, compat_ulong_t data);
- asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t);
/*
+ * epoll (fs/eventpoll.c) compat bits follow ...
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
-index ded4299..da50e3b 100644
+index dfadc96..23c5182 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
-@@ -39,9 +39,29 @@
- # define __compiletime_warning(message) __attribute__((warning(message)))
- # define __compiletime_error(message) __attribute__((error(message)))
- #endif /* __CHECKER__ */
-+
-+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
-+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
-+#define __bos0(ptr) __bos((ptr), 0)
-+#define __bos1(ptr) __bos((ptr), 1)
- #endif /* GCC_VERSION >= 40300 */
+@@ -31,6 +31,21 @@
- #if GCC_VERSION >= 40500
+
+ #if __GNUC_MINOR__ >= 5
+
+#ifdef CONSTIFY_PLUGIN
+#define __no_const __attribute__((no_const))
@@ -73375,11 +72285,23 @@ index ded4299..da50e3b 100644
/*
* Mark a position in code as unreachable. This can be used to
* suppress control flow warnings after asm blocks that transfer
+@@ -46,6 +61,11 @@
+ #define __noclone __attribute__((__noclone__))
+
+ #endif
++
++#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
++#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
++#define __bos0(ptr) __bos((ptr), 0)
++#define __bos1(ptr) __bos((ptr), 1)
+ #endif
+
+ #if __GNUC_MINOR__ > 0
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
-index 92669cd..1771a15 100644
+index 320d6c9..2d1df6b 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
-@@ -5,11 +5,14 @@
+@@ -5,31 +5,51 @@
#ifdef __CHECKER__
# define __user __attribute__((noderef, address_space(1)))
@@ -73391,10 +72313,9 @@ index 92669cd..1771a15 100644
# define __nocast __attribute__((nocast))
# define __iomem __attribute__((noderef, address_space(2)))
+# define __force_iomem __force __iomem
- # define __must_hold(x) __attribute__((context(x,1,1)))
# define __acquires(x) __attribute__((context(x,0,1)))
# define __releases(x) __attribute__((context(x,1,0)))
-@@ -17,20 +20,37 @@
+ # define __acquire(x) __context__(x,1)
# define __release(x) __context__(x,-1)
# define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
# define __percpu __attribute__((noderef, address_space(3)))
@@ -73434,7 +72355,7 @@ index 92669cd..1771a15 100644
# define __chk_user_ptr(x) (void)0
# define __chk_io_ptr(x) (void)0
# define __builtin_warning(x, y...) (1)
-@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
+@@ -39,7 +59,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
# define __release(x) (void)0
# define __cond_lock(x,c) (c)
# define __percpu
@@ -73443,8 +72364,8 @@ index 92669cd..1771a15 100644
+# define __force_rcu
#endif
- /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
-@@ -275,6 +297,26 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+ #ifdef __KERNEL__
+@@ -264,6 +286,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
# define __attribute_const__ /* unimplemented */
#endif
@@ -73460,10 +72381,6 @@ index 92669cd..1771a15 100644
+# define __size_overflow(...)
+#endif
+
-+#ifndef __intentional_overflow
-+# define __intentional_overflow(...)
-+#endif
-+
+#ifndef __latent_entropy
+# define __latent_entropy
+#endif
@@ -73471,7 +72388,7 @@ index 92669cd..1771a15 100644
/*
* Tell gcc if a function is cold. The compiler will assume any path
* directly leading to the call is unlikely.
-@@ -284,6 +326,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+@@ -273,6 +311,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
#define __cold
#endif
@@ -73494,7 +72411,26 @@ index 92669cd..1771a15 100644
/* Simple shorthand for a section definition */
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
-@@ -349,7 +407,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+@@ -292,6 +346,18 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+ #endif
+ #ifndef __compiletime_error
+ # define __compiletime_error(message)
++# define __compiletime_error_fallback(condition) \
++ do { ((void)sizeof(char[1 - 2*!!(condition)])); } while (0)
++#else
++# define __compiletime_error_fallback(condition) do { } while (0)
++#endif
++
++#ifndef __size_overflow
++# define __size_overflow(...)
++#endif
++
++#ifndef __intentional_overflow
++# define __intentional_overflow(...)
+ #endif
+
+ /*
+@@ -306,6 +372,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
* use is to mediate communication between process-level code and irq/NMI
* handlers, all running on the same CPU.
*/
@@ -73502,16 +72438,15 @@ index 92669cd..1771a15 100644
+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
- /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
- #ifdef CONFIG_KPROBES
+ #endif /* __LINUX_COMPILER_H */
diff --git a/include/linux/completion.h b/include/linux/completion.h
-index 3cd574d..240dcb0 100644
+index 51494e6..340575ab 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
-@@ -78,16 +78,16 @@ static inline void init_completion(struct completion *x)
+@@ -77,14 +77,14 @@ static inline void init_completion(struct completion *x)
+ }
extern void wait_for_completion(struct completion *);
- extern void wait_for_completion_io(struct completion *);
-extern int wait_for_completion_interruptible(struct completion *x);
-extern int wait_for_completion_killable(struct completion *x);
+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
@@ -73519,9 +72454,6 @@ index 3cd574d..240dcb0 100644
extern unsigned long wait_for_completion_timeout(struct completion *x,
- unsigned long timeout);
+ unsigned long timeout) __intentional_overflow(-1);
- extern unsigned long wait_for_completion_io_timeout(struct completion *x,
-- unsigned long timeout);
-+ unsigned long timeout) __intentional_overflow(-1);
extern long wait_for_completion_interruptible_timeout(
- struct completion *x, unsigned long timeout);
+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
@@ -73532,31 +72464,36 @@ index 3cd574d..240dcb0 100644
extern bool completion_done(struct completion *x);
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
-index 34025df..d94bbbc 100644
+index 3081c58..7714c00 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -125,7 +125,7 @@ struct configfs_attribute {
const char *ca_name;
struct module *ca_owner;
- umode_t ca_mode;
+ mode_t ca_mode;
-};
+} __do_const;
/*
* Users often need to create attribute structures for their configurable
+diff --git a/include/linux/cpu.h b/include/linux/cpu.h
+index 9c3e071..8a8ebea 100644
+--- a/include/linux/cpu.h
++++ b/include/linux/cpu.h
+@@ -108,7 +108,7 @@ enum {
+ /* Need to know about CPUs going up/down? */
+ #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)
+ #define cpu_notifier(fn, pri) { \
+- static struct notifier_block fn##_nb __cpuinitdata = \
++ static struct notifier_block fn##_nb = \
+ { .notifier_call = fn, .priority = pri }; \
+ register_cpu_notifier(&fn##_nb); \
+ }
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index fcabc42..cba5d93 100644
+index 6216115..68bf1d0 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
-@@ -167,6 +167,7 @@ struct global_attr {
- ssize_t (*store)(struct kobject *a, struct attribute *b,
- const char *c, size_t count);
- };
-+typedef struct global_attr __no_const global_attr_no_const;
-
- #define define_one_global_ro(_name) \
- static struct global_attr _name = \
-@@ -208,7 +209,7 @@ struct cpufreq_driver {
+@@ -236,7 +236,7 @@ struct cpufreq_driver {
int (*suspend) (struct cpufreq_policy *policy);
int (*resume) (struct cpufreq_policy *policy);
struct freq_attr **attr;
@@ -73564,22 +72501,30 @@ index fcabc42..cba5d93 100644
+} __do_const;
/* flags */
- #define CPUFREQ_STICKY 0x01 /* the driver isn't removed even if
+
+@@ -295,6 +295,7 @@ struct global_attr {
+ ssize_t (*store)(struct kobject *a, struct attribute *b,
+ const char *c, size_t count);
+ };
++typedef struct global_attr __no_const global_attr_no_const;
+
+ #define define_one_global_ro(_name) \
+ static struct global_attr _name = \
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
-index 781addc..d1e1fe6 100644
+index 7408af8..8d6f9dd 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
-@@ -50,7 +50,8 @@ struct cpuidle_state {
+@@ -49,7 +49,8 @@ struct cpuidle_state {
+ int (*enter) (struct cpuidle_device *dev,
+ struct cpuidle_driver *drv,
int index);
-
- int (*enter_dead) (struct cpuidle_device *dev, int index);
-};
+} __do_const;
+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
/* Idle State Flags */
#define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
-@@ -192,7 +193,7 @@ struct cpuidle_governor {
+@@ -181,7 +182,7 @@ struct cpuidle_governor {
void (*reflect) (struct cpuidle_device *dev, int index);
struct module *owner;
@@ -73589,10 +72534,10 @@ index 781addc..d1e1fe6 100644
#ifdef CONFIG_CPU_IDLE
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
-index d08e4d2..95fad61 100644
+index 4f7a632..b9e6f95 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
-@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
+@@ -117,17 +117,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
}
/* Valid inputs for n are -1 and 0. */
@@ -73613,7 +72558,7 @@ index d08e4d2..95fad61 100644
const struct cpumask *srcp,
const struct cpumask *andp)
{
-@@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
+@@ -166,7 +166,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
*
* Returns >= nr_cpu_ids if no further cpus set.
*/
@@ -73622,7 +72567,7 @@ index d08e4d2..95fad61 100644
{
/* -1 is a legal arg here. */
if (n != -1)
-@@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
+@@ -181,7 +181,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
*
* Returns >= nr_cpu_ids if no further cpus unset.
*/
@@ -73631,7 +72576,7 @@ index d08e4d2..95fad61 100644
{
/* -1 is a legal arg here. */
if (n != -1)
-@@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
+@@ -189,7 +189,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
}
@@ -73641,10 +72586,10 @@ index d08e4d2..95fad61 100644
/**
diff --git a/include/linux/cred.h b/include/linux/cred.h
-index 04421e8..6bce4ef 100644
+index 4030896..8d6f342 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
-@@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
+@@ -207,6 +207,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
static inline void validate_process_creds(void)
{
}
@@ -73655,10 +72600,10 @@ index 04421e8..6bce4ef 100644
/**
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
-index b92eadf..b4ecdc1 100644
+index 8a94217..15d49e3 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
-@@ -373,7 +373,7 @@ struct cipher_tfm {
+@@ -365,7 +365,7 @@ struct cipher_tfm {
const u8 *key, unsigned int keylen);
void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
@@ -73667,7 +72612,7 @@ index b92eadf..b4ecdc1 100644
struct hash_tfm {
int (*init)(struct hash_desc *desc);
-@@ -394,13 +394,13 @@ struct compress_tfm {
+@@ -386,13 +386,13 @@ struct compress_tfm {
int (*cot_decompress)(struct crypto_tfm *tfm,
const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen);
@@ -73684,7 +72629,7 @@ index b92eadf..b4ecdc1 100644
#define crt_ablkcipher crt_u.ablkcipher
#define crt_aead crt_u.aead
diff --git a/include/linux/ctype.h b/include/linux/ctype.h
-index 653589e..4ef254a 100644
+index 8acfe31..6ffccd63 100644
--- a/include/linux/ctype.h
+++ b/include/linux/ctype.h
@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
@@ -73710,32 +72655,23 @@ index 7925bf0..d5143d2 100644
#define large_malloc(a) vmalloc(a)
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
-index 5f1ab92..39c35ae 100644
+index 98ce812..9afa76d 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
-@@ -114,7 +114,7 @@ struct devfreq_governor {
- int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
- int (*event_handler)(struct devfreq *devfreq,
- unsigned int event, void *data);
+@@ -100,7 +100,7 @@ struct devfreq_governor {
+ int (*init)(struct devfreq *this);
+ void (*exit)(struct devfreq *this);
+ const bool no_central_polling;
-};
+} __do_const;
/**
* struct devfreq - Device devfreq structure
diff --git a/include/linux/device.h b/include/linux/device.h
-index 2a9d6ed..d14551e3 100644
+index 3136ede..9a589c5 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -313,7 +313,7 @@ struct subsys_interface {
- struct list_head node;
- int (*add_dev)(struct device *dev, struct subsys_interface *sif);
- int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
--};
-+} __do_const;
-
- int subsys_interface_register(struct subsys_interface *sif);
- void subsys_interface_unregister(struct subsys_interface *sif);
-@@ -501,7 +501,7 @@ struct device_type {
+@@ -427,7 +427,7 @@ struct device_type {
void (*release)(struct device *dev);
const struct dev_pm_ops *pm;
@@ -73744,25 +72680,19 @@ index 2a9d6ed..d14551e3 100644
/* interface for exporting device attributes */
struct device_attribute {
-@@ -511,11 +511,12 @@ struct device_attribute {
+@@ -437,6 +437,7 @@ struct device_attribute {
ssize_t (*store)(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count);
};
+typedef struct device_attribute __no_const device_attribute_no_const;
- struct dev_ext_attribute {
- struct device_attribute attr;
- void *var;
--};
-+} __do_const;
-
- ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
- char *buf);
+ #define DEVICE_ATTR(_name, _mode, _show, _store) \
+ struct device_attribute dev_attr_##_name = __ATTR(_name, _mode, _show, _store)
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index 3a8d0a2..c762be2 100644
+index e13117c..e9fc938 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
-@@ -54,7 +54,7 @@ struct dma_map_ops {
+@@ -46,7 +46,7 @@ struct dma_map_ops {
u64 (*get_required_mask)(struct device *dev);
#endif
int is_phys;
@@ -73772,10 +72702,10 @@ index 3a8d0a2..c762be2 100644
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
-index 0bc7275..4ccbf11 100644
+index 75f53f8..5c7972d 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
-@@ -1078,9 +1078,9 @@ struct dma_pinned_list {
+@@ -881,9 +881,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);
@@ -73788,10 +72718,10 @@ index 0bc7275..4ccbf11 100644
unsigned int offset, size_t len);
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 5f8f176..62a0556 100644
+index 88c953d..48685de 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
-@@ -745,6 +745,7 @@ struct efivar_operations {
+@@ -486,6 +486,7 @@ struct efivar_operations {
efi_set_variable_t *set_variable;
efi_query_variable_store_t *query_variable_store;
};
@@ -73800,10 +72730,66 @@ index 5f8f176..62a0556 100644
struct efivars {
/*
diff --git a/include/linux/elf.h b/include/linux/elf.h
-index 40a3c0e..4c45a38 100644
+index 31f0508..5421c01 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
-@@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
+@@ -49,6 +49,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
+@@ -106,6 +117,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
+@@ -252,6 +265,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;
+@@ -344,6 +370,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'
+@@ -423,6 +451,7 @@ extern Elf32_Dyn _DYNAMIC [];
#define elf_note elf32_note
#define elf_addr_t Elf32_Off
#define Elf_Half Elf32_Half
@@ -73811,7 +72797,7 @@ index 40a3c0e..4c45a38 100644
#else
-@@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
+@@ -433,6 +462,7 @@ extern Elf64_Dyn _DYNAMIC [];
#define elf_note elf64_note
#define elf_addr_t Elf64_Off
#define Elf_Half Elf64_Half
@@ -73820,7 +72806,7 @@ index 40a3c0e..4c45a38 100644
#endif
diff --git a/include/linux/err.h b/include/linux/err.h
-index 15f92e0..e825a8e 100644
+index f2edce2..cc2082c 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -19,12 +19,12 @@
@@ -73833,29 +72819,16 @@ index 15f92e0..e825a8e 100644
return (void *) error;
}
--static inline long __must_check PTR_ERR(__force const void *ptr)
-+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
+-static inline long __must_check PTR_ERR(const void *ptr)
++static inline long __must_check __intentional_overflow(-1) PTR_ERR(const void *ptr)
{
return (long) ptr;
}
-diff --git a/include/linux/extcon.h b/include/linux/extcon.h
-index fcb51c8..bdafcf6 100644
---- a/include/linux/extcon.h
-+++ b/include/linux/extcon.h
-@@ -134,7 +134,7 @@ struct extcon_dev {
- /* /sys/class/extcon/.../mutually_exclusive/... */
- struct attribute_group attr_g_muex;
- struct attribute **attrs_muex;
-- struct device_attribute *d_attrs_muex;
-+ device_attribute_no_const *d_attrs_muex;
- };
-
- /**
diff --git a/include/linux/fb.h b/include/linux/fb.h
-index ffac70a..ca3e711 100644
+index 73845ce..e5678a7 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
-@@ -304,7 +304,7 @@ struct fb_ops {
+@@ -691,7 +691,7 @@ struct fb_ops {
/* called at KDB enter and leave time to prepare the console */
int (*fb_debug_enter)(struct fb_info *info);
int (*fb_debug_leave)(struct fb_info *info);
@@ -73865,47 +72838,93 @@ index ffac70a..ca3e711 100644
#ifdef CONFIG_FB_TILEBLITTING
#define FB_TILE_CURSOR_NONE 0
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
-index 085197b..0fa6f0b 100644
+index 82163c4..c4b3b50 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
-@@ -95,7 +95,7 @@ struct files_struct *get_files_struct(struct task_struct *);
+@@ -101,7 +101,7 @@ struct files_struct *get_files_struct(struct task_struct *);
void put_files_struct(struct files_struct *fs);
void reset_files_struct(struct files_struct *);
int unshare_files(struct files_struct **);
-struct files_struct *dup_fd(struct files_struct *, int *);
+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
- void do_close_on_exec(struct files_struct *);
- int iterate_fd(struct files_struct *, unsigned,
- int (*)(const void *, struct file *, unsigned),
-diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
-index 8293262..2b3b8bd 100644
---- a/include/linux/frontswap.h
-+++ b/include/linux/frontswap.h
-@@ -11,7 +11,7 @@ struct frontswap_ops {
- int (*load)(unsigned, pgoff_t, struct page *);
- void (*invalidate_page)(unsigned, pgoff_t);
- void (*invalidate_area)(unsigned);
--};
-+} __no_const;
- extern bool frontswap_enabled;
- extern struct frontswap_ops *
+ extern struct kmem_cache *files_cachep;
+
+diff --git a/include/linux/filter.h b/include/linux/filter.h
+index 8eeb205..13d571c 100644
+--- a/include/linux/filter.h
++++ b/include/linux/filter.h
+@@ -10,6 +10,7 @@
+
+ #ifdef __KERNEL__
+ #include <linux/atomic.h>
++#include <linux/compat.h>
+ #endif
+
+ /*
+@@ -132,8 +133,19 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
+
+ #ifdef __KERNEL__
+
++#ifdef CONFIG_COMPAT
++/*
++ * A struct sock_filter is architecture independent.
++ */
++struct compat_sock_fprog {
++ u16 len;
++ compat_uptr_t filter; /* struct sock_filter * */
++};
++#endif
++
+ struct sk_buff;
+ struct sock;
++struct bpf_jit_work;
+
+ struct sk_filter
+ {
+@@ -141,6 +153,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);
++#ifdef CONFIG_BPF_JIT
++ struct bpf_jit_work *work;
++#endif
+ struct rcu_head rcu;
+ struct sock_filter insns[0];
+ };
+@@ -228,6 +243,7 @@ enum {
+ BPF_S_ANC_HATYPE,
+ BPF_S_ANC_RXHASH,
+ BPF_S_ANC_CPU,
++ BPF_S_ANC_SECCOMP_LD_W,
+ };
+
+ #endif /* __KERNEL__ */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 3f40547..46f76eb 100644
+index a276817..ba31358 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1552,7 +1552,8 @@ struct file_operations {
+@@ -1618,7 +1618,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);
- int (*show_fdinfo)(struct seq_file *m, struct file *f);
-};
+} __do_const;
+typedef struct file_operations __no_const file_operations_no_const;
struct inode_operations {
- struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
-@@ -2745,4 +2746,14 @@ static inline bool dir_relax(struct inode *inode)
- return !IS_DEADDIR(inode);
+ struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
+@@ -1885,6 +1886,8 @@ struct file_system_type {
+ struct lock_class_key i_mutex_dir_key;
+ };
+
++#define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME)
++
+ extern struct dentry *mount_ns(struct file_system_type *fs_type, int flags,
+ void *data, int (*fill_super)(struct super_block *, void *, int));
+ extern struct dentry *mount_bdev(struct file_system_type *fs_type,
+@@ -2716,5 +2719,15 @@ 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)
@@ -73918,9 +72937,10 @@ index 3f40547..46f76eb 100644
+#endif
+}
+
+ #endif /* __KERNEL__ */
#endif /* _LINUX_FS_H */
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
-index 0efc3e6..e0e1e5f 100644
+index 003dc0f..3c4ea97 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -6,7 +6,7 @@
@@ -73933,10 +72953,10 @@ index 0efc3e6..e0e1e5f 100644
seqcount_t seq;
int umask;
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
-index 7823e9e..56b6f2f 100644
+index ce31408..b1ad003 100644
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
-@@ -113,7 +113,7 @@ struct fscache_operation {
+@@ -102,7 +102,7 @@ struct fscache_operation {
fscache_operation_release_t release;
};
@@ -73945,17 +72965,17 @@ index 7823e9e..56b6f2f 100644
extern void fscache_op_work_func(struct work_struct *work);
extern void fscache_enqueue_operation(struct fscache_operation *);
-@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
+@@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
+ {
INIT_WORK(&op->work, fscache_op_work_func);
atomic_set(&op->usage, 1);
- op->state = FSCACHE_OP_ST_INITIALISED;
- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
op->processor = processor;
op->release = release;
INIT_LIST_HEAD(&op->pend_link);
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
-index 19b4645..3b73dfc 100644
+index 9ec20de..8007b8a 100644
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
@@ -152,7 +152,7 @@ struct fscache_cookie_def {
@@ -73968,11 +72988,11 @@ index 19b4645..3b73dfc 100644
/*
* fscache cached network filesystem type
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
-index 1c804b0..1432c2b 100644
+index 2a53f10..e3cd3e0 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
-@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
- struct inode *inode = file_inode(file);
+@@ -194,6 +194,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))
@@ -73981,8 +73001,8 @@ index 1c804b0..1432c2b 100644
if (S_ISDIR(inode->i_mode))
mask |= FS_ISDIR;
-@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
- struct inode *inode = file_inode(file);
+@@ -212,6 +215,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))
@@ -73991,7 +73011,7 @@ index 1c804b0..1432c2b 100644
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)
+@@ -314,7 +320,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)
{
@@ -74000,11 +73020,24 @@ index 1c804b0..1432c2b 100644
}
/*
+diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
+index 82924bf..1aa58e7 100644
+--- a/include/linux/ftrace_event.h
++++ b/include/linux/ftrace_event.h
+@@ -256,7 +256,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);
+
+-#define is_signed_type(type) (((type)(-1)) < 0)
++#define is_signed_type(type) (((type)(-1)) < (type)1)
+
+ int trace_set_clr_event(const char *system, const char *event, int set);
+
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
-index 9f3c275..8bdff5d 100644
+index 4eec461..4ff5db5 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
-@@ -194,7 +194,7 @@ struct gendisk {
+@@ -185,7 +185,7 @@ struct gendisk {
struct kobject *slave_dir;
struct timer_rand_state *random;
@@ -74013,7 +73046,7 @@ index 9f3c275..8bdff5d 100644
struct disk_events *ev;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
+@@ -420,7 +420,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
/* drivers/char/random.c */
@@ -74022,55 +73055,41 @@ index 9f3c275..8bdff5d 100644
extern void rand_initialize_disk(struct gendisk *disk);
static inline sector_t get_start_sect(struct block_device *bdev)
-diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
-index 023bc34..b02b46a 100644
---- a/include/linux/genl_magic_func.h
-+++ b/include/linux/genl_magic_func.h
-@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
- },
-
- #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
--static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
-+static struct genl_ops ZZZ_genl_ops[] = {
- #include GENL_MAGIC_INCLUDE_FILE
- };
-
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
-index 9b4dd49..61fd41d 100644
+index 3a76faf..c0592c7 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
-@@ -35,6 +35,13 @@ struct vm_area_struct;
+@@ -37,6 +37,12 @@ struct vm_area_struct;
#define ___GFP_NO_KSWAPD 0x400000u
#define ___GFP_OTHER_NODE 0x800000u
- #define ___GFP_WRITE 0x1000000u
-+
+
+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+#define ___GFP_USERCOPY 0x2000000u
++#define ___GFP_USERCOPY 0x1000000u
+#else
+#define ___GFP_USERCOPY 0
+#endif
+
- /* If the above are modified, __GFP_BITS_SHIFT may need updating */
-
/*
-@@ -92,6 +99,7 @@ struct vm_area_struct;
+ * GFP bitmasks..
+ *
+@@ -85,6 +91,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_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
- #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
/*
* This may seem redundant, but it's a way of annotating false positives vs.
-@@ -99,7 +107,7 @@ struct vm_area_struct;
+@@ -92,7 +99,7 @@ struct vm_area_struct;
*/
#define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
--#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
-+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
+-#define __GFP_BITS_SHIFT 24 /* Room for N __GFP_FOO bits */
++#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
/* This equals 0, but use constants in case they ever change */
-@@ -153,6 +161,8 @@ struct vm_area_struct;
+@@ -146,6 +153,8 @@ struct vm_area_struct;
/* 4GB DMA on some platforms */
#define GFP_DMA32 __GFP_DMA32
@@ -74750,10 +73769,10 @@ index 0000000..be66033
+#endif
diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
new file mode 100644
-index 0000000..d25522e
+index 0000000..44d8215
--- /dev/null
+++ b/include/linux/grinternal.h
-@@ -0,0 +1,229 @@
+@@ -0,0 +1,236 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
+
@@ -74816,18 +73835,18 @@ index 0000000..d25522e
+extern int grsec_enable_chroot_sysctl;
+extern int grsec_enable_chroot_unix;
+extern int grsec_enable_symlinkown;
-+extern kgid_t grsec_symlinkown_gid;
++extern int grsec_symlinkown_gid;
+extern int grsec_enable_tpe;
-+extern kgid_t grsec_tpe_gid;
++extern int grsec_tpe_gid;
+extern int grsec_enable_tpe_all;
+extern int grsec_enable_tpe_invert;
+extern int grsec_enable_socket_all;
-+extern kgid_t grsec_socket_all_gid;
++extern int grsec_socket_all_gid;
+extern int grsec_enable_socket_client;
-+extern kgid_t grsec_socket_client_gid;
++extern int grsec_socket_client_gid;
+extern int grsec_enable_socket_server;
-+extern kgid_t grsec_socket_server_gid;
-+extern kgid_t grsec_audit_gid;
++extern int grsec_socket_server_gid;
++extern int grsec_audit_gid;
+extern int grsec_enable_group;
+extern int grsec_enable_log_rwxmaps;
+extern int grsec_enable_mount;
@@ -74836,7 +73855,6 @@ index 0000000..d25522e
+extern int grsec_enable_blackhole;
+extern int grsec_lastack_retries;
+extern int grsec_enable_brute;
-+extern int grsec_enable_harden_ipc;
+extern int grsec_lock;
+
+extern spinlock_t grsec_alert_lock;
@@ -74849,24 +73867,32 @@ index 0000000..d25522e
+
+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
-+ (tsk)->exec_file->f_path.mnt) : "/")
++ (tsk)->exec_file->f_vfsmnt) : "/")
+
+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
-+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
++ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
+
+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
-+ (tsk)->exec_file->f_path.mnt) : "/")
++ (tsk)->exec_file->f_vfsmnt) : "/")
+
+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
-+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
++ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
+
+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
+
+#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
++
+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
+{
+ if (file1 && file2) {
@@ -74985,10 +74011,10 @@ index 0000000..d25522e
+#endif
diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
new file mode 100644
-index 0000000..378a81a
+index 0000000..a4396b5
--- /dev/null
+++ b/include/linux/grmsg.h
-@@ -0,0 +1,114 @@
+@@ -0,0 +1,113 @@
+#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 "
@@ -75102,13 +74128,12 @@ index 0000000..378a81a
+#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 "
+#define GR_BRUTE_SUID_MSG "bruteforce prevention initiated due to crash of %.950s against uid %u, banning suid/sgid execs for %u minutes. Please investigate the crash report for "
-+#define GR_IPC_DENIED_MSG "denied %s of globally-%sable IPC with creator uid %u by "
diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
new file mode 100644
-index 0000000..b2edfb1
+index 0000000..1a80e7d
--- /dev/null
+++ b/include/linux/grsecurity.h
-@@ -0,0 +1,243 @@
+@@ -0,0 +1,222 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#include <linux/fs.h>
@@ -75140,8 +74165,8 @@ index 0000000..b2edfb1
+
+int gr_acl_enable_at_secure(void);
+
-+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
-+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
++int gr_check_user_change(int real, int effective, int fs);
++int gr_check_group_change(int real, int effective, int fs);
+
+void gr_del_task_from_ip_table(struct task_struct *p);
+
@@ -75154,7 +74179,7 @@ index 0000000..b2edfb1
+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
+int gr_handle_chroot_chroot(const struct dentry *dentry,
+ const struct vfsmount *mnt);
-+void gr_handle_chroot_chdir(const struct path *path);
++void gr_handle_chroot_chdir(struct path *path);
+int gr_handle_chroot_chmod(const struct dentry *dentry,
+ const struct vfsmount *mnt, const int mode);
+int gr_handle_chroot_mknod(const struct dentry *dentry,
@@ -75174,7 +74199,7 @@ index 0000000..b2edfb1
+
+int gr_tpe_allow(const struct file *file);
+
-+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
++void gr_set_chroot_entries(struct task_struct *task, struct path *path);
+void gr_clear_chroot_entries(struct task_struct *task);
+
+void gr_log_forkfail(const int retval);
@@ -75203,17 +74228,16 @@ index 0000000..b2edfb1
+int gr_handle_hardlink(const struct dentry *dentry,
+ const struct vfsmount *mnt,
+ struct inode *inode,
-+ const int mode, const struct filename *to);
++ const int mode, const char *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);
-+int gr_check_crash_uid(const kuid_t uid);
++int gr_check_crash_uid(const uid_t uid);
+int gr_check_protected_task(const struct task_struct *task);
+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
+int gr_acl_handle_mmap(const struct file *file,
@@ -75239,8 +74263,8 @@ index 0000000..b2edfb1
+ const struct vfsmount *mnt);
+int gr_check_crash_exec(const struct file *filp);
+int gr_acl_is_enabled(void);
-+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
-+ const kgid_t gid);
++void gr_set_role_label(struct task_struct *task, const uid_t uid,
++ const gid_t gid);
+int gr_set_proc_label(const struct dentry *dentry,
+ const struct vfsmount *mnt,
+ const int unsafe_flags);
@@ -75271,19 +74295,19 @@ index 0000000..b2edfb1
+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
+ const struct dentry *parent_dentry,
+ const struct vfsmount *parent_mnt,
-+ const struct filename *from);
++ const char *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 struct filename *to);
++ const struct vfsmount *old_mnt, const char *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 struct filename *newname);
++ struct vfsmount *old_mnt, const char *newname);
+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
+ struct dentry *old_dentry,
+ struct dentry *new_dentry,
@@ -75309,26 +74333,6 @@ index 0000000..b2edfb1
+
+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);
@@ -75340,7 +74344,7 @@ index 0000000..b2edfb1
+extern int grsec_disable_privio;
+
+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
-+extern kgid_t grsec_proc_gid;
++extern int grsec_proc_gid;
+#endif
+
+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
@@ -75378,11 +74382,11 @@ index 0000000..e7ffaaf
+
+#endif
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index 7fb31da..08b5114 100644
+index 52e9620..26c34b1 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
-@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
- kunmap_atomic(kaddr);
+@@ -192,6 +192,18 @@ static inline void clear_highpage(struct page *page)
+ kunmap_atomic(kaddr, KM_USER0);
}
+static inline void sanitize_highpage(struct page *page)
@@ -75391,9 +74395,9 @@ index 7fb31da..08b5114 100644
+ unsigned long flags;
+
+ local_irq_save(flags);
-+ kaddr = kmap_atomic(page);
++ kaddr = kmap_atomic(page, KM_CLEARPAGE);
+ clear_page(kaddr);
-+ kunmap_atomic(kaddr);
++ kunmap_atomic(kaddr, KM_CLEARPAGE);
+ local_irq_restore(flags);
+}
+
@@ -75401,10 +74405,10 @@ index 7fb31da..08b5114 100644
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
-index 1c7b89a..7dda400 100644
+index a90c09d..15f7933 100644
--- a/include/linux/hwmon-sysfs.h
+++ b/include/linux/hwmon-sysfs.h
-@@ -25,7 +25,8 @@
+@@ -23,7 +23,8 @@
struct sensor_device_attribute{
struct device_attribute dev_attr;
int index;
@@ -75414,33 +74418,32 @@ index 1c7b89a..7dda400 100644
#define to_sensor_dev_attr(_dev_attr) \
container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
-@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
+@@ -39,7 +40,7 @@ struct sensor_device_attribute_2 {
struct device_attribute dev_attr;
u8 index;
u8 nr;
-};
+} __do_const;
-+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
#define to_sensor_dev_attr_2(_dev_attr) \
container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
-index 2ab11dc..663a3f2 100644
+index 07d103a..04ec65b 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
-@@ -366,6 +366,7 @@ struct i2c_algorithm {
+@@ -364,6 +364,7 @@ struct i2c_algorithm {
/* To determine what the adapter supports */
u32 (*functionality) (struct i2c_adapter *);
};
+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
- /**
- * struct i2c_bus_recovery_info - I2C bus recovery information
+ /*
+ * i2c_adapter is the structure used to identify a physical i2c bus along
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
-index d23c3c2..eb63c81 100644
+index a6deef4..c56a7f2 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
-@@ -565,7 +565,7 @@ struct i2o_controller {
+@@ -564,7 +564,7 @@ struct i2o_controller {
struct i2o_device *exec; /* Executive */
#if BITS_PER_LONG == 64
spinlock_t context_list_lock; /* lock for context_list */
@@ -75450,10 +74453,10 @@ index d23c3c2..eb63c81 100644
and pointers */
#endif
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
-index aff7ad8..3942bbd 100644
+index 732c962..61c3f70 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
-@@ -76,7 +76,7 @@ struct pppox_proto {
+@@ -203,7 +203,7 @@ struct pppox_proto {
int (*ioctl)(struct socket *sock, unsigned int cmd,
unsigned long arg);
struct module *owner;
@@ -75463,15 +74466,27 @@ index aff7ad8..3942bbd 100644
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 f1c27a71..7d6010e 100644
+index 9146f39..536519a 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
-@@ -39,9 +39,17 @@
+@@ -38,9 +38,29 @@
* Also note, that this data cannot be "const".
*/
+#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_cpuinit_latent_entropy __latent_entropy
++#endif
++
+#ifdef CONFIG_MEMORY_HOTPLUG
+#define add_meminit_latent_entropy
+#else
@@ -75483,22 +74498,40 @@ index f1c27a71..7d6010e 100644
-#define __init __section(.init.text) __cold notrace
+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
#define __initdata __section(.init.data)
- #define __initconst __constsection(.init.rodata)
+ #define __initconst __section(.init.rodata)
#define __exitdata __section(.exit.data)
-@@ -102,7 +110,7 @@
- #define __cpuexitconst
+@@ -82,7 +102,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_devinit_latent_entropy
+ #define __devinitdata __section(.devinit.data)
+ #define __devinitconst __section(.devinit.rodata)
+ #define __devexit __section(.devexit.text) __exitused __cold notrace
+@@ -90,7 +110,7 @@
+ #define __devexitconst __section(.devexit.rodata)
+
+ /* Used for HOTPLUG_CPU */
+-#define __cpuinit __section(.cpuinit.text) __cold notrace
++#define __cpuinit __section(.cpuinit.text) __cold notrace add_cpuinit_latent_entropy
+ #define __cpuinitdata __section(.cpuinit.data)
+ #define __cpuinitconst __section(.cpuinit.rodata)
+ #define __cpuexit __section(.cpuexit.text) __exitused __cold notrace
+@@ -98,7 +118,7 @@
+ #define __cpuexitconst __section(.cpuexit.rodata)
/* Used for MEMORY_HOTPLUG */
-#define __meminit __section(.meminit.text) __cold notrace
+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
#define __meminitdata __section(.meminit.data)
- #define __meminitconst __constsection(.meminit.rodata)
+ #define __meminitconst __section(.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 5cd0f09..c9f67cc 100644
+index cdde2b3..d782954 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
-@@ -154,6 +154,12 @@ extern struct task_group root_task_group;
+@@ -144,6 +144,12 @@ extern struct task_group root_task_group;
#define INIT_TASK_COMM "swapper"
@@ -75511,8 +74544,8 @@ index 5cd0f09..c9f67cc 100644
/*
* INIT_TASK is used to set up the first task table, touch at
* your own risk!. Base=0, limit=0x1fffff (=2MB)
-@@ -193,6 +199,7 @@ extern struct task_group root_task_group;
- RCU_POINTER_INITIALIZER(cred, &init_cred), \
+@@ -183,6 +189,7 @@ extern struct task_group root_task_group;
+ RCU_INIT_POINTER(.cred, &init_cred), \
.comm = INIT_TASK_COMM, \
.thread = INIT_THREAD, \
+ INIT_TASK_THREAD_INFO \
@@ -75520,10 +74553,10 @@ index 5cd0f09..c9f67cc 100644
.files = &init_files, \
.signal = &init_signals, \
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 5e865b5..71bd258 100644
+index a64b00e..2ef3855f 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
-@@ -361,7 +361,7 @@ enum
+@@ -441,7 +441,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
*/
@@ -75532,7 +74565,7 @@ index 5e865b5..71bd258 100644
/* softirq mask and active fields moved to irq_cpustat_t in
* asm/hardirq.h to get better cache usage. KAO
-@@ -369,12 +369,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
+@@ -449,12 +449,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
struct softirq_action
{
@@ -75546,26 +74579,13 @@ index 5e865b5..71bd258 100644
-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
+extern void open_softirq(int nr, void (*action)(void));
extern void softirq_init(void);
- extern void __raise_softirq_irqoff(unsigned int nr);
-
-diff --git a/include/linux/iommu.h b/include/linux/iommu.h
-index 7ea319e..f9e971d 100644
---- a/include/linux/iommu.h
-+++ b/include/linux/iommu.h
-@@ -129,7 +129,7 @@ struct iommu_ops {
- u32 (*domain_get_windows)(struct iommu_domain *domain);
-
- unsigned long pgsize_bitmap;
--};
-+} __do_const;
-
- #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
- #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
+ static inline void __raise_softirq_irqoff(unsigned int nr)
+ {
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
-index 89b7c24..382af74 100644
+index 9d57a71..8d0f701 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
-@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
+@@ -166,7 +166,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
int adjust_resource(struct resource *res, resource_size_t start,
resource_size_t size);
resource_size_t resource_alignment(struct resource *res);
@@ -75575,63 +74595,37 @@ index 89b7c24..382af74 100644
return res->end - res->start + 1;
}
diff --git a/include/linux/irq.h b/include/linux/irq.h
-index 56bb0dc..8ae94d62 100644
+index bff29c5..7437762 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
-@@ -333,7 +333,8 @@ struct irq_chip {
- void (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
-
- unsigned long flags;
+@@ -328,7 +328,7 @@ struct irq_chip {
+ #ifdef CONFIG_IRQ_RELEASE_METHOD
+ void (*release)(unsigned int irq, void *dev_id);
+ #endif
-};
+} __do_const;
-+typedef struct irq_chip __no_const irq_chip_no_const;
/*
* irq_chip specific flags
-diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
-index 0e5d9ec..46acb3a 100644
---- a/include/linux/irqchip/arm-gic.h
-+++ b/include/linux/irqchip/arm-gic.h
-@@ -59,9 +59,11 @@
-
- #ifndef __ASSEMBLY__
-
-+#include <linux/irq.h>
-+
- struct device_node;
-
--extern struct irq_chip gic_arch_extn;
-+extern irq_chip_no_const gic_arch_extn;
-
- void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
- u32 offset, struct device_node *);
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
-index d235e88..8ccbe74 100644
+index 265e2c3..cdd6f29 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
-@@ -292,14 +292,14 @@ extern unsigned long preset_lpj;
- /*
- * Convert various time units to each other:
+@@ -295,9 +295,9 @@ extern unsigned long preset_lpj;
*/
--extern unsigned int jiffies_to_msecs(const unsigned long j);
--extern unsigned int jiffies_to_usecs(const unsigned long j);
+ extern unsigned int jiffies_to_msecs(const unsigned long j);
+ extern unsigned int jiffies_to_usecs(const unsigned long j);
-extern unsigned long msecs_to_jiffies(const unsigned int m);
-extern unsigned long usecs_to_jiffies(const unsigned int u);
-extern unsigned long timespec_to_jiffies(const struct timespec *value);
-+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
-+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
+extern unsigned long timespec_to_jiffies(const struct timespec *value) __intentional_overflow(-1);
extern void jiffies_to_timespec(const unsigned long jiffies,
struct timespec *value);
--extern unsigned long timeval_to_jiffies(const struct timeval *value);
-+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
- extern void jiffies_to_timeval(const unsigned long jiffies,
- struct timeval *value);
-
+ extern unsigned long timeval_to_jiffies(const struct timeval *value);
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
-index 6883e19..e854fcb 100644
+index 3875719..4663bc3 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -15,7 +15,8 @@
@@ -75644,7 +74638,7 @@ index 6883e19..e854fcb 100644
/* Lookup the address for a symbol. Returns 0 if not found. */
unsigned long kallsyms_lookup_name(const char *name);
-@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
+@@ -99,6 +100,20 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
/* Stupid that this does nothing, but I didn't create this mess. */
#define __print_symbol(fmt, addr)
#endif /*CONFIG_KALLSYMS*/
@@ -75654,7 +74648,6 @@ index 6883e19..e854fcb 100644
+extern void __print_symbol(const char *fmt, unsigned long address);
+extern int sprint_backtrace(char *buffer, unsigned long address);
+extern int sprint_symbol(char *buffer, unsigned long address);
-+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
+const char *kallsyms_lookup(unsigned long addr,
+ unsigned long *symbolsize,
+ unsigned long *offset,
@@ -75666,24 +74659,79 @@ index 6883e19..e854fcb 100644
/* This macro allows us to keep printk typechecking */
static __printf(1, 2)
+diff --git a/include/linux/kernel.h b/include/linux/kernel.h
+index a70783d..bf1dd28 100644
+--- a/include/linux/kernel.h
++++ b/include/linux/kernel.h
+@@ -34,6 +34,7 @@
+ #define LLONG_MAX ((long long)(~0ULL>>1))
+ #define LLONG_MIN (-LLONG_MAX - 1)
+ #define ULLONG_MAX (~0ULL)
++#define SIZE_MAX (~(size_t)0)
+
+ #define STACK_MAGIC 0xdeadbeef
+
+@@ -696,24 +697,30 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
+ * @condition: the condition which the compiler should know is false.
+ *
+ * If you have some code which relies on certain constants being equal, or
+- * other compile-time-evaluated condition, you should use BUILD_BUG_ON to
++ * some other compile-time-evaluated condition, you should use BUILD_BUG_ON to
+ * detect if someone changes it.
+ *
+- * The implementation uses gcc's reluctance to create a negative array, but
+- * gcc (as of 4.4) only emits that error for obvious cases (eg. not arguments
+- * to inline functions). So as a fallback we use the optimizer; if it can't
+- * prove the condition is false, it will cause a link error on the undefined
+- * "__build_bug_on_failed". This error message can be harder to track down
+- * though, hence the two different methods.
++ * The implementation uses gcc's reluctance to create a negative array, but gcc
++ * (as of 4.4) only emits that error for obvious cases (e.g. not arguments to
++ * inline functions). Luckily, in 4.3 they added the "error" function
++ * attribute just for this type of case. Thus, we use a negative sized array
++ * (should always create an error on gcc versions older than 4.4) and then call
++ * an undefined function with the error attribute (should always create an
++ * error on gcc 4.3 and later). If for some reason, neither creates a
++ * compile-time error, we'll still have a link-time error, which is harder to
++ * track down.
+ */
+ #ifndef __OPTIMIZE__
+ #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+ #else
+-extern int __build_bug_on_failed;
+-#define BUILD_BUG_ON(condition) \
+- do { \
+- ((void)sizeof(char[1 - 2*!!(condition)])); \
+- if (condition) __build_bug_on_failed = 1; \
++#define BUILD_BUG_ON(condition) \
++ do { \
++ bool __cond = !!(condition); \
++ extern void __build_bug_on_failed(void) \
++ __compiletime_error("BUILD_BUG_ON failed"); \
++ if (__cond) \
++ __build_bug_on_failed(); \
++ __compiletime_error_fallback(__cond); \
+ } while(0)
+ #endif
+ #endif /* __CHECKER__ */
diff --git a/include/linux/key-type.h b/include/linux/key-type.h
-index 518a53a..5e28358 100644
+index 9efd081..19f989c 100644
--- a/include/linux/key-type.h
+++ b/include/linux/key-type.h
-@@ -125,7 +125,7 @@ struct key_type {
+@@ -92,7 +92,7 @@ struct key_type {
+
/* internal fields */
struct list_head link; /* link in types list */
- struct lock_class_key lock_class; /* key->sem lock class */
-};
+} __do_const;
extern struct key_type key_type_keyring;
diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
-index c6e091b..a940adf 100644
+index c4d2fc1..5df9c19 100644
--- a/include/linux/kgdb.h
+++ b/include/linux/kgdb.h
-@@ -52,7 +52,7 @@ extern int kgdb_connected;
+@@ -53,7 +53,7 @@ extern int kgdb_connected;
extern int kgdb_io_module_registered;
extern atomic_t kgdb_setting_breakpoint;
@@ -75692,16 +74740,16 @@ index c6e091b..a940adf 100644
extern struct task_struct *kgdb_usethread;
extern struct task_struct *kgdb_contthread;
-@@ -254,7 +254,7 @@ struct kgdb_arch {
+@@ -252,7 +252,7 @@ struct kgdb_arch {
+ void (*disable_hw_break)(struct pt_regs *regs);
+ void (*remove_all_hw_break)(void);
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.
-@@ -279,7 +279,7 @@ struct kgdb_io {
+@@ -277,7 +277,7 @@ struct kgdb_io {
void (*pre_exception) (void);
void (*post_exception) (void);
int is_console;
@@ -75711,7 +74759,7 @@ index c6e091b..a940adf 100644
extern struct kgdb_arch arch_kgdb_ops;
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
-index 0555cc6..40116ce 100644
+index f8d4b27..8560882 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
@@ -75723,7 +74771,7 @@ index 0555cc6..40116ce 100644
#define request_module(mod...) __request_module(true, mod)
#define request_module_nowait(mod...) __request_module(false, mod)
#define try_then_request_module(x, mod...) \
-@@ -57,6 +59,9 @@ struct subprocess_info {
+@@ -60,6 +62,9 @@ struct subprocess_info {
struct work_struct work;
struct completion *complete;
char *path;
@@ -75732,12 +74780,12 @@ index 0555cc6..40116ce 100644
+#endif
char **argv;
char **envp;
- int wait;
+ enum umh_wait wait;
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
-index de6dcbcc..4735f88 100644
+index 445f978..3a02264 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
-@@ -115,7 +115,7 @@ struct kobj_type {
+@@ -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);
@@ -75746,7 +74794,7 @@ index de6dcbcc..4735f88 100644
struct kobj_uevent_env {
char *envp[UEVENT_NUM_ENVP];
-@@ -138,6 +138,7 @@ struct kobj_attribute {
+@@ -134,6 +134,7 @@ struct kobj_attribute {
ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t count);
};
@@ -75755,10 +74803,10 @@ index de6dcbcc..4735f88 100644
extern const struct sysfs_ops kobj_sysfs_ops;
diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
-index df32d25..fb52e27 100644
+index f66b065..c2c29b4 100644
--- a/include/linux/kobject_ns.h
+++ b/include/linux/kobject_ns.h
-@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
+@@ -43,7 +43,7 @@ struct kobj_ns_type_operations {
const void *(*netlink_ns)(struct sock *sk);
const void *(*initial_ns)(void);
void (*drop_ns)(void *);
@@ -75767,33 +74815,20 @@ index df32d25..fb52e27 100644
int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
int kobj_ns_type_registered(enum kobj_ns_type type);
-diff --git a/include/linux/kref.h b/include/linux/kref.h
-index 484604d..0f6c5b6 100644
---- a/include/linux/kref.h
-+++ b/include/linux/kref.h
-@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
- static inline int kref_sub(struct kref *kref, unsigned int count,
- void (*release)(struct kref *kref))
- {
-- WARN_ON(release == NULL);
-+ BUG_ON(release == NULL);
-
- 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 0fbbc7a..db081e3 100644
+index e6796c1..350d338 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
-@@ -458,7 +458,7 @@ static inline void kvm_irqfd_exit(void)
- {
- }
- #endif
+@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
+ void vcpu_load(struct kvm_vcpu *vcpu);
+ void vcpu_put(struct kvm_vcpu *vcpu);
+
-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
struct module *module);
void kvm_exit(void);
-@@ -632,7 +632,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
+@@ -454,7 +454,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);
@@ -75803,10 +74838,10 @@ index 0fbbc7a..db081e3 100644
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
diff --git a/include/linux/libata.h b/include/linux/libata.h
-index 0e23c26..6ad8c33 100644
+index 62467ca..3d65d7d 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
-@@ -972,7 +972,7 @@ struct ata_port_operations {
+@@ -910,7 +910,7 @@ struct ata_port_operations {
* fields must be pointers.
*/
const struct ata_port_operations *inherits;
@@ -75815,20 +74850,8 @@ index 0e23c26..6ad8c33 100644
struct ata_port_info {
unsigned long flags;
-diff --git a/include/linux/linkage.h b/include/linux/linkage.h
-index d3e8ad2..a949f68 100644
---- a/include/linux/linkage.h
-+++ b/include/linux/linkage.h
-@@ -31,6 +31,7 @@
- #endif
-
- #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
-+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
- #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
-
- /*
diff --git a/include/linux/list.h b/include/linux/list.h
-index f4d8a2f..38e6e46 100644
+index cc6d2aa..c10ee83 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
@@ -75860,11 +74883,26 @@ index f4d8a2f..38e6e46 100644
/**
* list_move - delete from one list and add as another's head
* @list: the entry to move
+diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
+index 88e78de..c63979a 100644
+--- a/include/linux/lsm_audit.h
++++ b/include/linux/lsm_audit.h
+@@ -124,6 +124,10 @@ struct common_audit_data {
+ u32 denied;
+ uid_t ouid;
+ } fs;
++ struct {
++ int type, protocol;
++ struct sock *sk;
++ } net;
+ };
+ } apparmor_audit_data;
+ #endif
diff --git a/include/linux/math64.h b/include/linux/math64.h
-index 69ed5f5..243ed51 100644
+index b8ba855..bfdffd0 100644
--- a/include/linux/math64.h
+++ b/include/linux/math64.h
-@@ -15,7 +15,7 @@
+@@ -14,7 +14,7 @@
* This is commonly provided by 32bit archs to provide an optimized 64bit
* divide.
*/
@@ -75873,7 +74911,7 @@ index 69ed5f5..243ed51 100644
{
*remainder = dividend % divisor;
return dividend / divisor;
-@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
+@@ -32,7 +32,7 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
/**
* div64_u64 - unsigned 64bit divide with 64bit divisor
*/
@@ -75882,8 +74920,8 @@ index 69ed5f5..243ed51 100644
{
return dividend / divisor;
}
-@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
- #define div64_ul(x, y) div_u64((x), (y))
+@@ -50,7 +50,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
+ #define div64_long(x,y) div_s64((x),(y))
#ifndef div_u64_rem
-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
@@ -75891,7 +74929,7 @@ index 69ed5f5..243ed51 100644
{
*remainder = do_div(dividend, divisor);
return dividend;
-@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
+@@ -62,7 +62,7 @@ extern s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder);
#endif
#ifndef div64_u64
@@ -75900,7 +74938,7 @@ index 69ed5f5..243ed51 100644
#endif
#ifndef div64_s64
-@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
+@@ -79,7 +79,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
* divide.
*/
#ifndef div_u64
@@ -75909,48 +74947,39 @@ index 69ed5f5..243ed51 100644
{
u32 remainder;
return div_u64_rem(dividend, divisor, &remainder);
-diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
-index da6716b..2e31db3 100644
---- a/include/linux/mempolicy.h
-+++ b/include/linux/mempolicy.h
-@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
- }
-
- #define vma_policy(vma) ((vma)->vm_policy)
-+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
-+{
-+ vma->vm_policy = pol;
-+}
-
- static inline void mpol_get(struct mempolicy *pol)
- {
-@@ -240,6 +244,9 @@ mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx)
- }
-
- #define vma_policy(vma) NULL
-+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
-+{
-+}
+diff --git a/include/linux/mca.h b/include/linux/mca.h
+index 3797270..7765ede 100644
+--- a/include/linux/mca.h
++++ b/include/linux/mca.h
+@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
+ int region);
+ void * (*mca_transform_memory)(struct mca_device *,
+ void *memory);
+-};
++} __no_const;
- static inline int
- vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
+ struct mca_bus {
+ u64 default_dma_mask;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 8b6e55e..c4edf39 100644
+index 305fd75..cdbfb05 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -113,6 +113,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 */
+@@ -115,7 +115,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 */
+
+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
-+#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
++#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) */
+#endif
+
- #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
+ #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
+ #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
- #ifdef CONFIG_MEM_SOFT_DIRTY
-@@ -215,8 +220,8 @@ struct vm_operations_struct {
+@@ -213,8 +220,8 @@ struct vm_operations_struct {
/* called by access_process_vm when get_user_pages() fails, typically
* for use by special VMAs that can switch between memory and hardware
*/
@@ -75961,15 +74990,15 @@ index 8b6e55e..c4edf39 100644
#ifdef CONFIG_NUMA
/*
* set_policy() op must add a reference to any non-NULL @new mempolicy
-@@ -246,6 +251,7 @@ struct vm_operations_struct {
- int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
- unsigned long size, pgoff_t pgoff);
+@@ -241,6 +248,7 @@ struct vm_operations_struct {
+ const nodemask_t *to, unsigned long flags);
+ #endif
};
+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
struct mmu_gather;
struct inode;
-@@ -977,8 +983,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
+@@ -941,8 +949,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
unsigned long *pfn);
int follow_phys(struct vm_area_struct *vma, unsigned long address,
unsigned int flags, unsigned long *prot, resource_size_t *phys);
@@ -75980,20 +75009,22 @@ index 8b6e55e..c4edf39 100644
static inline void unmap_shared_mapping_range(struct address_space *mapping,
loff_t const holebegin, loff_t const holelen)
-@@ -1017,9 +1023,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -984,10 +992,10 @@ static inline int fixup_user_fault(struct task_struct *tsk,
}
#endif
+-extern int make_pages_present(unsigned long addr, unsigned long end);
-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
- void *buf, int len, int write);
++extern ssize_t make_pages_present(unsigned long addr, unsigned long end);
+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
+ void *buf, size_t len, int write);
- long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
- unsigned long start, unsigned long nr_pages,
-@@ -1051,34 +1057,6 @@ int set_page_dirty(struct page *page);
+ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+ unsigned long start, int len, unsigned int foll_flags,
+@@ -1013,34 +1021,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);
@@ -76025,10 +75056,10 @@ index 8b6e55e..c4edf39 100644
- !vma_growsup(vma->vm_next, addr);
-}
-
- extern pid_t
- vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
-
-@@ -1178,6 +1156,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
+ extern unsigned long move_page_tables(struct vm_area_struct *vma,
+ unsigned long old_addr, struct vm_area_struct *new_vma,
+ unsigned long new_addr, unsigned long len);
+@@ -1135,6 +1115,15 @@ static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
}
#endif
@@ -76044,7 +75075,7 @@ index 8b6e55e..c4edf39 100644
int vma_wants_writenotify(struct vm_area_struct *vma);
extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1196,8 +1183,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
+@@ -1153,8 +1142,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
{
return 0;
}
@@ -76060,7 +75091,7 @@ index 8b6e55e..c4edf39 100644
#endif
#ifdef __PAGETABLE_PMD_FOLDED
-@@ -1206,8 +1200,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
+@@ -1163,8 +1159,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
{
return 0;
}
@@ -76076,7 +75107,7 @@ index 8b6e55e..c4edf39 100644
#endif
int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
-@@ -1225,11 +1226,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
+@@ -1182,11 +1185,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
NULL: pud_offset(pgd, address);
}
@@ -76100,47 +75131,24 @@ index 8b6e55e..c4edf39 100644
#endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
#if USE_SPLIT_PTLOCKS
-@@ -1517,7 +1530,7 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1397,7 +1412,7 @@ extern int install_special_mapping(struct mm_struct *mm,
unsigned long addr, unsigned long len,
unsigned long flags, struct page **pages);
-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
- extern unsigned long mmap_region(struct file *file, unsigned long addr,
- unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
-@@ -1525,6 +1538,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
- unsigned long len, unsigned long prot, unsigned long flags,
- unsigned long pgoff, unsigned long *populate);
+ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+ unsigned long len, unsigned long prot,
+@@ -1420,6 +1435,7 @@ out:
+ }
+
extern int do_munmap(struct mm_struct *, unsigned long, size_t);
+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
- #ifdef CONFIG_MMU
- extern int __mm_populate(unsigned long addr, unsigned long len,
-@@ -1553,10 +1567,11 @@ struct vm_unmapped_area_info {
- unsigned long high_limit;
- unsigned long align_mask;
- unsigned long align_offset;
-+ unsigned long threadstack_offset;
- };
-
--extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
--extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
-+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
-+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
+ extern unsigned long do_brk(unsigned long, unsigned long);
- /*
- * Search for an unmapped address range.
-@@ -1568,7 +1583,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
- * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
- */
- static inline unsigned long
--vm_unmapped_area(struct vm_unmapped_area_info *info)
-+vm_unmapped_area(const struct vm_unmapped_area_info *info)
- {
- if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
- return unmapped_area(info);
-@@ -1631,6 +1646,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
+@@ -1477,6 +1493,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);
@@ -76151,8 +75159,8 @@ index 8b6e55e..c4edf39 100644
/* 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)
-@@ -1659,15 +1678,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
- return vma;
+@@ -1493,15 +1513,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
+ return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
}
-#ifdef CONFIG_MMU
@@ -76164,10 +75172,10 @@ index 8b6e55e..c4edf39 100644
-}
-#endif
-
- #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE
- unsigned long change_prot_numa(struct vm_area_struct *vma,
- unsigned long start, unsigned long end);
-@@ -1719,6 +1729,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
+ 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);
+@@ -1537,6 +1548,12 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
static inline void vm_stat_account(struct mm_struct *mm,
unsigned long flags, struct file *file, long pages)
{
@@ -76176,21 +75184,22 @@ index 8b6e55e..c4edf39 100644
+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
+#endif
+
- mm->total_vm += pages;
++ mm->total_vm += pages;
}
#endif /* CONFIG_PROC_FS */
-@@ -1800,7 +1815,7 @@ extern int unpoison_memory(unsigned long pfn);
+
+@@ -1617,7 +1634,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 atomic_long_t num_poisoned_pages;
-+extern atomic_long_unchecked_t num_poisoned_pages;
+-extern atomic_long_t mce_bad_pages;
++extern atomic_long_unchecked_t mce_bad_pages;
extern int soft_offline_page(struct page *page, int flags);
extern void dump_page(struct page *page);
-@@ -1837,5 +1852,11 @@ void __init setup_nr_node_ids(void);
- static inline void setup_nr_node_ids(void) {}
- #endif
+@@ -1631,5 +1648,11 @@ extern void copy_user_huge_page(struct page *dst, struct page *src,
+ unsigned int pages_per_huge_page);
+ #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
@@ -76201,10 +75210,10 @@ index 8b6e55e..c4edf39 100644
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index d9851ee..619492d 100644
+index de3a321..8761f4a 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -289,6 +289,8 @@ struct vm_area_struct {
+@@ -253,6 +253,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
#endif
@@ -76213,10 +75222,10 @@ index d9851ee..619492d 100644
};
struct core_thread {
-@@ -436,6 +438,24 @@ struct mm_struct {
- int first_nid;
+@@ -390,6 +392,24 @@ struct mm_struct {
+ #ifdef CONFIG_CPUMASK_OFFSTACK
+ struct cpumask cpumask_allocation;
#endif
- struct uprobes_state uprobes_state;
+
+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
+ unsigned long pax_flags;
@@ -76237,7 +75246,7 @@ index d9851ee..619492d 100644
+
};
- /* first nid will either be a valid NID or one of these values */
+ static inline void mm_init_cpumask(struct mm_struct *mm)
diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
index c5d5278..f0b68c8 100644
--- a/include/linux/mmiotrace.h
@@ -76260,11 +75269,31 @@ index c5d5278..f0b68c8 100644
{
}
+diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
+index ee2baf0..e24a58c 100644
+--- a/include/linux/mmu_notifier.h
++++ b/include/linux/mmu_notifier.h
+@@ -256,12 +256,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; \
+ })
+
+ #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index bd791e4..8617c34f 100644
+index 25842b6..6e42df8 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
-@@ -396,7 +396,7 @@ struct zone {
+@@ -371,7 +371,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
/* Zone statistics */
@@ -76274,10 +75303,10 @@ index bd791e4..8617c34f 100644
/*
* 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 45e9214..a7227d6 100644
+index 468819c..c02b63b 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -76286,16 +75315,16 @@ index 45e9214..a7227d6 100644
struct pci_device_id {
__u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
-@@ -139,7 +139,7 @@ struct usb_device_id {
+@@ -131,7 +131,7 @@ struct usb_device_id {
+ #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
#define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
- #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
-#define HID_ANY_ID (~0)
+#define HID_ANY_ID (~0U)
- #define HID_BUS_ANY 0xffff
- #define HID_GROUP_ANY 0x0000
-@@ -467,7 +467,7 @@ struct dmi_system_id {
+ struct hid_device_id {
+ __u16 bus;
+@@ -479,7 +479,7 @@ struct dmi_system_id {
const char *ident;
struct dmi_strmatch matches[4];
void *driver_data;
@@ -76305,7 +75334,7 @@ index 45e9214..a7227d6 100644
* struct dmi_device_id appears during expansion of
* "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
diff --git a/include/linux/module.h b/include/linux/module.h
-index 05f2447..2aee07c 100644
+index 3cb7839..56d41ff 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -17,9 +17,11 @@
@@ -76318,9 +75347,9 @@ index 05f2447..2aee07c 100644
#include <asm/module.h>
+#include <asm/pgtable.h>
- /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
- #define MODULE_SIG_STRING "~Module signature appended~\n"
-@@ -55,12 +57,13 @@ struct module_attribute {
+ #include <trace/events/module.h>
+
+@@ -53,12 +55,13 @@ struct module_attribute {
int (*test)(struct module *);
void (*free)(struct module *);
};
@@ -76335,7 +75364,7 @@ index 05f2447..2aee07c 100644
extern ssize_t __modver_version_show(struct module_attribute *,
struct module_kobject *, char *);
-@@ -238,7 +241,7 @@ struct module
+@@ -217,7 +220,7 @@ struct module
/* Sysfs stuff. */
struct module_kobject mkobj;
@@ -76344,7 +75373,7 @@ index 05f2447..2aee07c 100644
const char *version;
const char *srcversion;
struct kobject *holders_dir;
-@@ -287,19 +290,16 @@ struct module
+@@ -261,19 +264,16 @@ struct module
int (*init)(void);
/* If this is non-NULL, vfree after init() returns */
@@ -76368,7 +75397,7 @@ index 05f2447..2aee07c 100644
/* Arch-specific module values */
struct mod_arch_specific arch;
-@@ -355,6 +355,10 @@ struct module
+@@ -329,6 +329,10 @@ struct module
#ifdef CONFIG_EVENT_TRACING
struct ftrace_event_call **trace_events;
unsigned int num_trace_events;
@@ -76379,7 +75408,7 @@ index 05f2447..2aee07c 100644
#endif
#ifdef CONFIG_FTRACE_MCOUNT_RECORD
unsigned int num_ftrace_callsites;
-@@ -402,16 +406,46 @@ bool is_module_address(unsigned long addr);
+@@ -379,16 +383,46 @@ bool is_module_address(unsigned long addr);
bool is_module_percpu_address(unsigned long addr);
bool is_module_text_address(unsigned long addr);
@@ -76395,34 +75424,34 @@ index 05f2447..2aee07c 100644
+ return ((void *)addr >= start && (void *)addr < start + size);
+}
+
-+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
++static inline int within_module_core_rx(unsigned long addr, struct module *mod)
+{
+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
+}
+
-+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
++static inline int within_module_core_rw(unsigned long addr, struct module *mod)
+{
+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
+}
+
-+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
++static inline int within_module_init_rx(unsigned long addr, struct module *mod)
+{
+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
+}
+
-+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
++static inline int within_module_init_rw(unsigned long addr, struct module *mod)
+{
+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
+}
+
- static inline int within_module_core(unsigned long addr, const struct module *mod)
+ static inline int within_module_core(unsigned long addr, struct module *mod)
{
- return (unsigned long)mod->module_core <= addr &&
- addr < (unsigned long)mod->module_core + mod->core_size;
+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
}
- static inline int within_module_init(unsigned long addr, const struct module *mod)
+ static inline int within_module_init(unsigned long addr, struct module *mod)
{
- return (unsigned long)mod->module_init <= addr &&
- addr < (unsigned long)mod->module_init + mod->init_size;
@@ -76431,7 +75460,7 @@ index 05f2447..2aee07c 100644
/* Search for module by name: must hold module_mutex. */
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
-index 560ca53..ef621ef 100644
+index b2be02e..6a9fdb1 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
@@ -76453,34 +75482,14 @@ index 560ca53..ef621ef 100644
+#define module_free_exec(x, y) module_free((x), (y))
+#endif
+
- /*
- * 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
+ /* Apply the given relocation to the (simplified) ELF. Return -error
+ or 0. */
+ int apply_relocate(Elf_Shdr *sechdrs,
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
-index c3eb102..073c4a6 100644
+index 7939f63..ec6df57 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
-@@ -295,7 +295,7 @@ static inline void __kernel_param_unlock(void)
+@@ -260,7 +260,7 @@ static inline void __kernel_param_unlock(void)
* @len is usually just sizeof(string).
*/
#define module_param_string(name, string, len, perm) \
@@ -76489,31 +75498,31 @@ index c3eb102..073c4a6 100644
= { len, string }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
¶m_ops_string, \
-@@ -434,7 +434,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
+@@ -395,7 +395,7 @@ extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
+ * module_param_named() for why this might be necessary.
*/
#define module_param_array_named(name, array, type, nump, perm) \
- param_check_##type(name, &(array)[0]); \
- static const struct kparam_array __param_arr_##name \
+ static const struct kparam_array __param_arr_##name __used \
= { .max = ARRAY_SIZE(array), .num = nump, \
.ops = ¶m_ops_##type, \
.elemsize = sizeof(array[0]), .elem = array }; \
diff --git a/include/linux/namei.h b/include/linux/namei.h
-index 8e47bc7..c70fd73 100644
+index ffc0213..2c1f2cb 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
-@@ -19,7 +19,7 @@ struct nameidata {
+@@ -24,7 +24,7 @@ struct nameidata {
unsigned seq;
int last_type;
unsigned depth;
- char *saved_names[MAX_NESTED_LINKS + 1];
+ const char *saved_names[MAX_NESTED_LINKS + 1];
- };
- /*
-@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
-
- extern void nd_jump_link(struct nameidata *nd, struct path *path);
+ /* Intent data */
+ union {
+@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
+ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
+ extern void unlock_rename(struct dentry *, struct dentry *);
-static inline void nd_set_link(struct nameidata *nd, char *path)
+static inline void nd_set_link(struct nameidata *nd, const char *path)
@@ -76527,10 +75536,10 @@ index 8e47bc7..c70fd73 100644
return nd->saved_names[nd->depth];
}
diff --git a/include/linux/net.h b/include/linux/net.h
-index 4f27575..fc8a65f 100644
+index b7ca08e..c8350cb 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
-@@ -183,7 +183,7 @@ struct net_proto_family {
+@@ -216,7 +216,7 @@ struct net_proto_family {
int (*create)(struct net *net, struct socket *sock,
int protocol, int kern);
struct module *owner;
@@ -76540,18 +75549,18 @@ index 4f27575..fc8a65f 100644
struct iovec;
struct kvec;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 25f5d2d1..5cf2120 100644
+index 8c43fd1..782342e 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1098,6 +1098,7 @@ struct net_device_ops {
- sa_family_t sa_family,
- __be16 port);
+@@ -949,6 +949,7 @@ struct net_device_ops {
+ int (*ndo_set_features)(struct net_device *dev,
+ u32 features);
};
+typedef struct net_device_ops __no_const net_device_ops_no_const;
/*
* The DEVICE structure.
-@@ -1169,7 +1170,7 @@ struct net_device {
+@@ -1088,7 +1089,7 @@ struct net_device {
int iflink;
struct net_device_stats stats;
@@ -76560,11 +75569,20 @@ index 25f5d2d1..5cf2120 100644
* Do not use this in drivers.
*/
+@@ -2585,7 +2586,7 @@ static inline int netif_is_bond_slave(struct net_device *dev)
+ return dev->flags & IFF_SLAVE && dev->priv_flags & IFF_BONDING;
+ }
+
+-extern struct pernet_operations __net_initdata loopback_net_ops;
++extern struct pernet_operations __net_initconst loopback_net_ops;
+
+ static inline u32 dev_ethtool_get_rx_csum(struct net_device *dev)
+ {
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index 708fe72ab9..77084a3 100644
+index 857f502..350a113 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
-@@ -82,7 +82,7 @@ struct nf_sockopt_ops {
+@@ -141,7 +141,7 @@ struct nf_sockopt_ops {
#endif
/* Use the module struct to lock set/get code in place */
struct module *owner;
@@ -76574,10 +75592,10 @@ index 708fe72ab9..77084a3 100644
/* Function to register/unregister hook points. */
int nf_register_hook(struct nf_hook_ops *reg);
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
-index 9ac9fbd..f92edb4 100644
+index 3540c6e..83adb6c 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
-@@ -124,7 +124,7 @@ struct ip_set_type_variant {
+@@ -274,7 +274,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);
@@ -76587,10 +75605,10 @@ index 9ac9fbd..f92edb4 100644
/* The core set type structure */
struct ip_set_type {
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
-index cadb740..d7c37c0 100644
+index 74d3386..e800dbf 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
-@@ -16,7 +16,7 @@ struct nfnl_callback {
+@@ -65,7 +65,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 */
@@ -76628,11 +75646,11 @@ index 5dc635f..35f5e11 100644
/* this value hold the maximum octet of charset */
#define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
-index d14a4c3..a078786 100644
+index d65746e..62e72c2 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
-@@ -54,7 +54,8 @@ struct notifier_block {
- notifier_fn_t notifier_call;
+@@ -51,7 +51,8 @@ struct notifier_block {
+ int (*notifier_call)(struct notifier_block *, unsigned long, void *);
struct notifier_block __rcu *next;
int priority;
-};
@@ -76642,29 +75660,42 @@ index d14a4c3..a078786 100644
struct atomic_notifier_head {
spinlock_t lock;
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
-index b2a0f15..4d7da32 100644
+index a4c5624..79d6d88 100644
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
-@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
- int oprofilefs_create_ro_ulong(struct dentry * root,
+@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
+ int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
char const * name, ulong * val);
-/** Create a file for read-only access to an atomic_t. */
+/** Create a file for read-only access to an atomic_unchecked_t. */
- int oprofilefs_create_ro_atomic(struct dentry * root,
+ int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
- char const * name, atomic_t * val);
+ char const * name, atomic_unchecked_t * val);
/** create a directory */
- struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
+ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
+diff --git a/include/linux/padata.h b/include/linux/padata.h
+index 4633b2f..988bc08 100644
+--- a/include/linux/padata.h
++++ b/include/linux/padata.h
+@@ -129,7 +129,7 @@ struct parallel_data {
+ struct padata_instance *pinst;
+ struct padata_parallel_queue __percpu *pqueue;
+ struct padata_serial_queue __percpu *squeue;
+- atomic_t seq_nr;
++ atomic_unchecked_t seq_nr;
+ atomic_t reorder_objects;
+ atomic_t refcnt;
+ unsigned int max_seq_nr;
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
-index 430dd96..544e26e 100644
+index 45fc162..01a4068 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
-@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
+@@ -80,7 +80,8 @@ struct hotplug_slot_ops {
+ int (*get_attention_status) (struct hotplug_slot *slot, u8 *value);
int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
- int (*reset_slot) (struct hotplug_slot *slot, int probe);
-};
+} __do_const;
+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
@@ -76672,10 +75703,10 @@ index 430dd96..544e26e 100644
/**
* struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index c8ba627..24bdfa8 100644
+index eeb6a29..6eb2b52 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
-@@ -327,8 +327,8 @@ struct perf_event {
+@@ -748,8 +748,8 @@ struct perf_event {
enum perf_event_active_state state;
unsigned int attach_state;
@@ -76686,7 +75717,7 @@ index c8ba627..24bdfa8 100644
/*
* These are the total time in nanoseconds that the event
-@@ -379,8 +379,8 @@ struct perf_event {
+@@ -800,8 +800,8 @@ struct perf_event {
* These accumulate total time (in nanoseconds) that children
* events have been enabled and running, respectively.
*/
@@ -76697,7 +75728,7 @@ index c8ba627..24bdfa8 100644
/*
* Protect attach/detach and child_list:
-@@ -702,7 +702,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
+@@ -1100,7 +1100,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
entry->ip[entry->nr++] = ip;
}
@@ -76705,10 +75736,10 @@ index c8ba627..24bdfa8 100644
+extern int sysctl_perf_event_legitimately_concerned;
extern int sysctl_perf_event_mlock;
extern int sysctl_perf_event_sample_rate;
- extern int sysctl_perf_cpu_time_max_percent;
-@@ -717,19 +717,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
- loff_t *ppos);
+@@ -1108,19 +1108,24 @@ extern int perf_proc_update_handler(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp,
+ loff_t *ppos);
+static inline bool perf_paranoid_any(void)
+{
@@ -76734,90 +75765,49 @@ index c8ba627..24bdfa8 100644
}
extern void perf_event_init(void);
-@@ -845,7 +850,7 @@ struct perf_pmu_events_attr {
- struct device_attribute attr;
- u64 id;
- const char *event_str;
--};
-+} __do_const;
+@@ -1198,7 +1203,7 @@ static inline void perf_restore_debug_store(void) { }
+ */
+ #define perf_cpu_notifier(fn) \
+ do { \
+- static struct notifier_block fn##_nb __cpuinitdata = \
++ static struct notifier_block fn##_nb = \
+ { .notifier_call = fn, .priority = CPU_PRI_PERF }; \
+ fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE, \
+ (void *)(unsigned long)smp_processor_id()); \
+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)
- #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
- static struct perf_pmu_events_attr _var = { \
+ /*
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
-index b8809fe..ae4ccd0 100644
+index 0072a53..c5dcca5 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
-@@ -47,10 +47,10 @@ struct pipe_inode_info {
- struct mutex mutex;
+@@ -47,9 +47,9 @@ struct pipe_buffer {
+ struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf, buffers;
- unsigned int readers;
- unsigned int writers;
-- unsigned int files;
- unsigned int waiting_writers;
+ atomic_t readers;
+ atomic_t writers;
-+ atomic_t files;
+ atomic_t waiting_writers;
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/platform_data/usb-ohci-exynos.h b/include/linux/platform_data/usb-ohci-exynos.h
-index c256c59..8ea94c7 100644
---- a/include/linux/platform_data/usb-ohci-exynos.h
-+++ b/include/linux/platform_data/usb-ohci-exynos.h
-@@ -14,7 +14,7 @@
- struct exynos4_ohci_platdata {
- int (*phy_init)(struct platform_device *pdev, int type);
- int (*phy_exit)(struct platform_device *pdev, int type);
--};
-+} __no_const;
-
- extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
-
-diff --git a/include/linux/pm.h b/include/linux/pm.h
-index a224c7f..92d8a97 100644
---- a/include/linux/pm.h
-+++ b/include/linux/pm.h
-@@ -576,6 +576,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
- struct dev_pm_domain {
- struct dev_pm_ops ops;
- };
-+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
-
- /*
- * The PM_EVENT_ messages are also used by drivers implementing the legacy
-diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
-index 7c1d252..c5c773e 100644
---- a/include/linux/pm_domain.h
-+++ b/include/linux/pm_domain.h
-@@ -48,7 +48,7 @@ struct gpd_dev_ops {
-
- struct gpd_cpu_data {
- unsigned int saved_exit_latency;
-- struct cpuidle_state *idle_state;
-+ cpuidle_state_no_const *idle_state;
- };
-
- struct generic_pm_domain {
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
-index 6fa7cea..7bf6415 100644
+index d3085e7..fd01052 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
-@@ -103,7 +103,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
+@@ -95,7 +95,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
static inline void pm_runtime_mark_last_busy(struct device *dev)
{
@@ -76840,7 +75830,7 @@ index 195aafc..49a7bc2 100644
/* config parameters */
#define PNP_CONFIG_NORMAL 0x0001
diff --git a/include/linux/poison.h b/include/linux/poison.h
-index 2110a81..13a11bb 100644
+index 79159de..f1233a9 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -19,8 +19,8 @@
@@ -76854,24 +75844,11 @@ index 2110a81..13a11bb 100644
/********** include/linux/timer.h **********/
/*
-diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
-index d8b187c3..9a9257a 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;
--};
-+} __do_const;
-
- /**
- * struct omap_sr_nvalue_table - Smartreflex n-target value info
diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
-index 4ea1d37..80f4b33 100644
+index b8d4ddd..bb59d8b 100644
--- a/include/linux/ppp-comp.h
+++ b/include/linux/ppp-comp.h
-@@ -84,7 +84,7 @@ struct compressor {
+@@ -111,7 +111,7 @@ struct compressor {
struct module *owner;
/* Extra skb space needed by the compressor algorithm */
unsigned int comp_extra;
@@ -76880,91 +75857,60 @@ index 4ea1d37..80f4b33 100644
/*
* The return value from decompress routine is the length of the
-diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index f5d4723..a6ea2fa 100644
---- a/include/linux/preempt.h
-+++ b/include/linux/preempt.h
-@@ -18,8 +18,13 @@
- # define sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
- #endif
-
-+#define raw_add_preempt_count(val) do { preempt_count() += (val); } while (0)
-+#define raw_sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
-+
- #define inc_preempt_count() add_preempt_count(1)
-+#define raw_inc_preempt_count() raw_add_preempt_count(1)
- #define dec_preempt_count() sub_preempt_count(1)
-+#define raw_dec_preempt_count() raw_sub_preempt_count(1)
+diff --git a/include/linux/prctl.h b/include/linux/prctl.h
+index a3baeb2..b527252 100644
+--- a/include/linux/prctl.h
++++ b/include/linux/prctl.h
+@@ -102,4 +102,19 @@
- #define preempt_count() (current_thread_info()->preempt_count)
+ #define PR_MCE_KILL_GET 34
-@@ -64,6 +69,12 @@ do { \
- barrier(); \
- } while (0)
-
-+#define raw_preempt_disable() \
-+do { \
-+ raw_inc_preempt_count(); \
-+ barrier(); \
-+} while (0)
-+
- #define sched_preempt_enable_no_resched() \
- do { \
- barrier(); \
-@@ -72,6 +83,12 @@ do { \
-
- #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
-
-+#define raw_preempt_enable_no_resched() \
-+do { \
-+ barrier(); \
-+ raw_dec_preempt_count(); \
-+} while (0)
++/*
++ * If no_new_privs is set, then operations that grant new privileges (i.e.
++ * execve) will either fail or not grant them. This affects suid/sgid,
++ * file capabilities, and LSMs.
++ *
++ * Operations that merely manipulate or drop existing privileges (setresuid,
++ * capset, etc.) will still work. Drop those privileges if you want them gone.
++ *
++ * Changing LSM security domain is considered a new privilege. So, for example,
++ * asking selinux for a specific new context (e.g. with runcon) will result
++ * in execve returning -EPERM.
++ */
++#define PR_SET_NO_NEW_PRIVS 38
++#define PR_GET_NO_NEW_PRIVS 39
+
- #define preempt_enable() \
- do { \
- preempt_enable_no_resched(); \
-@@ -116,8 +133,10 @@ do { \
- * region.
- */
- #define preempt_disable() barrier()
-+#define raw_preempt_disable() barrier()
- #define sched_preempt_enable_no_resched() barrier()
- #define preempt_enable_no_resched() barrier()
-+#define raw_preempt_enable_no_resched() barrier()
- #define preempt_enable() barrier()
-
- #define preempt_disable_notrace() barrier()
+ #endif /* _LINUX_PRCTL_H */
diff --git a/include/linux/printk.h b/include/linux/printk.h
-index e6131a78..8e9fb61 100644
+index f0e22f7..82dd544 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
-@@ -106,6 +106,8 @@ static inline __printf(1, 2) __cold
- void early_printk(const char *s, ...) { }
- #endif
+@@ -94,6 +94,8 @@ void early_printk(const char *fmt, ...);
+ extern int printk_needs_cpu(int cpu);
+ extern void printk_tick(void);
+extern int kptr_restrict;
+
#ifdef CONFIG_PRINTK
- asmlinkage __printf(5, 0)
- int vprintk_emit(int facility, int level,
-@@ -140,7 +142,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
+ asmlinkage __printf(1, 0)
+ int vprintk(const char *fmt, va_list args);
+@@ -112,7 +114,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
extern int printk_delay_msec;
extern int dmesg_restrict;
-extern int kptr_restrict;
- extern void wake_up_klogd(void);
-
+ 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 608e60a..c26f864 100644
+index 643b96c..9544c71 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
-@@ -34,6 +34,19 @@ static inline struct proc_dir_entry *proc_create(
+@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
-+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
++static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
+{
+#ifdef CONFIG_GRKERNSEC_PROC_USER
@@ -76975,43 +75921,88 @@ index 608e60a..c26f864 100644
+ return proc_create_data(name, mode, parent, proc_fops, NULL);
+#endif
+}
++
+
-+
- extern void proc_set_size(struct proc_dir_entry *, loff_t);
- extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
- extern void *PDE_DATA(const struct inode *);
-diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
-index 34a1e10..03a6d03 100644
---- a/include/linux/proc_ns.h
-+++ b/include/linux/proc_ns.h
-@@ -14,7 +14,7 @@ struct proc_ns_operations {
+ static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
+ mode_t mode, struct proc_dir_entry *base,
+ read_proc_t *read_proc, void * data)
+@@ -247,7 +260,7 @@ struct proc_ns_operations {
+ void *(*get)(struct task_struct *task);
void (*put)(void *ns);
int (*install)(struct nsproxy *nsproxy, void *ns);
- unsigned int (*inum)(void *ns);
-};
+} __do_const;
-
- struct proc_ns {
- void *ns;
-diff --git a/include/linux/quota.h b/include/linux/quota.h
-index cc7494a..1e27036 100644
---- a/include/linux/quota.h
-+++ b/include/linux/quota.h
-@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
-
- extern bool qid_eq(struct kqid left, struct kqid right);
- extern bool qid_lt(struct kqid left, struct kqid right);
--extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
-+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
- extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
- extern bool qid_valid(struct kqid qid);
+ extern const struct proc_ns_operations netns_operations;
+ extern const struct proc_ns_operations utsns_operations;
+ extern const struct proc_ns_operations ipcns_operations;
+diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
+index 800f113..13b3715 100644
+--- a/include/linux/ptrace.h
++++ b/include/linux/ptrace.h
+@@ -62,8 +62,9 @@
+ #define PTRACE_O_TRACEEXEC 0x00000010
+ #define PTRACE_O_TRACEVFORKDONE 0x00000020
+ #define PTRACE_O_TRACEEXIT 0x00000040
++#define PTRACE_O_TRACESECCOMP 0x00000080
+
+-#define PTRACE_O_MASK 0x0000007f
++#define PTRACE_O_MASK 0x000000ff
+
+ /* Wait extended result codes for the above trace options. */
+ #define PTRACE_EVENT_FORK 1
+@@ -73,6 +74,7 @@
+ #define PTRACE_EVENT_VFORK_DONE 5
+ #define PTRACE_EVENT_EXIT 6
+ #define PTRACE_EVENT_STOP 7
++#define PTRACE_EVENT_SECCOMP 8
+
+ #include <asm/ptrace.h>
+
+@@ -101,8 +103,9 @@
+ #define PT_TRACE_EXEC PT_EVENT_FLAG(PTRACE_EVENT_EXEC)
+ #define PT_TRACE_VFORK_DONE PT_EVENT_FLAG(PTRACE_EVENT_VFORK_DONE)
+ #define PT_TRACE_EXIT PT_EVENT_FLAG(PTRACE_EVENT_EXIT)
++#define PT_TRACE_SECCOMP PT_EVENT_FLAG(PTRACE_EVENT_SECCOMP)
+
+-#define PT_TRACE_MASK 0x000003f4
++#define PT_TRACE_MASK 0x00000bf4
+
+ /* single stepping state bits (used on ARM and PA-RISC) */
+ #define PT_SINGLESTEP_BIT 31
+@@ -129,10 +132,12 @@ extern void __ptrace_unlink(struct task_struct *child);
+ extern void exit_ptrace(struct task_struct *tracer);
+ #define PTRACE_MODE_READ 1
+ #define PTRACE_MODE_ATTACH 2
+-/* Returns 0 on success, -errno on denial. */
+-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
+ /* Returns true on success, false on denial. */
+ extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
++/* Returns true on success, false on denial. */
++extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
++/* Returns true on success, false on denial. */
++extern bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode);
+
+ static inline int ptrace_reparented(struct task_struct *child)
+ {
+@@ -197,9 +202,10 @@ static inline void ptrace_event(int event, unsigned long message)
+ if (unlikely(ptrace_event_enabled(current, event))) {
+ current->ptrace_message = message;
+ ptrace_notify((event << 8) | SIGTRAP);
+- } else if (event == PTRACE_EVENT_EXEC && unlikely(current->ptrace)) {
++ } else if (event == PTRACE_EVENT_EXEC) {
+ /* legacy EXEC report via SIGTRAP */
+- send_sig(SIGTRAP, current, 0);
++ if ((current->ptrace & (PT_PTRACED|PT_SEIZED)) == PT_PTRACED)
++ send_sig(SIGTRAP, current, 0);
+ }
+ }
diff --git a/include/linux/random.h b/include/linux/random.h
-index 6312dd9..2561947 100644
+index 29e217a..a76bcd0 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
-@@ -10,9 +10,19 @@
-
+@@ -51,9 +51,19 @@ struct rnd_state {
+ extern void rand_initialize_irq(int irq);
extern void add_device_randomness(const void *, unsigned int);
+
@@ -77032,25 +76023,32 @@ index 6312dd9..2561947 100644
extern void get_random_bytes(void *buf, int nbytes);
extern void get_random_bytes_arch(void *buf, int nbytes);
-@@ -33,6 +43,11 @@ void prandom_seed(u32 seed);
- u32 prandom_u32_state(struct rnd_state *);
- void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
+@@ -71,12 +81,17 @@ void srandom32(u32 seed);
+
+ u32 prandom32(struct rnd_state *);
+static inline unsigned long pax_get_random_long(void)
+{
-+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
++ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
+}
+
/*
* Handle minimum values for seeds
*/
+ static inline u32 __seed(u32 x, u32 m)
+ {
+- return (x < m) ? x + m : x;
++ return (x <= m) ? x + m + 1 : x;
+ }
+
+ /**
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
-index 4106721..132d42c 100644
+index 3863352..4ec4bfb 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
-@@ -44,6 +44,9 @@ extern void __list_add_rcu(struct list_head *new,
- struct list_head *prev, struct list_head *next);
- #endif
+@@ -39,6 +39,9 @@ static inline void __list_add_rcu(struct list_head *new,
+ next->prev = new;
+ }
+extern void __pax_list_add_rcu(struct list_head *new,
+ struct list_head *prev, struct list_head *next);
@@ -77058,7 +76056,7 @@ index 4106721..132d42c 100644
/**
* list_add_rcu - add a new entry to rcu-protected list
* @new: new entry to be added
-@@ -65,6 +68,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
+@@ -60,6 +63,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
__list_add_rcu(new, head, head->next);
}
@@ -77070,7 +76068,7 @@ index 4106721..132d42c 100644
/**
* list_add_tail_rcu - add a new entry to rcu-protected list
* @new: new entry to be added
-@@ -87,6 +95,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
+@@ -82,6 +90,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
__list_add_rcu(new, head->prev, head);
}
@@ -77083,7 +76081,7 @@ index 4106721..132d42c 100644
/**
* list_del_rcu - deletes entry from list without re-initialization
* @entry: the element to delete from the list.
-@@ -117,6 +131,8 @@ static inline void list_del_rcu(struct list_head *entry)
+@@ -112,6 +126,8 @@ static inline void list_del_rcu(struct list_head *entry)
entry->prev = LIST_POISON2;
}
@@ -77093,10 +76091,10 @@ index 4106721..132d42c 100644
* hlist_del_init_rcu - deletes entry from hash list with re-initialization
* @n: the element to delete from the hash list.
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
-index 8e00f9f..9449b55 100644
+index e0879a7..a12f962 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
-@@ -43,9 +43,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
+@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
* Architecture-specific implementations of sys_reboot commands.
*/
@@ -77109,7 +76107,7 @@ index 8e00f9f..9449b55 100644
extern void machine_shutdown(void);
struct pt_regs;
-@@ -56,9 +56,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
+@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
*/
extern void kernel_restart_prepare(char *cmd);
@@ -77122,7 +76120,7 @@ index 8e00f9f..9449b55 100644
extern int C_A_D; /* for sysctl */
void ctrl_alt_del(void);
-@@ -72,7 +72,7 @@ extern int orderly_poweroff(bool force);
+@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
* Emergency restart, callable from an interrupt handler.
*/
@@ -77130,12 +76128,12 @@ index 8e00f9f..9449b55 100644
+extern void emergency_restart(void) __noreturn;
#include <asm/emergency-restart.h>
- #endif /* _LINUX_REBOOT_H */
+ #endif
diff --git a/include/linux/regset.h b/include/linux/regset.h
-index 8e0c9fe..ac4d221 100644
+index 686f373..6ade19e 100644
--- a/include/linux/regset.h
+++ b/include/linux/regset.h
-@@ -161,7 +161,8 @@ struct user_regset {
+@@ -160,7 +160,8 @@ struct user_regset {
unsigned int align;
unsigned int bias;
unsigned int core_note_type;
@@ -77145,11 +76143,37 @@ index 8e0c9fe..ac4d221 100644
/**
* struct user_regset_view - available regsets
+diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
+index 96d465f..b084e05 100644
+--- a/include/linux/reiserfs_fs.h
++++ b/include/linux/reiserfs_fs.h
+@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
+ #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
+
+ #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
+-#define get_generation(s) atomic_read (&fs_generation(s))
++#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
+ #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
+ #define __fs_changed(gen,s) (gen != get_generation (s))
+ #define fs_changed(gen,s) \
+diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
+index 52c83b6..18ed7eb 100644
+--- a/include/linux/reiserfs_fs_sb.h
++++ b/include/linux/reiserfs_fs_sb.h
+@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
+ /* Comment? -Hans */
+ wait_queue_head_t s_wait;
+ /* To be obsoleted soon by per buffer seals.. -Hans */
+- atomic_t s_generation_counter; // increased by one every time the
++ atomic_unchecked_t s_generation_counter; // increased by one every time the
+ // tree gets re-balanced
+ unsigned long s_properties; /* File system properties. Currently holds
+ on-disk FS format */
diff --git a/include/linux/relay.h b/include/linux/relay.h
-index d7c8359..818daf5 100644
+index 14a86bc..17d0700 100644
--- a/include/linux/relay.h
+++ b/include/linux/relay.h
-@@ -157,7 +157,7 @@ struct rchan_callbacks
+@@ -159,7 +159,7 @@ struct rchan_callbacks
* The callback should return 0 if successful, negative if not.
*/
int (*remove_buf_file)(struct dentry *dentry);
@@ -77159,23 +76183,23 @@ index d7c8359..818daf5 100644
/*
* CONFIG_RELAY kernel API, kernel/relay.c
diff --git a/include/linux/rio.h b/include/linux/rio.h
-index b71d573..2f940bd 100644
+index 4d50611..c6858a2 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
-@@ -355,7 +355,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);
+@@ -315,7 +315,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);
-};
+} __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 6dacb93..6174423 100644
+index 2148b12..519b820 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
-@@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
+@@ -119,8 +119,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 *);
@@ -77183,14 +76207,14 @@ index 6dacb93..6174423 100644
-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 *);
+ void __anon_vma_link(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 e27baee..aaef421 100644
+index 8204898..d17b99e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -62,6 +62,7 @@ struct bio_list;
+@@ -101,6 +101,7 @@ struct bio_list;
struct fs_struct;
struct perf_event_context;
struct blk_plug;
@@ -77198,7 +76222,7 @@ index e27baee..aaef421 100644
/*
* List of flags we want to share for kernel threads,
-@@ -295,7 +296,7 @@ extern char __sched_text_start[], __sched_text_end[];
+@@ -355,7 +356,7 @@ extern char __sched_text_start[], __sched_text_end[];
extern int in_sched_functions(unsigned long addr);
#define MAX_SCHEDULE_TIMEOUT LONG_MAX
@@ -77207,8 +76231,13 @@ index e27baee..aaef421 100644
extern signed long schedule_timeout_interruptible(signed long timeout);
extern signed long schedule_timeout_killable(signed long timeout);
extern signed long schedule_timeout_uninterruptible(signed long timeout);
-@@ -306,6 +307,19 @@ struct nsproxy;
- struct user_namespace;
+@@ -381,10 +382,23 @@ struct user_namespace;
+ #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
+
+ extern int sysctl_max_map_count;
++extern unsigned long sysctl_heap_stack_gap;
+
+ #include <linux/aio.h>
#ifdef CONFIG_MMU
+
@@ -77221,13 +76250,24 @@ index e27baee..aaef421 100644
+}
+#endif
+
-+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
++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,
-@@ -581,6 +595,17 @@ struct signal_struct {
+@@ -403,6 +417,11 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}
+ extern void set_dumpable(struct mm_struct *mm, int value);
+ extern int get_dumpable(struct mm_struct *mm);
+
++/* get/set_dumpable() values */
++#define SUID_DUMPABLE_DISABLED 0
++#define SUID_DUMPABLE_ENABLED 1
++#define SUID_DUMPABLE_SAFE 2
++
+ /* mm flags */
+ /* dumpable bits */
+ #define MMF_DUMPABLE 0 /* core dump is permitted */
+@@ -630,6 +649,17 @@ struct signal_struct {
#ifdef CONFIG_TASKSTATS
struct taskstats *stats;
#endif
@@ -77244,8 +76284,8 @@ index e27baee..aaef421 100644
+
#ifdef CONFIG_AUDIT
unsigned audit_tty;
- unsigned audit_tty_log_passwd;
-@@ -661,6 +686,14 @@ struct user_struct {
+ struct tty_audit_buf *tty_audit_buf;
+@@ -711,6 +741,14 @@ struct user_struct {
struct key *session_keyring; /* UID's default session keyring */
#endif
@@ -77259,8 +76299,26 @@ index e27baee..aaef421 100644
+
/* Hash table maintenance information */
struct hlist_node uidhash_node;
- kuid_t uid;
-@@ -1146,8 +1179,8 @@ struct task_struct {
+ uid_t uid;
+@@ -1125,7 +1163,7 @@ struct sched_class {
+ #ifdef CONFIG_FAIR_GROUP_SCHED
+ void (*task_move_group) (struct task_struct *p, int on_rq);
+ #endif
+-};
++} __do_const;
+
+ struct load_weight {
+ unsigned long weight, inv_weight;
+@@ -1301,6 +1339,8 @@ struct task_struct {
+ * execve */
+ unsigned in_iowait:1;
+
++ /* task may not gain privileges */
++ unsigned no_new_privs:1;
+
+ /* Revert to default priority/policy when forking */
+ unsigned sched_reset_on_fork:1;
+@@ -1341,8 +1381,8 @@ struct task_struct {
struct list_head thread_group;
struct completion *vfork_done; /* for vfork() */
@@ -77271,7 +76329,7 @@ index e27baee..aaef421 100644
cputime_t utime, stime, utimescaled, stimescaled;
cputime_t gtime;
-@@ -1172,11 +1205,6 @@ struct task_struct {
+@@ -1358,13 +1398,6 @@ struct task_struct {
struct task_cputime cputime_expires;
struct list_head cpu_timers[3];
@@ -77280,10 +76338,12 @@ index e27baee..aaef421 100644
- * credentials (COW) */
- const struct cred __rcu *cred; /* effective (overridable) subjective task
- * credentials (COW) */
+- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
+-
char comm[TASK_COMM_LEN]; /* executable name excluding path
- access with [gs]et_task_comm (which lock
it with task_lock())
-@@ -1193,6 +1221,10 @@ struct task_struct {
+@@ -1381,8 +1414,16 @@ struct task_struct {
#endif
/* CPU-specific state of this task */
struct thread_struct thread;
@@ -77293,33 +76353,38 @@ index e27baee..aaef421 100644
+#endif
/* filesystem information */
struct fs_struct *fs;
++
++ const struct cred __rcu *cred; /* effective (overridable) subjective task
++ * credentials (COW) */
++
/* open file information */
-@@ -1266,6 +1298,10 @@ struct task_struct {
- gfp_t lockdep_reclaim_gfp;
+ struct files_struct *files;
+ /* namespaces */
+@@ -1405,7 +1446,7 @@ struct task_struct {
+ uid_t loginuid;
+ unsigned int sessionid;
+ #endif
+- seccomp_t seccomp;
++ struct seccomp seccomp;
+
+ /* Thread group tracking */
+ u32 parent_exec_id;
+@@ -1429,6 +1470,11 @@ struct task_struct {
+ struct rt_mutex_waiter *pi_blocked_on;
#endif
+/* process credentials */
+ const struct cred __rcu *real_cred; /* objective and real subjective task
+ * credentials (COW) */
++ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
+
- /* journalling filesystem info */
- void *journal_info;
+ #ifdef CONFIG_DEBUG_MUTEXES
+ /* mutex deadlock detection */
+ struct mutex_waiter *blocked_on;
+@@ -1544,6 +1590,30 @@ struct task_struct {
+ unsigned long default_timer_slack_ns;
-@@ -1304,6 +1340,10 @@ struct task_struct {
- /* cg_list protected by css_set_lock and tsk->alloc_lock */
- struct list_head cg_list;
- #endif
-+
-+ const struct cred __rcu *cred; /* effective (overridable) subjective task
-+ * credentials (COW) */
-+
- #ifdef CONFIG_FUTEX
- struct robust_list_head __user *robust_list;
- #ifdef CONFIG_COMPAT
-@@ -1407,8 +1447,78 @@ struct task_struct {
- unsigned int sequential_io;
- unsigned int sequential_io_avg;
- #endif
+ struct list_head *scm_work_list;
+
+#ifdef CONFIG_GRKERNSEC
+ /* grsecurity */
@@ -77344,6 +76409,11 @@ index e27baee..aaef421 100644
+ u8 gr_is_chrooted;
+#endif
+
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+ /* Index of current stored address in ret_stack */
+ int curr_ret_stack;
+@@ -1578,6 +1648,52 @@ struct task_struct {
+ #endif
};
+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
@@ -77395,16 +76465,7 @@ index e27baee..aaef421 100644
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-@@ -1467,7 +1577,7 @@ struct pid_namespace;
- pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
- struct pid_namespace *ns);
-
--static inline pid_t task_pid_nr(struct task_struct *tsk)
-+static inline pid_t task_pid_nr(const struct task_struct *tsk)
- {
- return tsk->pid;
- }
-@@ -1917,7 +2027,9 @@ void yield(void);
+@@ -2093,7 +2209,9 @@ void yield(void);
extern struct exec_domain default_exec_domain;
union thread_union {
@@ -77414,7 +76475,7 @@ index e27baee..aaef421 100644
unsigned long stack[THREAD_SIZE/sizeof(long)];
};
-@@ -1950,6 +2062,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -2126,6 +2244,7 @@ extern struct pid_namespace init_pid_ns;
*/
extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -77422,16 +76483,31 @@ index e27baee..aaef421 100644
extern struct task_struct *find_task_by_pid_ns(pid_t nr,
struct pid_namespace *ns);
-@@ -2114,7 +2227,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
+@@ -2247,6 +2366,12 @@ static inline void mmdrop(struct mm_struct * mm)
+ extern void mmput(struct mm_struct *);
+ /* Grab a reference to a task's mm, if it is not already going away */
+ extern struct mm_struct *get_task_mm(struct task_struct *task);
++/*
++ * Grab a reference to a task's mm, if it is not already going away
++ * and ptrace_may_access with the mode parameter passed to it
++ * succeeds.
++ */
++extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);
+ /* Remove the current tasks stale references to the old mm_struct */
+ extern void mm_release(struct task_struct *, struct mm_struct *);
+ /* Allocate a new mm structure and copy contents from tsk->mm */
+@@ -2263,9 +2388,8 @@ extern void __cleanup_sighand(struct sighand_struct *);
extern void exit_itimers(struct signal_struct *);
extern void flush_itimer_signals(void);
--extern void do_group_exit(int);
+-extern NORET_TYPE void do_group_exit(int);
+extern __noreturn void do_group_exit(int);
+-extern void daemonize(const char *, ...);
extern int allow_signal(int);
extern int disallow_signal(int);
-@@ -2305,9 +2418,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
+
+@@ -2428,9 +2552,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
#endif
@@ -77443,39 +76519,217 @@ index e27baee..aaef421 100644
return (obj >= stack) && (obj < (stack + THREAD_SIZE));
}
-diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
-index bf8086b..962b035 100644
---- a/include/linux/sched/sysctl.h
-+++ b/include/linux/sched/sysctl.h
-@@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
- #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
+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));
- extern int sysctl_max_map_count;
-+extern unsigned long sysctl_heap_stack_gap;
+ #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
+diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
+index cc7a4e9..306733e 100644
+--- a/include/linux/seccomp.h
++++ b/include/linux/seccomp.h
+@@ -1,25 +1,89 @@
+ #ifndef _LINUX_SECCOMP_H
+ #define _LINUX_SECCOMP_H
+
++#include <linux/compiler.h>
++#include <linux/types.h>
+
++
++/* Valid values for seccomp.mode and prctl(PR_SET_SECCOMP, <mode>) */
++#define SECCOMP_MODE_DISABLED 0 /* seccomp is not in use. */
++#define SECCOMP_MODE_STRICT 1 /* uses hard-coded filter. */
++#define SECCOMP_MODE_FILTER 2 /* uses user-supplied filter. */
++
++/*
++ * All BPF programs must return a 32-bit value.
++ * The bottom 16-bits are for optional return data.
++ * The upper 16-bits are ordered from least permissive values to most.
++ *
++ * The ordering ensures that a min_t() over composed return values always
++ * selects the least permissive choice.
++ */
++#define SECCOMP_RET_KILL 0x00000000U /* kill the task immediately */
++#define SECCOMP_RET_TRAP 0x00030000U /* disallow and force a SIGSYS */
++#define SECCOMP_RET_ERRNO 0x00050000U /* returns an errno */
++#define SECCOMP_RET_TRACE 0x7ff00000U /* pass to a tracer or disallow */
++#define SECCOMP_RET_ALLOW 0x7fff0000U /* allow */
++
++/* Masks for the return value sections. */
++#define SECCOMP_RET_ACTION 0xffff0000U
++#define SECCOMP_RET_DATA 0x0000ffffU
++
++/**
++ * struct seccomp_data - the format the BPF program executes over.
++ * @nr: the system call number
++ * @arch: indicates system call convention as an AUDIT_ARCH_* value
++ * as defined in <linux/audit.h>.
++ * @instruction_pointer: at the time of the system call.
++ * @args: up to 6 system call arguments always stored as 64-bit values
++ * regardless of the architecture.
++ */
++struct seccomp_data {
++ int nr;
++ __u32 arch;
++ __u64 instruction_pointer;
++ __u64 args[6];
++};
++
++#ifdef __KERNEL__
+ #ifdef CONFIG_SECCOMP
+
+ #include <linux/thread_info.h>
+ #include <asm/seccomp.h>
+
+-typedef struct { int mode; } seccomp_t;
++struct seccomp_filter;
++/**
++ * struct seccomp - the state of a seccomp'ed process
++ *
++ * @mode: indicates one of the valid values above for controlled
++ * system calls available to a process.
++ * @filter: The metadata and ruleset for determining what system calls
++ * are allowed for a task.
++ *
++ * @filter must only be accessed from the context of current as there
++ * is no locking.
++ */
++struct seccomp {
++ int mode;
++ struct seccomp_filter *filter;
++};
+
+-extern void __secure_computing(int);
+-static inline void secure_computing(int this_syscall)
++/*
++ * Direct callers to __secure_computing should be updated as
++ * CONFIG_HAVE_ARCH_SECCOMP_FILTER propagates.
++ */
++extern void __secure_computing(int) __deprecated;
++extern int __secure_computing_int(int);
++static inline int secure_computing(int this_syscall)
+ {
+ if (unlikely(test_thread_flag(TIF_SECCOMP)))
+- __secure_computing(this_syscall);
++ return __secure_computing_int(this_syscall);
++ return 0;
+ }
+
+ extern long prctl_get_seccomp(void);
+-extern long prctl_set_seccomp(unsigned long);
++extern long prctl_set_seccomp(unsigned long, char __user *);
+
+-static inline int seccomp_mode(seccomp_t *s)
++static inline int seccomp_mode(struct seccomp *s)
+ {
+ return s->mode;
+ }
+@@ -28,25 +92,40 @@ static inline int seccomp_mode(seccomp_t *s)
+
+ #include <linux/errno.h>
+
+-typedef struct { } seccomp_t;
++struct seccomp { };
++struct seccomp_filter { };
- extern unsigned int sysctl_sched_latency;
- extern unsigned int sysctl_sched_min_granularity;
+-#define secure_computing(x) do { } while (0)
++#define secure_computing(x) 0
+
+ static inline long prctl_get_seccomp(void)
+ {
+ return -EINVAL;
+ }
+
+-static inline long prctl_set_seccomp(unsigned long arg2)
++static inline long prctl_set_seccomp(unsigned long arg2, char __user *arg3)
+ {
+ return -EINVAL;
+ }
+
+-static inline int seccomp_mode(seccomp_t *s)
++static inline int seccomp_mode(struct seccomp *s)
+ {
+ return 0;
+ }
+-
+ #endif /* CONFIG_SECCOMP */
+
++#ifdef CONFIG_SECCOMP_FILTER
++extern void put_seccomp_filter(struct task_struct *tsk);
++extern void get_seccomp_filter(struct task_struct *tsk);
++extern u32 seccomp_bpf_load(int off);
++#else /* CONFIG_SECCOMP_FILTER */
++static inline void put_seccomp_filter(struct task_struct *tsk)
++{
++ return;
++}
++static inline void get_seccomp_filter(struct task_struct *tsk)
++{
++ return;
++}
++#endif /* CONFIG_SECCOMP_FILTER */
++#endif /* __KERNEL__ */
+ #endif /* _LINUX_SECCOMP_H */
diff --git a/include/linux/security.h b/include/linux/security.h
-index 9d37e2b..43368e4 100644
+index e8c619d..99d0f1f 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -27,6 +27,7 @@
+@@ -37,6 +37,7 @@
+ #include <linux/xfrm.h>
#include <linux/slab.h>
- #include <linux/err.h>
- #include <linux/string.h>
+ #include <linux/xattr.h>
+#include <linux/grsecurity.h>
+ #include <net/flow.h>
- struct linux_binprm;
- struct cred;
-@@ -116,8 +117,6 @@ struct seq_file;
-
+ /* Maximum number of letters for an LSM name string */
+@@ -98,8 +99,6 @@ struct seq_file;
extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
+ extern int cap_netlink_recv(struct sk_buff *skb, int cap);
-void reset_security_ops(void);
-
#ifdef CONFIG_MMU
extern unsigned long mmap_min_addr;
extern unsigned long dac_mmap_min_addr;
+@@ -130,6 +129,7 @@ struct request_sock;
+ #define LSM_UNSAFE_SHARE 1
+ #define LSM_UNSAFE_PTRACE 2
+ #define LSM_UNSAFE_PTRACE_CAP 4
++#define LSM_UNSAFE_NO_NEW_PRIVS 8
+
+ #ifdef CONFIG_MMU
+ /*
+@@ -1676,6 +1676,8 @@ int security_capset(struct cred *new, const struct cred *old,
+ const kernel_cap_t *permitted);
+ int security_capable(struct user_namespace *ns, const struct cred *cred,
+ int cap);
++int security_capable_noaudit(struct user_namespace *ns, const struct cred *cred,
++ int cap);
+ int security_real_capable(struct task_struct *tsk, struct user_namespace *ns,
+ int cap);
+ int security_real_capable_noaudit(struct task_struct *tsk,
+@@ -1880,6 +1882,12 @@ static inline int security_capable(struct user_namespace *ns,
+ return cap_capable(current, cred, ns, cap, SECURITY_CAP_AUDIT);
+ }
+
++static inline int security_capable_noaudit(struct user_namespace *ns,
++ const struct cred *cred, int cap)
++{
++ return cap_capable(current, cred, ns, cap, SECURITY_CAP_NOAUDIT);
++}
++
+ static inline int security_real_capable(struct task_struct *tsk, struct user_namespace *ns, int cap)
+ {
+ int ret;
diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
index dc368b8..e895209 100644
--- a/include/linux/semaphore.h
@@ -77490,20 +76744,20 @@ index dc368b8..e895209 100644
extern int __must_check down_trylock(struct semaphore *sem);
extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
-index 4e32edc..f8f2d18 100644
+index 0b69a46..b2ffa4c 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
-@@ -26,6 +26,9 @@ struct seq_file {
+@@ -24,6 +24,9 @@ struct seq_file {
struct mutex lock;
const struct seq_operations *op;
int poll_event;
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ u64 exec_id;
+#endif
- #ifdef CONFIG_USER_NS
- struct user_namespace *user_ns;
- #endif
-@@ -38,6 +41,7 @@ struct seq_operations {
+ void *private;
+ };
+
+@@ -33,6 +36,7 @@ struct seq_operations {
void * (*next) (struct seq_file *m, void *v, loff_t *pos);
int (*show) (struct seq_file *m, void *v);
};
@@ -77512,10 +76766,10 @@ index 4e32edc..f8f2d18 100644
#define SEQ_SKIP 1
diff --git a/include/linux/shm.h b/include/linux/shm.h
-index 429c199..4d42e38 100644
+index 92808b8..c28cac4 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
-@@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
+@@ -98,6 +98,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;
@@ -77527,19 +76781,19 @@ index 429c199..4d42e38 100644
/* shm_mode upper byte flags */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index c2d8933..b2b4ed6 100644
+index efe50af..9a039e5 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -648,7 +648,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
+@@ -538,7 +538,7 @@ extern void consume_skb(struct sk_buff *skb);
+ extern void __kfree_skb(struct sk_buff *skb);
extern struct sk_buff *__alloc_skb(unsigned int size,
- gfp_t priority, int flags, int node);
- extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
+ gfp_t priority, int fclone, int node);
-static inline struct sk_buff *alloc_skb(unsigned int size,
+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
gfp_t priority)
{
return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
-@@ -764,7 +764,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
+@@ -640,7 +640,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
*/
static inline int skb_queue_empty(const struct sk_buff_head *list)
{
@@ -77548,7 +76802,7 @@ index c2d8933..b2b4ed6 100644
}
/**
-@@ -777,7 +777,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
+@@ -653,7 +653,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
static inline bool skb_queue_is_last(const struct sk_buff_head *list,
const struct sk_buff *skb)
{
@@ -77557,7 +76811,7 @@ index c2d8933..b2b4ed6 100644
}
/**
-@@ -790,7 +790,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
+@@ -666,7 +666,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
static inline bool skb_queue_is_first(const struct sk_buff_head *list,
const struct sk_buff *skb)
{
@@ -77566,7 +76820,19 @@ index c2d8933..b2b4ed6 100644
}
/**
-@@ -1750,7 +1750,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
+@@ -1157,6 +1157,11 @@ static inline int skb_pagelen(const struct sk_buff *skb)
+ return len + skb_headlen(skb);
+ }
+
++static inline bool skb_has_frags(const struct sk_buff *skb)
++{
++ return skb_shinfo(skb)->nr_frags;
++}
++
+ /**
+ * __skb_fill_page_desc - initialise a paged fragment in an skb
+ * @skb: buffer containing fragment to be initialised
+@@ -1546,7 +1551,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
@@ -77575,7 +76841,7 @@ index c2d8933..b2b4ed6 100644
#endif
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-@@ -2348,7 +2348,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
+@@ -2085,7 +2090,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);
@@ -77584,25 +76850,24 @@ index c2d8933..b2b4ed6 100644
int offset, struct iovec *to,
int size);
extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
-@@ -2643,6 +2643,9 @@ static inline void nf_reset(struct sk_buff *skb)
+@@ -2365,6 +2370,9 @@ static inline void nf_reset(struct sk_buff *skb)
nf_bridge_put(skb->nf_bridge);
skb->nf_bridge = NULL;
#endif
-+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
++#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)
+ skb->nf_trace = 0;
+#endif
}
static inline void nf_reset_trace(struct sk_buff *skb)
diff --git a/include/linux/slab.h b/include/linux/slab.h
-index 74f1058..914b7da 100644
+index a595dce..e710d26 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
-@@ -14,15 +14,29 @@
+@@ -11,14 +11,29 @@
+
#include <linux/gfp.h>
#include <linux/types.h>
- #include <linux/workqueue.h>
--
+#include <linux/err.h>
/*
@@ -77629,7 +76894,7 @@ index 74f1058..914b7da 100644
#define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
#define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
#define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
-@@ -91,10 +105,13 @@
+@@ -87,10 +102,22 @@
* ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
* Both make kfree a no-op.
*/
@@ -77643,10 +76908,19 @@ index 74f1058..914b7da 100644
-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
- (unsigned long)ZERO_SIZE_PTR)
+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
++
++#ifdef CONFIG_PAX_MEMORY_SANITIZE
++#ifdef CONFIG_X86_64
++#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
++#else
++#define PAX_MEMORY_SANITIZE_VALUE '\xff'
++#endif
++extern bool pax_sanitize_slab;
++#endif
- #include <linux/kmemleak.h>
-
-@@ -135,6 +152,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
+ /*
+ * struct kmem_cache related prototypes
+@@ -161,6 +188,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
void kfree(const void *);
void kzfree(const void *);
size_t ksize(const void *);
@@ -77654,64 +76928,12 @@ index 74f1058..914b7da 100644
+bool is_usercopy_object(const void *ptr);
/*
- * Some archs want to perform DMA into kmalloc caches and need a guaranteed
-@@ -167,7 +186,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 */
- };
-@@ -241,6 +260,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
- extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
- #endif
-
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
-+#endif
-+
- /*
- * Figure out which kmalloc slab an allocation of a certain size
- * belongs to.
-@@ -249,7 +272,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
- * 2 = 120 .. 192 bytes
- * n = 2^(n-1) .. 2^n -1
- */
--static __always_inline int kmalloc_index(size_t size)
-+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
- {
- if (!size)
- return 0;
-@@ -292,11 +315,11 @@ static __always_inline int kmalloc_index(size_t size)
- }
- #endif /* !CONFIG_SLOB */
-
--void *__kmalloc(size_t size, gfp_t flags);
-+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
- void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
-
- #ifdef CONFIG_NUMA
--void *__kmalloc_node(size_t size, gfp_t flags, int node);
-+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
- void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
- #else
- static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
+ * Allocator specific definitions. These are mainly used to establish optimized
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
-index e9346b4..1494959 100644
+index d00e0ba..e075bd20 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
-@@ -36,7 +36,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;
-
-@@ -52,10 +52,14 @@ struct kmem_cache {
+@@ -68,10 +68,14 @@ struct kmem_cache {
unsigned long node_allocs;
unsigned long node_frees;
unsigned long node_overflow;
@@ -77730,11 +76952,59 @@ index e9346b4..1494959 100644
/*
* If debugging is enabled, then the allocator can add additional
+@@ -105,6 +109,11 @@ struct cache_sizes {
+ #ifdef CONFIG_ZONE_DMA
+ struct kmem_cache *cs_dmacachep;
+ #endif
++
++#ifdef CONFIG_PAX_USERCOPY_SLABS
++ struct kmem_cache *cs_usercopycachep;
++#endif
++
+ };
+ extern struct cache_sizes malloc_sizes[];
+
+@@ -152,6 +161,13 @@ found:
+ cachep = malloc_sizes[i].cs_dmacachep;
+ else
+ #endif
++
++#ifdef CONFIG_PAX_USERCOPY_SLABS
++ if (flags & GFP_USERCOPY)
++ cachep = malloc_sizes[i].cs_usercopycachep;
++ else
++#endif
++
+ cachep = malloc_sizes[i].cs_cachep;
+
+ ret = kmem_cache_alloc_trace(size, cachep, flags);
+@@ -181,6 +197,7 @@ kmem_cache_alloc_node_trace(size_t size,
+ }
+ #endif
+
++static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
+ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+ {
+ struct kmem_cache *cachep;
+@@ -205,6 +222,13 @@ found:
+ cachep = malloc_sizes[i].cs_dmacachep;
+ else
+ #endif
++
++#ifdef CONFIG_PAX_USERCOPY_SLABS
++ if (flags & GFP_USERCOPY)
++ cachep = malloc_sizes[i].cs_usercopycachep;
++ else
++#endif
++
+ cachep = malloc_sizes[i].cs_cachep;
+
+ return kmem_cache_alloc_node_trace(size, cachep, flags, node);
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
-index cc0b67e..a0329b1 100644
+index a32bcfd..f0246c3 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
-@@ -74,7 +74,7 @@ struct kmem_cache {
+@@ -89,7 +89,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
gfp_t allocflags; /* gfp flags to use on each alloc */
@@ -77743,39 +77013,33 @@ index cc0b67e..a0329b1 100644
void (*ctor)(void *);
int inuse; /* Offset to metadata */
int align; /* Alignment */
-diff --git a/include/linux/smp.h b/include/linux/smp.h
-index 731f523..3340268 100644
---- a/include/linux/smp.h
-+++ b/include/linux/smp.h
-@@ -186,7 +186,9 @@ static inline void __smp_call_function_single(int cpuid,
- #endif
-
- #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
-+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
- #define put_cpu() preempt_enable()
-+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
+@@ -150,7 +150,7 @@ extern struct kmem_cache *kmalloc_caches[SLUB_PAGE_SHIFT];
+ * Sorry that the following has to be that ugly but some versions of GCC
+ * have trouble with constant propagation and loops.
+ */
+-static __always_inline int kmalloc_index(size_t size)
++static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
+ {
+ if (!size)
+ return 0;
+@@ -215,9 +215,9 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
+ }
- /*
- * Callback to arch code if there's nosmp or maxcpus=0 on the
-diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
-index 54f91d3..be2c379 100644
---- a/include/linux/sock_diag.h
-+++ b/include/linux/sock_diag.h
-@@ -11,7 +11,7 @@ struct sock;
- struct sock_diag_handler {
- __u8 family;
- int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
--};
-+} __do_const;
+ void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
+-void *__kmalloc(size_t size, gfp_t flags);
++void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
- int sock_diag_register(const struct sock_diag_handler *h);
- void sock_diag_unregister(const struct sock_diag_handler *h);
+-static __always_inline void *
++static __always_inline __size_overflow(1) void *
+ kmalloc_order(size_t size, gfp_t flags, unsigned int order)
+ {
+ void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
diff --git a/include/linux/sonet.h b/include/linux/sonet.h
-index 680f9a3..f13aeb0 100644
+index de8832d..0147b46 100644
--- a/include/linux/sonet.h
+++ b/include/linux/sonet.h
-@@ -7,7 +7,7 @@
- #include <uapi/linux/sonet.h>
+@@ -61,7 +61,7 @@ struct sonet_stats {
+ #include <linux/atomic.h>
struct k_sonet_stats {
-#define __HANDLE_ITEM(i) atomic_t i
@@ -77783,11 +77047,41 @@ index 680f9a3..f13aeb0 100644
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
-index 07d8e53..dc934c9 100644
---- a/include/linux/sunrpc/addr.h
-+++ b/include/linux/sunrpc/addr.h
-@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
+diff --git a/include/linux/stddef.h b/include/linux/stddef.h
+index 6a40c76..1747b67 100644
+--- a/include/linux/stddef.h
++++ b/include/linux/stddef.h
+@@ -3,14 +3,10 @@
+
+ #include <linux/compiler.h>
+
++#ifdef __KERNEL__
++
+ #undef NULL
+-#if defined(__cplusplus)
+-#define NULL 0
+-#else
+ #define NULL ((void *)0)
+-#endif
+-
+-#ifdef __KERNEL__
+
+ enum {
+ false = 0,
+diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
+index 3d8f9c4..349a695 100644
+--- a/include/linux/sunrpc/clnt.h
++++ b/include/linux/sunrpc/clnt.h
+@@ -98,7 +98,7 @@ struct rpc_procinfo {
+ unsigned int p_timer; /* Which RTT timer to use */
+ u32 p_statidx; /* Which procedure to account */
+ char * p_name; /* name of procedure */
+-};
++} __do_const;
+
+ #ifdef __KERNEL__
+
+@@ -172,9 +172,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
{
switch (sap->sa_family) {
case AF_INET:
@@ -77799,7 +77093,7 @@ index 07d8e53..dc934c9 100644
}
return 0;
}
-@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
+@@ -207,7 +207,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
static inline bool __rpc_copy_addr4(struct sockaddr *dst,
const struct sockaddr *src)
{
@@ -77808,7 +77102,7 @@ index 07d8e53..dc934c9 100644
struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
dsin->sin_family = ssin->sin_family;
-@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
+@@ -310,7 +310,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
if (sa->sa_family != AF_INET6)
return 0;
@@ -77816,25 +77110,12 @@ index 07d8e53..dc934c9 100644
+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
}
- #endif /* _LINUX_SUNRPC_ADDR_H */
-diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
-index 6740801..c535f27 100644
---- a/include/linux/sunrpc/clnt.h
-+++ b/include/linux/sunrpc/clnt.h
-@@ -96,7 +96,7 @@ struct rpc_procinfo {
- unsigned int p_timer; /* Which RTT timer to use */
- u32 p_statidx; /* Which procedure to account */
- const char * p_name; /* name of procedure */
--};
-+} __do_const;
-
- #ifdef __KERNEL__
-
+ #endif /* __KERNEL__ */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
-index 6eecfc2..7ada79d 100644
+index 35b37b1..c39eab4 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
-@@ -410,7 +410,7 @@ struct svc_procedure {
+@@ -408,7 +408,7 @@ struct svc_procedure {
unsigned int pc_count; /* call count */
unsigned int pc_cachetype; /* cache info (NFS) */
unsigned int pc_xdrressize; /* maximum size of XDR reply */
@@ -77844,7 +77125,7 @@ index 6eecfc2..7ada79d 100644
/*
* Function prototypes.
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
-index 0b8e3e6..33e0a01 100644
+index c14fe86..d04f36c 100644
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
@@ -77872,11 +77153,20 @@ index 0b8e3e6..33e0a01 100644
#define RPCRDMA_VERSION 1
+@@ -292,7 +292,7 @@ svc_rdma_get_reply_array(struct rpcrdma_msg *rmsgp)
+ if (wr_ary) {
+ rp_ary = (struct rpcrdma_write_array *)
+ &wr_ary->
+- wc_array[wr_ary->wc_nchunks].wc_target.rs_length;
++ wc_array[ntohl(wr_ary->wc_nchunks)].wc_target.rs_length;
+
+ goto found_it;
+ }
diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
-index 8d71d65..f79586e 100644
+index 25d333c..a722ca0 100644
--- a/include/linux/sunrpc/svcauth.h
+++ b/include/linux/sunrpc/svcauth.h
-@@ -120,7 +120,7 @@ struct auth_ops {
+@@ -100,7 +100,7 @@ struct auth_ops {
int (*release)(struct svc_rqst *rq);
void (*domain_release)(struct auth_domain *);
int (*set_client)(struct svc_rqst *rq);
@@ -77885,41 +77175,69 @@ index 8d71d65..f79586e 100644
#define SVC_GARBAGE 1
#define SVC_SYSERR 2
-diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
-index a5ffd32..0935dea 100644
---- a/include/linux/swiotlb.h
-+++ b/include/linux/swiotlb.h
-@@ -60,7 +60,8 @@ extern void
-
- extern void
- swiotlb_free_coherent(struct device *hwdev, size_t size,
-- void *vaddr, dma_addr_t dma_handle);
-+ void *vaddr, dma_addr_t dma_handle,
-+ struct dma_attrs *attrs);
-
- extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
- unsigned long offset, size_t size,
+diff --git a/include/linux/swab.h b/include/linux/swab.h
+index ea0c02f..0eed39d 100644
+--- a/include/linux/swab.h
++++ b/include/linux/swab.h
+@@ -43,7 +43,7 @@
+ * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
+ */
+
+-static inline __attribute_const__ __u16 __fswab16(__u16 val)
++static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
+ {
+ #ifdef __arch_swab16
+ return __arch_swab16(val);
+@@ -52,7 +52,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
+ #endif
+ }
+
+-static inline __attribute_const__ __u32 __fswab32(__u32 val)
++static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
+ {
+ #ifdef __arch_swab32
+ return __arch_swab32(val);
+@@ -61,7 +61,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
+ #endif
+ }
+
+-static inline __attribute_const__ __u64 __fswab64(__u64 val)
++static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
+ {
+ #ifdef __arch_swab64
+ return __arch_swab64(val);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
-index 7fac04e..de57300 100644
+index 86a24b1..e6974f1 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
-@@ -97,8 +97,14 @@ struct sigaltstack;
- #define __MAP(n,...) __MAP##n(__VA_ARGS__)
-
- #define __SC_DECL(t, a) t a
+@@ -83,12 +83,20 @@ struct file_handle;
+ #define __SC_DECL5(t5, a5, ...) t5 a5, __SC_DECL4(__VA_ARGS__)
+ #define __SC_DECL6(t6, a6, ...) t6 a6, __SC_DECL5(__VA_ARGS__)
+
+-#define __SC_LONG1(t1, a1) long a1
+-#define __SC_LONG2(t2, a2, ...) long a2, __SC_LONG1(__VA_ARGS__)
+-#define __SC_LONG3(t3, a3, ...) long a3, __SC_LONG2(__VA_ARGS__)
+-#define __SC_LONG4(t4, a4, ...) long a4, __SC_LONG3(__VA_ARGS__)
+-#define __SC_LONG5(t5, a5, ...) long a5, __SC_LONG4(__VA_ARGS__)
+-#define __SC_LONG6(t6, a6, ...) long a6, __SC_LONG5(__VA_ARGS__)
+#define __TYPE_IS_U(t) (__same_type((t)0, 0UL) || __same_type((t)0, 0U) || __same_type((t)0, (unsigned short)0) || __same_type((t)0, (unsigned char)0))
- #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
--#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
-+#define __SC_LONG(t, a) __typeof( \
++#define __SC_TYPE(t, a) __typeof( \
+ __builtin_choose_expr( \
+ sizeof(t) > sizeof(int), \
+ (t) 0, \
+ __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
+ )) a
- #define __SC_CAST(t, a) (t) a
- #define __SC_ARGS(t, a) a
- #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
-@@ -363,11 +369,11 @@ asmlinkage long sys_sync(void);
++
++#define __SC_LONG1(t1, a1) __SC_TYPE(t1, a1)
++#define __SC_LONG2(t2, a2, ...) __SC_TYPE(t2, a2), __SC_LONG1(__VA_ARGS__)
++#define __SC_LONG3(t3, a3, ...) __SC_TYPE(t3, a3), __SC_LONG2(__VA_ARGS__)
++#define __SC_LONG4(t4, a4, ...) __SC_TYPE(t4, a4), __SC_LONG3(__VA_ARGS__)
++#define __SC_LONG5(t5, a5, ...) __SC_TYPE(t5, a5), __SC_LONG4(__VA_ARGS__)
++#define __SC_LONG6(t6, a6, ...) __SC_TYPE(t6, a6), __SC_LONG5(__VA_ARGS__)
+
+ #define __SC_CAST1(t1, a1) (t1) a1
+ #define __SC_CAST2(t2, a2, ...) (t2) a2, __SC_CAST1(__VA_ARGS__)
+@@ -392,11 +400,11 @@ asmlinkage long sys_sync(void);
asmlinkage long sys_fsync(unsigned int fd);
asmlinkage long sys_fdatasync(unsigned int fd);
asmlinkage long sys_bdflush(int func, long data);
@@ -77935,7 +77253,7 @@ index 7fac04e..de57300 100644
asmlinkage long sys_truncate(const char __user *path, long length);
asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
asmlinkage long sys_stat(const char __user *filename,
-@@ -579,7 +585,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
+@@ -608,7 +616,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
asmlinkage long sys_send(int, void __user *, size_t, unsigned);
asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
@@ -77958,12 +77276,25 @@ index 27b3b0b..e093dd9 100644
extern void register_syscore_ops(struct syscore_ops *ops);
extern void unregister_syscore_ops(struct syscore_ops *ops);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
-index 14a8ff2..af52bad 100644
+index 703cfa33..dff53c0 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
-@@ -34,13 +34,13 @@ struct ctl_table_root;
- struct ctl_table_header;
- struct ctl_dir;
+@@ -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
+@@ -961,13 +965,13 @@ extern void sysctl_head_finish(struct ctl_table_header *prev);
+ extern int sysctl_perm(struct ctl_table_root *root,
+ struct ctl_table *table, int op);
-typedef struct ctl_table ctl_table;
-
@@ -77977,7 +77308,7 @@ index 14a8ff2..af52bad 100644
extern int proc_dointvec(struct ctl_table *, int,
void __user *, size_t *, loff_t *);
extern int proc_dointvec_minmax(struct ctl_table *, int,
-@@ -115,7 +115,9 @@ struct ctl_table
+@@ -1045,7 +1049,9 @@ struct ctl_table
struct ctl_table_poll *poll;
void *extra1;
void *extra2;
@@ -77986,13 +77317,26 @@ index 14a8ff2..af52bad 100644
+typedef struct ctl_table __no_const ctl_table_no_const;
+typedef struct ctl_table ctl_table;
- struct ctl_node {
- struct rb_node node;
+ struct ctl_table_root {
+ struct list_head root_list;
+diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
+index 20f63d3..fdd3cbb 100644
+--- a/include/linux/sysdev.h
++++ b/include/linux/sysdev.h
+@@ -98,7 +98,7 @@ struct sysdev_attribute {
+ ssize_t (*store)(struct sys_device *, struct sysdev_attribute *,
+ const char *, size_t);
+ };
+-
++typedef struct sysdev_attribute __no_const sysdev_attribute_no_const;
+
+ #define _SYSDEV_ATTR(_name, _mode, _show, _store) \
+ { \
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
-index 11baec7..706f99f 100644
+index dac0859..4ea79a9 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
-@@ -33,7 +33,8 @@ struct attribute {
+@@ -30,7 +30,8 @@ struct attribute {
struct lock_class_key *key;
struct lock_class_key skey;
#endif
@@ -78002,17 +77346,18 @@ index 11baec7..706f99f 100644
/**
* sysfs_attr_init - initialize a dynamically allocated sysfs attribute
-@@ -62,7 +63,8 @@ struct attribute_group {
+@@ -58,8 +59,8 @@ struct attribute_group {
+ mode_t (*is_visible)(struct kobject *,
struct attribute *, int);
struct attribute **attrs;
- struct bin_attribute **bin_attrs;
-};
+-
+} __do_const;
+typedef struct attribute_group __no_const attribute_group_no_const;
+
/**
- * Use these macros to make defining attributes easier. See include/linux/device.h
-@@ -126,7 +128,8 @@ struct bin_attribute {
+@@ -95,7 +96,8 @@ struct bin_attribute {
char *, loff_t, size_t);
int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
struct vm_area_struct *vma);
@@ -78044,52 +77389,66 @@ index 7faf933..9b85a0c 100644
#ifdef CONFIG_MAGIC_SYSRQ
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
-index e7e0473..7989295 100644
+index 8d03f07..e723aa8 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
-@@ -148,6 +148,15 @@ static inline bool test_and_clear_restore_sigmask(void)
- #error "no set_restore_sigmask() provided and default one won't work"
- #endif
+@@ -123,6 +123,13 @@ static inline void set_restore_sigmask(void)
+ }
+ #endif /* TIF_RESTORE_SIGMASK && !HAVE_SET_RESTORE_SIGMASK */
-+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user);
-+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
++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_user);
++ __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 64f8646..1515fc7 100644
---- a/include/linux/tty.h
-+++ b/include/linux/tty.h
-@@ -197,7 +197,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 */
-- int count; /* Usage count */
-+ atomic_t count; /* Usage count */
- 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 */
-@@ -546,7 +546,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)
- {
-- return port->count + port->blocked_open;
-+ return atomic_read(&port->count) + port->blocked_open;
- }
-
- extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
+diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
+index a71a292..51bd91d 100644
+--- a/include/linux/tracehook.h
++++ b/include/linux/tracehook.h
+@@ -54,12 +54,12 @@ struct linux_binprm;
+ /*
+ * ptrace report for syscall entry and exit looks identical.
+ */
+-static inline void ptrace_report_syscall(struct pt_regs *regs)
++static inline int ptrace_report_syscall(struct pt_regs *regs)
+ {
+ int ptrace = current->ptrace;
+
+ if (!(ptrace & PT_PTRACED))
+- return;
++ return 0;
+
+ ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
+
+@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
+ send_sig(current->exit_code, current, 1);
+ current->exit_code = 0;
+ }
++
++ return fatal_signal_pending(current);
+ }
+
+ /**
+@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
+ static inline __must_check int tracehook_report_syscall_entry(
+ struct pt_regs *regs)
+ {
+- ptrace_report_syscall(regs);
+- return 0;
++ return ptrace_report_syscall(regs);
+ }
+
+ /**
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
-index 756a609..b302dd6 100644
+index ecdaeb9..8d27e20 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
-@@ -285,7 +285,7 @@ struct tty_operations {
+@@ -286,7 +286,7 @@ struct tty_operations {
void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
#endif
const struct file_operations *proc_fops;
@@ -78099,23 +77458,23 @@ index 756a609..b302dd6 100644
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 f15c898..207b7d1 100644
+index ff7dc08..893e1bd 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
-@@ -211,7 +211,7 @@ struct tty_ldisc_ops {
+@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
struct module *owner;
-
+
- int refcount;
+ atomic_t refcount;
};
struct tty_ldisc {
diff --git a/include/linux/types.h b/include/linux/types.h
-index 4d118ba..c3ee9bf 100644
+index 57a9723..dbe234a 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
-@@ -176,10 +176,26 @@ typedef struct {
+@@ -213,10 +213,26 @@ typedef struct {
int counter;
} atomic_t;
@@ -78161,20 +77520,6 @@ index 5ca0951..ab496a5 100644
ret; \
})
-diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
-index 8e522cbc..aa8572d 100644
---- a/include/linux/uidgid.h
-+++ b/include/linux/uidgid.h
-@@ -197,4 +197,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
-
- #endif /* CONFIG_USER_NS */
-
-+#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 gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
-+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
-+
- #endif /* _LINUX_UIDGID_H */
diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
index 99c1b4d..562e6f3 100644
--- a/include/linux/unaligned/access_ok.h
@@ -78227,11 +77572,11 @@ index 99c1b4d..562e6f3 100644
static inline void put_unaligned_le16(u16 val, void *p)
diff --git a/include/linux/usb.h b/include/linux/usb.h
-index 001629c..7c1cc9b 100644
+index 93629fc..be16802 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
-@@ -561,7 +561,7 @@ struct usb_device {
- int maxchild;
+@@ -497,7 +497,7 @@ struct usb_device {
+ struct usb_device *children[USB_MAXCHILDREN];
u32 quirks;
- atomic_t urbnum;
@@ -78239,7 +77584,7 @@ index 001629c..7c1cc9b 100644
unsigned long active_duration;
-@@ -1635,7 +1635,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
+@@ -1442,7 +1442,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
__u8 request, __u8 requesttype, __u16 value, __u16 index,
@@ -78249,7 +77594,7 @@ index 001629c..7c1cc9b 100644
void *data, int len, int *actual_length, int timeout);
extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
-index e452ba6..78f8e80 100644
+index e5a40c3..d75f068 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -39,7 +39,7 @@ enum {
@@ -78261,6 +77606,27 @@ index e452ba6..78f8e80 100644
/*
* callback functions for platform
+diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
+index 76f4396..3e0a4a8 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_WAKING 6
+ # define EVENT_DEV_ASLEEP 7
+ # define EVENT_DEV_OPEN 8
++# define EVENT_NO_RUNTIME_PM 9
++# define EVENT_RX_KILL 10
+ };
+
+ 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
@@ -78302,58 +77668,23 @@ index 6f8fbcf..8259001 100644
+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
+ MODULE_GRSEC
-diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
-index 502073a..a7de024 100644
---- a/include/linux/vga_switcheroo.h
-+++ b/include/linux/vga_switcheroo.h
-@@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
-
- void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
-
--int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
--int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
-+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
-+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
- #else
-
- static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
-@@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
-
- static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
-
--static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
--static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
-+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
-+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
-
- #endif
- #endif /* _LINUX_VGA_SWITCHEROO_H_ */
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index 4b8a891..cc929b4 100644
+index 4bde182..943f335 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
-@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
- #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
- #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
- #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
+@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
+ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
+ #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
+ #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
+
+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
-+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
++#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
+#endif
+
/* bits [20..32] reserved for arch specific ioremap internals */
/*
-@@ -75,7 +80,7 @@ extern void *vmalloc_32_user(unsigned long size);
- extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
- extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
- unsigned long start, unsigned long end, gfp_t gfp_mask,
-- pgprot_t prot, int node, const void *caller);
-+ pgprot_t prot, int node, const void *caller) __size_overflow(1);
- extern void vfree(const void *addr);
-
- extern void *vmap(struct page **pages, unsigned int count,
-@@ -142,7 +147,7 @@ extern void free_vm_area(struct vm_struct *area);
+@@ -124,7 +129,7 @@ extern void free_vm_area(struct vm_struct *area);
/* for /dev/kmem */
extern long vread(char *buf, char *addr, unsigned long count);
@@ -78363,10 +77694,10 @@ index 4b8a891..cc929b4 100644
/*
* Internals. Dont't use..
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
-index e4b9480..b96d5ab 100644
+index 65efb92..137adbb 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
-@@ -90,18 +90,18 @@ static inline void vm_events_fold_cpu(int cpu)
+@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
/*
* Zone based page accounting with per cpu differentials.
*/
@@ -78389,7 +77720,7 @@ index e4b9480..b96d5ab 100644
#ifdef CONFIG_SMP
if (x < 0)
x = 0;
-@@ -112,7 +112,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
+@@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
static inline unsigned long zone_page_state(struct zone *zone,
enum zone_stat_item item)
{
@@ -78398,7 +77729,7 @@ index e4b9480..b96d5ab 100644
#ifdef CONFIG_SMP
if (x < 0)
x = 0;
-@@ -129,7 +129,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
+@@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
static inline unsigned long zone_page_state_snapshot(struct zone *zone,
enum zone_stat_item item)
{
@@ -78407,7 +77738,7 @@ index e4b9480..b96d5ab 100644
#ifdef CONFIG_SMP
int cpu;
-@@ -220,8 +220,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
+@@ -221,8 +221,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)
{
@@ -78418,7 +77749,7 @@ index e4b9480..b96d5ab 100644
}
static inline void __inc_zone_page_state(struct page *page,
-@@ -232,8 +232,8 @@ static inline void __inc_zone_page_state(struct page *page,
+@@ -233,8 +233,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)
{
@@ -78430,10 +77761,22 @@ index e4b9480..b96d5ab 100644
static inline void __dec_zone_page_state(struct page *page,
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
-index 91b0a68..0e9adf6 100644
+index e5d1220..5a87d07 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
-@@ -28,7 +28,7 @@ struct xattr_handler {
+@@ -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>
+@@ -73,7 +78,7 @@ struct xattr_handler {
size_t size, int handler_flags);
int (*set)(struct dentry *dentry, const char *name, const void *buffer,
size_t size, int flags, int handler_flags);
@@ -78441,8 +77784,8 @@ index 91b0a68..0e9adf6 100644
+} __do_const;
struct xattr {
- const char *name;
-@@ -37,6 +37,9 @@ struct xattr {
+ char *name;
+@@ -82,6 +87,9 @@ struct xattr {
};
ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
@@ -78452,6 +77795,18 @@ index 91b0a68..0e9adf6 100644
ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
+diff --git a/include/linux/yam.h b/include/linux/yam.h
+index 7fe2822..512cdc2 100644
+--- a/include/linux/yam.h
++++ b/include/linux/yam.h
+@@ -77,6 +77,6 @@ struct yamdrv_ioctl_cfg {
+
+ struct yamdrv_ioctl_mcs {
+ int cmd;
+- int bitrate;
++ unsigned int bitrate;
+ unsigned char bits[YAM_FPGA_SIZE];
+ };
diff --git a/include/linux/zlib.h b/include/linux/zlib.h
index 9c5a6b4..09c9438 100644
--- a/include/linux/zlib.h
@@ -78474,20 +77829,20 @@ index 9c5a6b4..09c9438 100644
Returns the number of bytes that needs to be allocated for a per-
stream workspace with the specified parameters. A pointer to this
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
-index c768c9f..bdcaa5a 100644
+index c7c40f1..5c31482 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
-@@ -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;
+@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
- /*
- * Newer version of video_device, handled by videodev2.c
+
+ struct v4l2_file_operations {
+- struct module *owner;
++ struct module * const owner;
+ ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+ ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
+ unsigned int (*poll) (struct file *, struct poll_table_struct *);
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
-index c9b1593..a572459 100644
+index d61febf..f0094f6 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
@@ -78499,11 +77854,23 @@ index c9b1593..a572459 100644
/* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
Since the parent disappears this ensures that v4l2_dev doesn't have an
+diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
+index 4d1c74a..8e58054 100644
+--- a/include/media/v4l2-ioctl.h
++++ b/include/media/v4l2-ioctl.h
+@@ -275,7 +275,6 @@ struct v4l2_ioctl_ops {
+ bool valid_prio, int cmd, void *arg);
+ };
+
+-
+ /* v4l debugging and diagnostics */
+
+ /* Debug bitmask flags to be used on V4L2 */
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
-index 9a36d92..0aafe2a 100644
+index adcbb20..62c2559 100644
--- a/include/net/9p/transport.h
+++ b/include/net/9p/transport.h
-@@ -60,7 +60,7 @@ struct p9_trans_module {
+@@ -57,7 +57,7 @@ struct p9_trans_module {
int (*cancel) (struct p9_client *, struct p9_req_t *req);
int (*zc_request)(struct p9_client *, struct p9_req_t *,
char *, char *, int , int, int, int);
@@ -78513,20 +77880,20 @@ index 9a36d92..0aafe2a 100644
void v9fs_register_trans(struct p9_trans_module *m);
void v9fs_unregister_trans(struct p9_trans_module *m);
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
-index 1a966af..2767cf6 100644
+index 6cc18f3..b0df15a 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
-@@ -551,7 +551,7 @@ struct l2cap_ops {
- void (*defer) (struct l2cap_chan *chan);
- struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
- unsigned long len, int nb);
+@@ -387,7 +387,7 @@ struct l2cap_ops {
+ int (*recv) (void *data, struct sk_buff *skb);
+ void (*close) (void *data);
+ void (*state_change) (void *data, int state);
-};
+} __do_const;
struct l2cap_conn {
- struct hci_conn *hcon;
+ struct hci_conn *hcon;
diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
-index f2ae33d..c457cf0 100644
+index 9e5425b..8136ffc 100644
--- a/include/net/caif/cfctrl.h
+++ b/include/net/caif/cfctrl.h
@@ -52,7 +52,7 @@ struct cfctrl_rsp {
@@ -78550,10 +77917,10 @@ index f2ae33d..c457cf0 100644
/* Protects from simultaneous access to first_req list */
spinlock_t info_list_lock;
diff --git a/include/net/flow.h b/include/net/flow.h
-index 628e11b..4c475df 100644
+index 2a7eefd..3250f3b 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
-@@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
+@@ -218,6 +218,6 @@ extern struct flow_cache_object *flow_cache_lookup(
extern void flow_cache_flush(void);
extern void flow_cache_flush_deferred(void);
@@ -78562,49 +77929,36 @@ index 628e11b..4c475df 100644
#endif
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
-index 8e0b6c8..73cf605 100644
+index 82d8d09..d1e04ff 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
-@@ -120,7 +120,7 @@ struct genl_ops {
+@@ -116,7 +116,7 @@ struct genl_ops {
struct netlink_callback *cb);
int (*done)(struct netlink_callback *cb);
struct list_head ops_list;
-};
+} __do_const;
- extern int __genl_register_family(struct genl_family *family);
-
-diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
-index 734d9b5..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;
- }
+ extern int genl_register_family(struct genl_family *family);
+ extern int genl_register_family_with_ops(struct genl_family *family,
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
-index de2c785..0588a6b 100644
+index ca2755f..85ec88c 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 {
+@@ -61,7 +61,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);
+ const struct inet_bind_bucket *tb);
-};
+} __do_const;
/** inet_connection_sock - INET connection oriented sock
*
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
-index 53f464d..0bd0b49 100644
+index 34b06da..03b1d34 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
-@@ -47,8 +47,8 @@ struct inet_peer {
+@@ -52,8 +52,8 @@ struct inet_peer {
*/
union {
struct {
@@ -78612,10 +77966,10 @@ index 53f464d..0bd0b49 100644
- atomic_t ip_id_count; /* IP ID for the next packet */
+ atomic_unchecked_t rid; /* Frag reception counter */
+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
+ __u32 tcp_ts;
+ __u32 tcp_ts_stamp;
};
- struct rcu_head rcu;
- struct inet_peer *gc_next;
-@@ -178,16 +178,13 @@ static inline void inet_peer_refcheck(const struct inet_peer *p)
+@@ -115,16 +115,13 @@ static inline void inet_peer_refcheck(const struct inet_peer *p)
/* can be called with or without local BH being disabled */
static inline int inet_getid(struct inet_peer *p, int more)
{
@@ -78638,10 +77992,10 @@ index 53f464d..0bd0b49 100644
#endif /* _NET_INETPEER_H */
diff --git a/include/net/ip.h b/include/net/ip.h
-index 5e52688..f181e95 100644
+index 06aed72..54fbf5b 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
-@@ -212,7 +212,7 @@ extern struct local_ports {
+@@ -214,7 +214,7 @@ extern struct local_ports {
} sysctl_local_ports;
extern void inet_get_local_port_range(int *low, int *high);
@@ -78651,10 +78005,10 @@ index 5e52688..f181e95 100644
{
return test_bit(port, sysctl_local_reserved_ports);
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
-index cbf2be3..3683f6d 100644
+index 2124004..3713897 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
-@@ -169,7 +169,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
+@@ -144,7 +144,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
#define FIB_RES_SADDR(net, res) \
((FIB_RES_NH(res).nh_saddr_genid == \
@@ -78664,10 +78018,10 @@ index cbf2be3..3683f6d 100644
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 9c4d37e..eed6d41 100644
+index 416dcb0..e203877 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
-@@ -588,7 +588,7 @@ struct ip_vs_conn {
+@@ -509,7 +509,7 @@ struct ip_vs_conn {
struct ip_vs_conn *control; /* Master control connection */
atomic_t n_control; /* Number of controlled ones */
struct ip_vs_dest *dest; /* real server */
@@ -78676,16 +78030,16 @@ index 9c4d37e..eed6d41 100644
/* packet transmitter for different forwarding methods. If it
mangles the packet, it must return NF_DROP or better NF_STOLEN,
-@@ -735,7 +735,7 @@ struct ip_vs_dest {
+@@ -647,7 +647,7 @@ struct ip_vs_dest {
__be16 port; /* port number of the server */
union nf_inet_addr addr; /* IP address of the server */
- volatile unsigned int flags; /* dest status flags */
+ volatile unsigned flags; /* dest status flags */
- atomic_t conn_flags; /* flags to copy to conn */
+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
atomic_t weight; /* server weight */
atomic_t refcnt; /* reference counter */
-@@ -990,11 +990,11 @@ struct netns_ipvs {
+@@ -878,11 +878,11 @@ struct netns_ipvs {
/* ip_vs_lblc */
int sysctl_lblc_expiration;
struct ctl_table_header *lblc_ctl_header;
@@ -78700,7 +78054,7 @@ index 9c4d37e..eed6d41 100644
struct list_head est_list; /* estimator list */
spinlock_t est_lock;
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
-index 80ffde3..968b0f4 100644
+index 59ba38bc..d515662 100644
--- a/include/net/irda/ircomm_tty.h
+++ b/include/net/irda/ircomm_tty.h
@@ -35,6 +35,7 @@
@@ -78711,11 +78065,22 @@ index 80ffde3..968b0f4 100644
#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 714cc9a..ea05f3e 100644
+index f2419cf..473679f 100644
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
-@@ -149,7 +149,7 @@ struct iucv_skb_cb {
+@@ -139,7 +139,7 @@ struct iucv_sock {
struct iucv_sock_list {
struct hlist_head head;
rwlock_t lock;
@@ -78738,7 +78103,7 @@ index df83f69..9b640b8 100644
extern int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
extern int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
-index 6ca3113..f8026dd 100644
+index 23a4093..6d106df 100644
--- a/include/net/llc_c_ev.h
+++ b/include/net/llc_c_ev.h
@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
@@ -78792,10 +78157,10 @@ index 567c681..cd73ac0 100644
struct llc_sap_state {
u8 curr_state;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index cc6035f..a8406fc 100644
+index 1a6201a..66d9531 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -4361,7 +4361,7 @@ struct rate_control_ops {
+@@ -3529,7 +3529,7 @@ struct rate_control_ops {
void (*add_sta_debugfs)(void *priv, void *priv_sta,
struct dentry *dir);
void (*remove_sta_debugfs)(void *priv, void *priv_sta);
@@ -78805,10 +78170,10 @@ index cc6035f..a8406fc 100644
static inline int rate_supported(struct ieee80211_sta *sta,
enum ieee80211_band band,
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
-index 536501a..7c6193c 100644
+index 2720884..3aa5c25 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
-@@ -123,7 +123,7 @@ struct neigh_ops {
+@@ -122,7 +122,7 @@ struct neigh_ops {
void (*error_report)(struct neighbour *, struct sk_buff *);
int (*output)(struct neighbour *, struct sk_buff *);
int (*connected_output)(struct neighbour *, struct sk_buff *);
@@ -78818,31 +78183,27 @@ index 536501a..7c6193c 100644
struct pneigh_entry {
struct pneigh_entry *next;
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
-index 9d22f08..980fbf8 100644
+index 3bb6fa0..3af7393 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
-@@ -120,7 +120,7 @@ struct net {
- struct netns_ipvs *ipvs;
- #endif
- struct sock *diag_nlsk;
-- atomic_t fnhe_genid;
-+ atomic_unchecked_t fnhe_genid;
- };
-
- /*
-@@ -277,7 +277,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
+@@ -240,10 +240,16 @@ static inline struct net *read_pnet(struct net * const *pnet)
+ #define __net_init
+ #define __net_exit
+ #define __net_initdata
++#define __net_initconst
+ #else
#define __net_init __init
#define __net_exit __exit_refok
#define __net_initdata __initdata
+#ifdef CONSTIFY_PLUGIN
- #define __net_initconst __initconst
++#define __net_initconst __initconst
+#else
+#define __net_initconst __initdata
+#endif
#endif
struct pernet_operations {
-@@ -287,7 +291,7 @@ struct pernet_operations {
+@@ -253,7 +259,7 @@ struct pernet_operations {
void (*exit_batch)(struct list_head *net_exit_list);
int *id;
size_t size;
@@ -78851,49 +78212,6 @@ index 9d22f08..980fbf8 100644
/*
* Use these carefully. If you implement a network device and it
-@@ -335,23 +339,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
-
- static inline int rt_genid_ipv4(struct net *net)
- {
-- return atomic_read(&net->ipv4.rt_genid);
-+ return atomic_read_unchecked(&net->ipv4.rt_genid);
- }
-
- static inline void rt_genid_bump_ipv4(struct net *net)
- {
-- atomic_inc(&net->ipv4.rt_genid);
-+ atomic_inc_unchecked(&net->ipv4.rt_genid);
- }
-
- #if IS_ENABLED(CONFIG_IPV6)
- static inline int rt_genid_ipv6(struct net *net)
- {
-- return atomic_read(&net->ipv6.rt_genid);
-+ return atomic_read_unchecked(&net->ipv6.rt_genid);
- }
-
- static inline void rt_genid_bump_ipv6(struct net *net)
- {
-- atomic_inc(&net->ipv6.rt_genid);
-+ atomic_inc_unchecked(&net->ipv6.rt_genid);
- }
- #else
- static inline int rt_genid_ipv6(struct net *net)
-@@ -373,12 +377,12 @@ static inline void rt_genid_bump_all(struct net *net)
-
- static inline int fnhe_genid(struct net *net)
- {
-- return atomic_read(&net->fnhe_genid);
-+ return atomic_read_unchecked(&net->fnhe_genid);
- }
-
- static inline void fnhe_genid_bump(struct net *net)
- {
-- atomic_inc(&net->fnhe_genid);
-+ atomic_inc_unchecked(&net->fnhe_genid);
- }
-
- #endif /* __NET_NET_NAMESPACE_H */
diff --git a/include/net/netdma.h b/include/net/netdma.h
index 8ba8ce2..99b7fff 100644
--- a/include/net/netdma.h
@@ -78907,11 +78225,24 @@ index 8ba8ce2..99b7fff 100644
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 9690b0f..87aded7 100644
+index cb1f350..3279d2c 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
-@@ -534,7 +534,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
+@@ -569,7 +569,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)
@@ -78920,97 +78251,37 @@ index 9690b0f..87aded7 100644
}
/**
-diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
-index c9c0c53..53f24c3 100644
---- a/include/net/netns/conntrack.h
-+++ b/include/net/netns/conntrack.h
-@@ -12,10 +12,10 @@ struct nf_conntrack_ecache;
- struct nf_proto_net {
- #ifdef CONFIG_SYSCTL
- struct ctl_table_header *ctl_table_header;
-- struct ctl_table *ctl_table;
-+ ctl_table_no_const *ctl_table;
- #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
- struct ctl_table_header *ctl_compat_header;
-- struct ctl_table *ctl_compat_table;
-+ ctl_table_no_const *ctl_compat_table;
- #endif
- #endif
- unsigned int users;
-@@ -58,7 +58,7 @@ struct nf_ip_net {
- struct nf_icmp_net icmpv6;
- #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
- struct ctl_table_header *ctl_table_header;
-- struct ctl_table *ctl_table;
-+ ctl_table_no_const *ctl_table;
- #endif
- };
-
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index bf2ec22..5e7f9d9 100644
+index d786b4f..4c3dd41 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
-@@ -67,7 +67,7 @@ struct netns_ipv4 {
- kgid_t sysctl_ping_group_range[2];
- long sysctl_tcp_mem[3];
+@@ -56,8 +56,8 @@ struct netns_ipv4 {
+ unsigned int sysctl_ping_group_range[2];
+
+- atomic_t rt_genid;
- atomic_t dev_addr_genid;
-+ atomic_unchecked_t dev_addr_genid;
++ atomic_unchecked_t rt_genid;
++ atomic_unchecked_t dev_addr_genid;
#ifdef CONFIG_IP_MROUTE
#ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-@@ -77,6 +77,6 @@ struct netns_ipv4 {
- struct fib_rules_ops *mr_rules_ops;
- #endif
- #endif
-- atomic_t rt_genid;
-+ atomic_unchecked_t rt_genid;
- };
- #endif
-diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
-index 0fb2401..477d81c 100644
---- a/include/net/netns/ipv6.h
-+++ b/include/net/netns/ipv6.h
-@@ -71,8 +71,8 @@ struct netns_ipv6 {
- struct fib_rules_ops *mr6_rules_ops;
- #endif
- #endif
-- atomic_t dev_addr_genid;
-- atomic_t rt_genid;
-+ atomic_unchecked_t dev_addr_genid;
-+ atomic_unchecked_t rt_genid;
- };
-
- #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
-diff --git a/include/net/ping.h b/include/net/ping.h
-index 5db0224..0d65365 100644
---- a/include/net/ping.h
-+++ b/include/net/ping.h
-@@ -55,7 +55,7 @@ struct ping_iter_state {
- extern struct proto ping_prot;
- extern struct ping_table ping_table;
- #if IS_ENABLED(CONFIG_IPV6)
--extern struct pingv6_ops pingv6_ops;
-+extern struct pingv6_ops *pingv6_ops;
- #endif
-
- struct pingfakehdr {
diff --git a/include/net/protocol.h b/include/net/protocol.h
-index 047c047..b9dad15 100644
+index 6f7eb80..f9838be 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -44,7 +44,7 @@ struct net_protocol {
- void (*err_handler)(struct sk_buff *skb, u32 info);
+ int (*gro_complete)(struct sk_buff *skb);
unsigned int no_policy:1,
netns_ok:1;
-};
+} __do_const;
- #if IS_ENABLED(CONFIG_IPV6)
+ #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
struct inet6_protocol {
-@@ -57,7 +57,7 @@ struct inet6_protocol {
- u8 type, u8 code, int offset,
- __be32 info);
+@@ -63,7 +63,7 @@ struct inet6_protocol {
+ int (*gro_complete)(struct sk_buff *skb);
+
unsigned int flags; /* INET6_PROTO_xxx */
-};
+} __do_const;
@@ -79018,23 +78289,40 @@ index 047c047..b9dad15 100644
#define INET6_PROTO_NOPOLICY 0x1
#define INET6_PROTO_FINAL 0x2
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
-index 7026648..584cc8c 100644
+index 3702939..cf9e78e 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
-@@ -81,7 +81,7 @@ struct rtnl_link_ops {
- const struct net_device *dev);
- unsigned int (*get_num_tx_queues)(void);
- unsigned int (*get_num_rx_queues)(void);
+@@ -78,7 +78,7 @@ struct rtnl_link_ops {
+ int (*get_tx_queues)(struct net *net, struct nlattr *tb[],
+ unsigned int *tx_queues,
+ unsigned int *real_tx_queues);
-};
+} __do_const;
extern int __rtnl_link_register(struct rtnl_link_ops *ops);
extern void __rtnl_link_unregister(struct rtnl_link_ops *ops);
+diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
+index ad03988..0c5a964 100644
+--- a/include/net/sctp/sctp.h
++++ b/include/net/sctp/sctp.h
+@@ -318,9 +318,9 @@ do { \
+
+ #else /* SCTP_DEBUG */
+
+-#define SCTP_DEBUG_PRINTK(whatever...)
+-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
+-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
++#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
++#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
++#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
+ #define SCTP_ENABLE_DEBUG
+ #define SCTP_DISABLE_DEBUG
+ #define SCTP_ASSERT(expr, str, func)
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
-index 4ef75af..5aa073a 100644
+index 9148632..be3c5ac 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
-@@ -81,7 +81,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
+@@ -86,7 +86,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
typedef struct {
sctp_state_fn_t *fn;
const char *name;
@@ -79043,7 +78331,7 @@ index 4ef75af..5aa073a 100644
/* A naming convention of "sctp_sf_xxx" applies to all the state functions
* currently in use.
-@@ -293,7 +293,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
+@@ -295,7 +295,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
__u32 sctp_generate_tsn(const struct sctp_endpoint *);
/* Extern declarations for major data structures. */
@@ -79053,10 +78341,10 @@ index 4ef75af..5aa073a 100644
/* Get the size of a DATA chunk payload. */
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
-index 2174d8d..71d5257 100644
+index a15432da..9459dcc 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
-@@ -508,7 +508,7 @@ struct sctp_pf {
+@@ -644,7 +644,7 @@ struct sctp_pf {
struct sctp_association *asoc);
void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
struct sctp_af *af;
@@ -79065,20 +78353,32 @@ index 2174d8d..71d5257 100644
/* Structure to track chunk fragments that have been acked, but peer
+diff --git a/include/net/secure_seq.h b/include/net/secure_seq.h
+index c2e542b..6ca975b 100644
+--- a/include/net/secure_seq.h
++++ b/include/net/secure_seq.h
+@@ -3,6 +3,7 @@
+
+ #include <linux/types.h>
+
++extern void net_secret_init(void);
+ extern __u32 secure_ip_id(__be32 daddr);
+ extern __u32 secure_ipv6_id(const __be32 daddr[4]);
+ extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
diff --git a/include/net/sock.h b/include/net/sock.h
-index 808cbc2..f6f6ac3 100644
+index e6454b6..cda5eaf 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
-@@ -332,7 +332,7 @@ struct sock {
- unsigned int sk_napi_id;
- unsigned int sk_ll_usec;
+@@ -278,7 +278,7 @@ struct sock {
+ #ifdef CONFIG_RPS
+ __u32 sk_rxhash;
#endif
- atomic_t sk_drops;
+ atomic_unchecked_t sk_drops;
int sk_rcvbuf;
struct sk_filter __rcu *sk_filter;
-@@ -1821,7 +1821,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
+@@ -1416,7 +1416,7 @@ static inline void sk_nocaps_add(struct sock *sk, int flags)
}
static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
@@ -79087,20 +78387,20 @@ index 808cbc2..f6f6ac3 100644
int copy, int offset)
{
if (skb->ip_summed == CHECKSUM_NONE) {
-@@ -2083,7 +2083,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
+@@ -1678,7 +1678,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);
- /**
- * sk_page_frag - return an appropriate page_frag
+ static inline struct page *sk_stream_alloc_page(struct sock *sk)
+ {
diff --git a/include/net/tcp.h b/include/net/tcp.h
-index b1aa324..b8530ea 100644
+index fe46019..1422c5a 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
-@@ -527,7 +527,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
+@@ -470,7 +470,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);
@@ -79109,7 +78409,7 @@ index b1aa324..b8530ea 100644
extern void tcp_send_probe0(struct sock *);
extern void tcp_send_partial(struct sock *);
-@@ -699,8 +699,8 @@ struct tcp_skb_cb {
+@@ -633,8 +633,8 @@ struct tcp_skb_cb {
struct inet6_skb_parm h6;
#endif
} header; /* For incoming frames */
@@ -79119,21 +78419,21 @@ index b1aa324..b8530ea 100644
+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
__u32 when; /* used to compute rtt's */
__u8 tcp_flags; /* TCP header flags. (tcp[13]) */
+ __u8 sacked; /* State flags for SACK/FACK. */
+@@ -647,7 +647,7 @@ struct tcp_skb_cb {
+ #define TCPCB_EVER_RETRANS 0x80 /* Ever retransmitted frame */
+ #define TCPCB_RETRANS (TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS)
-@@ -714,7 +714,7 @@ struct tcp_skb_cb {
-
- __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
- /* 1 byte hole */
- __u32 ack_seq; /* Sequence number ACK'd */
+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
};
#define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index e253bf0..2278b4b 100644
+index 921f627..3744fe8 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
-@@ -287,7 +287,6 @@ struct xfrm_dst;
+@@ -282,7 +282,6 @@ struct xfrm_dst;
struct xfrm_policy_afinfo {
unsigned short family;
struct dst_ops *dst_ops;
@@ -79141,7 +78441,7 @@ index e253bf0..2278b4b 100644
struct dst_entry *(*dst_lookup)(struct net *net, int tos,
const xfrm_address_t *saddr,
const xfrm_address_t *daddr);
-@@ -305,7 +304,7 @@ struct xfrm_policy_afinfo {
+@@ -298,7 +297,7 @@ struct xfrm_policy_afinfo {
struct net_device *dev,
const struct flowi *fl);
struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
@@ -79150,16 +78450,16 @@ index e253bf0..2278b4b 100644
extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
-@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
+@@ -334,7 +333,7 @@ struct xfrm_state_afinfo {
+ struct sk_buff *skb);
int (*transport_finish)(struct sk_buff *skb,
int async);
- void (*local_error)(struct sk_buff *skb, u32 mtu);
-};
+} __do_const;
extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
-@@ -427,7 +426,7 @@ struct xfrm_mode {
+@@ -417,7 +416,7 @@ struct xfrm_mode {
struct module *owner;
unsigned int encap;
int flags;
@@ -79168,7 +78468,7 @@ index e253bf0..2278b4b 100644
/* Flags for xfrm_mode. */
enum {
-@@ -524,7 +523,7 @@ struct xfrm_policy {
+@@ -508,7 +507,7 @@ struct xfrm_policy {
struct timer_list timer;
struct flow_cache_object flo;
@@ -79177,17 +78477,18 @@ index e253bf0..2278b4b 100644
u32 priority;
u32 index;
struct xfrm_mark mark;
-@@ -1164,6 +1163,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
+@@ -1141,6 +1140,8 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
+ }
}
- extern void xfrm_garbage_collect(struct net *net);
+extern void xfrm_garbage_collect_deferred(struct net *net);
-
++
#else
-@@ -1202,6 +1202,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
- static inline void xfrm_garbage_collect(struct net *net)
+ static inline void xfrm_sk_free_policy(struct sock *sk) {}
+@@ -1175,6 +1176,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
{
+ return 1;
}
+static inline void xfrm_garbage_collect_deferred(struct net *net)
+{
@@ -79196,7 +78497,7 @@ index e253bf0..2278b4b 100644
static __inline__
diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
-index 1017e0b..227aa4d 100644
+index 1a046b1..ee0bef0 100644
--- a/include/rdma/iw_cm.h
+++ b/include/rdma/iw_cm.h
@@ -122,7 +122,7 @@ struct iw_cm_verbs {
@@ -79209,10 +78510,10 @@ index 1017e0b..227aa4d 100644
/**
* iw_create_cm_id - Create an IW CM identifier.
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
-index e1379b4..67eafbe 100644
+index 5d1a758..1dbf795 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
-@@ -762,6 +762,7 @@ struct libfc_function_template {
+@@ -748,6 +748,7 @@ struct libfc_function_template {
*/
void (*disc_stop_final) (struct fc_lport *);
};
@@ -79220,7 +78521,7 @@ index e1379b4..67eafbe 100644
/**
* struct fc_disc - Discovery context
-@@ -866,7 +867,7 @@ struct fc_lport {
+@@ -851,7 +852,7 @@ struct fc_lport {
struct fc_vport *vport;
/* Operational Information */
@@ -79230,10 +78531,10 @@ index e1379b4..67eafbe 100644
u8 qfull;
enum fc_lport_state state;
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
-index d65fbec..f80fef2 100644
+index 5591ed5..13eb457 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
-@@ -180,9 +180,9 @@ struct scsi_device {
+@@ -161,9 +161,9 @@ struct scsi_device {
unsigned int max_device_blocked; /* what device_blocked counts down from */
#define SCSI_DEFAULT_DEVICE_BLOCKED 3
@@ -79247,37 +78548,23 @@ index d65fbec..f80fef2 100644
struct device sdev_gendev,
sdev_dev;
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
-index b797e8f..8e2c3aa 100644
+index 2a65167..91e01f8 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
-@@ -751,7 +751,8 @@ struct fc_function_template {
+@@ -711,7 +711,7 @@ struct fc_function_template {
unsigned long show_host_system_hostname:1;
unsigned long disable_target_scan:1;
-};
+} __do_const;
-+typedef struct fc_function_template __no_const fc_function_template_no_const;
/**
-diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
-index 9031a26..750d592 100644
---- a/include/sound/compress_driver.h
-+++ b/include/sound/compress_driver.h
-@@ -128,7 +128,7 @@ struct snd_compr_ops {
- struct snd_compr_caps *caps);
- int (*get_codec_caps) (struct snd_compr_stream *stream,
- struct snd_compr_codec_caps *codec);
--};
-+} __no_const;
-
- /**
- * struct snd_compr: Compressed device
diff --git a/include/sound/soc.h b/include/sound/soc.h
-index d22cb0a..c6ba150 100644
+index 11cfb59..808afef 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
-@@ -780,7 +780,7 @@ struct snd_soc_codec_driver {
+@@ -641,7 +641,7 @@ struct snd_soc_codec_driver {
/* probe ordering - for components with runtime dependencies */
int probe_order;
int remove_order;
@@ -79286,31 +78573,55 @@ index d22cb0a..c6ba150 100644
/* SoC platform interface */
struct snd_soc_platform_driver {
-@@ -826,7 +826,7 @@ struct snd_soc_platform_driver {
+@@ -683,7 +683,7 @@ struct snd_soc_platform_driver {
+ /* platform IO - used for platform DAPM */
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);
-};
+} __do_const;
struct snd_soc_platform {
const char *name;
+diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
+index 444cd6b..3327cc5 100644
+--- a/include/sound/ymfpci.h
++++ b/include/sound/ymfpci.h
+@@ -358,7 +358,7 @@ struct snd_ymfpci {
+ spinlock_t reg_lock;
+ spinlock_t voice_lock;
+ wait_queue_head_t interrupt_sleep;
+- atomic_t interrupt_sleep_count;
++ atomic_unchecked_t interrupt_sleep_count;
+ struct snd_info_entry *proc_entry;
+ const struct firmware *dsp_microcode;
+ const struct firmware *controller_microcode;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
-index 5bdb8b7..bb1096c 100644
+index 6ee550e..ebec4cc 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
-@@ -663,7 +663,7 @@ struct se_device {
- spinlock_t stats_lock;
+@@ -466,8 +466,8 @@ struct se_cmd {
+ atomic_t t_se_count;
+ atomic_t t_task_cdbs_left;
+ atomic_t t_task_cdbs_ex_left;
+- atomic_t t_task_cdbs_sent;
+- atomic_t t_transport_aborted;
++ atomic_unchecked_t t_task_cdbs_sent;
++ atomic_unchecked_t t_transport_aborted;
+ atomic_t t_transport_active;
+ atomic_t t_transport_complete;
+ atomic_t t_transport_queue_active;
+@@ -706,7 +706,7 @@ struct se_device {
/* Active commands on this virtual SE device */
atomic_t simple_cmds;
+ atomic_t depth_left;
- atomic_t dev_ordered_id;
+ atomic_unchecked_t dev_ordered_id;
+ atomic_t execute_tasks;
atomic_t dev_ordered_sync;
atomic_t dev_qf_count;
- int export_count;
diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
new file mode 100644
-index 0000000..fb634b7
+index 0000000..2efe49d
--- /dev/null
+++ b/include/trace/events/fs.h
@@ -0,0 +1,53 @@
@@ -79325,7 +78636,7 @@ index 0000000..fb634b7
+
+TRACE_EVENT(do_sys_open,
+
-+ TP_PROTO(const char *filename, int flags, int mode),
++ TP_PROTO(char *filename, int flags, int mode),
+
+ TP_ARGS(filename, flags, mode),
+
@@ -79389,248 +78700,11 @@ index 1c09820..7f5ec79 100644
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..ccce5c0 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)
-+static inline __u64 __intentional_overflow(-1) __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)
-+static inline __u32 __intentional_overflow(-1) __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 ef6103b..d4e65dd 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/swab.h b/include/uapi/linux/swab.h
-index 0e011eb..82681b1 100644
---- a/include/uapi/linux/swab.h
-+++ b/include/uapi/linux/swab.h
-@@ -43,7 +43,7 @@
- * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
- */
-
--static inline __attribute_const__ __u16 __fswab16(__u16 val)
-+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
- {
- #ifdef __HAVE_BUILTIN_BSWAP16__
- return __builtin_bswap16(val);
-@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
- #endif
- }
-
--static inline __attribute_const__ __u32 __fswab32(__u32 val)
-+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
- {
- #ifdef __HAVE_BUILTIN_BSWAP32__
- return __builtin_bswap32(val);
-@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
- #endif
- }
-
--static inline __attribute_const__ __u64 __fswab64(__u64 val)
-+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
- {
- #ifdef __HAVE_BUILTIN_BSWAP64__
- return __builtin_bswap64(val);
-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 e4629b9..6958086 100644
---- a/include/uapi/linux/xattr.h
-+++ b/include/uapi/linux/xattr.h
-@@ -63,5 +63,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
+index c41f308..6918de3 100644
--- a/include/video/udlfb.h
+++ b/include/video/udlfb.h
-@@ -53,10 +53,10 @@ struct dlfb_data {
+@@ -52,10 +52,10 @@ struct dlfb_data {
u32 pseudo_palette[256];
int blank_mode; /*one of FB_BLANK_ */
/* blit-only rendering path metrics, exposed through sysfs */
@@ -79646,10 +78720,10 @@ index f9466fa..f4e2b81 100644
#define NR_USB_REQUEST_I2C_SUB_IO 0x02
diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
-index 30f5362..8ed8ac9 100644
+index 0993a22..32ba2fe 100644
--- a/include/video/uvesafb.h
+++ b/include/video/uvesafb.h
-@@ -122,6 +122,7 @@ struct uvesafb_par {
+@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
u16 *pmi_base; /* protected mode interface location */
@@ -79658,18 +78732,10 @@ index 30f5362..8ed8ac9 100644
void *pmi_pal;
u8 *vbe_state_orig; /*
diff --git a/init/Kconfig b/init/Kconfig
-index 3ecd8a1..627843f 100644
+index 43298f9..7e4816c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1086,6 +1086,7 @@ endif # CGROUPS
-
- config CHECKPOINT_RESTORE
- bool "Checkpoint/restore support" if EXPERT
-+ depends on !GRKERNSEC
- default n
- help
- Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1557,7 +1558,7 @@ config SLUB_DEBUG
+@@ -1214,7 +1214,7 @@ config SLUB_DEBUG
config COMPAT_BRK
bool "Disable heap randomization"
@@ -79678,7 +78744,7 @@ index 3ecd8a1..627843f 100644
help
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
-@@ -1832,7 +1833,7 @@ config INIT_ALL_POSSIBLE
+@@ -1397,7 +1397,7 @@ config INIT_ALL_POSSIBLE
config STOP_MACHINE
bool
default y
@@ -79687,39 +78753,25 @@ index 3ecd8a1..627843f 100644
help
Need stop_machine() primitive.
-diff --git a/init/Makefile b/init/Makefile
-index 7bc47ee..6da2dc7 100644
---- a/init/Makefile
-+++ b/init/Makefile
-@@ -2,6 +2,9 @@
- # Makefile for the linux kernel.
- #
-
-+ccflags-y := $(GCC_PLUGINS_CFLAGS)
-+asflags-y := $(GCC_PLUGINS_AFLAGS)
-+
- obj-y := main.o version.o mounts.o
- ifneq ($(CONFIG_BLK_DEV_INITRD),y)
- obj-y += noinitramfs.o
diff --git a/init/do_mounts.c b/init/do_mounts.c
-index a51cddc..25c2768 100644
+index d6c229f..4746631 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -357,11 +357,11 @@ static void __init get_fs_names(char *page)
+@@ -325,11 +325,11 @@ static void __init get_fs_names(char *page)
+
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
{
- struct super_block *s;
- int err = sys_mount(name, "/root", fs, flags, data);
+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
if (err)
return err;
-- sys_chdir("/root");
-+ sys_chdir((const char __force_user *)"/root");
- s = current->fs->pwd.dentry->d_sb;
- ROOT_DEV = s->s_dev;
+- sys_chdir((const char __user __force *)"/root");
++ sys_chdir((const char __force_user*)"/root");
+ ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
printk(KERN_INFO
-@@ -482,18 +482,18 @@ void __init change_floppy(char *fmt, ...)
+ "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
+@@ -448,18 +448,18 @@ void __init change_floppy(char *fmt, ...)
va_start(args, fmt);
vsprintf(buf, fmt, args);
va_end(args);
@@ -79741,17 +78793,15 @@ index a51cddc..25c2768 100644
termios.c_lflag |= ICANON;
sys_ioctl(fd, TCSETSF, (long)&termios);
sys_close(fd);
-@@ -587,8 +587,8 @@ void __init prepare_namespace(void)
+@@ -553,6 +553,6 @@ void __init prepare_namespace(void)
mount_root();
out:
devtmpfs_mount("dev");
- sys_mount(".", "/", NULL, MS_MOVE, NULL);
-- sys_chroot(".");
+- sys_chroot((const char __user __force *)".");
+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
+ sys_chroot((const char __force_user *)".");
}
-
- static bool is_tmpfs;
diff --git a/init/do_mounts.h b/init/do_mounts.h
index f5b978a..69dbfe8 100644
--- a/init/do_mounts.h
@@ -79785,17 +78835,19 @@ index f5b978a..69dbfe8 100644
if (!S_ISBLK(stat.st_mode))
return 0;
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
-index 3e0878e..8a9d7a0 100644
+index 3098a38..253064e 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
-@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
- {
- sys_unshare(CLONE_FS | CLONE_FILES);
- /* stdin/stdout/stderr for /linuxrc */
-- sys_open("/dev/console", O_RDWR, 0);
-+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
- sys_dup(0);
- sys_dup(0);
+@@ -44,13 +44,13 @@ 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_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);
@@ -79803,29 +78855,21 @@ index 3e0878e..8a9d7a0 100644
+ 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_setsid();
- return 0;
- }
-@@ -59,8 +59,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);
-- sys_chdir("/old");
-+ sys_mkdir((const char __force_user *)"/old", 0700);
-+ sys_chdir((const char __force_user *)"/old");
- /* try loading default modules from initrd */
- load_default_modules();
-@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
- current->flags &= ~PF_FREEZER_SKIP;
+ /*
+ * In case that a resume from disk is carried out by linuxrc or one of
+@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
/* move initrd to rootfs' /old */
-- sys_mount("..", ".", NULL, MS_MOVE, NULL);
-+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
+ sys_fchdir(old_fd);
+- 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_chroot("..");
-+ sys_chroot((const char __force_user *)"..");
+ sys_fchdir(root_fd);
+- sys_chroot(".");
++ sys_chroot((const char __force_user *)".");
+ sys_close(old_fd);
+ sys_close(root_fd);
if (new_decode_dev(real_root_dev) == Root_RAM0) {
- sys_chdir("/old");
@@ -79833,9 +78877,7 @@ index 3e0878e..8a9d7a0 100644
return;
}
-- sys_chdir("/");
-+ sys_chdir((const char __force_user *)"/");
- ROOT_DEV = new_decode_dev(real_root_dev);
+@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
mount_root();
printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
@@ -79856,7 +78898,7 @@ index 3e0878e..8a9d7a0 100644
printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
if (fd < 0) {
error = fd;
-@@ -127,11 +127,11 @@ int __init initrd_load(void)
+@@ -116,11 +116,11 @@ int __init initrd_load(void)
* mounted in the normal path.
*/
if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
@@ -79871,10 +78913,10 @@ index 3e0878e..8a9d7a0 100644
return 0;
}
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
-index 8cb6db5..d729f50 100644
+index 32c4799..c27ee74 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
-@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
+@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
@@ -79883,7 +78925,7 @@ index 8cb6db5..d729f50 100644
if (fd < 0) {
printk(KERN_ERR "md: open failed - cannot start "
"array %s\n", name);
-@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
+@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
* array without it
*/
sys_close(fd);
@@ -79892,43 +78934,29 @@ index 8cb6db5..d729f50 100644
sys_ioctl(fd, BLKRRPART, 0);
}
sys_close(fd);
-@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
+@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
wait_for_device_probe();
-- fd = sys_open("/dev/md0", 0, 0);
+- fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd);
-diff --git a/init/init_task.c b/init/init_task.c
-index ba0a7f36..2bcf1d5 100644
---- a/init/init_task.c
-+++ b/init/init_task.c
-@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
- * Initial thread structure. Alignment of this is handled by a special
- * linker map entry.
- */
-+#ifdef CONFIG_X86
-+union thread_union init_thread_union __init_task_data;
-+#else
- union thread_union init_thread_union __init_task_data =
- { INIT_THREAD_INFO(init_task) };
-+#endif
diff --git a/init/initramfs.c b/init/initramfs.c
-index a67ef9d..2d17ed9 100644
+index 2531811..4f036c4 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
-@@ -84,7 +84,7 @@ static void __init free_hash(void)
+@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
--static long __init do_utime(char *filename, time_t mtime)
-+static long __init do_utime(char __force_user *filename, time_t mtime)
+-static long __init do_utime(char __user *filename, time_t mtime)
++static long __init do_utime(__force char __user *filename, time_t mtime)
{
struct timespec t[2];
-@@ -119,7 +119,7 @@ static void __init dir_utime(void)
+@@ -109,7 +109,7 @@ static void __init dir_utime(void)
struct dir_entry *de, *tmp;
list_for_each_entry_safe(de, tmp, &dir_list, list) {
list_del(&de->list);
@@ -79937,7 +78965,7 @@ index a67ef9d..2d17ed9 100644
kfree(de->name);
kfree(de);
}
-@@ -281,7 +281,7 @@ static int __init maybe_link(void)
+@@ -271,7 +271,7 @@ static int __init maybe_link(void)
if (nlink >= 2) {
char *old = find_link(major, minor, ino, mode, collected);
if (old)
@@ -79946,7 +78974,7 @@ index a67ef9d..2d17ed9 100644
}
return 0;
}
-@@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
+@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
{
struct stat st;
@@ -79961,7 +78989,7 @@ index a67ef9d..2d17ed9 100644
}
}
-@@ -315,7 +315,7 @@ static int __init do_name(void)
+@@ -305,7 +305,7 @@ static int __init do_name(void)
int openflags = O_WRONLY|O_CREAT;
if (ml != 1)
openflags |= O_TRUNC;
@@ -79970,7 +78998,7 @@ index a67ef9d..2d17ed9 100644
if (wfd >= 0) {
sys_fchown(wfd, uid, gid);
-@@ -327,17 +327,17 @@ static int __init do_name(void)
+@@ -317,17 +317,17 @@ static int __init do_name(void)
}
}
} else if (S_ISDIR(mode)) {
@@ -79995,7 +79023,7 @@ index a67ef9d..2d17ed9 100644
}
}
return 0;
-@@ -346,15 +346,15 @@ static int __init do_name(void)
+@@ -336,15 +336,15 @@ static int __init do_name(void)
static int __init do_copy(void)
{
if (count >= body_len) {
@@ -80014,7 +79042,7 @@ index a67ef9d..2d17ed9 100644
body_len -= count;
eat(count);
return 1;
-@@ -365,9 +365,9 @@ static int __init do_symlink(void)
+@@ -355,9 +355,9 @@ static int __init do_symlink(void)
{
collected[N_ALIGN(name_len) + body_len] = '\0';
clean_path(collected, 0);
@@ -80027,7 +79055,7 @@ index a67ef9d..2d17ed9 100644
state = SkipIt;
next_state = Reset;
return 0;
-@@ -583,7 +583,7 @@ static int __init populate_rootfs(void)
+@@ -573,7 +573,7 @@ static int __init populate_rootfs(void)
{
char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
if (err)
@@ -80037,10 +79065,10 @@ index a67ef9d..2d17ed9 100644
#ifdef CONFIG_BLK_DEV_RAM
int fd;
diff --git a/init/main.c b/init/main.c
-index 63d3e8f..291fa8a 100644
+index 5d0eb1d..83506bb 100644
--- a/init/main.c
+++ b/init/main.c
-@@ -103,6 +103,8 @@ static inline void mark_rodata_ro(void) { }
+@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
extern void tc_init(void);
#endif
@@ -80049,25 +79077,26 @@ index 63d3e8f..291fa8a 100644
/*
* Debug helper: via this flag we know that we are in 'early bootup code'
* where only the boot processor is running with IRQ disabled. This means
-@@ -156,6 +158,74 @@ static int __init set_reset_devices(char *str)
+@@ -149,6 +151,64 @@ static int __init set_reset_devices(char *str)
__setup("reset_devices", set_reset_devices);
+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
-+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
++int grsec_proc_gid = CONFIG_GRKERNSEC_PROC_GID;
+static int __init setup_grsec_proc_gid(char *str)
+{
-+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
++ grsec_proc_gid = (int)simple_strtol(str, NULL, 0);
+ return 1;
+}
+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
+#endif
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+unsigned long pax_user_shadow_base __read_only;
++unsigned long pax_user_shadow_base __read_only = 1UL << TASK_SIZE_MAX_SHIFT;
+EXPORT_SYMBOL(pax_user_shadow_base);
+extern char pax_enter_kernel_user[];
+extern char pax_exit_kernel_user[];
++extern pgdval_t clone_pgd_mask;
+#endif
+
+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -80092,22 +79121,11 @@ index 63d3e8f..291fa8a 100644
+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
+ clone_pgd_mask = ~(pgdval_t)0UL;
+ pax_user_shadow_base = 0UL;
-+ setup_clear_cpu_cap(X86_FEATURE_PCID);
+#endif
+
+ return 0;
+}
+early_param("pax_nouderef", setup_pax_nouderef);
-+
-+#ifdef CONFIG_X86_64
-+static int __init setup_pax_weakuderef(char *str)
-+{
-+ if (clone_pgd_mask != ~(pgdval_t)0UL)
-+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
-+ return 1;
-+}
-+__setup("pax_weakuderef", setup_pax_weakuderef);
-+#endif
+#endif
+
+#ifdef CONFIG_PAX_SOFTMODE
@@ -80124,22 +79142,19 @@ index 63d3e8f..291fa8a 100644
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;
-@@ -682,25 +752,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -678,6 +738,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
{
int count = preempt_count();
int ret;
-- char msgbuf[64];
+ const char *msg1 = "", *msg2 = "";
if (initcall_debug)
ret = do_one_initcall_debug(fn);
- else
- ret = fn();
+@@ -690,17 +751,18 @@ int __init_or_module do_one_initcall(initcall_t fn)
+ sprintf(msgbuf, "error code %d ", ret);
-- msgbuf[0] = 0;
--
if (preempt_count() != count) {
-- sprintf(msgbuf, "preemption imbalance ");
+- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
+ msg1 = " preemption imbalance";
preempt_count() = count;
}
@@ -80148,32 +79163,29 @@ index 63d3e8f..291fa8a 100644
+ msg2 = " disabled interrupts";
local_irq_enable();
}
-- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
-+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
+- if (msgbuf[0]) {
+- printk("initcall %pF returned with %s\n", fn, msgbuf);
++ if (msgbuf[0] || *msg1 || *msg2) {
++ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
+ }
+ add_latent_entropy();
return ret;
}
-@@ -807,10 +876,14 @@ static int run_init_process(const char *init_filename)
- {
- argv_init[0] = init_filename;
- return do_execve(init_filename,
-- (const char __user *const __user *)argv_init,
-- (const char __user *const __user *)envp_init);
-+ (const char __user *const __force_user *)argv_init,
-+ (const char __user *const __force_user *)envp_init);
+@@ -748,6 +810,10 @@ static void run_init_process(const char *init_filename)
+ kernel_execve(init_filename, argv_init, envp_init);
}
+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
+extern int gr_init_ran;
+#endif
+
- static noinline void __init kernel_init_freeable(void);
-
- static int __ref kernel_init(void *unused)
-@@ -831,6 +904,11 @@ static int __ref kernel_init(void *unused)
- pr_err("Failed to execute %s\n", ramdisk_execute_command);
+ /* This is a non __init function. Force it to be noinline otherwise gcc
+ * makes it inline to init() and it becomes part of init.text section
+ */
+@@ -769,6 +835,11 @@ static noinline int init_post(void)
+ ramdisk_execute_command);
}
+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
@@ -80184,16 +79196,16 @@ index 63d3e8f..291fa8a 100644
/*
* We try each of these until one succeeds.
*
-@@ -885,7 +963,7 @@ static noinline void __init kernel_init_freeable(void)
+@@ -821,7 +892,7 @@ static int __init kernel_init(void * unused)
do_basic_setup();
/* Open the /dev/console on the rootfs, this should never fail */
- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
- pr_err("Warning: unable to open an initial console.\n");
+ printk(KERN_WARNING "Warning: unable to open an initial console.\n");
(void) sys_dup(0);
-@@ -898,11 +976,13 @@ static noinline void __init kernel_init_freeable(void)
+@@ -834,11 +905,13 @@ static int __init kernel_init(void * unused)
if (!ramdisk_execute_command)
ramdisk_execute_command = "/init";
@@ -80209,7 +79221,7 @@ index 63d3e8f..291fa8a 100644
* Ok, we have completed the initial bootup, and
* we're essentially up and running. Get rid of the
diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
-index b0e99de..09f385c 100644
+index 00fba2b..9afd545 100644
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
@@ -80231,7 +79243,7 @@ index b0e99de..09f385c 100644
memcpy(&ipc_table, table, sizeof(ipc_table));
ipc_table.data = get_ipc(table);
@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
- static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
+ static int proc_ipc_callback_dointvec(ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
- struct ctl_table ipc_table;
@@ -80239,7 +79251,7 @@ index b0e99de..09f385c 100644
size_t lenp_bef = *lenp;
int rc;
-@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
+@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec(ctl_table *table, int write,
static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -80258,10 +79270,19 @@ index b0e99de..09f385c 100644
int oldval;
int rc;
diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
-index 383d638..943fdbb 100644
+index 0c09366..c81a8ec 100644
--- a/ipc/mq_sysctl.c
+++ b/ipc/mq_sysctl.c
-@@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
+@@ -34,7 +34,7 @@ static void *get_mq(ctl_table *table)
+ static int proc_mq_dointvec(ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
+ {
+- struct ctl_table mq_table;
++ ctl_table_no_const mq_table;
+ memcpy(&mq_table, table, sizeof(mq_table));
+ mq_table.data = get_mq(table);
+
+@@ -44,7 +44,7 @@ static int proc_mq_dointvec(ctl_table *table, int write,
static int proc_mq_dointvec_minmax(ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -80271,22 +79292,22 @@ index 383d638..943fdbb 100644
mq_table.data = get_mq(table);
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
-index ae1996d..a35f2cc 100644
+index 5b4293d..f179875 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
-@@ -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);
+@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
+ mq_bytes = (mq_msg_tblsz +
+ (info->attr.mq_maxmsg * info->attr.mq_msgsize));
+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
- u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
+ u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
diff --git a/ipc/msg.c b/ipc/msg.c
-index 558aa91..359e718 100644
+index 7385de2..a8180e08 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
-@@ -297,18 +297,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
+@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
return security_msg_queue_associate(msq, msgflg);
}
@@ -80312,10 +79333,10 @@ index 558aa91..359e718 100644
msg_params.flg = msgflg;
diff --git a/ipc/sem.c b/ipc/sem.c
-index db9d241..bc8427c 100644
+index 5215a81..cfc0cac 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
-@@ -562,10 +562,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
+@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
return 0;
}
@@ -80332,7 +79353,7 @@ index db9d241..bc8427c 100644
struct ipc_params sem_params;
ns = current->nsproxy->ipc_ns;
-@@ -573,10 +578,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
+@@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
if (nsems < 0 || nsems > ns->sc_semmsl)
return -EINVAL;
@@ -80344,16 +79365,16 @@ index db9d241..bc8427c 100644
sem_params.flg = semflg;
sem_params.u.nsems = nsems;
diff --git a/ipc/shm.c b/ipc/shm.c
-index d697396..5aadb3f 100644
+index 326a20b..62e6b7e 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
-@@ -72,6 +72,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
+@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif
+#ifdef CONFIG_GRKERNSEC
+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+ const time_t shm_createtime, const kuid_t cuid,
++ const time_t shm_createtime, const uid_t cuid,
+ const int shmid);
+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
+ const time_t shm_createtime);
@@ -80362,7 +79383,7 @@ index d697396..5aadb3f 100644
void shm_init_ns(struct ipc_namespace *ns)
{
ns->shm_ctlmax = SHMMAX;
-@@ -551,6 +559,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
+@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
shp->shm_lprid = 0;
shp->shm_atim = shp->shm_dtim = 0;
shp->shm_ctim = get_seconds();
@@ -80377,7 +79398,7 @@ index d697396..5aadb3f 100644
shp->shm_segsz = size;
shp->shm_nattch = 0;
shp->shm_file = file;
-@@ -604,18 +620,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
+@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
return 0;
}
@@ -80402,7 +79423,7 @@ index d697396..5aadb3f 100644
shm_params.key = key;
shm_params.flg = shmflg;
shm_params.u.size = size;
-@@ -1076,6 +1093,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
+@@ -988,6 +1005,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
f_mode = FMODE_READ | FMODE_WRITE;
}
if (shmflg & SHM_EXEC) {
@@ -80415,7 +79436,7 @@ index d697396..5aadb3f 100644
prot |= PROT_EXEC;
acc_mode |= S_IXUGO;
}
-@@ -1100,10 +1123,23 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
+@@ -1011,9 +1034,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
if (err)
goto out_unlock;
@@ -80428,8 +79449,6 @@ index d697396..5aadb3f 100644
+ }
+#endif
+
- ipc_lock_object(&shp->shm_perm);
-+
path = shp->shm_file->f_path;
path_get(&path);
shp->shm_nattch++;
@@ -80437,36 +79456,13 @@ index d697396..5aadb3f 100644
+ shp->shm_lapid = current->pid;
+#endif
size = i_size_read(path.dentry->d_inode);
- ipc_unlock_object(&shp->shm_perm);
- rcu_read_unlock();
-diff --git a/ipc/util.c b/ipc/util.c
-index 7684f41..f7da711 100644
---- a/ipc/util.c
-+++ b/ipc/util.c
-@@ -71,6 +71,8 @@ struct ipc_proc_iface {
- int (*show)(struct seq_file *, void *);
- };
+ shm_unlock(shp);
-+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
-+
- static void ipc_memory_notifier(struct work_struct *work)
- {
- ipcns_notify(IPCNS_MEMCHANGED);
-@@ -560,6 +562,9 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
- granted_mode >>= 6;
- else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
- granted_mode >>= 3;
-+ else if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
-+ return -1;
-+
- /* is there some bit set in requested_mode but not in granted_mode? */
- if ((requested_mode & ~granted_mode & 0007) &&
- !ns_capable(ns->user_ns, CAP_IPC_OWNER))
diff --git a/kernel/acct.c b/kernel/acct.c
-index 8d6e145..33e0b1e 100644
+index fa7eb3d..7faf116 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
-@@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
+@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
@@ -80476,10 +79472,10 @@ index 8d6e145..33e0b1e 100644
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
set_fs(fs);
diff --git a/kernel/audit.c b/kernel/audit.c
-index 7b0e23a..f4d172f 100644
+index d4bc594..b26065d 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
-@@ -118,7 +118,7 @@ u32 audit_sig_sid = 0;
+@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
3) suppressed due to audit_rate_limit
4) suppressed due to audit_backlog_limit
*/
@@ -80488,7 +79484,7 @@ index 7b0e23a..f4d172f 100644
/* The netlink socket. */
static struct sock *audit_sock;
-@@ -240,7 +240,7 @@ void audit_log_lost(const char *message)
+@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
unsigned long now;
int print;
@@ -80497,7 +79493,7 @@ index 7b0e23a..f4d172f 100644
print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
-@@ -259,7 +259,7 @@ void audit_log_lost(const char *message)
+@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
printk(KERN_WARNING
"audit: audit_lost=%d audit_rate_limit=%d "
"audit_backlog_limit=%d\n",
@@ -80506,7 +79502,7 @@ index 7b0e23a..f4d172f 100644
audit_rate_limit,
audit_backlog_limit);
audit_panic(message);
-@@ -659,18 +659,19 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -684,18 +684,19 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
switch (msg_type) {
case AUDIT_GET:
@@ -80519,7 +79515,7 @@ index 7b0e23a..f4d172f 100644
- 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).portid, seq, AUDIT_GET, 0, 0,
+ audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
&status_set, sizeof(status_set));
break;
case AUDIT_SET:
@@ -80528,16 +79524,32 @@ index 7b0e23a..f4d172f 100644
return -EINVAL;
status_get = (struct audit_status *)data;
if (status_get->mask & AUDIT_STATUS_ENABLED) {
-@@ -832,7 +833,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
-
- memset(&s, 0, sizeof(s));
- /* guard against past and future API changes */
-- memcpy(&s, data, min(sizeof(s), (size_t)nlh->nlmsg_len));
-+ memcpy(&s, data, min_t(size_t, sizeof(s), nlmsg_len(nlh)));
- if ((s.enabled != 0 && s.enabled != 1) ||
- (s.log_passwd != 0 && s.log_passwd != 1))
+@@ -899,7 +900,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ struct task_struct *tsk;
+ unsigned long flags;
+
+- if (nlh->nlmsg_len < sizeof(struct audit_tty_status))
++ if (nlmsg_len(nlh) < sizeof(struct audit_tty_status))
return -EINVAL;
-@@ -1251,7 +1252,7 @@ void audit_log_n_hex(struct audit_buffer *ab, const unsigned char *buf,
+ s = data;
+ if (s->enabled != 0 && s->enabled != 1)
+@@ -1260,12 +1261,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
+ avail = audit_expand(ab,
+ max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
+ if (!avail)
+- goto out;
++ goto out_va_end;
+ len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
+ }
+- va_end(args2);
+ if (len > 0)
+ skb_put(skb, len);
++out_va_end:
++ va_end(args2);
+ out:
+ return;
+ }
+@@ -1306,7 +1308,7 @@ void audit_log_n_hex(struct audit_buffer *ab, const unsigned char *buf,
int i, avail, new_len;
unsigned char *ptr;
struct sk_buff *skb;
@@ -80547,10 +79559,29 @@ index 7b0e23a..f4d172f 100644
if (!ab)
return;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index 9845cb3..3ec9369 100644
+index 47b7fc1..b8e1e47 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
-@@ -1962,7 +1962,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
+@@ -67,6 +67,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/capability.h>
+ #include <linux/fs_struct.h>
++#include <linux/compat.h>
+
+ #include "audit.h"
+
+@@ -1166,8 +1167,8 @@ static void audit_log_execve_info(struct audit_context *context,
+ struct audit_buffer **ab,
+ struct audit_aux_data_execve *axi)
+ {
+- int i;
+- size_t len, len_sent = 0;
++ int i, len;
++ size_t len_sent = 0;
+ const char __user *p;
+ char *buf;
+
+@@ -2118,7 +2119,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
}
/* global counter which is incremented every time something logs in */
@@ -80558,18 +79589,112 @@ index 9845cb3..3ec9369 100644
+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
/**
- * audit_set_loginuid - set current task's audit_context loginuid
-@@ -1986,7 +1986,7 @@ int audit_set_loginuid(kuid_t loginuid)
- return -EPERM;
- #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+ * audit_set_loginuid - set a task's audit_context loginuid
+@@ -2129,9 +2130,9 @@ static atomic_t session_id = ATOMIC_INIT(0);
+ *
+ * Called (set) from fs/proc/base.c::proc_loginuid_write().
+ */
+-int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
++int __intentional_overflow(-1) audit_set_loginuid(struct task_struct *task, uid_t loginuid)
+ {
+- unsigned int sessionid = atomic_inc_return(&session_id);
++ unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
+ struct audit_context *context = task->audit_context;
-- sessionid = atomic_inc_return(&session_id);
-+ sessionid = atomic_inc_return_unchecked(&session_id);
if (context && context->in_syscall) {
- struct audit_buffer *ab;
+@@ -2499,46 +2500,59 @@ void __audit_mmap_fd(int fd, int flags)
+ context->type = AUDIT_MMAP;
+ }
+
+-/**
+- * audit_core_dumps - record information about processes that end abnormally
+- * @signr: signal value
+- *
+- * If a process ends with a core dump, something fishy is going on and we
+- * should record the event for investigation.
+- */
+-void audit_core_dumps(long signr)
++static void audit_log_abend(struct audit_buffer *ab, char *reason, long signr)
+ {
+- struct audit_buffer *ab;
+- u32 sid;
+- uid_t auid = audit_get_loginuid(current), uid;
++ uid_t auid, uid;
+ gid_t gid;
+- unsigned int sessionid = audit_get_sessionid(current);
++ unsigned int sessionid;
+
+- if (!audit_enabled)
+- return;
+-
+- if (signr == SIGQUIT) /* don't care for those */
+- return;
+-
+- ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_ANOM_ABEND);
++ auid = audit_get_loginuid(current);
++ sessionid = audit_get_sessionid(current);
+ current_uid_gid(&uid, &gid);
++
+ audit_log_format(ab, "auid=%u uid=%u gid=%u ses=%u",
+ auid, uid, gid, sessionid);
+- security_task_getsecid(current, &sid);
+- if (sid) {
+- char *ctx = NULL;
+- u32 len;
+-
+- if (security_secid_to_secctx(sid, &ctx, &len))
+- audit_log_format(ab, " ssid=%u", sid);
+- else {
+- audit_log_format(ab, " subj=%s", ctx);
+- security_release_secctx(ctx, len);
+- }
+- }
++ audit_log_task_context(ab);
+ audit_log_format(ab, " pid=%d comm=", current->pid);
+ audit_log_untrustedstring(ab, current->comm);
++ audit_log_format(ab, " reason=");
++ audit_log_string(ab, reason);
+ audit_log_format(ab, " sig=%ld", signr);
++}
++/**
++ * audit_core_dumps - record information about processes that end abnormally
++ * @signr: signal value
++ *
++ * If a process ends with a core dump, something fishy is going on and we
++ * should record the event for investigation.
++ */
++void audit_core_dumps(long signr)
++{
++ struct audit_buffer *ab;
++
++ if (!audit_enabled)
++ return;
++
++ if (signr == SIGQUIT) /* don't care for those */
++ return;
++
++ ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_ANOM_ABEND);
++ audit_log_abend(ab, "memory violation", signr);
++ audit_log_end(ab);
++}
++
++void __audit_seccomp(unsigned long syscall, long signr, int code)
++{
++ struct audit_buffer *ab;
++
++ ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_ANOM_ABEND);
++ audit_log_abend(ab, "seccomp", signr);
++ audit_log_format(ab, " syscall=%ld", syscall);
++#ifdef CONFIG_COMPAT
++ audit_log_format(ab, " compat=%d", is_compat_task());
++#endif
++ audit_log_format(ab, " ip=0x%lx", KSTK_EIP(current));
++ audit_log_format(ab, " code=0x%x", code);
+ audit_log_end(ab);
+ }
diff --git a/kernel/capability.c b/kernel/capability.c
-index 4e66bf9..cdccecf 100644
+index b463871..59495fd 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
@@ -80582,43 +79707,16 @@ index 4e66bf9..cdccecf 100644
if (copy_to_user(dataptr, kdata, tocopy
* sizeof(struct __user_cap_data_struct))) {
return -EFAULT;
-@@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
- int ret;
-
- rcu_read_lock();
-- ret = security_capable(__task_cred(t), ns, cap);
-+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
-+ gr_task_is_capable(t, __task_cred(t), cap);
- rcu_read_unlock();
-
-- return (ret == 0);
-+ return ret;
- }
-
- /**
-@@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
- int ret;
-
- rcu_read_lock();
-- ret = security_capable_noaudit(__task_cred(t), ns, cap);
-+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
- rcu_read_unlock();
-
-- return (ret == 0);
-+ return ret;
- }
-
- /**
-@@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
+@@ -374,7 +377,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
BUG();
}
-- if (security_capable(current_cred(), ns, cap) == 0) {
-+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
+- if (security_capable(ns, current_cred(), cap) == 0) {
++ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable(cap)) {
current->flags |= PF_SUPERPRIV;
return true;
}
-@@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
+@@ -382,6 +385,27 @@ bool ns_capable(struct user_namespace *ns, int cap)
}
EXPORT_SYMBOL(ns_capable);
@@ -80629,7 +79727,7 @@ index 4e66bf9..cdccecf 100644
+ BUG();
+ }
+
-+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
++ if (security_capable_noaudit(ns, current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
+ current->flags |= PF_SUPERPRIV;
+ return true;
+ }
@@ -80637,13 +79735,6 @@ index 4e66bf9..cdccecf 100644
+}
+EXPORT_SYMBOL(ns_capable_nolog);
+
- /**
- * file_ns_capable - Determine if the file's opener had a capability in effect
- * @file: The file we want to check
-@@ -432,6 +451,12 @@ bool capable(int cap)
- }
- EXPORT_SYMBOL(capable);
-
+bool capable_nolog(int cap)
+{
+ return ns_capable_nolog(&init_user_ns, cap);
@@ -80651,35 +79742,36 @@ index 4e66bf9..cdccecf 100644
+EXPORT_SYMBOL(capable_nolog);
+
/**
- * inode_capable - Check superior capability over inode
- * @inode: The inode in question
-@@ -453,3 +478,11 @@ bool inode_capable(const struct inode *inode, int cap)
- return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
+ * task_ns_capable - Determine whether current task has a superior
+ * capability targeted at a specific task's user namespace.
+@@ -396,6 +420,12 @@ bool task_ns_capable(struct task_struct *t, int cap)
}
- EXPORT_SYMBOL(inode_capable);
-+
-+bool inode_capable_nolog(const struct inode *inode, int cap)
+ EXPORT_SYMBOL(task_ns_capable);
+
++bool task_ns_capable_nolog(struct task_struct *t, int cap)
+{
-+ struct user_namespace *ns = current_user_ns();
-+
-+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
++ return ns_capable_nolog(task_cred_xxx(t, user)->user_ns, cap);
+}
-+EXPORT_SYMBOL(inode_capable_nolog);
++EXPORT_SYMBOL(task_ns_capable_nolog);
++
+ /**
+ * nsown_capable - Check superior capability to one's own user_ns
+ * @cap: The capability in question
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index 8bd9cfd..9faf120 100644
+index 2a1ffb7..b99a595 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5817,7 +5817,7 @@ static int cgroup_css_links_read(struct cgroup_subsys_state *css,
- struct css_set *cset = link->cset;
+@@ -5164,7 +5164,7 @@ static int cgroup_css_links_read(struct cgroup *cont,
+ struct css_set *cg = link->cg;
struct task_struct *task;
int count = 0;
-- seq_printf(seq, "css_set %p\n", cset);
-+ seq_printf(seq, "css_set %pK\n", cset);
- list_for_each_entry(task, &cset->tasks, cg_list) {
+- seq_printf(seq, "css_set %p\n", cg);
++ seq_printf(seq, "css_set %pK\n", cg);
+ list_for_each_entry(task, &cg->tasks, cg_list) {
if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
seq_puts(seq, " ...\n");
diff --git a/kernel/compat.c b/kernel/compat.c
-index 0a09e48..f44f3f0 100644
+index a6d0649..f44fb27 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -13,6 +13,7 @@
@@ -80690,7 +79782,7 @@ index 0a09e48..f44f3f0 100644
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/signal.h>
-@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
+@@ -168,7 +169,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
mm_segment_t oldfs;
long ret;
@@ -80699,7 +79791,7 @@ index 0a09e48..f44f3f0 100644
oldfs = get_fs();
set_fs(KERNEL_DS);
ret = hrtimer_nanosleep_restart(restart);
-@@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
+@@ -200,7 +201,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
oldfs = get_fs();
set_fs(KERNEL_DS);
ret = hrtimer_nanosleep(&tu,
@@ -80708,7 +79800,7 @@ index 0a09e48..f44f3f0 100644
HRTIMER_MODE_REL, CLOCK_MONOTONIC);
set_fs(oldfs);
-@@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
+@@ -309,7 +310,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
mm_segment_t old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -80717,7 +79809,7 @@ index 0a09e48..f44f3f0 100644
set_fs(old_fs);
if (ret == 0)
ret = put_user(s, set);
-@@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
+@@ -399,7 +400,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
mm_segment_t old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -80726,7 +79818,16 @@ index 0a09e48..f44f3f0 100644
set_fs(old_fs);
if (!ret) {
-@@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
+@@ -471,7 +472,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
+ mm_segment_t old_fs = get_fs();
+
+ set_fs(KERNEL_DS);
+- ret = sys_getrusage(who, (struct rusage __user *) &r);
++ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
+ set_fs(old_fs);
+
+ if (ret)
+@@ -498,8 +499,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
set_fs (KERNEL_DS);
ret = sys_wait4(pid,
(stat_addr ?
@@ -80737,7 +79838,7 @@ index 0a09e48..f44f3f0 100644
set_fs (old_fs);
if (ret > 0) {
-@@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
+@@ -524,8 +525,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
memset(&info, 0, sizeof(info));
set_fs(KERNEL_DS);
@@ -80748,7 +79849,7 @@ index 0a09e48..f44f3f0 100644
set_fs(old_fs);
if ((ret < 0) || (info.si_signo == 0))
-@@ -695,8 +696,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
+@@ -655,8 +656,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_timer_settime(timer_id, flags,
@@ -80759,7 +79860,7 @@ index 0a09e48..f44f3f0 100644
set_fs(oldfs);
if (!err && old && put_compat_itimerspec(old, &oldts))
return -EFAULT;
-@@ -713,7 +714,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
+@@ -673,7 +674,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_timer_gettime(timer_id,
@@ -80768,7 +79869,7 @@ index 0a09e48..f44f3f0 100644
set_fs(oldfs);
if (!err && put_compat_itimerspec(setting, &ts))
return -EFAULT;
-@@ -732,7 +733,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
+@@ -692,7 +693,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_settime(which_clock,
@@ -80777,7 +79878,7 @@ index 0a09e48..f44f3f0 100644
set_fs(oldfs);
return err;
}
-@@ -747,7 +748,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
+@@ -707,7 +708,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_gettime(which_clock,
@@ -80786,7 +79887,7 @@ index 0a09e48..f44f3f0 100644
set_fs(oldfs);
if (!err && put_compat_timespec(&ts, tp))
return -EFAULT;
-@@ -767,7 +768,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
+@@ -727,7 +728,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
oldfs = get_fs();
set_fs(KERNEL_DS);
@@ -80795,7 +79896,7 @@ index 0a09e48..f44f3f0 100644
set_fs(oldfs);
err = compat_put_timex(utp, &txc);
-@@ -787,7 +788,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
+@@ -747,7 +748,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_getres(which_clock,
@@ -80804,7 +79905,7 @@ index 0a09e48..f44f3f0 100644
set_fs(oldfs);
if (!err && tp && put_compat_timespec(&ts, tp))
return -EFAULT;
-@@ -799,9 +800,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
+@@ -759,9 +760,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
long err;
mm_segment_t oldfs;
struct timespec tu;
@@ -80816,7 +79917,7 @@ index 0a09e48..f44f3f0 100644
oldfs = get_fs();
set_fs(KERNEL_DS);
err = clock_nanosleep_restart(restart);
-@@ -833,8 +834,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
+@@ -793,8 +794,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
oldfs = get_fs();
set_fs(KERNEL_DS);
err = sys_clock_nanosleep(which_clock, flags,
@@ -80828,7 +79929,7 @@ index 0a09e48..f44f3f0 100644
if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
diff --git a/kernel/configs.c b/kernel/configs.c
-index c18b1f1..b9a0132 100644
+index 42e8fa0..9e7406b 100644
--- a/kernel/configs.c
+++ b/kernel/configs.c
@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
@@ -80852,27 +79953,26 @@ index c18b1f1..b9a0132 100644
return -ENOMEM;
diff --git a/kernel/cred.c b/kernel/cred.c
-index e0573a4..3874e41 100644
+index 48c6fd3..8398912 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
-@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
- validate_creds(cred);
- alter_cred_subscribers(cred, -1);
- put_cred(cred);
+@@ -204,6 +204,15 @@ void exit_creds(struct task_struct *tsk)
+ validate_creds(cred);
+ put_cred(cred);
+ }
+
+#ifdef CONFIG_GRKERNSEC_SETXID
+ cred = (struct cred *) tsk->delayed_cred;
-+ if (cred != NULL) {
++ if (cred) {
+ tsk->delayed_cred = NULL;
+ validate_creds(cred);
-+ alter_cred_subscribers(cred, -1);
+ put_cred(cred);
+ }
+#endif
}
/**
-@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
+@@ -472,7 +481,7 @@ error_put:
* Always returns 0 thus allowing this function to be tail-called at the end
* of, say, sys_setgid().
*/
@@ -80881,16 +79981,16 @@ index e0573a4..3874e41 100644
{
struct task_struct *task = current;
const struct cred *old = task->real_cred;
-@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
+@@ -491,6 +500,8 @@ int commit_creds(struct cred *new)
get_cred(new); /* we will require a ref for the subj creds too */
+ gr_set_role_label(task, new->uid, new->gid);
+
/* dumpability changes */
- if (!uid_eq(old->euid, new->euid) ||
- !gid_eq(old->egid, new->egid) ||
-@@ -479,6 +491,102 @@ int commit_creds(struct cred *new)
+ if (old->euid != new->euid ||
+ old->egid != new->egid ||
+@@ -540,6 +551,101 @@ int commit_creds(struct cred *new)
put_cred(old);
return 0;
}
@@ -80904,7 +80004,7 @@ index e0573a4..3874e41 100644
+
+ current->delayed_cred = NULL;
+
-+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
++ if (current_uid() && new != NULL) {
+ // from doing get_cred on it when queueing this
+ put_cred(new);
+ return;
@@ -80965,8 +80065,7 @@ index e0573a4..3874e41 100644
+ init_cred
+ */
+ if (grsec_enable_setxid && !current_is_single_threaded() &&
-+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
-+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
++ !current_uid() && new->uid) {
+ schedule_it = 1;
+ }
+ ret = __commit_creds(new);
@@ -80994,10 +80093,10 @@ index e0573a4..3874e41 100644
/**
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
-index 0506d44..2c20034 100644
+index 7fda904..59f620c 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
-@@ -123,7 +123,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
+@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
*/
static atomic_t masters_in_kgdb;
static atomic_t slaves_in_kgdb;
@@ -81006,7 +80105,7 @@ index 0506d44..2c20034 100644
atomic_t kgdb_setting_breakpoint;
struct task_struct *kgdb_usethread;
-@@ -133,7 +133,7 @@ int kgdb_single_step;
+@@ -129,7 +129,7 @@ int kgdb_single_step;
static pid_t kgdb_sstep_pid;
/* to keep track of the CPU which is doing the single stepping*/
@@ -81015,7 +80114,7 @@ index 0506d44..2c20034 100644
/*
* If you are debugging a problem where roundup (the collection of
-@@ -541,7 +541,7 @@ return_normal:
+@@ -537,7 +537,7 @@ return_normal:
* kernel will only try for the value of sstep_tries before
* giving up and continuing on.
*/
@@ -81024,7 +80123,7 @@ index 0506d44..2c20034 100644
(kgdb_info[cpu].task &&
kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
atomic_set(&kgdb_active, -1);
-@@ -635,8 +635,8 @@ cpu_master_loop:
+@@ -631,8 +631,8 @@ cpu_master_loop:
}
kgdb_restore:
@@ -81035,7 +80134,7 @@ index 0506d44..2c20034 100644
if (kgdb_info[sstep_cpu].task)
kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
else
-@@ -888,18 +888,18 @@ static void kgdb_unregister_callbacks(void)
+@@ -829,18 +829,18 @@ static void kgdb_unregister_callbacks(void)
static void kgdb_tasklet_bpt(unsigned long ing)
{
kgdb_breakpoint();
@@ -81058,19 +80157,19 @@ index 0506d44..2c20034 100644
}
EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index 00eb8f7..d7e3244 100644
+index 63786e7..0780cac 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
-@@ -1974,7 +1974,7 @@ static int kdb_lsmod(int argc, const char **argv)
- continue;
+@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
+ list_for_each_entry(mod, kdb_modules, list) {
kdb_printf("%-20s%8u 0x%p ", mod->name,
- mod->core_size, (void *)mod);
+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
#ifdef CONFIG_MODULE_UNLOAD
- kdb_printf("%4ld ", module_refcount(mod));
+ kdb_printf("%4d ", module_refcount(mod));
#endif
-@@ -1984,7 +1984,7 @@ static int kdb_lsmod(int argc, const char **argv)
+@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
kdb_printf(" (Loading)");
else
kdb_printf(" (Live)");
@@ -81080,10 +80179,10 @@ index 00eb8f7..d7e3244 100644
#ifdef CONFIG_MODULE_UNLOAD
{
diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 953c143..5646bb1 100644
+index 83d5621..8c6738d 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
-@@ -157,8 +157,15 @@ static struct srcu_struct pmus_srcu;
+@@ -145,8 +145,15 @@ static struct srcu_struct pmus_srcu;
* 0 - disallow raw tracepoint access for unpriv
* 1 - disallow cpu events for unpriv
* 2 - disallow kernel profiling for unpriv
@@ -81100,8 +80199,8 @@ index 953c143..5646bb1 100644
/* Minimum for 512 kiB + 1 user control page */
int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -271,7 +278,7 @@ void perf_sample_event_took(u64 sample_len_ns)
- update_perf_cpu_limits();
+@@ -173,7 +180,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
+ return 0;
}
-static atomic64_t perf_event_id;
@@ -81109,7 +80208,7 @@ index 953c143..5646bb1 100644
static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
enum event_type_t event_type);
-@@ -2940,7 +2947,7 @@ static void __perf_event_read(void *info)
+@@ -2575,7 +2582,7 @@ static void __perf_event_read(void *info)
static inline u64 perf_event_count(struct perf_event *event)
{
@@ -81118,7 +80217,7 @@ index 953c143..5646bb1 100644
}
static u64 perf_event_read(struct perf_event *event)
-@@ -3308,9 +3315,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
+@@ -3121,9 +3128,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 +
@@ -81130,7 +80229,7 @@ index 953c143..5646bb1 100644
list_for_each_entry(child, &event->child_list, child_list) {
total += perf_event_read(child);
-@@ -3725,10 +3732,10 @@ void perf_event_update_userpage(struct perf_event *event)
+@@ -3515,10 +3522,10 @@ void perf_event_update_userpage(struct perf_event *event)
userpg->offset -= local64_read(&event->hw.prev_count);
userpg->time_enabled = enabled +
@@ -81141,18 +80240,9 @@ index 953c143..5646bb1 100644
- atomic64_read(&event->child_total_time_running);
+ atomic64_read_unchecked(&event->child_total_time_running);
- arch_perf_update_userpage(userpg, now);
-
-@@ -4279,7 +4286,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
-
- /* Data. */
- sp = perf_user_stack_pointer(regs);
-- rem = __output_copy_user(handle, (void *) sp, dump_size);
-+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
- dyn_size = dump_size - rem;
-
- perf_output_skip(handle, rem);
-@@ -4370,11 +4377,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
+ barrier();
+ ++userpg->lock;
+@@ -4026,11 +4033,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 +
@@ -81166,7 +80256,7 @@ index 953c143..5646bb1 100644
}
if (read_format & PERF_FORMAT_ID)
values[n++] = primary_event_id(event);
-@@ -5112,12 +5119,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
+@@ -4681,12 +4688,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.
*/
@@ -81181,16 +80271,16 @@ index 953c143..5646bb1 100644
if (IS_ERR(name)) {
name = strncpy(tmp, "//toolong", sizeof(tmp));
goto got_name;
-@@ -6639,7 +6646,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
+@@ -6043,7 +6050,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
event->parent = parent_event;
- event->ns = get_pid_ns(task_active_pid_ns(current));
+ event->ns = get_pid_ns(current->nsproxy->pid_ns);
- event->id = atomic64_inc_return(&perf_event_id);
+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
event->state = PERF_EVENT_STATE_INACTIVE;
-@@ -6938,6 +6945,11 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -6289,6 +6296,11 @@ SYSCALL_DEFINE5(perf_event_open,
if (flags & ~PERF_FLAG_ALL)
return -EINVAL;
@@ -81202,7 +80292,7 @@ index 953c143..5646bb1 100644
err = perf_copy_attr(attr_uptr, &attr);
if (err)
return err;
-@@ -7271,10 +7283,10 @@ static void sync_child_event(struct perf_event *child_event,
+@@ -6584,10 +6596,10 @@ static void sync_child_event(struct perf_event *child_event,
/*
* Add back the child's count to the parent's count:
*/
@@ -81217,62 +80307,23 @@ index 953c143..5646bb1 100644
/*
diff --git a/kernel/events/internal.h b/kernel/events/internal.h
-index ca65997..60df03d 100644
+index a2101bb..f2e0354 100644
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
-@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
- return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
- }
-
--#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
--static inline unsigned int \
-+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
-+static inline unsigned long \
- func_name(struct perf_output_handle *handle, \
-- const void *buf, unsigned int len) \
-+ const void user *buf, unsigned long len) \
- { \
- unsigned long size, written; \
- \
-@@ -116,17 +116,17 @@ static inline int memcpy_common(void *dst, const void *src, size_t n)
- return n;
- }
-
--DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
-+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
-
- #define MEMCPY_SKIP(dst, src, n) (n)
-
--DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP)
-+DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP, )
-
- #ifndef arch_perf_out_copy_user
- #define arch_perf_out_copy_user __copy_from_user_inatomic
- #endif
-
--DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
-+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
+@@ -78,7 +78,7 @@ static unsigned long perf_data_size(struct ring_buffer *rb)
- /* Callchain handling */
- extern struct perf_callchain_entry *
-diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
-index ad8e1bd..fed7ba9 100644
---- a/kernel/events/uprobes.c
-+++ b/kernel/events/uprobes.c
-@@ -1556,7 +1556,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
+ static inline void
+ __output_copy(struct perf_output_handle *handle,
+- const void *buf, unsigned int len)
++ const void *buf, unsigned long len)
{
- struct page *page;
- uprobe_opcode_t opcode;
-- int result;
-+ long result;
-
- pagefault_disable();
- result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
+ do {
+ unsigned long size = min_t(unsigned long, handle->size, len);
diff --git a/kernel/exit.c b/kernel/exit.c
-index a949819..a5f127d 100644
+index 234e152..4c61aa3 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -172,6 +172,10 @@ void release_task(struct task_struct * p)
+@@ -168,6 +168,10 @@ void release_task(struct task_struct * p)
struct task_struct *leader;
int zap_leader;
repeat:
@@ -81283,7 +80334,7 @@ index a949819..a5f127d 100644
/* 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();
-@@ -329,7 +333,7 @@ int allow_signal(int sig)
+@@ -380,7 +384,7 @@ int allow_signal(int sig)
* know it'll be handled, so that they don't get converted to
* SIGKILL or just silently dropped.
*/
@@ -81292,7 +80343,64 @@ index a949819..a5f127d 100644
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
return 0;
-@@ -698,6 +702,8 @@ void do_exit(long code)
+@@ -402,56 +406,6 @@ int disallow_signal(int sig)
+
+ EXPORT_SYMBOL(disallow_signal);
+
+-/*
+- * Put all the gunge required to become a kernel thread without
+- * attached user resources in one place where it belongs.
+- */
+-
+-void daemonize(const char *name, ...)
+-{
+- va_list args;
+- sigset_t blocked;
+-
+- va_start(args, name);
+- vsnprintf(current->comm, sizeof(current->comm), name, args);
+- va_end(args);
+-
+- /*
+- * 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
+- * they would be locked into memory.
+- */
+- exit_mm(current);
+- /*
+- * We don't want to have TIF_FREEZE set if the system-wide hibernation
+- * or suspend transition begins right now.
+- */
+- current->flags |= (PF_NOFREEZE | PF_KTHREAD);
+-
+- if (current->nsproxy != &init_nsproxy) {
+- get_nsproxy(&init_nsproxy);
+- switch_task_namespaces(current, &init_nsproxy);
+- }
+- set_special_pids(&init_struct_pid);
+- proc_clear_tty(current);
+-
+- /* Block and flush all signals */
+- sigfillset(&blocked);
+- sigprocmask(SIG_BLOCK, &blocked, NULL);
+- flush_signals(current);
+-
+- /* Become as one with the init task */
+-
+- daemonize_fs_struct();
+- exit_files(current);
+- current->files = init_task.files;
+- atomic_inc(¤t->files->count);
+-
+- reparent_to_kthreadd();
+-}
+-
+-EXPORT_SYMBOL(daemonize);
+-
+ static void close_files(struct files_struct * files)
+ {
+ int i, j;
+@@ -874,6 +828,8 @@ NORET_TYPE void do_exit(long code)
struct task_struct *tsk = current;
int group_dead;
@@ -81301,7 +80409,7 @@ index a949819..a5f127d 100644
profile_task_exit(tsk);
WARN_ON(blk_needs_flush_plug(tsk));
-@@ -714,7 +720,6 @@ void do_exit(long code)
+@@ -890,7 +846,6 @@ NORET_TYPE void do_exit(long code)
* mm_release()->clear_child_tid() from writing to a user-controlled
* kernel address.
*/
@@ -81309,7 +80417,7 @@ index a949819..a5f127d 100644
ptrace_event(PTRACE_EVENT_EXIT, code);
-@@ -773,6 +778,9 @@ void do_exit(long code)
+@@ -952,6 +907,9 @@ NORET_TYPE void do_exit(long code)
tsk->exit_code = code;
taskstats_exit(tsk, group_dead);
@@ -81319,20 +80427,56 @@ index a949819..a5f127d 100644
exit_mm(tsk);
if (group_dead)
-@@ -894,7 +902,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
+@@ -1065,7 +1023,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).
*/
--void
+-NORET_TYPE void
+__noreturn void
do_group_exit(int exit_code)
{
struct signal_struct *sig = current->signal;
diff --git a/kernel/fork.c b/kernel/fork.c
-index 086fe73..72c1122 100644
+index ce0c182..c6ec99a 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+@@ -34,6 +34,7 @@
+ #include <linux/cgroup.h>
+ #include <linux/security.h>
+ #include <linux/hugetlb.h>
++#include <linux/seccomp.h>
+ #include <linux/swap.h>
+ #include <linux/syscalls.h>
+ #include <linux/jiffies.h>
+@@ -168,6 +169,7 @@ void free_task(struct task_struct *tsk)
+ free_thread_info(tsk->stack);
+ rt_mutex_debug_task_free(tsk);
+ ftrace_graph_exit_task(tsk);
++ put_seccomp_filter(tsk);
+ free_task_struct(tsk);
+ }
+ EXPORT_SYMBOL(free_task);
+@@ -270,19 +272,24 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+ }
+
+ err = arch_dup_task_struct(tsk, orig);
+- if (err)
+- goto out;
+
++ /*
++ * We defer looking at err, because we will need this setup
++ * for the clean up path to work correctly.
++ */
+ tsk->stack = ti;
+-
+ setup_thread_stack(tsk, orig);
++
++ if (err)
++ goto out;
++
+ clear_user_return_notifier(tsk);
+ clear_tsk_need_resched(tsk);
+ stackend = end_of_stack(tsk);
*stackend = STACK_END_MAGIC; /* for overflow detection */
#ifdef CONFIG_CC_STACKPROTECTOR
@@ -81341,23 +80485,26 @@ index 086fe73..72c1122 100644
#endif
/*
-@@ -345,12 +345,80 @@ free_tsk:
+@@ -306,13 +313,78 @@ out:
}
#ifdef CONFIG_MMU
-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
-+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
-+{
++static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
+ {
+- struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
+- struct rb_node **rb_link, *rb_parent;
+- int retval;
+ struct vm_area_struct *tmp;
-+ unsigned long charge;
+ unsigned long charge;
+ struct mempolicy *pol;
+ struct file *file;
-+ int retval;
+
+ charge = 0;
+ if (mpnt->vm_flags & VM_ACCOUNT) {
-+ unsigned long len = vma_pages(mpnt);
-+
-+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
++ unsigned long len;
++ len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
++ if (security_vm_enough_memory(len))
+ goto fail_nomem;
+ charge = len;
+ }
@@ -81367,9 +80514,10 @@ index 086fe73..72c1122 100644
+ *tmp = *mpnt;
+ tmp->vm_mm = mm;
+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
-+ retval = vma_dup_policy(mpnt, tmp);
-+ if (retval)
++ pol = mpol_dup(vma_policy(mpnt));
++ if (IS_ERR(pol))
+ goto fail_nomem_policy;
++ vma_set_policy(tmp, pol);
+ if (anon_vma_fork(tmp, mpnt))
+ goto fail_nomem_anon_vma_fork;
+ tmp->vm_flags &= ~VM_LOCKED;
@@ -81377,7 +80525,7 @@ index 086fe73..72c1122 100644
+ tmp->vm_mirror = NULL;
+ file = tmp->vm_file;
+ if (file) {
-+ struct inode *inode = file_inode(file);
++ struct inode *inode = file->f_path.dentry->d_inode;
+ struct address_space *mapping = file->f_mapping;
+
+ get_file(file);
@@ -81388,10 +80536,7 @@ index 086fe73..72c1122 100644
+ mapping->i_mmap_writable++;
+ flush_dcache_mmap_lock(mapping);
+ /* insert tmp into the share list, just after 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);
++ vma_prio_tree_add(tmp, mpnt);
+ flush_dcache_mmap_unlock(mapping);
+ mutex_unlock(&mapping->i_mmap_mutex);
+ }
@@ -81407,7 +80552,7 @@ index 086fe73..72c1122 100644
+ return tmp;
+
+fail_nomem_anon_vma_fork:
-+ mpol_put(vma_policy(tmp));
++ mpol_put(pol);
+fail_nomem_policy:
+ kmem_cache_free(vm_area_cachep, tmp);
+fail_nomem:
@@ -81416,41 +80561,60 @@ index 086fe73..72c1122 100644
+}
+
+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
- {
- struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
- struct rb_node **rb_link, *rb_parent;
- int retval;
-- unsigned long charge;
++{
++ struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
++ struct rb_node **rb_link, *rb_parent;
++ int retval;
- uprobe_start_dup_mmap();
down_write(&oldmm->mmap_sem);
-@@ -379,55 +447,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+ flush_cache_dup_mm(oldmm);
+@@ -324,8 +396,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->free_area_cache = oldmm->mmap_base;
+- mm->cached_hole_size = ~0UL;
++ mm->free_area_cache = oldmm->free_area_cache;
++ mm->cached_hole_size = oldmm->cached_hole_size;
+ mm->map_count = 0;
+ cpumask_clear(mm_cpumask(mm));
+ mm->mm_rb = RB_ROOT;
+@@ -341,63 +413,16 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
prev = NULL;
for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
- struct file *file;
-
if (mpnt->vm_flags & VM_DONTCOPY) {
+- long pages = vma_pages(mpnt);
+- mm->total_vm -= pages;
vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
- -vma_pages(mpnt));
+- -pages);
++ -vma_pages(mpnt));
continue;
}
- charge = 0;
- if (mpnt->vm_flags & VM_ACCOUNT) {
-- unsigned long len = vma_pages(mpnt);
--
-- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
+- unsigned long len;
+- len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+- if (security_vm_enough_memory(len))
- goto fail_nomem;
- charge = len;
-- }
++ tmp = dup_vma(mm, mpnt);
++ if (!tmp) {
++ retval = -ENOMEM;
++ goto out;
+ }
- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
- if (!tmp)
- goto fail_nomem;
- *tmp = *mpnt;
- INIT_LIST_HEAD(&tmp->anon_vma_chain);
-- retval = vma_dup_policy(mpnt, tmp);
-- if (retval)
+- pol = mpol_dup(vma_policy(mpnt));
+- retval = PTR_ERR(pol);
+- if (IS_ERR(pol))
- goto fail_nomem_policy;
+- vma_set_policy(tmp, pol);
- tmp->vm_mm = mm;
- if (anon_vma_fork(tmp, mpnt))
- goto fail_nomem_anon_vma_fork;
@@ -81458,7 +80622,7 @@ index 086fe73..72c1122 100644
- tmp->vm_next = tmp->vm_prev = NULL;
- file = tmp->vm_file;
- if (file) {
-- struct inode *inode = file_inode(file);
+- struct inode *inode = file->f_path.dentry->d_inode;
- struct address_space *mapping = file->f_mapping;
-
- get_file(file);
@@ -81469,22 +80633,22 @@ index 086fe73..72c1122 100644
- mapping->i_mmap_writable++;
- flush_dcache_mmap_lock(mapping);
- /* insert tmp into the share list, just after 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);
+- vma_prio_tree_add(tmp, mpnt);
- flush_dcache_mmap_unlock(mapping);
- mutex_unlock(&mapping->i_mmap_mutex);
-+ tmp = dup_vma(mm, oldmm, mpnt);
-+ if (!tmp) {
-+ retval = -ENOMEM;
-+ goto out;
- }
+- }
+-
+- /*
+- * Clear hugetlb-related page reserves for children. This only
+- * affects MAP_PRIVATE mappings. Faults generated by the child
+- * are not guaranteed to succeed, even if read-only
+- */
+- if (is_vm_hugetlb_page(tmp))
+- reset_vma_resv_huge_pages(tmp);
/*
-@@ -459,6 +487,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+ * Link in the new vma and copy the page table entries.
+@@ -420,6 +445,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
if (retval)
goto out;
}
@@ -81516,12 +80680,12 @@ index 086fe73..72c1122 100644
/* a new mm has just been created */
arch_dup_mmap(oldmm, mm);
retval = 0;
-@@ -468,14 +521,6 @@ out:
+@@ -428,14 +478,6 @@ out:
+ flush_tlb_mm(oldmm);
up_write(&oldmm->mmap_sem);
- uprobe_end_dup_mmap();
return retval;
-fail_nomem_anon_vma_fork:
-- mpol_put(vma_policy(tmp));
+- mpol_put(pol);
-fail_nomem_policy:
- kmem_cache_free(vm_area_cachep, tmp);
-fail_nomem:
@@ -81531,18 +80695,34 @@ index 086fe73..72c1122 100644
}
static inline int mm_alloc_pgd(struct mm_struct *mm)
-@@ -688,8 +733,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
- return ERR_PTR(err);
+@@ -647,6 +689,26 @@ struct mm_struct *get_task_mm(struct task_struct *task)
+ }
+ EXPORT_SYMBOL_GPL(get_task_mm);
- mm = get_task_mm(task);
-- if (mm && mm != current->mm &&
-- !ptrace_may_access(task, mode)) {
++struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
++{
++ struct mm_struct *mm;
++ int err;
++
++ err = mutex_lock_killable(&task->signal->cred_guard_mutex);
++ if (err)
++ return ERR_PTR(err);
++
++ mm = get_task_mm(task);
+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
-+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
- mmput(mm);
- mm = ERR_PTR(-EACCES);
- }
-@@ -911,13 +956,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
++ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
++ mmput(mm);
++ mm = ERR_PTR(-EACCES);
++ }
++ mutex_unlock(&task->signal->cred_guard_mutex);
++
++ return mm;
++}
++
+ /* Please note the differences between mmput and mm_release.
+ * mmput is called whenever we stop holding onto a mm_struct,
+ * error success whatever.
+@@ -832,13 +894,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
spin_unlock(&fs->lock);
return -EAGAIN;
}
@@ -81564,16 +80744,24 @@ index 086fe73..72c1122 100644
return 0;
}
-@@ -1128,7 +1180,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
+@@ -1047,7 +1116,7 @@ static void posix_cpu_timers_init(struct task_struct *tsk)
* parts of the process environment (as per the clone
* flags). The actual kick-off is left to the caller.
*/
-static struct task_struct *copy_process(unsigned long clone_flags,
+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
unsigned long stack_start,
+ struct pt_regs *regs,
unsigned long stack_size,
- int __user *child_tidptr,
-@@ -1200,6 +1252,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1096,6 +1165,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+ goto fork_out;
+
+ ftrace_graph_init_task(p);
++ get_seccomp_filter(p);
+
+ rt_mutex_init_task(p);
+
+@@ -1104,10 +1174,13 @@ static struct task_struct *copy_process(unsigned long clone_flags,
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
retval = -EAGAIN;
@@ -81582,8 +80770,14 @@ index 086fe73..72c1122 100644
+
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
- if (p->real_cred->user != INIT_USER &&
-@@ -1449,6 +1504,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+- if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
+- p->real_cred->user != INIT_USER)
++ if (p->real_cred->user != INIT_USER &&
++ !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN))
+ goto bad_fork_free;
+ }
+ current->flags &= ~PF_NPROC_EXCEEDED;
+@@ -1341,6 +1414,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
goto bad_fork_free_pid;
}
@@ -81592,10 +80786,10 @@ index 086fe73..72c1122 100644
+ */
+ gr_copy_label(p);
+
- if (likely(p->pid)) {
- ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
-
-@@ -1534,6 +1594,8 @@ bad_fork_cleanup_count:
+ if (clone_flags & CLONE_THREAD) {
+ current->signal->nr_threads++;
+ atomic_inc(¤t->signal->live);
+@@ -1421,6 +1499,8 @@ bad_fork_cleanup_count:
bad_fork_free:
free_task(p);
fork_out:
@@ -81604,15 +80798,15 @@ index 086fe73..72c1122 100644
return ERR_PTR(retval);
}
-@@ -1595,6 +1657,7 @@ long do_fork(unsigned long clone_flags,
+@@ -1507,6 +1587,7 @@ long do_fork(unsigned long clone_flags,
- p = copy_process(clone_flags, stack_start, stack_size,
+ p = copy_process(clone_flags, stack_start, regs, stack_size,
child_tidptr, NULL, trace);
+ add_latent_entropy();
/*
* Do this prior waking up the new thread - the thread pointer
* might get invalid after that point, if the thread exits quickly.
-@@ -1609,6 +1672,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1521,6 +1602,8 @@ long do_fork(unsigned long clone_flags,
if (clone_flags & CLONE_PARENT_SETTID)
put_user(nr, parent_tidptr);
@@ -81621,7 +80815,7 @@ index 086fe73..72c1122 100644
if (clone_flags & CLONE_VFORK) {
p->vfork_done = &vfork;
init_completion(&vfork);
-@@ -1725,7 +1790,7 @@ void __init proc_caches_init(void)
+@@ -1591,7 +1674,7 @@ void __init proc_caches_init(void)
mm_cachep = kmem_cache_create("mm_struct",
sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
@@ -81630,7 +80824,7 @@ index 086fe73..72c1122 100644
mmap_init();
nsproxy_cache_init();
}
-@@ -1765,7 +1830,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
+@@ -1630,7 +1713,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 */
@@ -81639,7 +80833,7 @@ index 086fe73..72c1122 100644
return 0;
*new_fsp = copy_fs_struct(fs);
-@@ -1872,7 +1937,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+@@ -1719,7 +1802,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
fs = current->fs;
spin_lock(&fs->lock);
current->fs = new_fs;
@@ -81650,7 +80844,7 @@ index 086fe73..72c1122 100644
else
new_fs = fs;
diff --git a/kernel/futex.c b/kernel/futex.c
-index c3a1a55..e32b4a98 100644
+index 1d0538e..04de80f 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -54,6 +54,7 @@
@@ -81661,7 +80855,7 @@ index c3a1a55..e32b4a98 100644
#include <linux/signal.h>
#include <linux/export.h>
#include <linux/magic.h>
-@@ -243,6 +244,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
+@@ -240,6 +241,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
struct page *page, *page_head;
int err, ro = 0;
@@ -81673,7 +80867,7 @@ index c3a1a55..e32b4a98 100644
/*
* The futex address must be "naturally" aligned.
*/
-@@ -441,7 +447,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
+@@ -438,7 +444,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
static int get_futex_value_locked(u32 *dest, u32 __user *from)
{
@@ -81682,7 +80876,7 @@ index c3a1a55..e32b4a98 100644
pagefault_disable();
ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
-@@ -2734,6 +2740,7 @@ static int __init futex_init(void)
+@@ -2744,6 +2750,7 @@ static int __init futex_init(void)
{
u32 curval;
int i;
@@ -81690,7 +80884,7 @@ index c3a1a55..e32b4a98 100644
/*
* This will fail and we want it. Some arch implementations do
-@@ -2745,8 +2752,11 @@ static int __init futex_init(void)
+@@ -2755,8 +2762,11 @@ static int __init futex_init(void)
* implementation, the non-functional ones will return
* -ENOSYS.
*/
@@ -81703,10 +80897,10 @@ index c3a1a55..e32b4a98 100644
for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
plist_head_init(&futex_queues[i].chain);
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
-index f9f44fd..29885e4 100644
+index a9642d5..51eb98c 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
-@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
+@@ -31,7 +31,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
return 0;
}
@@ -81741,52 +80935,40 @@ index 9b22d03..6295b62 100644
prev->next = info->next;
else
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
-index 383319b..56ebb13 100644
+index 60f7e32..d703ad4 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
-@@ -1438,7 +1438,7 @@ void hrtimer_peek_ahead_timers(void)
+@@ -1414,7 +1414,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
-static void run_hrtimer_softirq(struct softirq_action *h)
+static __latent_entropy void run_hrtimer_softirq(void)
{
- hrtimer_peek_ahead_timers();
- }
-diff --git a/kernel/irq_work.c b/kernel/irq_work.c
-index 55fcce6..0e4cf34 100644
---- a/kernel/irq_work.c
-+++ b/kernel/irq_work.c
-@@ -189,12 +189,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
+ struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases);
+
+@@ -1756,7 +1756,7 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
--static struct notifier_block cpu_notify;
-+static struct notifier_block cpu_notify = {
-+ .notifier_call = irq_work_cpu_notify,
-+ .priority = 0,
-+};
+-static struct notifier_block __cpuinitdata hrtimers_nb = {
++static struct notifier_block hrtimers_nb = {
+ .notifier_call = hrtimer_cpu_notify,
+ };
- static __init int irq_work_init_cpu_notifier(void)
- {
-- cpu_notify.notifier_call = irq_work_cpu_notify;
-- cpu_notify.priority = 0;
- register_cpu_notifier(&cpu_notify);
- return 0;
- }
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
-index 297a924..7290070 100644
+index 66ff710..794bc5a 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
-@@ -14,6 +14,7 @@
+@@ -13,6 +13,7 @@
+ #include <linux/sort.h>
#include <linux/err.h>
- #include <linux/static_key.h>
- #include <linux/jump_label_ratelimit.h>
+ #include <linux/jump_label.h>
+#include <linux/mm.h>
#ifdef HAVE_JUMP_LABEL
-@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
+@@ -55,7 +56,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
size = (((unsigned long)stop - (unsigned long)start)
/ sizeof(struct jump_entry));
@@ -81795,8 +80977,8 @@ index 297a924..7290070 100644
+ pax_close_kernel();
}
- static void jump_label_update(struct static_key *key, int enable);
-@@ -358,10 +361,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
+ static void jump_label_update(struct jump_label_key *key, int enable);
+@@ -303,10 +306,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;
@@ -81810,7 +80992,7 @@ index 297a924..7290070 100644
static int
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
-index 3127ad5..159d880 100644
+index 079f1d3..d712c9c 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -11,6 +11,9 @@
@@ -81886,7 +81068,7 @@ index 3127ad5..159d880 100644
if (all_var)
return is_kernel(addr);
-@@ -480,7 +519,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
+@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
{
@@ -81894,19 +81076,19 @@ index 3127ad5..159d880 100644
iter->nameoff = get_symbol_offset(new_pos);
iter->pos = new_pos;
}
-@@ -528,6 +566,11 @@ static int s_show(struct seq_file *m, void *p)
+@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, void *p)
{
struct kallsym_iter *iter = m->private;
+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
++ if (current_uid())
+ return 0;
+#endif
+
/* Some debugging symbols have no name. Ignore them. */
if (!iter->name[0])
return 0;
-@@ -541,6 +584,7 @@ static int s_show(struct seq_file *m, void *p)
+@@ -515,6 +558,7 @@ static int s_show(struct seq_file *m, void *p)
*/
type = iter->exported ? toupper(iter->type) :
tolower(iter->type);
@@ -81914,7 +81096,7 @@ index 3127ad5..159d880 100644
seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
type, iter->name, iter->module_name);
} else
-@@ -566,7 +610,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
+@@ -540,7 +584,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
struct kallsym_iter *iter;
int ret;
@@ -81923,26 +81105,11 @@ index 3127ad5..159d880 100644
if (!iter)
return -ENOMEM;
reset_iter(iter, 0);
-diff --git a/kernel/kcmp.c b/kernel/kcmp.c
-index e30ac0f..3528cac 100644
---- a/kernel/kcmp.c
-+++ b/kernel/kcmp.c
-@@ -99,6 +99,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
- struct task_struct *task1, *task2;
- int ret;
-
-+#ifdef CONFIG_GRKERNSEC
-+ return -ENOSYS;
-+#endif
-+
- rcu_read_lock();
-
- /*
diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 2a74f30..d139351 100644
+index dc7bc08..4601964 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
-@@ -1041,7 +1041,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
+@@ -1048,7 +1048,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
unsigned long flags)
{
struct compat_kexec_segment in;
@@ -81953,19 +81120,19 @@ index 2a74f30..d139351 100644
/* Don't allow clients that don't understand the native
diff --git a/kernel/kmod.c b/kernel/kmod.c
-index b086006..56b1feb 100644
+index a16dac1..3227c2c 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
-@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
+@@ -64,7 +64,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
kfree(info->argv);
}
-static int call_modprobe(char *module_name, int wait)
+static int call_modprobe(char *module_name, char *module_param, int wait)
{
- struct subprocess_info *info;
static char *envp[] = {
-@@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
+ "HOME=/",
+@@ -73,7 +73,7 @@ static int call_modprobe(char *module_name, int wait)
NULL
};
@@ -81974,7 +81141,7 @@ index b086006..56b1feb 100644
if (!argv)
goto out;
-@@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
+@@ -85,7 +85,8 @@ static int call_modprobe(char *module_name, int wait)
argv[1] = "-q";
argv[2] = "--";
argv[3] = module_name; /* check free_modprobe_argv() */
@@ -81982,9 +81149,9 @@ index b086006..56b1feb 100644
+ argv[4] = module_param;
+ argv[5] = NULL;
- info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
- NULL, free_modprobe_argv, NULL);
-@@ -129,9 +130,8 @@ out:
+ return call_usermodehelper_fns(modprobe_path, argv, envp,
+ wait | UMH_KILLABLE, NULL, free_modprobe_argv, NULL);
+@@ -110,9 +111,8 @@ out:
* If module auto-loading support is disabled then this function
* becomes a no-operation.
*/
@@ -81995,9 +81162,9 @@ index b086006..56b1feb 100644
char module_name[MODULE_NAME_LEN];
unsigned int max_modprobes;
int ret;
-@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
- if (!modprobe_path[0])
- return 0;
+@@ -120,9 +120,7 @@ int __request_module(bool wait, const char *fmt, ...)
+ #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
+ static int kmod_loop_msg;
- va_start(args, fmt);
- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
@@ -82006,12 +81173,12 @@ index b086006..56b1feb 100644
if (ret >= MODULE_NAME_LEN)
return -ENAMETOOLONG;
-@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -130,6 +128,20 @@ int __request_module(bool wait, const char *fmt, ...)
if (ret)
return ret;
+#ifdef CONFIG_GRKERNSEC_MODHARDEN
-+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
++ if (!current_uid()) {
+ /* hack to workaround consolekit/udisks stupidity */
+ read_lock(&tasklist_lock);
+ if (!strcmp(current->comm, "mount") &&
@@ -82027,7 +81194,7 @@ index b086006..56b1feb 100644
/* 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
-@@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -158,11 +170,52 @@ int __request_module(bool wait, const char *fmt, ...)
trace_module_request(module_name, wait, _RET_IP_);
@@ -82056,12 +81223,12 @@ index b086006..56b1feb 100644
+ int ret;
+
+#ifdef CONFIG_GRKERNSEC_MODHARDEN
-+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
++ if (current_uid()) {
+ char module_param[MODULE_NAME_LEN];
+
+ memset(module_param, 0, sizeof(module_param));
+
-+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
++ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
+
+ va_start(args, fmt);
+ ret = ____request_module(wait, module_param, fmt, args);
@@ -82081,7 +81248,7 @@ index b086006..56b1feb 100644
EXPORT_SYMBOL(__request_module);
#endif /* CONFIG_MODULES */
-@@ -218,6 +271,18 @@ static int ____call_usermodehelper(void *data)
+@@ -188,6 +241,19 @@ static int ____call_usermodehelper(void *data)
*/
set_user_nice(current, 0);
@@ -82090,8 +81257,9 @@ index b086006..56b1feb 100644
+ out the path to be used prior to this point and are now operating
+ on that copy
+ */
-+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/systemd/", 17)) || strstr(sub_info->path, "..")) {
-+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and /usr/lib/systemd\n", sub_info->path);
++ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
++ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) {
++ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
+ retval = -EPERM;
+ goto fail;
+ }
@@ -82100,9 +81268,9 @@ index b086006..56b1feb 100644
retval = -ENOMEM;
new = prepare_kernel_cred(current);
if (!new)
-@@ -260,6 +325,10 @@ static int call_helper(void *data)
+@@ -221,6 +287,10 @@ fail:
- static void call_usermodehelper_freeinfo(struct subprocess_info *info)
+ void call_usermodehelper_freeinfo(struct subprocess_info *info)
{
+#ifdef CONFIG_GRKERNSEC
+ kfree(info->path);
@@ -82111,7 +81279,7 @@ index b086006..56b1feb 100644
if (info->cleanup)
(*info->cleanup)(info);
kfree(info);
-@@ -303,7 +372,7 @@ static int wait_for_helper(void *data)
+@@ -265,7 +335,7 @@ static int wait_for_helper(void *data)
*
* Thus the __user pointer cast is valid here.
*/
@@ -82120,7 +81288,7 @@ index b086006..56b1feb 100644
/*
* If ret is 0, either ____call_usermodehelper failed and the
-@@ -542,7 +611,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
+@@ -413,7 +483,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
goto out;
INIT_WORK(&sub_info->work, __call_usermodehelper);
@@ -82132,8 +81300,8 @@ index b086006..56b1feb 100644
+#endif
sub_info->argv = argv;
sub_info->envp = envp;
-
-@@ -650,7 +724,7 @@ EXPORT_SYMBOL(call_usermodehelper);
+ out:
+@@ -512,7 +587,7 @@ EXPORT_SYMBOL(call_usermodehelper_exec);
static int proc_cap_handler(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -82143,7 +81311,7 @@ index b086006..56b1feb 100644
kernel_cap_t new_cap;
int err, i;
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
-index a0d367a..11c18b6 100644
+index bc90b87..32da385 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -31,6 +31,9 @@
@@ -82156,22 +81324,25 @@ index a0d367a..11c18b6 100644
#include <linux/kprobes.h>
#include <linux/hash.h>
#include <linux/init.h>
-@@ -135,12 +138,12 @@ enum kprobe_slot_state {
-
- static void *alloc_insn_page(void)
- {
-- return module_alloc(PAGE_SIZE);
-+ return module_alloc_exec(PAGE_SIZE);
- }
-
- static void free_insn_page(void *page)
- {
-- module_free(NULL, page);
-+ module_free_exec(NULL, page);
- }
-
- struct kprobe_insn_cache kprobe_insn_slots = {
-@@ -2066,7 +2069,7 @@ static int __init init_kprobes(void)
+@@ -185,7 +188,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
+ * kernel image and loaded module images reside. This is required
+ * so x86_64 can correctly handle the %rip-relative fixups.
+ */
+- kip->insns = module_alloc(PAGE_SIZE);
++ kip->insns = module_alloc_exec(PAGE_SIZE);
+ if (!kip->insns) {
+ kfree(kip);
+ return NULL;
+@@ -225,7 +228,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
+ */
+ if (!list_is_singular(&kip->list)) {
+ list_del(&kip->list);
+- module_free(NULL, kip->insns);
++ module_free_exec(NULL, kip->insns);
+ kfree(kip);
+ }
+ return 1;
+@@ -1955,7 +1958,7 @@ static int __init init_kprobes(void)
{
int i, err = 0;
unsigned long offset = 0, size = 0;
@@ -82180,7 +81351,7 @@ index a0d367a..11c18b6 100644
const char *symbol_name;
void *addr;
struct kprobe_blackpoint *kb;
-@@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
+@@ -2040,11 +2043,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
kprobe_type = "k";
if (sym)
@@ -82194,7 +81365,7 @@ index a0d367a..11c18b6 100644
p->addr, kprobe_type, p->addr);
if (!pp)
-@@ -2192,7 +2195,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
+@@ -2081,7 +2084,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;
@@ -82203,11 +81374,20 @@ index a0d367a..11c18b6 100644
head = &kprobe_table[i];
preempt_disable();
+@@ -2204,7 +2207,7 @@ static ssize_t write_enabled_file_bool(struct file *file,
+ const char __user *user_buf, size_t count, loff_t *ppos)
+ {
+ char buf[32];
+- int buf_size;
++ size_t buf_size;
+
+ buf_size = min(count, (sizeof(buf)-1));
+ if (copy_from_user(buf, user_buf, buf_size))
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
-index 9659d38..bffd520 100644
+index 4e316e1..a2879b6 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
-@@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
+@@ -47,6 +47,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
{
if (count+1 > UEVENT_HELPER_PATH_LEN)
return -ENOENT;
@@ -82216,7 +81396,7 @@ index 9659d38..bffd520 100644
memcpy(uevent_helper, buf, count);
uevent_helper[count] = '\0';
if (count && uevent_helper[count-1] == '\n')
-@@ -172,7 +174,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
+@@ -156,7 +158,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
return count;
}
@@ -82226,10 +81406,10 @@ index 9659d38..bffd520 100644
.name = "notes",
.mode = S_IRUGO,
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
-index e16c45b..6f49c48 100644
+index b2e08c9..01d8049 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
-@@ -596,6 +596,10 @@ static int static_obj(void *obj)
+@@ -592,6 +592,10 @@ static int static_obj(void *obj)
end = (unsigned long) &_end,
addr = (unsigned long) obj;
@@ -82240,7 +81420,7 @@ index e16c45b..6f49c48 100644
/*
* static variable?
*/
-@@ -736,6 +740,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
+@@ -731,6 +735,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
if (!static_obj(lock->key)) {
debug_locks_off();
printk("INFO: trying to register non-static key.\n");
@@ -82248,7 +81428,7 @@ index e16c45b..6f49c48 100644
printk("the code is fine but needs lockdep annotation.\n");
printk("turning off the locking correctness validator.\n");
dump_stack();
-@@ -3080,7 +3085,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
+@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
if (!class)
return 0;
}
@@ -82258,9 +81438,18 @@ index e16c45b..6f49c48 100644
printk("\nacquire class [%p] %s", class->key, class->name);
if (class->name_version > 1)
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
-index b2c71c5..7b88d63 100644
+index 91c32a0..7b88d63 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
+@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
+
+ static void print_name(struct seq_file *m, struct lock_class *class)
+ {
+- char str[128];
++ char str[KSYM_NAME_LEN];
+ const char *name = class->name;
+
+ if (!name) {
@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
return 0;
}
@@ -82307,18 +81496,18 @@ index b2c71c5..7b88d63 100644
seq_printf(m, "%40s %14lu %29s %pS\n",
name, stats->contending_point[i],
diff --git a/kernel/module.c b/kernel/module.c
-index dc58274..3ddfa55 100644
+index 65362d9..96ac6ba 100644
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -61,6 +61,7 @@
+@@ -58,6 +58,7 @@
+ #include <linux/jump_label.h>
#include <linux/pfn.h>
#include <linux/bsearch.h>
- #include <linux/fips.h>
+#include <linux/grsecurity.h>
- #include <uapi/linux/module.h>
- #include "module-internal.h"
-@@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/module.h>
+@@ -119,7 +120,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
/* Bounds of module allocation, for speeding __module_address.
* Protected by module_mutex. */
@@ -82328,7 +81517,7 @@ index dc58274..3ddfa55 100644
int register_module_notifier(struct notifier_block * nb)
{
-@@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
+@@ -284,7 +286,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
return true;
list_for_each_entry_rcu(mod, &modules, list) {
@@ -82337,43 +81526,25 @@ index dc58274..3ddfa55 100644
{ mod->syms, mod->syms + mod->num_syms, mod->crcs,
NOT_GPL_ONLY, false },
{ mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
-@@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
- if (mod->state == MODULE_STATE_UNFORMED)
- continue;
+@@ -306,7 +308,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
+ #endif
+ };
- 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;
-@@ -491,7 +493,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
- if (!pcpusec->sh_size)
- return 0;
-
+@@ -438,7 +440,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
+ static int percpu_modalloc(struct module *mod,
+ unsigned long size, unsigned long align)
+ {
- if (align > PAGE_SIZE) {
+ if (align-1 >= PAGE_SIZE) {
printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
mod->name, align, PAGE_SIZE);
align = PAGE_SIZE;
-@@ -1097,7 +1099,7 @@ struct module_attribute module_uevent =
- static ssize_t show_coresize(struct module_attribute *mattr,
- struct module_kobject *mk, char *buffer)
- {
-- return sprintf(buffer, "%u\n", mk->mod->core_size);
-+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
- }
-
- static struct module_attribute modinfo_coresize =
-@@ -1106,7 +1108,7 @@ static struct module_attribute modinfo_coresize =
- static ssize_t show_initsize(struct module_attribute *mattr,
- struct module_kobject *mk, char *buffer)
- {
-- return sprintf(buffer, "%u\n", mk->mod->init_size);
-+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
- }
-
- static struct module_attribute modinfo_initsize =
-@@ -1321,7 +1323,7 @@ resolve_symbol_wait(struct module *mod,
+@@ -1183,7 +1185,7 @@ resolve_symbol_wait(struct module *mod,
*/
#ifdef CONFIG_SYSFS
@@ -82382,7 +81553,7 @@ index dc58274..3ddfa55 100644
static inline bool sect_empty(const Elf_Shdr *sect)
{
return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-@@ -1461,7 +1463,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
+@@ -1323,7 +1325,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
{
unsigned int notes, loaded, i;
struct module_notes_attrs *notes_attrs;
@@ -82391,7 +81562,7 @@ index dc58274..3ddfa55 100644
/* failed to create section attributes, so can't create notes */
if (!mod->sect_attrs)
-@@ -1573,7 +1575,7 @@ static void del_usage_links(struct module *mod)
+@@ -1435,7 +1437,7 @@ static void del_usage_links(struct module *mod)
static int module_add_modinfo_attrs(struct module *mod)
{
struct module_attribute *attr;
@@ -82400,7 +81571,7 @@ index dc58274..3ddfa55 100644
int error = 0;
int i;
-@@ -1795,21 +1797,21 @@ static void set_section_ro_nx(void *base,
+@@ -1649,21 +1651,21 @@ static void set_section_ro_nx(void *base,
static void unset_module_core_ro_nx(struct module *mod)
{
@@ -82430,10 +81601,10 @@ index dc58274..3ddfa55 100644
set_memory_rw);
}
-@@ -1822,14 +1824,14 @@ void set_all_modules_text_rw(void)
+@@ -1674,14 +1676,14 @@ void set_all_modules_text_rw(void)
+
+ mutex_lock(&module_mutex);
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,
@@ -82451,10 +81622,10 @@ index dc58274..3ddfa55 100644
set_memory_rw);
}
}
-@@ -1845,14 +1847,14 @@ void set_all_modules_text_ro(void)
+@@ -1695,14 +1697,14 @@ void set_all_modules_text_ro(void)
+
+ mutex_lock(&module_mutex);
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,
@@ -82472,7 +81643,7 @@ index dc58274..3ddfa55 100644
set_memory_ro);
}
}
-@@ -1903,16 +1905,19 @@ static void free_module(struct module *mod)
+@@ -1748,16 +1750,19 @@ static void free_module(struct module *mod)
/* This may be NULL, but that's OK */
unset_module_init_ro_nx(mod);
@@ -82495,10 +81666,10 @@ index dc58274..3ddfa55 100644
#ifdef CONFIG_MPU
update_protections(current->mm);
-@@ -1982,9 +1987,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1826,10 +1831,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+ unsigned int i;
int ret = 0;
const struct kernel_symbol *ksym;
-
+#ifdef CONFIG_GRKERNSEC_MODHARDEN
+ int is_fs_load = 0;
+ int register_filesystem_found = 0;
@@ -82512,7 +81683,7 @@ index dc58274..3ddfa55 100644
+ is_fs_load = 1;
+ }
+#endif
-+
+
for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
const char *name = info->strtab + sym[i].st_name;
@@ -82527,7 +81698,7 @@ index dc58274..3ddfa55 100644
switch (sym[i].st_shndx) {
case SHN_COMMON:
/* We compiled with -fno-common. These are not
-@@ -2005,7 +2032,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1850,7 +1876,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)) {
@@ -82537,7 +81708,7 @@ index dc58274..3ddfa55 100644
break;
}
-@@ -2024,11 +2053,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1869,11 +1897,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;
@@ -82558,7 +81729,7 @@ index dc58274..3ddfa55 100644
return ret;
}
-@@ -2112,22 +2150,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -1977,22 +2014,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
|| s->sh_entsize != ~0UL
|| strstarts(sname, ".init"))
continue;
@@ -82567,7 +81738,7 @@ index dc58274..3ddfa55 100644
+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
+ else
+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
- pr_debug("\t%s\n", sname);
+ DEBUGP("\t%s\n", name);
}
- switch (m) {
- case 0: /* executable */
@@ -82584,8 +81755,8 @@ index dc58274..3ddfa55 100644
- }
}
- pr_debug("Init section allocation order:\n");
-@@ -2141,23 +2169,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
+ DEBUGP("Init section allocation order:\n");
+@@ -2006,23 +2033,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
|| s->sh_entsize != ~0UL
|| !strstarts(sname, ".init"))
continue;
@@ -82596,7 +81767,7 @@ index dc58274..3ddfa55 100644
+ else
+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
+ s->sh_entsize |= INIT_OFFSET_MASK;
- pr_debug("\t%s\n", sname);
+ DEBUGP("\t%s\n", sname);
}
- switch (m) {
- case 0: /* executable */
@@ -82614,34 +81785,41 @@ index dc58274..3ddfa55 100644
}
}
-@@ -2330,7 +2348,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2187,7 +2204,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;
- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
info->index.sym) | INIT_OFFSET_MASK;
- pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
+ DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
-@@ -2347,13 +2365,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2206,19 +2223,19 @@ 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->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
-- mod->core_size += strtab_size;
+- mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
-+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
-+ mod->core_size_rx += strtab_size;
++ mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
/* Put string table section at end of init part of module. */
strsect->sh_flags |= SHF_ALLOC;
- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
info->index.str) | INIT_OFFSET_MASK;
- pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
+ DEBUGP("\t%s\n", info->secstrings + strsect->sh_name);
+
+ /* Append room for core symbols' strings at end of core part. */
+- info->stroffs = mod->core_size;
++ info->stroffs = mod->core_size_rx;
+ __set_bit(0, info->strmap);
+- mod->core_size += bitmap_weight(info->strmap, strsect->sh_size);
++ mod->core_size_rx += bitmap_weight(info->strmap, strsect->sh_size);
}
-@@ -2371,12 +2389,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+
+ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2234,11 +2251,13 @@ 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;
@@ -82652,23 +81830,26 @@ index dc58274..3ddfa55 100644
mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
- mod->core_symtab = dst = mod->module_core + info->symoffs;
-- mod->core_strtab = s = mod->module_core + info->stroffs;
+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
-+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
src = mod->symtab;
for (ndst = i = 0; i < mod->num_symtab; i++) {
if (i == 0 ||
-@@ -2388,6 +2408,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
- }
+@@ -2251,10 +2270,12 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
}
mod->core_num_syms = ndst;
+
+- mod->core_strtab = s = mod->module_core + info->stroffs;
++ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
+ for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
+ if (test_bit(i, info->strmap))
+ *++s = mod->strtab[i];
+
+ pax_close_kernel();
}
#else
static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2421,17 +2443,33 @@ void * __weak module_alloc(unsigned long size)
- return vmalloc_exec(size);
+@@ -2288,17 +2309,33 @@ void * __weak module_alloc(unsigned long size)
+ return size == 0 ? NULL : vmalloc_exec(size);
}
-static void *module_alloc_update_bounds(unsigned long size)
@@ -82706,8 +81887,8 @@ index dc58274..3ddfa55 100644
mutex_unlock(&module_mutex);
}
return ret;
-@@ -2706,8 +2744,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
- static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+@@ -2475,8 +2512,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");
+ const char *license = get_modinfo(info, "license");
@@ -82718,10 +81899,10 @@ index dc58274..3ddfa55 100644
+ return -ENOEXEC;
+#endif
+
- if (flags & MODULE_INIT_IGNORE_VERMAGIC)
- modmagic = NULL;
-
-@@ -2733,7 +2777,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+ /* This is allowed: modprobe --force will invalidate it. */
+ if (!modmagic) {
+ err = try_to_force_load(mod, "bad vermagic");
+@@ -2499,7 +2542,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
}
/* Set up license info based on the info section */
@@ -82730,7 +81911,7 @@ index dc58274..3ddfa55 100644
return 0;
}
-@@ -2814,7 +2858,7 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2593,7 +2636,7 @@ static int move_module(struct module *mod, struct load_info *info)
void *ptr;
/* Do the allocs. */
@@ -82739,7 +81920,7 @@ index dc58274..3ddfa55 100644
/*
* The pointer to this block is stored in the module structure
* which is inside the block. Just mark it as not being a
-@@ -2824,11 +2868,11 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2603,10 +2646,10 @@ static int move_module(struct module *mod, struct load_info *info)
if (!ptr)
return -ENOMEM;
@@ -82748,34 +81929,30 @@ index dc58274..3ddfa55 100644
+ memset(ptr, 0, mod->core_size_rw);
+ mod->module_core_rw = ptr;
-- if (mod->init_size) {
-- ptr = module_alloc_update_bounds(mod->init_size);
-+ if (mod->init_size_rw) {
-+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
- /*
- * The pointer to this block is stored in the module structure
- * which is inside the block. This block doesn't need to be
-@@ -2837,13 +2881,45 @@ static int move_module(struct module *mod, struct load_info *info)
- */
- kmemleak_ignore(ptr);
- if (!ptr) {
-- module_free(mod, mod->module_core);
-+ module_free(mod, mod->module_core_rw);
- return -ENOMEM;
- }
-- memset(ptr, 0, mod->init_size);
-- mod->module_init = ptr;
-+ memset(ptr, 0, mod->init_size_rw);
-+ mod->module_init_rw = ptr;
- } else
-- mod->module_init = NULL;
-+ mod->module_init_rw = NULL;
+- ptr = module_alloc_update_bounds(mod->init_size);
++ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
+ /*
+ * The pointer to this block is stored in the module structure
+ * which is inside the block. This block doesn't need to be
+@@ -2614,12 +2657,39 @@ static int move_module(struct module *mod, struct load_info *info)
+ * after the module is initialized.
+ */
+ kmemleak_ignore(ptr);
+- if (!ptr && mod->init_size) {
+- module_free(mod, mod->module_core);
++ if (!ptr && mod->init_size_rw) {
++ module_free(mod, mod->module_core_rw);
+ return -ENOMEM;
+ }
+- memset(ptr, 0, mod->init_size);
+- mod->module_init = ptr;
++ memset(ptr, 0, mod->init_size_rw);
++ mod->module_init_rw = ptr;
+
+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
+ kmemleak_not_leak(ptr);
+ if (!ptr) {
-+ if (mod->module_init_rw)
-+ module_free(mod, mod->module_init_rw);
++ module_free(mod, mod->module_init_rw);
+ module_free(mod, mod->module_core_rw);
+ return -ENOMEM;
+ }
@@ -82785,27 +81962,23 @@ index dc58274..3ddfa55 100644
+ pax_close_kernel();
+ mod->module_core_rx = ptr;
+
-+ if (mod->init_size_rx) {
-+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
-+ kmemleak_ignore(ptr);
-+ if (!ptr && mod->init_size_rx) {
-+ module_free_exec(mod, mod->module_core_rx);
-+ if (mod->module_init_rw)
-+ module_free(mod, mod->module_init_rw);
-+ module_free(mod, mod->module_core_rw);
-+ return -ENOMEM;
-+ }
++ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
++ kmemleak_ignore(ptr);
++ if (!ptr && mod->init_size_rx) {
++ module_free_exec(mod, mod->module_core_rx);
++ module_free(mod, mod->module_init_rw);
++ module_free(mod, mod->module_core_rw);
++ return -ENOMEM;
++ }
+
-+ pax_open_kernel();
-+ memset(ptr, 0, mod->init_size_rx);
-+ pax_close_kernel();
-+ mod->module_init_rx = ptr;
-+ } else
-+ mod->module_init_rx = NULL;
++ pax_open_kernel();
++ memset(ptr, 0, mod->init_size_rx);
++ pax_close_kernel();
++ mod->module_init_rx = ptr;
/* Transfer each section which specifies SHF_ALLOC */
- pr_debug("final section addresses:\n");
-@@ -2854,16 +2930,45 @@ static int move_module(struct module *mod, struct load_info *info)
+ DEBUGP("final section addresses:\n");
+@@ -2630,16 +2700,45 @@ static int move_module(struct module *mod, struct load_info *info)
if (!(shdr->sh_flags & SHF_ALLOC))
continue;
@@ -82855,10 +82028,10 @@ index dc58274..3ddfa55 100644
+#endif
+
+ shdr->sh_addr = (unsigned long)dest;
- pr_debug("\t0x%lx %s\n",
- (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
+ DEBUGP("\t0x%lx %s\n",
+ shdr->sh_addr, info->secstrings + shdr->sh_name);
}
-@@ -2920,12 +3025,12 @@ static void flush_module_icache(const struct module *mod)
+@@ -2694,12 +2793,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.
*/
@@ -82877,9 +82050,9 @@ index dc58274..3ddfa55 100644
set_fs(old_fs);
}
-@@ -2982,8 +3087,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
- static void module_deallocate(struct module *mod, struct load_info *info)
+@@ -2779,8 +2878,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
{
+ kfree(info->strmap);
percpu_modfree(mod);
- module_free(mod, mod->module_init);
- module_free(mod, mod->module_core);
@@ -82890,60 +82063,7 @@ index dc58274..3ddfa55 100644
}
int __weak module_finalize(const Elf_Ehdr *hdr,
-@@ -2996,7 +3103,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. */
-+ pax_open_kernel();
- sort_extable(mod->extable, mod->extable + mod->num_exentries);
-+ pax_close_kernel();
-
- /* Copy relocated percpu area over. */
- percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
-@@ -3050,16 +3159,16 @@ static int do_init_module(struct module *mod)
- MODULE_STATE_COMING, mod);
-
- /* Set RO and NX regions for core */
-- set_section_ro_nx(mod->module_core,
-- mod->core_text_size,
-- mod->core_ro_size,
-- mod->core_size);
-+ set_section_ro_nx(mod->module_core_rx,
-+ mod->core_size_rx,
-+ mod->core_size_rx,
-+ mod->core_size_rx);
-
- /* Set RO and NX regions for init */
-- set_section_ro_nx(mod->module_init,
-- mod->init_text_size,
-- mod->init_ro_size,
-- mod->init_size);
-+ set_section_ro_nx(mod->module_init_rx,
-+ mod->init_size_rx,
-+ mod->init_size_rx,
-+ mod->init_size_rx);
-
- do_mod_ctors(mod);
- /* Start the module */
-@@ -3121,11 +3230,12 @@ static int do_init_module(struct module *mod)
- mod->strtab = mod->core_strtab;
- #endif
- unset_module_init_ro_nx(mod);
-- module_free(mod, mod->module_init);
-- mod->module_init = NULL;
-- mod->init_size = 0;
-- mod->init_ro_size = 0;
-- mod->init_text_size = 0;
-+ module_free(mod, mod->module_init_rw);
-+ module_free_exec(mod, mod->module_init_rx);
-+ mod->module_init_rw = NULL;
-+ mod->module_init_rx = NULL;
-+ mod->init_size_rw = 0;
-+ mod->init_size_rx = 0;
- mutex_unlock(&module_mutex);
- wake_up_all(&module_wq);
-
-@@ -3269,9 +3379,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -2844,9 +2945,38 @@ static struct module *load_module(void __user *umod,
if (err)
goto free_unload;
@@ -82955,7 +82075,7 @@ index dc58274..3ddfa55 100644
+ }
+
/* Set up MODINFO_ATTR fields */
- setup_modinfo(mod, info);
+ setup_modinfo(mod, &info);
+#ifdef CONFIG_GRKERNSEC_MODHARDEN
+ {
@@ -82980,9 +82100,9 @@ index dc58274..3ddfa55 100644
+#endif
+
/* Fix up syms, so that st_value is a pointer to location. */
- err = simplify_symbols(mod, info);
+ err = simplify_symbols(mod, &info);
if (err < 0)
-@@ -3287,13 +3426,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -2862,13 +2992,6 @@ static struct module *load_module(void __user *umod,
flush_module_icache(mod);
@@ -82993,12 +82113,12 @@ index dc58274..3ddfa55 100644
- goto free_arch_cleanup;
- }
-
- dynamic_debug_setup(info->debug, info->num_debug);
+ /* Mark state as coming so strong_try_module_get() ignores us. */
+ mod->state = MODULE_STATE_COMING;
- /* Finally it's fully formed, ready to start executing. */
-@@ -3328,11 +3460,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
- ddebug_cleanup:
- dynamic_debug_remove(info->debug);
+@@ -2926,11 +3049,10 @@ static struct module *load_module(void __user *umod,
+ unlock:
+ mutex_unlock(&module_mutex);
synchronize_sched();
- kfree(mod->args);
- free_arch_cleanup:
@@ -83008,8 +82128,51 @@ index dc58274..3ddfa55 100644
+ kfree(mod->args);
free_unload:
module_unload_free(mod);
- unlink_mod:
-@@ -3415,10 +3546,16 @@ static const char *get_ksymbol(struct module *mod,
+ free_module:
+@@ -2971,16 +3093,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ MODULE_STATE_COMING, mod);
+
+ /* Set RO and NX regions for core */
+- set_section_ro_nx(mod->module_core,
+- mod->core_text_size,
+- mod->core_ro_size,
+- mod->core_size);
++ set_section_ro_nx(mod->module_core_rx,
++ mod->core_size_rx,
++ mod->core_size_rx,
++ mod->core_size_rx);
+
+ /* Set RO and NX regions for init */
+- set_section_ro_nx(mod->module_init,
+- mod->init_text_size,
+- mod->init_ro_size,
+- mod->init_size);
++ set_section_ro_nx(mod->module_init_rx,
++ mod->init_size_rx,
++ mod->init_size_rx,
++ mod->init_size_rx);
+
+ do_mod_ctors(mod);
+ /* Start the module */
+@@ -3026,11 +3148,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ mod->strtab = mod->core_strtab;
+ #endif
+ unset_module_init_ro_nx(mod);
+- module_free(mod, mod->module_init);
+- mod->module_init = NULL;
+- mod->init_size = 0;
+- mod->init_ro_size = 0;
+- mod->init_text_size = 0;
++ module_free(mod, mod->module_init_rw);
++ module_free_exec(mod, mod->module_init_rx);
++ mod->module_init_rw = NULL;
++ mod->module_init_rx = NULL;
++ mod->init_size_rw = 0;
++ mod->init_size_rx = 0;
+ mutex_unlock(&module_mutex);
+
+ return 0;
+@@ -3061,10 +3184,16 @@ static const char *get_ksymbol(struct module *mod,
unsigned long nextval;
/* At worse, next value is at end of module */
@@ -83029,8 +82192,8 @@ index dc58274..3ddfa55 100644
/* Scan for closest preceding symbol, and next symbol. (ELF
starts real symbols at 1). */
-@@ -3669,7 +3806,7 @@ static int m_show(struct seq_file *m, void *p)
- return 0;
+@@ -3312,7 +3441,7 @@ static int m_show(struct seq_file *m, void *p)
+ char buf[8];
seq_printf(m, "%s %u",
- mod->name, mod->init_size + mod->core_size);
@@ -83038,7 +82201,7 @@ index dc58274..3ddfa55 100644
print_unload_info(m, mod);
/* Informative for users. */
-@@ -3678,7 +3815,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3321,7 +3450,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. */
@@ -83047,7 +82210,7 @@ index dc58274..3ddfa55 100644
/* Taints info */
if (mod->taints)
-@@ -3714,7 +3851,17 @@ static const struct file_operations proc_modules_operations = {
+@@ -3357,7 +3486,17 @@ static const struct file_operations proc_modules_operations = {
static int __init proc_modules_init(void)
{
@@ -83065,7 +82228,7 @@ index dc58274..3ddfa55 100644
return 0;
}
module_init(proc_modules_init);
-@@ -3775,14 +3922,14 @@ struct module *__module_address(unsigned long addr)
+@@ -3416,12 +3555,12 @@ struct module *__module_address(unsigned long addr)
{
struct module *mod;
@@ -83074,16 +82237,14 @@ index dc58274..3ddfa55 100644
+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
return NULL;
- list_for_each_entry_rcu(mod, &modules, list) {
- if (mod->state == MODULE_STATE_UNFORMED)
- continue;
+ list_for_each_entry_rcu(mod, &modules, list)
- 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;
-@@ -3817,11 +3964,20 @@ bool is_module_text_address(unsigned long addr)
+ }
+@@ -3455,11 +3594,20 @@ bool is_module_text_address(unsigned long addr)
*/
struct module *__module_text_address(unsigned long addr)
{
@@ -83156,29 +82317,11 @@ index 0799fd3..d06ae3b 100644
extern void debug_mutex_init(struct mutex *lock, const char *name,
struct lock_class_key *key);
diff --git a/kernel/mutex.c b/kernel/mutex.c
-index d24105b..15648eb 100644
+index 89096dd..f91ebc5 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
-@@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
- node->locked = 1;
- return;
- }
-- ACCESS_ONCE(prev->next) = node;
-+ ACCESS_ONCE_RW(prev->next) = node;
- smp_wmb();
- /* Wait until the lock holder passes the lock down */
- while (!ACCESS_ONCE(node->locked))
-@@ -156,7 +156,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
- while (!(next = ACCESS_ONCE(node->next)))
- arch_mutex_cpu_relax();
- }
-- ACCESS_ONCE(next->locked) = 1;
-+ ACCESS_ONCE_RW(next->locked) = 1;
- smp_wmb();
- }
-
-@@ -520,7 +520,7 @@ slowpath:
- goto skip_wait;
+@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
+ spin_lock_mutex(&lock->wait_lock, flags);
debug_mutex_lock_common(lock, &waiter);
- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
@@ -83186,24 +82329,25 @@ index d24105b..15648eb 100644
/* add waiting tasks to the end of the waitqueue (FIFO): */
list_add_tail(&waiter.list, &lock->wait_list);
-@@ -564,7 +564,7 @@ slowpath:
- schedule_preempt_disabled();
- spin_lock_mutex(&lock->wait_lock, flags);
- }
+@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
+ * TASK_UNINTERRUPTIBLE case.)
+ */
+ if (unlikely(signal_pending_state(state, task))) {
+- mutex_remove_waiter(lock, &waiter,
+- task_thread_info(task));
++ mutex_remove_waiter(lock, &waiter, task);
+ mutex_release(&lock->dep_map, 1, ip);
+ spin_unlock_mutex(&lock->wait_lock, flags);
+
+@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
+ done:
+ lock_acquired(&lock->dep_map, ip);
+ /* got the lock - rejoice! */
- mutex_remove_waiter(lock, &waiter, current_thread_info());
+ mutex_remove_waiter(lock, &waiter, task);
- /* set it to 0 if there are no waiters left: */
- if (likely(list_empty(&lock->wait_list)))
- atomic_set(&lock->count, 0);
-@@ -601,7 +601,7 @@ skip_wait:
- return 0;
+ mutex_set_owner(lock);
- err:
-- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
-+ mutex_remove_waiter(lock, &waiter, task);
- spin_unlock_mutex(&lock->wait_lock, flags);
- debug_mutex_free_waiter(&waiter);
- mutex_release(&lock->dep_map, 1, ip);
+ /* 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
@@ -83260,20 +82404,75 @@ index 2d5cc4c..d9ea600 100644
}
return -ENOENT;
}
+diff --git a/kernel/padata.c b/kernel/padata.c
+index b452599..5d68f4e 100644
+--- a/kernel/padata.c
++++ b/kernel/padata.c
+@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
+ padata->pd = pd;
+ padata->cb_cpu = cb_cpu;
+
+- if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
+- atomic_set(&pd->seq_nr, -1);
++ if (unlikely(atomic_read_unchecked(&pd->seq_nr) == pd->max_seq_nr))
++ atomic_set_unchecked(&pd->seq_nr, -1);
+
+- padata->seq_nr = atomic_inc_return(&pd->seq_nr);
++ padata->seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
+
+ target_cpu = padata_cpu_hash(padata);
+ queue = per_cpu_ptr(pd->pqueue, target_cpu);
+@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
+ padata_init_pqueues(pd);
+ padata_init_squeues(pd);
+ setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
+- atomic_set(&pd->seq_nr, -1);
++ atomic_set_unchecked(&pd->seq_nr, -1);
+ atomic_set(&pd->reorder_objects, 0);
+ atomic_set(&pd->refcnt, 0);
+ pd->pinst = pinst;
diff --git a/kernel/panic.c b/kernel/panic.c
-index b6c482c..5578061 100644
+index 3458469..3ed0694 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -407,7 +407,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
- disable_trace_on_warning();
+@@ -65,6 +65,14 @@ NORET_TYPE void panic(const char * fmt, ...)
+ int state = 0;
- pr_warn("------------[ cut here ]------------\n");
-- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
-+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
- raw_smp_processor_id(), current->pid, file, line, caller);
+ /*
++ * Disable local interrupts. This will prevent panic_smp_self_stop
++ * from deadlocking the first cpu that invokes the panic, since
++ * there is nothing to prevent an interrupt handler (that runs
++ * after the panic_lock is acquired) from invoking panic again.
++ */
++ local_irq_disable();
++
++ /*
+ * It's possible to come here directly from a panic-assertion and
+ * not have preempt disabled. Some functions called from here want
+ * preempt to be disabled. No point enabling it later though...
+@@ -78,7 +86,11 @@ NORET_TYPE void panic(const char * fmt, ...)
+ va_end(args);
+ printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
+ #ifdef CONFIG_DEBUG_BUGVERBOSE
+- dump_stack();
++ /*
++ * Avoid nested stack-dumping if a panic occurs during oops processing
++ */
++ if (!test_taint(TAINT_DIE) && oops_in_progress <= 1)
++ dump_stack();
+ #endif
- if (args)
-@@ -461,7 +461,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+ /*
+@@ -382,7 +394,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
+ const char *board;
+
+ printk(KERN_WARNING "------------[ cut here ]------------\n");
+- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
++ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
+ board = dmi_get_system_info(DMI_PRODUCT_NAME);
+ if (board)
+ printk(KERN_WARNING "Hardware name: %s\n", board);
+@@ -437,7 +449,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
*/
void __stack_chk_fail(void)
{
@@ -83284,7 +82483,7 @@ index b6c482c..5578061 100644
}
EXPORT_SYMBOL(__stack_chk_fail);
diff --git a/kernel/pid.c b/kernel/pid.c
-index 9b9a266..c20ef80 100644
+index fa5f722..0c93e57 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -33,6 +33,7 @@
@@ -83295,7 +82494,7 @@ index 9b9a266..c20ef80 100644
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
#include <linux/syscalls.h>
-@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
+@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
int pid_max = PID_MAX_DEFAULT;
@@ -83304,7 +82503,7 @@ index 9b9a266..c20ef80 100644
int pid_max_min = RESERVED_PIDS + 1;
int pid_max_max = PID_MAX_LIMIT;
-@@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
+@@ -418,10 +419,18 @@ EXPORT_SYMBOL(pid_task);
*/
struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
{
@@ -83324,8 +82523,8 @@ index 9b9a266..c20ef80 100644
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-@@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
- return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
+@@ -429,6 +438,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
+ return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
}
+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
@@ -83333,30 +82532,38 @@ index 9b9a266..c20ef80 100644
+ rcu_lockdep_assert(rcu_read_lock_held(),
+ "find_task_by_pid_ns() needs rcu_read_lock()"
+ " protection");
-+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
++ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
+}
+
struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
{
struct pid *pid;
-diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
-index 4208655..19f36a5 100644
---- a/kernel/pid_namespace.c
-+++ b/kernel/pid_namespace.c
-@@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
- {
- struct pid_namespace *pid_ns = task_active_pid_ns(current);
-- struct ctl_table tmp = *table;
-+ ctl_table_no_const tmp = *table;
-
- if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
- return -EPERM;
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
-index c7f31aa..2b44977 100644
+index 962c291..31cf69d7 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
-@@ -1521,14 +1521,14 @@ struct k_clock clock_posix_cpu = {
+@@ -6,9 +6,11 @@
+ #include <linux/posix-timers.h>
+ #include <linux/errno.h>
+ #include <linux/math64.h>
++#include <linux/security.h>
+ #include <asm/uaccess.h>
+ #include <linux/kernel_stat.h>
+ #include <trace/events/timer.h>
++#include <linux/random.h>
+
+ /*
+ * Called after updating RLIMIT_CPU to run cpu timer and update
+@@ -511,6 +513,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);
+
+@@ -1625,14 +1629,14 @@ struct k_clock clock_posix_cpu = {
static __init int init_posix_cpu_timers(void)
{
@@ -83374,18 +82581,18 @@ index c7f31aa..2b44977 100644
.clock_get = thread_cpu_clock_get,
.timer_create = thread_cpu_timer_create,
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
-index 424c2d4..679242f 100644
+index e885be1..f005738 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -43,6 +43,7 @@
- #include <linux/hash.h>
+ #include <linux/idr.h>
#include <linux/posix-clock.h>
#include <linux/posix-timers.h>
+#include <linux/grsecurity.h>
#include <linux/syscalls.h>
#include <linux/wait.h>
#include <linux/workqueue.h>
-@@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
+@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
* which we beg off on and pass to do_sys_settimeofday().
*/
@@ -83394,7 +82601,7 @@ index 424c2d4..679242f 100644
/*
* These ones are defined below.
-@@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
+@@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
*/
static __init int init_posix_timers(void)
{
@@ -83403,7 +82610,7 @@ index 424c2d4..679242f 100644
.clock_getres = hrtimer_get_res,
.clock_get = posix_clock_realtime_get,
.clock_set = posix_clock_realtime_set,
-@@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
+@@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
.timer_get = common_timer_get,
.timer_del = common_timer_del,
};
@@ -83412,7 +82619,7 @@ index 424c2d4..679242f 100644
.clock_getres = hrtimer_get_res,
.clock_get = posix_ktime_get_ts,
.nsleep = common_nsleep,
-@@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
+@@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
.timer_get = common_timer_get,
.timer_del = common_timer_del,
};
@@ -83431,21 +82638,12 @@ index 424c2d4..679242f 100644
.clock_getres = posix_get_coarse_res,
.clock_get = posix_get_monotonic_coarse,
};
-- struct k_clock clock_tai = {
-+ static struct k_clock clock_tai = {
- .clock_getres = hrtimer_get_res,
- .clock_get = posix_get_tai,
- .nsleep = common_nsleep,
-@@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
- .timer_get = common_timer_get,
- .timer_del = common_timer_del,
- };
- struct k_clock clock_boottime = {
+ static struct k_clock clock_boottime = {
.clock_getres = hrtimer_get_res,
.clock_get = posix_get_boottime,
.nsleep = common_nsleep,
-@@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
+@@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
return;
}
@@ -83454,7 +82652,7 @@ index 424c2d4..679242f 100644
}
EXPORT_SYMBOL_GPL(posix_timers_register_clock);
-@@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
+@@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
return (id & CLOCKFD_MASK) == CLOCKFD ?
&clock_posix_dynamic : &clock_posix_cpu;
@@ -83466,7 +82664,7 @@ index 424c2d4..679242f 100644
}
static int common_timer_create(struct k_itimer *new_timer)
-@@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
+@@ -539,7 +540,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
struct k_clock *kc = clockid_to_kclock(which_clock);
struct k_itimer *new_timer;
int error, new_timer_id;
@@ -83475,7 +82673,7 @@ index 424c2d4..679242f 100644
int it_id_set = IT_ID_NOT_SET;
if (!kc)
-@@ -1011,6 +1012,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
+@@ -966,6 +967,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
if (copy_from_user(&new_tp, tp, sizeof (*tp)))
return -EFAULT;
@@ -83489,19 +82687,32 @@ index 424c2d4..679242f 100644
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 06ec886..9dba35e 100644
+index 3d4b954..11af930 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
-@@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
- unsigned int elapsed_msecs;
+@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_only)
+ u64 elapsed_csecs64;
+ unsigned int elapsed_csecs;
bool wakeup = false;
- int sleep_usecs = USEC_PER_MSEC;
+ bool timedout = false;
do_gettimeofday(&start);
-@@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
+@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_only)
while (true) {
todo = 0;
@@ -83509,11 +82720,14 @@ index 06ec886..9dba35e 100644
+ timedout = true;
read_lock(&tasklist_lock);
do_each_thread(g, p) {
- if (p == current || !freeze_task(p))
- continue;
-
-- if (!freezer_should_skip(p))
-+ if (!freezer_should_skip(p)) {
+ if (frozen(p) || !freezable(p))
+@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_only)
+ * try_to_stop() after schedule() in ptrace/signal
+ * stop sees TIF_FREEZE.
+ */
+- if (!task_is_stopped_or_traced(p) &&
+- !freezer_should_skip(p))
++ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
todo++;
+ if (timedout) {
+ printk(KERN_ERR "Task refusing to freeze:\n");
@@ -83523,7 +82737,7 @@ index 06ec886..9dba35e 100644
} while_each_thread(g, p);
read_unlock(&tasklist_lock);
-@@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
+@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_only)
todo += wq_busy;
}
@@ -83532,11 +82746,11 @@ index 06ec886..9dba35e 100644
break;
if (pm_wakeup_pending()) {
-diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index b4e8500..b457a6c 100644
---- a/kernel/printk/printk.c
-+++ b/kernel/printk/printk.c
-@@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
+diff --git a/kernel/printk.c b/kernel/printk.c
+index 16688ec..327729b 100644
+--- a/kernel/printk.c
++++ b/kernel/printk.c
+@@ -313,6 +313,11 @@ static int check_syslog_permissions(int type, bool from_file)
if (from_file && type != SYSLOG_ACTION_OPEN)
return 0;
@@ -83549,19 +82763,19 @@ index b4e8500..b457a6c 100644
if (capable(CAP_SYSLOG))
return 0;
diff --git a/kernel/profile.c b/kernel/profile.c
-index 6631e1e..310c266 100644
+index 76b8e77..a2930e8 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
-@@ -37,7 +37,7 @@ struct profile_hit {
- #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
- #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
+@@ -39,7 +39,7 @@ struct profile_hit {
+ /* Oprofile timer tick hook */
+ static int (*timer_hook)(struct pt_regs *) __read_mostly;
-static atomic_t *prof_buffer;
+static atomic_unchecked_t *prof_buffer;
static unsigned long prof_len, prof_shift;
int prof_on __read_mostly;
-@@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
+@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
hits[i].pc = 0;
continue;
}
@@ -83570,7 +82784,7 @@ index 6631e1e..310c266 100644
hits[i].hits = hits[i].pc = 0;
}
}
-@@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
+@@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
* Add the current hit(s) and flush the write-queue out
* to the global buffer:
*/
@@ -83582,7 +82796,7 @@ index 6631e1e..310c266 100644
hits[i].pc = hits[i].hits = 0;
}
out:
-@@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
+@@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
{
unsigned long pc;
pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
@@ -83591,7 +82805,7 @@ index 6631e1e..310c266 100644
}
#endif /* !CONFIG_SMP */
-@@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
return -EFAULT;
buf++; p++; count--; read++;
}
@@ -83600,7 +82814,7 @@ index 6631e1e..310c266 100644
if (copy_to_user(buf, (void *)pnt, count))
return -EFAULT;
read += count;
-@@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
+@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
}
#endif
profile_discard_flip_buffers();
@@ -83610,19 +82824,82 @@ index 6631e1e..310c266 100644
}
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index dd562e9..74fc16d 100644
+index 67fedad..82362a6 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
-@@ -326,7 +326,7 @@ static int ptrace_attach(struct task_struct *task, long request,
- if (seize)
- flags |= PT_SEIZED;
- rcu_read_lock();
-- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
-+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
- flags |= PT_PTRACE_CAP;
+@@ -211,7 +211,8 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state)
+ return ret;
+ }
+
+-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
++static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
++ unsigned int log)
+ {
+ const struct cred *cred = current_cred(), *tcred;
+
+@@ -237,7 +238,8 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
+ cred->gid == tcred->sgid &&
+ cred->gid == tcred->gid))
+ goto ok;
+- if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
++ if ((!log && ns_capable_nolog(tcred->user->user_ns, CAP_SYS_PTRACE)) ||
++ (log && ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)))
+ goto ok;
rcu_read_unlock();
- task->ptrace = flags;
-@@ -537,7 +537,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
+ return -EPERM;
+@@ -246,7 +248,9 @@ ok:
+ smp_rmb();
+ if (task->mm)
+ dumpable = get_dumpable(task->mm);
+- if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
++ if (!dumpable &&
++ ((!log && !task_ns_capable_nolog(task, CAP_SYS_PTRACE)) ||
++ (log && !task_ns_capable(task, CAP_SYS_PTRACE))))
+ return -EPERM;
+
+ return security_ptrace_access_check(task, mode);
+@@ -256,7 +260,21 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
+ {
+ int err;
+ task_lock(task);
+- err = __ptrace_may_access(task, mode);
++ err = __ptrace_may_access(task, mode, 0);
++ task_unlock(task);
++ return !err;
++}
++
++bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode)
++{
++ return __ptrace_may_access(task, mode, 0);
++}
++
++bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
++{
++ int err;
++ task_lock(task);
++ err = __ptrace_may_access(task, mode, 1);
+ task_unlock(task);
+ return !err;
+ }
+@@ -301,7 +319,7 @@ static int ptrace_attach(struct task_struct *task, long request,
+ goto out;
+
+ task_lock(task);
+- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
++ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
+ task_unlock(task);
+ if (retval)
+ goto unlock_creds;
+@@ -316,7 +334,7 @@ static int ptrace_attach(struct task_struct *task, long request,
+ task->ptrace = PT_PTRACED;
+ if (seize)
+ task->ptrace |= PT_SEIZED;
+- if (task_ns_capable(task, CAP_SYS_PTRACE))
++ if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
+ task->ptrace |= PT_PTRACE_CAP;
+
+ __ptrace_link(task, current);
+@@ -522,7 +540,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
break;
return -EIO;
}
@@ -83631,7 +82908,17 @@ index dd562e9..74fc16d 100644
return -EFAULT;
copied += retval;
src += retval;
-@@ -805,7 +805,7 @@ int ptrace_request(struct task_struct *child, long request,
+@@ -582,6 +600,9 @@ static int ptrace_setoptions(struct task_struct *child, unsigned long data)
+ if (data & PTRACE_O_TRACEEXIT)
+ child->ptrace |= PT_TRACE_EXIT;
+
++ if (data & PTRACE_O_TRACESECCOMP)
++ child->ptrace |= PT_TRACE_SECCOMP;
++
+ return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
+ }
+
+@@ -719,7 +740,7 @@ int ptrace_request(struct task_struct *child, long request,
bool seized = child->ptrace & PT_SEIZED;
int ret = -EIO;
siginfo_t siginfo, *si;
@@ -83640,7 +82927,7 @@ index dd562e9..74fc16d 100644
unsigned long __user *datalp = datavp;
unsigned long flags;
-@@ -1051,14 +1051,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
+@@ -921,14 +942,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
goto out;
}
@@ -83650,7 +82937,7 @@ index dd562e9..74fc16d 100644
+ }
+
if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
- ret = ptrace_attach(child, request, addr, data);
+ ret = ptrace_attach(child, request, data);
/*
* Some architectures need to do book-keeping after
* a ptrace attach.
@@ -83663,7 +82950,7 @@ index dd562e9..74fc16d 100644
goto out_put_task_struct;
}
-@@ -1086,7 +1093,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
+@@ -956,7 +984,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;
@@ -83672,7 +82959,7 @@ index dd562e9..74fc16d 100644
}
int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -1180,7 +1187,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
+@@ -1050,7 +1078,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
}
asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
@@ -83681,7 +82968,7 @@ index dd562e9..74fc16d 100644
{
struct task_struct *child;
long ret;
-@@ -1196,14 +1203,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
+@@ -1066,14 +1094,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
goto out;
}
@@ -83691,7 +82978,7 @@ index dd562e9..74fc16d 100644
+ }
+
if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
- ret = ptrace_attach(child, request, addr, data);
+ ret = ptrace_attach(child, request, data);
/*
* Some architectures need to do book-keeping after
* a ptrace attach.
@@ -83704,38 +82991,21 @@ index dd562e9..74fc16d 100644
goto out_put_task_struct;
}
-diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
-index b02a339..ce2d20c 100644
---- a/kernel/rcupdate.c
-+++ b/kernel/rcupdate.c
-@@ -312,10 +312,10 @@ int rcu_jiffies_till_stall_check(void)
- * for CONFIG_RCU_CPU_STALL_TIMEOUT.
- */
- if (till_stall_check < 3) {
-- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
-+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
- till_stall_check = 3;
- } else if (till_stall_check > 300) {
-- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
-+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
- till_stall_check = 300;
- }
- return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
-index 9ed6075..c9e8a63 100644
+index 636af6d..90b936f 100644
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
-@@ -45,7 +45,7 @@
- /* Forward declarations for rcutiny_plugin.h. */
+@@ -46,7 +46,7 @@
struct rcu_ctrlblk;
+ static void invoke_rcu_callbacks(void);
static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
-static void rcu_process_callbacks(struct softirq_action *unused);
+static void rcu_process_callbacks(void);
static void __call_rcu(struct rcu_head *head,
void (*func)(struct rcu_head *rcu),
struct rcu_ctrlblk *rcp);
-@@ -309,7 +309,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
- false));
+@@ -186,7 +186,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
+ RCU_TRACE(trace_rcu_batch_end(rcp->name, cb_count));
}
-static void rcu_process_callbacks(struct softirq_action *unused)
@@ -83743,11 +83013,24 @@ index 9ed6075..c9e8a63 100644
{
__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 2b0484a..07955ab 100644
+--- a/kernel/rcutiny_plugin.h
++++ b/kernel/rcutiny_plugin.h
+@@ -907,7 +907,7 @@ static int rcu_kthread(void *arg)
+ have_rcu_kthread_work = morework;
+ local_irq_restore(flags);
+ if (work)
+- rcu_process_callbacks(NULL);
++ rcu_process_callbacks();
+ schedule_timeout_interruptible(1); /* Leave CPU for others. */
+ }
+
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
-index be63101..05cf721 100644
+index 764825c..3aa6ac4 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
-@@ -170,12 +170,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
+@@ -138,12 +138,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 };
@@ -83763,10 +83046,10 @@ index be63101..05cf721 100644
+static atomic_unchecked_t n_rcu_torture_free;
+static atomic_unchecked_t n_rcu_torture_mberror;
+static atomic_unchecked_t n_rcu_torture_error;
- static long n_rcu_torture_barrier_error;
static long n_rcu_torture_boost_ktrerror;
static long n_rcu_torture_boost_rterror;
-@@ -293,11 +293,11 @@ rcu_torture_alloc(void)
+ static long n_rcu_torture_boost_failure;
+@@ -223,11 +223,11 @@ rcu_torture_alloc(void)
spin_lock_bh(&rcu_torture_lock);
if (list_empty(&rcu_torture_freelist)) {
@@ -83780,7 +83063,7 @@ index be63101..05cf721 100644
p = rcu_torture_freelist.next;
list_del_init(p);
spin_unlock_bh(&rcu_torture_lock);
-@@ -310,7 +310,7 @@ rcu_torture_alloc(void)
+@@ -240,7 +240,7 @@ rcu_torture_alloc(void)
static void
rcu_torture_free(struct rcu_torture *p)
{
@@ -83789,7 +83072,7 @@ index be63101..05cf721 100644
spin_lock_bh(&rcu_torture_lock);
list_add_tail(&p->rtort_free, &rcu_torture_freelist);
spin_unlock_bh(&rcu_torture_lock);
-@@ -431,7 +431,7 @@ rcu_torture_cb(struct rcu_head *p)
+@@ -360,7 +360,7 @@ rcu_torture_cb(struct rcu_head *p)
i = rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
@@ -83798,25 +83081,25 @@ index be63101..05cf721 100644
if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
rp->rtort_mbtest = 0;
rcu_torture_free(rp);
-@@ -821,7 +821,7 @@ rcu_torture_writer(void *arg)
+@@ -407,7 +407,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;
+- atomic_inc(&rcu_torture_wcount[i]);
++ atomic_inc_unchecked(&rcu_torture_wcount[i]);
+ if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
+ rp->rtort_mbtest = 0;
+ list_del(&rp->rtort_free);
+@@ -872,7 +872,7 @@ rcu_torture_writer(void *arg)
i = old_rp->rtort_pipe_count;
if (i > RCU_TORTURE_PIPE_LEN)
i = RCU_TORTURE_PIPE_LEN;
- atomic_inc(&rcu_torture_wcount[i]);
+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
old_rp->rtort_pipe_count++;
- if (gp_normal == gp_exp)
- exp = !!(rcu_random(&rand) & 0x80);
-@@ -839,7 +839,7 @@ rcu_torture_writer(void *arg)
- i = rp->rtort_pipe_count;
- if (i > RCU_TORTURE_PIPE_LEN)
- i = RCU_TORTURE_PIPE_LEN;
-- atomic_inc(&rcu_torture_wcount[i]);
-+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
- if (++rp->rtort_pipe_count >=
- RCU_TORTURE_PIPE_LEN) {
- rp->rtort_mbtest = 0;
-@@ -938,7 +938,7 @@ static void rcu_torture_timer(unsigned long unused)
+ cur_ops->deferred_free(old_rp);
+ }
+@@ -940,7 +940,7 @@ static void rcu_torture_timer(unsigned long unused)
return;
}
if (p->rtort_mbtest == 0)
@@ -83825,7 +83108,7 @@ index be63101..05cf721 100644
spin_lock(&rand_lock);
cur_ops->read_delay(&rand);
n_rcu_torture_timers++;
-@@ -1008,7 +1008,7 @@ rcu_torture_reader(void *arg)
+@@ -1001,7 +1001,7 @@ rcu_torture_reader(void *arg)
continue;
}
if (p->rtort_mbtest == 0)
@@ -83834,40 +83117,38 @@ index be63101..05cf721 100644
cur_ops->read_delay(&rand);
preempt_disable();
pipe_count = p->rtort_pipe_count;
-@@ -1071,11 +1071,11 @@ rcu_torture_printk(char *page)
+@@ -1060,16 +1060,16 @@ rcu_torture_printk(char *page)
rcu_torture_current,
rcu_torture_current_version,
list_empty(&rcu_torture_freelist),
- atomic_read(&n_rcu_torture_alloc),
- atomic_read(&n_rcu_torture_alloc_fail),
-- atomic_read(&n_rcu_torture_free));
+- atomic_read(&n_rcu_torture_free),
+- atomic_read(&n_rcu_torture_mberror),
+ atomic_read_unchecked(&n_rcu_torture_alloc),
+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
-+ atomic_read_unchecked(&n_rcu_torture_free));
- cnt += sprintf(&page[cnt], "rtmbe: %d rtbke: %ld rtbre: %ld ",
-- atomic_read(&n_rcu_torture_mberror),
++ atomic_read_unchecked(&n_rcu_torture_free),
+ atomic_read_unchecked(&n_rcu_torture_mberror),
n_rcu_torture_boost_ktrerror,
- n_rcu_torture_boost_rterror);
- cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ",
-@@ -1094,14 +1094,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);
+ n_rcu_torture_boost_rterror,
+ n_rcu_torture_boost_failure,
+ n_rcu_torture_boosts,
+ n_rcu_torture_timers);
- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
- n_rcu_torture_barrier_error != 0 ||
n_rcu_torture_boost_ktrerror != 0 ||
n_rcu_torture_boost_rterror != 0 ||
- n_rcu_torture_boost_failure != 0 ||
- i > 1) {
+ n_rcu_torture_boost_failure != 0)
+@@ -1077,7 +1077,7 @@ rcu_torture_printk(char *page)
+ cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
+ if (i > 1) {
cnt += sprintf(&page[cnt], "!!! ");
- atomic_inc(&n_rcu_torture_error);
+ atomic_inc_unchecked(&n_rcu_torture_error);
WARN_ON_ONCE(1);
}
cnt += sprintf(&page[cnt], "Reader Pipe: ");
-@@ -1115,7 +1115,7 @@ rcu_torture_printk(char *page)
+@@ -1091,7 +1091,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",
@@ -83876,16 +83157,16 @@ index be63101..05cf721 100644
}
cnt += sprintf(&page[cnt], "\n");
if (cur_ops->stats)
-@@ -1830,7 +1830,7 @@ rcu_torture_cleanup(void)
+@@ -1401,7 +1401,7 @@ rcu_torture_cleanup(void)
- rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
-
-- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
-+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
+ if (cur_ops->cleanup)
+ cur_ops->cleanup();
+- if (atomic_read(&n_rcu_torture_error))
++ if (atomic_read_unchecked(&n_rcu_torture_error))
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)
-@@ -1952,18 +1952,18 @@ rcu_torture_init(void)
+ else
+ rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
+@@ -1465,17 +1465,17 @@ rcu_torture_init(void)
rcu_torture_current = NULL;
rcu_torture_current_version = 0;
@@ -83899,7 +83180,6 @@ index be63101..05cf721 100644
+ atomic_set_unchecked(&n_rcu_torture_free, 0);
+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
+ atomic_set_unchecked(&n_rcu_torture_error, 0);
- n_rcu_torture_barrier_error = 0;
n_rcu_torture_boost_ktrerror = 0;
n_rcu_torture_boost_rterror = 0;
n_rcu_torture_boost_failure = 0;
@@ -83911,11 +83191,11 @@ index be63101..05cf721 100644
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 32618b3..c1fb822 100644
+index 1aa52af..d2875ad 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
-@@ -382,9 +382,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
- rcu_prepare_for_idle(smp_processor_id());
+@@ -369,9 +369,9 @@ void rcu_enter_nohz(void)
+ trace_rcu_dyntick("Start");
/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
smp_mb__before_atomic_inc(); /* See above. */
- atomic_inc(&rdtp->dynticks);
@@ -83923,12 +83203,12 @@ index 32618b3..c1fb822 100644
smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
+ local_irq_restore(flags);
+ }
- /*
- * It is illegal to enter an extended quiescent state while
-@@ -501,10 +501,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
- int user)
- {
+@@ -393,10 +393,10 @@ void rcu_exit_nohz(void)
+ return;
+ }
smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
- atomic_inc(&rdtp->dynticks);
+ atomic_inc_unchecked(&rdtp->dynticks);
@@ -83936,10 +83216,10 @@ index 32618b3..c1fb822 100644
smp_mb__after_atomic_inc(); /* See above. */
- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
- rcu_cleanup_after_idle(smp_processor_id());
- trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
- if (!user && !is_idle_task(current)) {
-@@ -623,14 +623,14 @@ void rcu_nmi_enter(void)
+ trace_rcu_dyntick("End");
+ local_irq_restore(flags);
+ }
+@@ -413,14 +413,14 @@ void rcu_nmi_enter(void)
struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
if (rdtp->dynticks_nmi_nesting == 0 &&
@@ -83957,7 +83237,7 @@ index 32618b3..c1fb822 100644
}
/**
-@@ -649,9 +649,9 @@ void rcu_nmi_exit(void)
+@@ -439,9 +439,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. */
@@ -83969,25 +83249,16 @@ index 32618b3..c1fb822 100644
}
/**
-@@ -665,7 +665,7 @@ int rcu_is_cpu_idle(void)
- int ret;
-
- preempt_disable();
-- ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
-+ ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
- preempt_enable();
- return ret;
- }
-@@ -734,7 +734,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
- static int dyntick_save_progress_counter(struct rcu_data *rdp,
- bool *isidle, unsigned long *maxj)
+@@ -476,7 +476,7 @@ void rcu_irq_exit(void)
+ */
+ static int dyntick_save_progress_counter(struct rcu_data *rdp)
{
- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
- rcu_sysidle_check_cpu(rdp, isidle, maxj);
- return (rdp->dynticks_snap & 0x1) == 0;
+ return 0;
}
-@@ -751,7 +751,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
+
+@@ -491,7 +491,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
unsigned int curr;
unsigned int snap;
@@ -83996,257 +83267,33 @@ index 32618b3..c1fb822 100644
snap = (unsigned int)rdp->dynticks_snap;
/*
-@@ -1341,9 +1341,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
- rdp = this_cpu_ptr(rsp->rda);
- rcu_preempt_check_blocked_tasks(rnp);
- rnp->qsmask = rnp->qsmaskinit;
-- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
-+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
- WARN_ON_ONCE(rnp->completed != rsp->completed);
-- ACCESS_ONCE(rnp->completed) = rsp->completed;
-+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
- if (rnp == rdp->mynode)
- __note_gp_changes(rsp, rnp, rdp);
- rcu_preempt_boost_start_gp(rnp);
-@@ -1434,7 +1434,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
- */
- rcu_for_each_node_breadth_first(rsp, rnp) {
- raw_spin_lock_irq(&rnp->lock);
-- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
-+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
- rdp = this_cpu_ptr(rsp->rda);
- if (rnp == rdp->mynode)
- __note_gp_changes(rsp, rnp, rdp);
-@@ -1766,7 +1766,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;
-- ACCESS_ONCE(rdp->qlen) = 0;
-+ ACCESS_ONCE_RW(rdp->qlen) = 0;
- }
-
- /*
-@@ -2012,7 +2012,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;
-- ACCESS_ONCE(rdp->qlen) -= count;
-+ ACCESS_ONCE_RW(rdp->qlen) -= count;
- rdp->n_cbs_invoked += count;
-
- /* Reinstate batch limit if we have worked down the excess. */
-@@ -2209,7 +2209,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+@@ -1554,7 +1554,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
/*
* Do RCU core processing for the current CPU.
*/
-static void rcu_process_callbacks(struct softirq_action *unused)
+static __latent_entropy void rcu_process_callbacks(void)
{
- struct rcu_state *rsp;
-
-@@ -2316,7 +2316,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
- WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
- if (debug_rcu_head_queue(head)) {
- /* Probable double call_rcu(), so leak the callback. */
-- ACCESS_ONCE(head->func) = rcu_leak_callback;
-+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
- WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
- return;
- }
-@@ -2344,7 +2344,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
-@@ -2553,11 +2553,11 @@ void synchronize_sched_expedited(void)
- * counter wrap on a 32-bit system. Quite a few more CPUs would of
- * course be required on a 64-bit system.
- */
-- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
-+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
- (ulong)atomic_long_read(&rsp->expedited_done) +
- ULONG_MAX / 8)) {
- synchronize_sched();
-- atomic_long_inc(&rsp->expedited_wrap);
-+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
- return;
- }
-
-@@ -2565,7 +2565,7 @@ void synchronize_sched_expedited(void)
- * Take a ticket. Note that atomic_inc_return() implies a
- * full memory barrier.
- */
-- snap = atomic_long_inc_return(&rsp->expedited_start);
-+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
- firstsnap = snap;
- get_online_cpus();
- WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
-@@ -2578,14 +2578,14 @@ void synchronize_sched_expedited(void)
- synchronize_sched_expedited_cpu_stop,
- NULL) == -EAGAIN) {
- put_online_cpus();
-- atomic_long_inc(&rsp->expedited_tryfail);
-+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
-
- /* Check to see if someone else did our work for us. */
- s = atomic_long_read(&rsp->expedited_done);
- if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
- /* ensure test happens before caller kfree */
- smp_mb__before_atomic_inc(); /* ^^^ */
-- atomic_long_inc(&rsp->expedited_workdone1);
-+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
- return;
- }
-
-@@ -2594,7 +2594,7 @@ void synchronize_sched_expedited(void)
- udelay(trycount * num_online_cpus());
- } else {
- wait_rcu_gp(call_rcu_sched);
-- atomic_long_inc(&rsp->expedited_normal);
-+ atomic_long_inc_unchecked(&rsp->expedited_normal);
- return;
- }
-
-@@ -2603,7 +2603,7 @@ void synchronize_sched_expedited(void)
- if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
- /* ensure test happens before caller kfree */
- smp_mb__before_atomic_inc(); /* ^^^ */
-- atomic_long_inc(&rsp->expedited_workdone2);
-+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
- return;
- }
-
-@@ -2615,10 +2615,10 @@ void synchronize_sched_expedited(void)
- * period works for us.
- */
- get_online_cpus();
-- snap = atomic_long_read(&rsp->expedited_start);
-+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
- smp_mb(); /* ensure read is before try_stop_cpus(). */
- }
-- atomic_long_inc(&rsp->expedited_stoppedcpus);
-+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
-
- /*
- * Everyone up to our most recent fetch is covered by our grace
-@@ -2627,16 +2627,16 @@ void synchronize_sched_expedited(void)
- * than we did already did their update.
- */
- do {
-- atomic_long_inc(&rsp->expedited_done_tries);
-+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
- s = atomic_long_read(&rsp->expedited_done);
- if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
- /* ensure test happens before caller kfree */
- smp_mb__before_atomic_inc(); /* ^^^ */
-- atomic_long_inc(&rsp->expedited_done_lost);
-+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
- break;
- }
- } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
-- atomic_long_inc(&rsp->expedited_done_exit);
-+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
-
- put_online_cpus();
- }
-@@ -2829,7 +2829,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.
- */
-- ACCESS_ONCE(rsp->n_barrier_done)++;
-+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
- 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. */
-@@ -2879,7 +2879,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
-
- /* Increment ->n_barrier_done to prevent duplicate work. */
- smp_mb(); /* Keep increment after above mechanism. */
-- ACCESS_ONCE(rsp->n_barrier_done)++;
-+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
- 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. */
-@@ -2924,10 +2924,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;
-- ACCESS_ONCE(rdp->qlen) = 0;
-+ ACCESS_ONCE_RW(rdp->qlen) = 0;
- rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
- 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;
- rcu_boot_init_nocb_percpu_data(rdp);
-@@ -2961,8 +2961,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
- init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
- rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
- rcu_sysidle_init_percpu_data(rdp->dynticks);
-- atomic_set(&rdp->dynticks->dynticks,
-- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
-+ atomic_set_unchecked(&rdp->dynticks->dynticks,
-+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
- raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
-
- /* Add CPU to rcu_node bitmasks. */
+ trace_rcu_utilization("Start RCU core");
+ __rcu_process_callbacks(&rcu_sched_state,
diff --git a/kernel/rcutree.h b/kernel/rcutree.h
-index 5f97eab..db8f687 100644
+index 849ce9e..74bc9de 100644
--- a/kernel/rcutree.h
+++ b/kernel/rcutree.h
-@@ -87,11 +87,11 @@ struct rcu_dynticks {
- long long dynticks_nesting; /* Track irq/process nesting level. */
- /* Process level is worth LLONG_MAX/2. */
- int dynticks_nmi_nesting; /* Track NMI nesting level. */
-- atomic_t dynticks; /* Even value for idle, else odd. */
-+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
- #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
- long long dynticks_idle_nesting;
- /* irq/process nesting level from idle. */
-- atomic_t dynticks_idle; /* Even value for idle, else odd. */
-+ atomic_unchecked_t dynticks_idle; /* Even value for idle, else odd. */
- /* "Idle" excludes userspace execution. */
- unsigned long dynticks_idle_jiffies;
- /* End of last non-NMI non-idle period. */
-@@ -427,17 +427,17 @@ struct rcu_state {
- /* _rcu_barrier(). */
- /* End of fields guarded by barrier_mutex. */
-
-- atomic_long_t expedited_start; /* Starting ticket. */
-- atomic_long_t expedited_done; /* Done ticket. */
-- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
-- atomic_long_t expedited_tryfail; /* # acquisition failures. */
-- atomic_long_t expedited_workdone1; /* # done by others #1. */
-- atomic_long_t expedited_workdone2; /* # done by others #2. */
-- atomic_long_t expedited_normal; /* # fallbacks to normal. */
-- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
-- atomic_long_t expedited_done_tries; /* # tries to update _done. */
-- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
-- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
-+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
-+ atomic_long_t expedited_done; /* Done ticket. */
-+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
-+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
-+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
-+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
-+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
-+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
-+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
-+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
-+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
-
- unsigned long jiffies_force_qs; /* Time at which to invoke */
- /* force_quiescent_state(). */
+@@ -86,7 +86,7 @@
+ struct rcu_dynticks {
+ int dynticks_nesting; /* Track irq/process nesting level. */
+ int dynticks_nmi_nesting; /* Track NMI nesting level. */
+- atomic_t dynticks; /* Even value for dynticks-idle, else odd. */
++ atomic_unchecked_t dynticks; /* Even value for dynticks-idle, else odd. */
+ };
+
+ /* RCU's kthread states for tracing. */
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
-index 130c97b..da2e5fc 100644
+index 4b9b9f8..2326053 100644
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
-@@ -900,7 +900,7 @@ void synchronize_rcu_expedited(void)
+@@ -842,7 +842,7 @@ void synchronize_rcu_expedited(void)
/* Clean up and exit. */
smp_mb(); /* ensure expedited GP seen before counter increment. */
@@ -84255,148 +83302,95 @@ index 130c97b..da2e5fc 100644
unlock_mb_ret:
mutex_unlock(&sync_rcu_preempt_exp_mutex);
mb_ret:
-@@ -1474,7 +1474,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
- free_cpumask_var(cm);
- }
-
--static struct smp_hotplug_thread rcu_cpu_thread_spec = {
-+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
- .store = &rcu_cpu_kthread_task,
- .thread_should_run = rcu_cpu_kthread_should_run,
- .thread_fn = rcu_cpu_kthread,
-@@ -1939,7 +1939,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
- print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
- pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %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,
- rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
- fast_no_hz);
-@@ -2102,7 +2102,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
-
- /* Enqueue the callback on the nocb list and update counts. */
- old_rhpp = xchg(&rdp->nocb_tail, rhtp);
-- ACCESS_ONCE(*old_rhpp) = rhp;
-+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
- atomic_long_add(rhcount, &rdp->nocb_q_count);
- atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
-
-@@ -2242,12 +2242,12 @@ static int rcu_nocb_kthread(void *arg)
- * Extract queued callbacks, update counts, and wait
- * for a grace period to elapse.
- */
-- ACCESS_ONCE(rdp->nocb_head) = NULL;
-+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
- tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
- c = atomic_long_xchg(&rdp->nocb_q_count, 0);
- cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
-- ACCESS_ONCE(rdp->nocb_p_count) += c;
-- ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
-+ ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
-+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
- rcu_nocb_wait_gp(rdp);
-
- /* Each pass through the following loop invokes a callback. */
-@@ -2269,8 +2269,8 @@ static int rcu_nocb_kthread(void *arg)
- list = next;
- }
- trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
-- ACCESS_ONCE(rdp->nocb_p_count) -= c;
-- ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
-+ ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
-+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
- rdp->n_nocbs_invoked += c;
- }
- return 0;
-@@ -2297,7 +2297,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
- t = kthread_run(rcu_nocb_kthread, rdp,
- "rcuo%c/%d", rsp->abbr, cpu);
- BUG_ON(IS_ERR(t));
-- ACCESS_ONCE(rdp->nocb_kthread) = t;
-+ ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
- }
- }
+@@ -1815,8 +1815,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
-@@ -2425,9 +2425,9 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
- j = jiffies;
- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
- smp_mb__before_atomic_inc();
-- atomic_inc(&rdtp->dynticks_idle);
-+ atomic_inc_unchecked(&rdtp->dynticks_idle);
- smp_mb__after_atomic_inc();
-- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
-+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
- }
+ #else /* #ifndef CONFIG_SMP */
- /*
-@@ -2492,9 +2492,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
+-static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
+-static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
++static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
++static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
- /* Record end of idle period. */
- smp_mb__before_atomic_inc();
-- atomic_inc(&rdtp->dynticks_idle);
-+ atomic_inc_unchecked(&rdtp->dynticks_idle);
- smp_mb__after_atomic_inc();
-- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
-+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
+ static int synchronize_sched_expedited_cpu_stop(void *data)
+ {
+@@ -1871,7 +1871,7 @@ void synchronize_sched_expedited(void)
+ int firstsnap, s, snap, trycount = 0;
+
+ /* Note that atomic_inc_return() implies full memory barrier. */
+- firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
++ firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
+ get_online_cpus();
/*
- * If we are the timekeeping CPU, we are permitted to be non-idle
-@@ -2535,7 +2535,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
- WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
-
- /* Pick up current idle and NMI-nesting counter and check. */
-- cur = atomic_read(&rdtp->dynticks_idle);
-+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
- if (cur & 0x1) {
- *isidle = false; /* We are not idle! */
- return;
+@@ -1892,7 +1892,7 @@ void synchronize_sched_expedited(void)
+ }
+
+ /* Check to see if someone else did our work for us. */
+- s = atomic_read(&sync_sched_expedited_done);
++ s = atomic_read_unchecked(&sync_sched_expedited_done);
+ if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
+ smp_mb(); /* ensure test happens before caller kfree */
+ return;
+@@ -1907,7 +1907,7 @@ void synchronize_sched_expedited(void)
+ * grace period works for us.
+ */
+ get_online_cpus();
+- snap = atomic_read(&sync_sched_expedited_started) - 1;
++ snap = atomic_read_unchecked(&sync_sched_expedited_started) - 1;
+ smp_mb(); /* ensure read is before try_stop_cpus(). */
+ }
+
+@@ -1918,12 +1918,12 @@ void synchronize_sched_expedited(void)
+ * than we did beat us to the punch.
+ */
+ do {
+- s = atomic_read(&sync_sched_expedited_done);
++ s = atomic_read_unchecked(&sync_sched_expedited_done);
+ if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
+ smp_mb(); /* ensure test happens before caller kfree */
+ break;
+ }
+- } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
++ } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
+
+ put_online_cpus();
+ }
+@@ -1985,7 +1985,7 @@ int rcu_needs_cpu(int cpu)
+ for_each_online_cpu(thatcpu) {
+ if (thatcpu == cpu)
+ continue;
+- snap = atomic_add_return(0, &per_cpu(rcu_dynticks,
++ snap = atomic_add_return_unchecked(0, &per_cpu(rcu_dynticks,
+ thatcpu).dynticks);
+ smp_mb(); /* Order sampling of snap with end of grace period. */
+ if ((snap & 0x1) != 0) {
diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
-index cf6c174..a8f4b50 100644
+index 9feffa4..54058df 100644
--- a/kernel/rcutree_trace.c
+++ b/kernel/rcutree_trace.c
-@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
- ulong2long(rdp->completed), ulong2long(rdp->gpnum),
- rdp->passed_quiesce, rdp->qs_pending);
- seq_printf(m, " dt=%d/%llx/%d df=%lu",
+@@ -69,7 +69,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
+ rdp->qs_pending);
+ #ifdef CONFIG_NO_HZ
+ seq_printf(m, " dt=%d/%d/%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);
+@@ -143,7 +143,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
+ rdp->qs_pending);
+ #ifdef CONFIG_NO_HZ
+ seq_printf(m, ",%d,%d,%d,%lu",
- atomic_read(&rdp->dynticks->dynticks),
+ atomic_read_unchecked(&rdp->dynticks->dynticks),
rdp->dynticks->dynticks_nesting,
rdp->dynticks->dynticks_nmi_nesting,
rdp->dynticks_fqs);
-@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
- struct rcu_state *rsp = (struct rcu_state *)m->private;
-
- seq_printf(m, "s=%lu d=%lu w=%lu tf=%lu wd1=%lu wd2=%lu n=%lu sc=%lu dt=%lu dl=%lu dx=%lu\n",
-- atomic_long_read(&rsp->expedited_start),
-+ atomic_long_read_unchecked(&rsp->expedited_start),
- atomic_long_read(&rsp->expedited_done),
-- atomic_long_read(&rsp->expedited_wrap),
-- atomic_long_read(&rsp->expedited_tryfail),
-- atomic_long_read(&rsp->expedited_workdone1),
-- atomic_long_read(&rsp->expedited_workdone2),
-- atomic_long_read(&rsp->expedited_normal),
-- atomic_long_read(&rsp->expedited_stoppedcpus),
-- atomic_long_read(&rsp->expedited_done_tries),
-- atomic_long_read(&rsp->expedited_done_lost),
-- atomic_long_read(&rsp->expedited_done_exit));
-+ atomic_long_read_unchecked(&rsp->expedited_wrap),
-+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
-+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
-+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
-+ atomic_long_read_unchecked(&rsp->expedited_normal),
-+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
-+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
-+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
-+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
- return 0;
- }
-
diff --git a/kernel/resource.c b/kernel/resource.c
-index 3f285dc..5755f62 100644
+index 08aa28e..b958c1c 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
-@@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
+@@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
static int __init ioresources_init(void)
{
@@ -84416,10 +83410,10 @@ index 3f285dc..5755f62 100644
}
__initcall(ioresources_init);
diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
-index 1d96dd0..994ff19 100644
+index 3d9f31c..7fefc9e 100644
--- a/kernel/rtmutex-tester.c
+++ b/kernel/rtmutex-tester.c
-@@ -22,7 +22,7 @@
+@@ -20,7 +20,7 @@
#define MAX_RT_TEST_MUTEXES 8
static spinlock_t rttest_lock;
@@ -84428,7 +83422,7 @@ index 1d96dd0..994ff19 100644
struct test_thread_data {
int opcode;
-@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
case RTTEST_LOCKCONT:
td->mutexes[td->opdata] = 1;
@@ -84437,7 +83431,7 @@ index 1d96dd0..994ff19 100644
return 0;
case RTTEST_RESET:
-@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
return 0;
case RTTEST_RESETEVENT:
@@ -84446,7 +83440,7 @@ index 1d96dd0..994ff19 100644
return 0;
default:
-@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
return ret;
td->mutexes[id] = 1;
@@ -84458,7 +83452,7 @@ index 1d96dd0..994ff19 100644
td->mutexes[id] = 4;
return 0;
-@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
return ret;
td->mutexes[id] = 1;
@@ -84470,7 +83464,7 @@ index 1d96dd0..994ff19 100644
td->mutexes[id] = ret ? 0 : 4;
return ret ? -EINTR : 0;
-@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
return ret;
@@ -84482,7 +83476,7 @@ index 1d96dd0..994ff19 100644
td->mutexes[id] = 0;
return 0;
-@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
+@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
break;
td->mutexes[dat] = 2;
@@ -84491,7 +83485,7 @@ index 1d96dd0..994ff19 100644
break;
default:
-@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
+@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
return;
td->mutexes[dat] = 3;
@@ -84500,7 +83494,7 @@ index 1d96dd0..994ff19 100644
break;
case RTTEST_LOCKNOWAIT:
-@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
+@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
return;
td->mutexes[dat] = 1;
@@ -84509,60 +83503,38 @@ index 1d96dd0..994ff19 100644
return;
default:
-diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
-index 4a07353..66b5291 100644
---- a/kernel/sched/auto_group.c
-+++ b/kernel/sched/auto_group.c
-@@ -11,7 +11,7 @@
-
- unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
- static struct autogroup autogroup_default;
--static atomic_t autogroup_seq_nr;
-+static atomic_unchecked_t autogroup_seq_nr;
-
- void __init autogroup_init(struct task_struct *init_task)
- {
-@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
-
- kref_init(&ag->kref);
- init_rwsem(&ag->lock);
-- ag->id = atomic_inc_return(&autogroup_seq_nr);
-+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
- ag->tg = tg;
- #ifdef CONFIG_RT_GROUP_SCHED
- /*
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 5ac63c9..d912786 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -2868,7 +2868,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
- * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
- * or number of jiffies left till timeout) if completed.
+diff --git a/kernel/sched.c b/kernel/sched.c
+index d93369a..700af59 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -5046,7 +5046,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
+ * The return value is -ERESTARTSYS if interrupted, 0 if timed out,
+ * positive (at least 1, or number of jiffies left till timeout) if completed.
*/
-long __sched
+long __sched __intentional_overflow(-1)
wait_for_completion_interruptible_timeout(struct completion *x,
unsigned long timeout)
{
-@@ -2885,7 +2885,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
+@@ -5063,7 +5063,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
*
- * Return: -ERESTARTSYS if interrupted, 0 if completed.
+ * The return value is -ERESTARTSYS if interrupted, 0 if completed.
*/
-int __sched wait_for_completion_killable(struct completion *x)
+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
{
long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
if (t == -ERESTARTSYS)
-@@ -2906,7 +2906,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
- * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
- * or number of jiffies left till timeout) if completed.
+@@ -5084,7 +5084,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
+ * The return value is -ERESTARTSYS if interrupted, 0 if timed out,
+ * positive (at least 1, or number of jiffies left till timeout) if completed.
*/
-long __sched
+long __sched __intentional_overflow(-1)
wait_for_completion_killable_timeout(struct completion *x,
unsigned long timeout)
{
-@@ -3132,6 +3132,8 @@ int can_nice(const struct task_struct *p, const int nice)
+@@ -5293,6 +5293,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;
@@ -84571,7 +83543,7 @@ index 5ac63c9..d912786 100644
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
-@@ -3165,7 +3167,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -5326,7 +5328,8 @@ SYSCALL_DEFINE1(nice, int, increment)
if (nice > 19)
nice = 19;
@@ -84581,7 +83553,7 @@ index 5ac63c9..d912786 100644
return -EPERM;
retval = security_task_setnice(current, nice);
-@@ -3327,6 +3330,7 @@ recheck:
+@@ -5483,6 +5486,7 @@ recheck:
unsigned long rlim_rtprio =
task_rlimit(p, RLIMIT_RTPRIO);
@@ -84589,7 +83561,7 @@ index 5ac63c9..d912786 100644
/* can't set/change the rt policy */
if (policy != p->policy && !rlim_rtprio)
return -EPERM;
-@@ -4456,7 +4460,7 @@ static void migrate_tasks(unsigned int dead_cpu)
+@@ -6626,7 +6630,7 @@ static void migrate_tasks(unsigned int dead_cpu)
#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
@@ -84598,7 +83570,7 @@ index 5ac63c9..d912786 100644
{
.procname = "sched_domain",
.mode = 0555,
-@@ -4473,17 +4477,17 @@ static struct ctl_table sd_ctl_root[] = {
+@@ -6643,17 +6647,17 @@ static struct ctl_table sd_ctl_root[] = {
{}
};
@@ -84620,7 +83592,7 @@ index 5ac63c9..d912786 100644
/*
* In the intermediate directories, both the child directory and
-@@ -4491,22 +4495,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
+@@ -6661,22 +6665,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
* will always be set. In the lowest directory the names are
* static strings and all have proc handlers.
*/
@@ -84650,9 +83622,9 @@ index 5ac63c9..d912786 100644
-set_table_entry(struct ctl_table *entry,
+set_table_entry(ctl_table_no_const *entry,
const char *procname, void *data, int maxlen,
- umode_t mode, proc_handler *proc_handler,
+ mode_t mode, proc_handler *proc_handler,
bool load_idx)
-@@ -4526,7 +4533,7 @@ set_table_entry(struct ctl_table *entry,
+@@ -6696,7 +6703,7 @@ set_table_entry(struct ctl_table *entry,
static struct ctl_table *
sd_alloc_ctl_domain_table(struct sched_domain *sd)
{
@@ -84661,11 +83633,11 @@ index 5ac63c9..d912786 100644
if (table == NULL)
return NULL;
-@@ -4561,9 +4568,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
+@@ -6731,9 +6738,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
return table;
}
--static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
+-static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
{
- struct ctl_table *entry, *table;
@@ -84673,7 +83645,7 @@ index 5ac63c9..d912786 100644
struct sched_domain *sd;
int domain_num = 0, i;
char buf[32];
-@@ -4590,11 +4597,13 @@ static struct ctl_table_header *sd_sysctl_header;
+@@ -6760,11 +6767,13 @@ static struct ctl_table_header *sd_sysctl_header;
static void register_sched_domain_sysctl(void)
{
int i, cpu_num = num_possible_cpus();
@@ -84688,7 +83660,7 @@ index 5ac63c9..d912786 100644
if (entry == NULL)
return;
-@@ -4617,8 +4626,12 @@ static void unregister_sched_domain_sysctl(void)
+@@ -6787,8 +6796,12 @@ static void unregister_sched_domain_sysctl(void)
if (sd_sysctl_header)
unregister_sysctl_table(sd_sysctl_header);
sd_sysctl_header = NULL;
@@ -84703,20 +83675,42 @@ index 5ac63c9..d912786 100644
}
#else
static void register_sched_domain_sysctl(void)
-diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 7c70201..23f52b6 100644
---- a/kernel/sched/fair.c
-+++ b/kernel/sched/fair.c
-@@ -869,7 +869,7 @@ void task_numa_fault(int node, int pages, bool migrated)
+@@ -6886,7 +6899,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ * happens before everything else. This has to be lower priority than
+ * the notifier in the perf_event subsystem, though.
+ */
+-static struct notifier_block __cpuinitdata migration_notifier = {
++static struct notifier_block migration_notifier = {
+ .notifier_call = migration_call,
+ .priority = CPU_PRI_MIGRATION,
+ };
+diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
+index f280df1..da1281d 100644
+--- a/kernel/sched_autogroup.c
++++ b/kernel/sched_autogroup.c
+@@ -7,7 +7,7 @@
- static void reset_ptenuma_scan(struct task_struct *p)
+ unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
+ static struct autogroup autogroup_default;
+-static atomic_t autogroup_seq_nr;
++static atomic_unchecked_t autogroup_seq_nr;
+
+ static void __init autogroup_init(struct task_struct *init_task)
{
-- ACCESS_ONCE(p->mm->numa_scan_seq)++;
-+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
- p->mm->numa_scan_offset = 0;
- }
+@@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
-@@ -5838,7 +5838,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
+ kref_init(&ag->kref);
+ init_rwsem(&ag->lock);
+- ag->id = atomic_inc_return(&autogroup_seq_nr);
++ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
+ ag->tg = tg;
+ #ifdef CONFIG_RT_GROUP_SCHED
+ /*
+diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
+index c261da7..4e5221ad 100644
+--- a/kernel/sched_fair.c
++++ b/kernel/sched_fair.c
+@@ -4801,7 +4801,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).
*/
@@ -84725,24 +83719,516 @@ index 7c70201..23f52b6 100644
{
int this_cpu = smp_processor_id();
struct rq *this_rq = cpu_rq(this_cpu);
-diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index b3c5653..a4d192a 100644
---- a/kernel/sched/sched.h
-+++ b/kernel/sched/sched.h
-@@ -1004,7 +1004,7 @@ struct sched_class {
- #ifdef CONFIG_FAIR_GROUP_SCHED
- void (*task_move_group) (struct task_struct *p, int on_rq);
+diff --git a/kernel/seccomp.c b/kernel/seccomp.c
+index 57d4b13..bc84054 100644
+--- a/kernel/seccomp.c
++++ b/kernel/seccomp.c
+@@ -3,15 +3,353 @@
+ *
+ * Copyright 2004-2005 Andrea Arcangeli <andrea@cpushare.com>
+ *
+- * This defines a simple but solid secure-computing mode.
++ * Copyright (C) 2012 Google, Inc.
++ * Will Drewry <wad@chromium.org>
++ *
++ * This defines a simple but solid secure-computing facility.
++ *
++ * Mode 1 uses a fixed list of allowed system calls.
++ * Mode 2 allows user-defined system call filters in the form
++ * of Berkeley Packet Filters/Linux Socket Filters.
+ */
+
+-#include <linux/seccomp.h>
+-#include <linux/sched.h>
++#include <linux/atomic.h>
++#include <linux/audit.h>
+ #include <linux/compat.h>
++#include <linux/filter.h>
++#include <linux/ptrace.h>
++#include <linux/sched.h>
++#include <linux/seccomp.h>
++#include <linux/security.h>
++#include <linux/slab.h>
++#include <linux/uaccess.h>
++
++#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
++#include <asm/syscall.h>
++#endif
+
+ /* #define SECCOMP_DEBUG 1 */
+-#define NR_SECCOMP_MODES 1
++
++#ifdef CONFIG_SECCOMP_FILTER
++/**
++ * struct seccomp_filter - container for seccomp BPF programs
++ *
++ * @usage: reference count to manage the object liftime.
++ * get/put helpers should be used when accessing an instance
++ * outside of a lifetime-guarded section. In general, this
++ * is only needed for handling filters shared across tasks.
++ * @prev: points to a previously installed, or inherited, filter
++ * @len: the number of instructions in the program
++ * @insns: the BPF program instructions to evaluate
++ *
++ * seccomp_filter objects are organized in a tree linked via the @prev
++ * pointer. For any task, it appears to be a singly-linked list starting
++ * with current->seccomp.filter, the most recently attached or inherited filter.
++ * However, multiple filters may share a @prev node, by way of fork(), which
++ * results in a unidirectional tree existing in memory. This is similar to
++ * how namespaces work.
++ *
++ * seccomp_filter objects should never be modified after being attached
++ * to a task_struct (other than @usage).
++ */
++struct seccomp_filter {
++ atomic_t usage;
++ struct seccomp_filter *prev;
++ unsigned short len; /* Instruction count */
++ struct sock_filter insns[];
++};
++
++/* Limit any path through the tree to 256KB worth of instructions. */
++#define MAX_INSNS_PER_PATH ((1 << 18) / sizeof(struct sock_filter))
++
++/**
++ * get_u32 - returns a u32 offset into data
++ * @data: a unsigned 64 bit value
++ * @index: 0 or 1 to return the first or second 32-bits
++ *
++ * This inline exists to hide the length of unsigned long.
++ * If a 32-bit unsigned long is passed in, it will be extended
++ * and the top 32-bits will be 0. If it is a 64-bit unsigned
++ * long, then whatever data is resident will be properly returned.
++ */
++static inline u32 get_u32(u64 data, int index)
++{
++ return ((u32 *)&data)[index];
++}
++
++/* Helper for bpf_load below. */
++#define BPF_DATA(_name) offsetof(struct seccomp_data, _name)
++/**
++ * bpf_load: checks and returns a pointer to the requested offset
++ * @off: offset into struct seccomp_data to load from
++ *
++ * Returns the requested 32-bits of data.
++ * seccomp_chk_filter() should assure that @off is 32-bit aligned
++ * and not out of bounds. Failure to do so is a BUG.
++ */
++u32 seccomp_bpf_load(int off)
++{
++ struct pt_regs *regs = task_pt_regs(current);
++ if (off == BPF_DATA(nr))
++ return syscall_get_nr(current, regs);
++ if (off == BPF_DATA(arch))
++ return syscall_get_arch(current, regs);
++ if (off >= BPF_DATA(args[0]) && off < BPF_DATA(args[6])) {
++ unsigned long value;
++ int arg = (off - BPF_DATA(args[0])) / sizeof(u64);
++ int index = !!(off % sizeof(u64));
++ syscall_get_arguments(current, regs, arg, 1, &value);
++ return get_u32(value, index);
++ }
++ if (off == BPF_DATA(instruction_pointer))
++ return get_u32(KSTK_EIP(current), 0);
++ if (off == BPF_DATA(instruction_pointer) + sizeof(u32))
++ return get_u32(KSTK_EIP(current), 1);
++ /* seccomp_chk_filter should make this impossible. */
++ BUG();
++}
++
++/**
++ * seccomp_chk_filter - verify seccomp filter code
++ * @filter: filter to verify
++ * @flen: length of filter
++ *
++ * Takes a previously checked filter (by sk_chk_filter) and
++ * redirects all filter code that loads struct sk_buff data
++ * and related data through seccomp_bpf_load. It also
++ * enforces length and alignment checking of those loads.
++ *
++ * Returns 0 if the rule set is legal or -EINVAL if not.
++ */
++static int seccomp_chk_filter(struct sock_filter *filter, unsigned int flen)
++{
++ int pc;
++ for (pc = 0; pc < flen; pc++) {
++ struct sock_filter *ftest = &filter[pc];
++ u16 code = ftest->code;
++ u32 k = ftest->k;
++ switch (code) {
++ case BPF_S_LD_W_ABS:
++ ftest->code = BPF_S_ANC_SECCOMP_LD_W;
++ /* 32-bit aligned and not out of bounds. */
++ if (k >= sizeof(struct seccomp_data) || k & 3)
++ return -EINVAL;
++ continue;
++ case BPF_S_LD_W_LEN:
++ ftest->code = BPF_S_LD_IMM;
++ ftest->k = sizeof(struct seccomp_data);
++ continue;
++ case BPF_S_LDX_W_LEN:
++ ftest->code = BPF_S_LDX_IMM;
++ ftest->k = sizeof(struct seccomp_data);
++ continue;
++ /* Explicitly include allowed calls. */
++ case BPF_S_RET_K:
++ case BPF_S_RET_A:
++ case BPF_S_ALU_ADD_K:
++ case BPF_S_ALU_ADD_X:
++ case BPF_S_ALU_SUB_K:
++ case BPF_S_ALU_SUB_X:
++ case BPF_S_ALU_MUL_K:
++ case BPF_S_ALU_MUL_X:
++ case BPF_S_ALU_DIV_X:
++ case BPF_S_ALU_AND_K:
++ case BPF_S_ALU_AND_X:
++ case BPF_S_ALU_OR_K:
++ case BPF_S_ALU_OR_X:
++ case BPF_S_ALU_LSH_K:
++ case BPF_S_ALU_LSH_X:
++ case BPF_S_ALU_RSH_K:
++ case BPF_S_ALU_RSH_X:
++ case BPF_S_ALU_NEG:
++ case BPF_S_LD_IMM:
++ case BPF_S_LDX_IMM:
++ case BPF_S_MISC_TAX:
++ case BPF_S_MISC_TXA:
++ case BPF_S_ALU_DIV_K:
++ case BPF_S_LD_MEM:
++ case BPF_S_LDX_MEM:
++ case BPF_S_ST:
++ case BPF_S_STX:
++ case BPF_S_JMP_JA:
++ case BPF_S_JMP_JEQ_K:
++ case BPF_S_JMP_JEQ_X:
++ case BPF_S_JMP_JGE_K:
++ case BPF_S_JMP_JGE_X:
++ case BPF_S_JMP_JGT_K:
++ case BPF_S_JMP_JGT_X:
++ case BPF_S_JMP_JSET_K:
++ case BPF_S_JMP_JSET_X:
++ continue;
++ default:
++ return -EINVAL;
++ }
++ }
++ return 0;
++}
++
++/**
++ * seccomp_run_filters - evaluates all seccomp filters against @syscall
++ * @syscall: number of the current system call
++ *
++ * Returns valid seccomp BPF response codes.
++ */
++static u32 seccomp_run_filters(int syscall)
++{
++ struct seccomp_filter *f;
++ u32 ret = SECCOMP_RET_ALLOW;
++
++ /* Ensure unexpected behavior doesn't result in failing open. */
++ if (WARN_ON(current->seccomp.filter == NULL))
++ return SECCOMP_RET_KILL;
++
++ /*
++ * All filters are evaluated in order of youngest to oldest. The lowest
++ * BPF return value (ignoring the DATA) always takes priority.
++ */
++ for (f = current->seccomp.filter; f; f = f->prev) {
++ u32 cur_ret = sk_run_filter(NULL, f->insns);
++ if ((cur_ret & SECCOMP_RET_ACTION) < (ret & SECCOMP_RET_ACTION))
++ ret = cur_ret;
++ }
++ return ret;
++}
++
++/**
++ * seccomp_attach_filter: Attaches a seccomp filter to current.
++ * @fprog: BPF program to install
++ *
++ * Returns 0 on success or an errno on failure.
++ */
++static long seccomp_attach_filter(struct sock_fprog *fprog)
++{
++ struct seccomp_filter *filter;
++ unsigned long fp_size = fprog->len * sizeof(struct sock_filter);
++ unsigned long total_insns = fprog->len;
++ long ret;
++
++ if (fprog->len == 0 || fprog->len > BPF_MAXINSNS)
++ return -EINVAL;
++
++ for (filter = current->seccomp.filter; filter; filter = filter->prev)
++ total_insns += filter->len + 4; /* include a 4 instr penalty */
++ if (total_insns > MAX_INSNS_PER_PATH)
++ return -ENOMEM;
++
++ /*
++ * Installing a seccomp filter requires that the task have
++ * CAP_SYS_ADMIN in its namespace or be running with no_new_privs.
++ * This avoids scenarios where unprivileged tasks can affect the
++ * behavior of privileged children.
++ */
++ if (!current->no_new_privs &&
++ security_real_capable_noaudit(current, current_user_ns(),
++ CAP_SYS_ADMIN) != 0)
++ return -EACCES;
++
++ /* Allocate a new seccomp_filter */
++ filter = kzalloc(sizeof(struct seccomp_filter) + fp_size, GFP_KERNEL);
++ if (!filter)
++ return -ENOMEM;
++ atomic_set(&filter->usage, 1);
++ filter->len = fprog->len;
++
++ /* Copy the instructions from fprog. */
++ ret = -EFAULT;
++ if (copy_from_user(filter->insns, fprog->filter, fp_size))
++ goto fail;
++
++ /* Check and rewrite the fprog via the skb checker */
++ ret = sk_chk_filter(filter->insns, filter->len);
++ if (ret)
++ goto fail;
++
++ /* Check and rewrite the fprog for seccomp use */
++ ret = seccomp_chk_filter(filter->insns, filter->len);
++ if (ret)
++ goto fail;
++
++ /*
++ * If there is an existing filter, make it the prev and don't drop its
++ * task reference.
++ */
++ filter->prev = current->seccomp.filter;
++ current->seccomp.filter = filter;
++ return 0;
++fail:
++ kfree(filter);
++ return ret;
++}
++
++/**
++ * seccomp_attach_user_filter - attaches a user-supplied sock_fprog
++ * @user_filter: pointer to the user data containing a sock_fprog.
++ *
++ * Returns 0 on success and non-zero otherwise.
++ */
++long seccomp_attach_user_filter(char __user *user_filter)
++{
++ struct sock_fprog fprog;
++ long ret = -EFAULT;
++
++#ifdef CONFIG_COMPAT
++ if (is_compat_task()) {
++ struct compat_sock_fprog fprog32;
++ if (copy_from_user(&fprog32, user_filter, sizeof(fprog32)))
++ goto out;
++ fprog.len = fprog32.len;
++ fprog.filter = compat_ptr(fprog32.filter);
++ } else /* falls through to the if below. */
++#endif
++ if (copy_from_user(&fprog, user_filter, sizeof(fprog)))
++ goto out;
++ ret = seccomp_attach_filter(&fprog);
++out:
++ return ret;
++}
++
++/* get_seccomp_filter - increments the reference count of the filter on @tsk */
++void get_seccomp_filter(struct task_struct *tsk)
++{
++ struct seccomp_filter *orig = tsk->seccomp.filter;
++ if (!orig)
++ return;
++ /* Reference count is bounded by the number of total processes. */
++ atomic_inc(&orig->usage);
++}
++
++/* put_seccomp_filter - decrements the ref count of tsk->seccomp.filter */
++void put_seccomp_filter(struct task_struct *tsk)
++{
++ struct seccomp_filter *orig = tsk->seccomp.filter;
++ /* Clean up single-reference branches iteratively. */
++ while (orig && atomic_dec_and_test(&orig->usage)) {
++ struct seccomp_filter *freeme = orig;
++ orig = orig->prev;
++ kfree(freeme);
++ }
++}
++
++/**
++ * seccomp_send_sigsys - signals the task to allow in-process syscall emulation
++ * @syscall: syscall number to send to userland
++ * @reason: filter-supplied reason code to send to userland (via si_errno)
++ *
++ * Forces a SIGSYS with a code of SYS_SECCOMP and related sigsys info.
++ */
++static void seccomp_send_sigsys(int syscall, int reason)
++{
++ struct siginfo info;
++ memset(&info, 0, sizeof(info));
++ info.si_signo = SIGSYS;
++ info.si_code = SYS_SECCOMP;
++ info.si_call_addr = (void __user *)KSTK_EIP(current);
++ info.si_errno = reason;
++ info.si_arch = syscall_get_arch(current, task_pt_regs(current));
++ info.si_syscall = syscall;
++ force_sig_info(SIGSYS, &info, current);
++}
++#endif /* CONFIG_SECCOMP_FILTER */
+
+ /*
+ * Secure computing mode 1 allows only read/write/exit/sigreturn.
+@@ -32,11 +370,21 @@ static int mode1_syscalls_32[] = {
+
+ void __secure_computing(int this_syscall)
+ {
++ /* Filter calls should never use this function. */
++ BUG_ON(current->seccomp.mode == SECCOMP_MODE_FILTER);
++ __secure_computing_int(this_syscall);
++}
++
++int __secure_computing_int(int this_syscall)
++{
+ int mode = current->seccomp.mode;
+- int * syscall;
++ int exit_sig = 0;
++ int *syscall;
++ u32 ret = SECCOMP_RET_KILL;
++ int data;
+
+ switch (mode) {
+- case 1:
++ case SECCOMP_MODE_STRICT:
+ syscall = mode1_syscalls;
+ #ifdef CONFIG_COMPAT
+ if (is_compat_task())
+@@ -44,9 +392,44 @@ void __secure_computing(int this_syscall)
#endif
--};
-+} __do_const;
+ do {
+ if (*syscall == this_syscall)
+- return;
++ return 0;
+ } while (*++syscall);
++ exit_sig = SIGKILL;
+ break;
++#ifdef CONFIG_SECCOMP_FILTER
++ case SECCOMP_MODE_FILTER:
++ ret = seccomp_run_filters(this_syscall);
++ data = ret & SECCOMP_RET_DATA;
++ switch (ret & SECCOMP_RET_ACTION) {
++ case SECCOMP_RET_ERRNO:
++ /* Set the low-order 16-bits as a errno. */
++ syscall_set_return_value(current, task_pt_regs(current),
++ -data, 0);
++ goto skip;
++ case SECCOMP_RET_TRAP:
++ /* Show the handler the original registers. */
++ syscall_rollback(current, task_pt_regs(current));
++ /* Let the filter pass back 16 bits of data. */
++ seccomp_send_sigsys(this_syscall, data);
++ goto skip;
++ case SECCOMP_RET_TRACE:
++ /* Skip these calls if there is no tracer. */
++ if (!ptrace_event_enabled(current, PTRACE_EVENT_SECCOMP))
++ goto skip;
++ /* Allow the BPF to provide the event message */
++ ptrace_event(PTRACE_EVENT_SECCOMP, data);
++ if (fatal_signal_pending(current))
++ break;
++ return 0;
++ case SECCOMP_RET_ALLOW:
++ return 0;
++ case SECCOMP_RET_KILL:
++ default:
++ break;
++ }
++ exit_sig = SIGSYS;
++ break;
++#endif
+ default:
+ BUG();
+ }
+@@ -54,7 +437,11 @@ void __secure_computing(int this_syscall)
+ #ifdef SECCOMP_DEBUG
+ dump_stack();
+ #endif
+- do_exit(SIGKILL);
++ __audit_seccomp(this_syscall, exit_sig, ret);
++ do_exit(exit_sig);
++skip:
++ audit_seccomp(this_syscall, exit_sig, ret);
++ return -1;
+ }
+
+ long prctl_get_seccomp(void)
+@@ -62,25 +449,48 @@ long prctl_get_seccomp(void)
+ return current->seccomp.mode;
+ }
+
+-long prctl_set_seccomp(unsigned long seccomp_mode)
++/**
++ * prctl_set_seccomp: configures current->seccomp.mode
++ * @seccomp_mode: requested mode to use
++ * @filter: optional struct sock_fprog for use with SECCOMP_MODE_FILTER
++ *
++ * This function may be called repeatedly with a @seccomp_mode of
++ * SECCOMP_MODE_FILTER to install additional filters. Every filter
++ * successfully installed will be evaluated (in reverse order) for each system
++ * call the task makes.
++ *
++ * Once current->seccomp.mode is non-zero, it may not be changed.
++ *
++ * Returns 0 on success or -EINVAL on failure.
++ */
++long prctl_set_seccomp(unsigned long seccomp_mode, char __user *filter)
+ {
+- long ret;
++ long ret = -EINVAL;
+
+- /* can set it only once to be even more secure */
+- ret = -EPERM;
+- if (unlikely(current->seccomp.mode))
++ if (current->seccomp.mode &&
++ current->seccomp.mode != seccomp_mode)
+ goto out;
+
+- ret = -EINVAL;
+- if (seccomp_mode && seccomp_mode <= NR_SECCOMP_MODES) {
+- current->seccomp.mode = seccomp_mode;
+- set_thread_flag(TIF_SECCOMP);
++ switch (seccomp_mode) {
++ case SECCOMP_MODE_STRICT:
++ ret = 0;
+ #ifdef TIF_NOTSC
+ disable_TSC();
+ #endif
+- ret = 0;
++ break;
++#ifdef CONFIG_SECCOMP_FILTER
++ case SECCOMP_MODE_FILTER:
++ ret = seccomp_attach_user_filter(filter);
++ if (ret)
++ goto out;
++ break;
++#endif
++ default:
++ goto out;
+ }
- #define sched_class_highest (&stop_sched_class)
- #define for_each_class(class) \
+- out:
++ current->seccomp.mode = seccomp_mode;
++ set_thread_flag(TIF_SECCOMP);
++out:
+ return ret;
+ }
diff --git a/kernel/signal.c b/kernel/signal.c
-index ded28b9..6886c08 100644
+index 3ecf574..0541e21 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep;
+@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep;
int print_fatal_signals __read_mostly;
@@ -84757,16 +84243,25 @@ index ded28b9..6886c08 100644
{
/* Is it explicitly or implicitly ignored? */
return handler == SIG_IGN ||
-@@ -65,7 +65,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
-
- static int sig_task_ignored(struct task_struct *t, int sig, bool force)
+@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
+ static int sig_task_ignored(struct task_struct *t, int sig,
+ int from_ancestor_ns)
{
- void __user *handler;
+ __sighandler_t handler;
handler = sig_handler(t, sig);
-@@ -369,6 +369,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
+@@ -159,7 +159,7 @@ void recalc_sigpending(void)
+
+ #define SYNCHRONOUS_MASK \
+ (sigmask(SIGSEGV) | sigmask(SIGBUS) | sigmask(SIGILL) | \
+- sigmask(SIGTRAP) | sigmask(SIGFPE))
++ sigmask(SIGTRAP) | sigmask(SIGFPE) | sigmask(SIGSYS))
+
+ int next_signal(struct sigpending *pending, sigset_t *mask)
+ {
+@@ -364,6 +364,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
atomic_inc(&user->sigpending);
rcu_read_unlock();
@@ -84776,7 +84271,7 @@ index ded28b9..6886c08 100644
if (override_rlimit ||
atomic_read(&user->sigpending) <=
task_rlimit(t, RLIMIT_SIGPENDING)) {
-@@ -496,7 +499,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)
{
@@ -84785,7 +84280,7 @@ index ded28b9..6886c08 100644
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,
+@@ -812,6 +815,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
}
}
@@ -84799,7 +84294,7 @@ index ded28b9..6886c08 100644
return security_task_kill(t, info, sig, 0);
}
-@@ -1199,7 +1209,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1162,7 +1172,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
return send_signal(sig, info, p, 1);
}
@@ -84808,7 +84303,7 @@ index ded28b9..6886c08 100644
specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
{
return send_signal(sig, info, t, 0);
-@@ -1236,6 +1246,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1199,6 +1209,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;
@@ -84816,7 +84311,7 @@ index ded28b9..6886c08 100644
spin_lock_irqsave(&t->sighand->siglock, flags);
action = &t->sighand->action[sig-1];
-@@ -1250,9 +1261,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1213,9 +1224,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;
@@ -84835,7 +84330,7 @@ index ded28b9..6886c08 100644
return ret;
}
-@@ -1319,8 +1339,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1282,8 +1302,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();
@@ -84848,7 +84343,21 @@ index ded28b9..6886c08 100644
return ret;
}
-@@ -2926,7 +2949,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
+@@ -2631,6 +2654,13 @@ int copy_siginfo_to_user(siginfo_t __user *to, siginfo_t *from)
+ err |= __put_user(from->si_uid, &to->si_uid);
+ err |= __put_user(from->si_ptr, &to->si_ptr);
+ break;
++#ifdef __ARCH_SIGSYS
++ case __SI_SYS:
++ err |= __put_user(from->si_call_addr, &to->si_call_addr);
++ err |= __put_user(from->si_syscall, &to->si_syscall);
++ err |= __put_user(from->si_arch, &to->si_arch);
++ break;
++#endif
+ default: /* this is just in case for now ... */
+ err |= __put_user(from->si_pid, &to->si_pid);
+ err |= __put_user(from->si_uid, &to->si_uid);
+@@ -2765,7 +2795,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
int error = -ESRCH;
rcu_read_lock();
@@ -84865,44 +84374,51 @@ index ded28b9..6886c08 100644
if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
error = check_kill_permission(sig, info, p);
/*
-@@ -3240,8 +3271,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
- }
- seg = get_fs();
- set_fs(KERNEL_DS);
-- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
-- (stack_t __force __user *) &uoss,
-+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
-+ (stack_t __force_user *) &uoss,
- compat_user_stack_pointer());
- set_fs(seg);
- if (ret >= 0 && uoss_ptr) {
-diff --git a/kernel/smpboot.c b/kernel/smpboot.c
-index eb89e18..a4e6792 100644
---- a/kernel/smpboot.c
-+++ b/kernel/smpboot.c
-@@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
- }
- smpboot_unpark_thread(plug_thread, cpu);
- }
-- list_add(&plug_thread->list, &hotplug_threads);
-+ pax_list_add(&plug_thread->list, &hotplug_threads);
- out:
- mutex_unlock(&smpboot_threads_lock);
- return ret;
-@@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
+diff --git a/kernel/smp.c b/kernel/smp.c
+index 9e800b2..1533ba5 100644
+--- a/kernel/smp.c
++++ b/kernel/smp.c
+@@ -75,7 +75,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata hotplug_cfd_notifier = {
++static struct notifier_block hotplug_cfd_notifier = {
+ .notifier_call = hotplug_cfd,
+ };
+
+@@ -591,22 +591,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
+ }
+ EXPORT_SYMBOL(smp_call_function);
+
+-void ipi_call_lock(void)
++void ipi_call_lock(void) __acquires(call_function.lock)
{
- get_online_cpus();
- mutex_lock(&smpboot_threads_lock);
-- list_del(&plug_thread->list);
-+ pax_list_del(&plug_thread->list);
- smpboot_destroy_threads(plug_thread);
- mutex_unlock(&smpboot_threads_lock);
- put_online_cpus();
+ raw_spin_lock(&call_function.lock);
+ }
+
+-void ipi_call_unlock(void)
++void ipi_call_unlock(void) __releases(call_function.lock)
+ {
+ raw_spin_unlock(&call_function.lock);
+ }
+
+-void ipi_call_lock_irq(void)
++void ipi_call_lock_irq(void) __acquires(call_function.lock)
+ {
+ raw_spin_lock_irq(&call_function.lock);
+ }
+
+-void ipi_call_unlock_irq(void)
++void ipi_call_unlock_irq(void) __releases(call_function.lock)
+ {
+ raw_spin_unlock_irq(&call_function.lock);
+ }
diff --git a/kernel/softirq.c b/kernel/softirq.c
-index d7d498d..94fe0f7 100644
+index 2c71d91..6b690a4 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
-@@ -53,11 +53,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
+@@ -52,11 +52,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
EXPORT_SYMBOL(irq_stat);
#endif
@@ -84916,7 +84432,7 @@ index d7d498d..94fe0f7 100644
"HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
"TASKLET", "SCHED", "HRTIMER", "RCU"
};
-@@ -248,7 +248,7 @@ restart:
+@@ -235,7 +235,7 @@ restart:
kstat_incr_softirqs_this_cpu(vec_nr);
trace_softirq_entry(vec_nr);
@@ -84925,8 +84441,8 @@ index d7d498d..94fe0f7 100644
trace_softirq_exit(vec_nr);
if (unlikely(prev_count != preempt_count())) {
printk(KERN_ERR "huh, entered softirq %u %s %p"
-@@ -412,7 +412,7 @@ void __raise_softirq_irqoff(unsigned int nr)
- or_softirq_pending(1UL << nr);
+@@ -385,7 +385,7 @@ void raise_softirq(unsigned int nr)
+ local_irq_restore(flags);
}
-void open_softirq(int nr, void (*action)(struct softirq_action *))
@@ -84934,7 +84450,7 @@ index d7d498d..94fe0f7 100644
{
softirq_vec[nr].action = action;
}
-@@ -468,7 +468,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
+@@ -441,7 +441,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
EXPORT_SYMBOL(__tasklet_hi_schedule_first);
@@ -84943,7 +84459,7 @@ index d7d498d..94fe0f7 100644
{
struct tasklet_struct *list;
-@@ -503,7 +503,7 @@ static void tasklet_action(struct softirq_action *a)
+@@ -476,7 +476,7 @@ static void tasklet_action(struct softirq_action *a)
}
}
@@ -84952,36 +84468,42 @@ index d7d498d..94fe0f7 100644
{
struct tasklet_struct *list;
-@@ -858,7 +858,7 @@ static struct notifier_block cpu_nfb = {
- .notifier_call = cpu_callback
+@@ -712,7 +712,7 @@ static int __cpuinit remote_softirq_cpu_notify(struct notifier_block *self,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata remote_softirq_cpu_notifier = {
++static struct notifier_block remote_softirq_cpu_notifier = {
+ .notifier_call = remote_softirq_cpu_notify,
};
--static struct smp_hotplug_thread softirq_threads = {
-+static struct smp_hotplug_thread softirq_threads __read_only = {
- .store = &ksoftirqd,
- .thread_should_run = ksoftirqd_should_run,
- .thread_fn = run_ksoftirqd,
-diff --git a/kernel/srcu.c b/kernel/srcu.c
-index 01d5ccb..cdcbee6 100644
---- a/kernel/srcu.c
-+++ b/kernel/srcu.c
-@@ -300,9 +300,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
-
- idx = ACCESS_ONCE(sp->completed) & 0x1;
- preempt_disable();
-- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
-+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
- smp_mb(); /* B */ /* Avoid leaking the critical section. */
-- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
-+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
- preempt_enable();
- return idx;
+@@ -894,7 +894,7 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
+ return NOTIFY_OK;
}
+
+-static struct notifier_block __cpuinitdata cpu_nfb = {
++static struct notifier_block cpu_nfb = {
+ .notifier_call = cpu_callback
+ };
+
+diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
+index 2f194e9..2c05ea9 100644
+--- a/kernel/stop_machine.c
++++ b/kernel/stop_machine.c
+@@ -362,7 +362,7 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb,
+ * cpu notifiers. It currently shares the same priority as sched
+ * migration_notifier.
+ */
+-static struct notifier_block __cpuinitdata cpu_stop_cpu_notifier = {
++static struct notifier_block cpu_stop_cpu_notifier = {
+ .notifier_call = cpu_stop_cpu_callback,
+ .priority = 10,
+ };
diff --git a/kernel/sys.c b/kernel/sys.c
-index c18ecca..b3c2dd2 100644
+index 9d557df..b2a5319 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
-@@ -149,6 +149,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
+@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
error = -EACCES;
goto out;
}
@@ -84994,28 +84516,28 @@ index c18ecca..b3c2dd2 100644
no_nice = security_task_setnice(p, niceval);
if (no_nice) {
error = no_nice;
-@@ -352,6 +358,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
+@@ -597,6 +603,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
goto error;
}
-+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
++ if (gr_check_group_change(new->gid, new->egid, -1))
+ goto error;
+
if (rgid != (gid_t) -1 ||
- (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
+ (egid != (gid_t) -1 && egid != old->gid))
new->sgid = new->egid;
-@@ -387,6 +396,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -626,6 +635,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
old = current_cred();
retval = -EPERM;
+
-+ if (gr_check_group_change(kgid, kgid, kgid))
++ if (gr_check_group_change(gid, gid, gid))
+ goto error;
+
- if (ns_capable(old->user_ns, CAP_SETGID))
- new->gid = new->egid = new->sgid = new->fsgid = kgid;
- else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
-@@ -404,7 +417,7 @@ error:
+ if (nsown_capable(CAP_SETGID))
+ new->gid = new->egid = new->sgid = new->fsgid = gid;
+ else if (gid == old->gid || gid == old->sgid)
+@@ -643,7 +656,7 @@ error:
/*
* change the user struct in a credentials set to match the new UID
*/
@@ -85024,57 +84546,57 @@ index c18ecca..b3c2dd2 100644
{
struct user_struct *new_user;
-@@ -484,6 +497,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
+@@ -713,6 +726,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
goto error;
}
-+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
++ if (gr_check_user_change(new->uid, new->euid, -1))
+ goto error;
+
- if (!uid_eq(new->uid, old->uid)) {
+ if (new->uid != old->uid) {
retval = set_user(new);
if (retval < 0)
-@@ -534,6 +550,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -757,6 +773,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
old = current_cred();
retval = -EPERM;
+
-+ if (gr_check_crash_uid(kuid))
++ if (gr_check_crash_uid(uid))
+ goto error;
-+ if (gr_check_user_change(kuid, kuid, kuid))
++ if (gr_check_user_change(uid, uid, uid))
+ goto error;
+
- if (ns_capable(old->user_ns, CAP_SETUID)) {
- new->suid = new->uid = kuid;
- if (!uid_eq(kuid, old->uid)) {
-@@ -603,6 +625,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
+ if (nsown_capable(CAP_SETUID)) {
+ new->suid = new->uid = uid;
+ if (uid != old->uid) {
+@@ -811,6 +833,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
goto error;
}
-+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
++ if (gr_check_user_change(ruid, euid, -1))
+ goto error;
+
if (ruid != (uid_t) -1) {
- new->uid = kruid;
- if (!uid_eq(kruid, old->uid)) {
-@@ -685,6 +710,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
+ new->uid = ruid;
+ if (ruid != old->uid) {
+@@ -875,6 +900,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
goto error;
}
-+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
++ if (gr_check_group_change(rgid, egid, -1))
+ goto error;
+
if (rgid != (gid_t) -1)
- new->gid = krgid;
+ new->gid = rgid;
if (egid != (gid_t) -1)
-@@ -746,12 +774,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
- uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
- ns_capable(old->user_ns, CAP_SETUID)) {
- if (!uid_eq(kuid, old->fsuid)) {
-+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
+@@ -925,12 +953,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+ uid == old->suid || uid == old->fsuid ||
+ nsown_capable(CAP_SETUID)) {
+ if (uid != old_fsuid) {
++ if (gr_check_user_change(-1, -1, uid))
+ goto error;
+
- new->fsuid = kuid;
+ new->fsuid = uid;
if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
goto change_okay;
}
@@ -85084,15 +84606,15 @@ index c18ecca..b3c2dd2 100644
abort_creds(new);
return old_fsuid;
-@@ -784,12 +816,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
- if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
- gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
- ns_capable(old->user_ns, CAP_SETGID)) {
-+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
+@@ -957,12 +989,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+ if (gid == old->gid || gid == old->egid ||
+ gid == old->sgid || gid == old->fsgid ||
+ nsown_capable(CAP_SETGID)) {
++ if (gr_check_group_change(-1, -1, gid))
+ goto error;
+
- if (!gid_eq(kgid, old->fsgid)) {
- new->fsgid = kgid;
+ if (gid != old_fsgid) {
+ new->fsgid = gid;
goto change_okay;
}
}
@@ -85101,7 +84623,7 @@ index c18ecca..b3c2dd2 100644
abort_creds(new);
return old_fsgid;
-@@ -1169,19 +1205,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
+@@ -1270,19 +1306,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
return -EFAULT;
down_read(&uts_sem);
@@ -85126,7 +84648,7 @@ index c18ecca..b3c2dd2 100644
__OLD_UTS_LEN);
error |= __put_user(0, name->machine + __OLD_UTS_LEN);
up_read(&uts_sem);
-@@ -1383,6 +1419,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
+@@ -1484,6 +1520,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
*/
new_rlim->rlim_cur = 1;
}
@@ -85140,23 +84662,65 @@ index c18ecca..b3c2dd2 100644
}
if (!retval) {
if (old_rlim)
+@@ -1747,7 +1790,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
+ error = get_dumpable(me->mm);
+ break;
+ case PR_SET_DUMPABLE:
+- if (arg2 < 0 || arg2 > 1) {
++ if (arg2 > 1) {
+ error = -EINVAL;
+ break;
+ }
+@@ -1808,7 +1851,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
+ error = prctl_get_seccomp();
+ break;
+ case PR_SET_SECCOMP:
+- error = prctl_set_seccomp(arg2);
++ error = prctl_set_seccomp(arg2, (char __user *)arg3);
+ break;
+ case PR_GET_TSC:
+ error = GET_TSC_CTL(arg2);
+@@ -1868,6 +1911,16 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
+ else
+ error = PR_MCE_KILL_DEFAULT;
+ break;
++ case PR_SET_NO_NEW_PRIVS:
++ if (arg2 != 1 || arg3 || arg4 || arg5)
++ return -EINVAL;
++
++ current->no_new_privs = 1;
++ break;
++ case PR_GET_NO_NEW_PRIVS:
++ if (arg2 || arg3 || arg4 || arg5)
++ return -EINVAL;
++ return current->no_new_privs ? 1 : 0;
+ default:
+ error = -EINVAL;
+ break;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index b2f06f3..e6354ab 100644
+index ea7ec7f..798623e 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -93,7 +93,6 @@
+@@ -86,6 +86,13 @@
#if defined(CONFIG_SYSCTL)
--
++#include <linux/grsecurity.h>
++#include <linux/grinternal.h>
++
++extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
++extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
++ const int op);
++extern int gr_handle_chroot_sysctl(const int op);
+
/* External variables not in a header file. */
extern int sysctl_overcommit_memory;
- extern int sysctl_overcommit_ratio;
-@@ -119,17 +118,18 @@ extern int blk_iopoll_enabled;
+@@ -112,18 +119,18 @@ extern int blk_iopoll_enabled;
/* Constants used for minimum and maximum */
#ifdef CONFIG_LOCKUP_DETECTOR
-static int sixty = 60;
+-static int neg_one = -1;
+static int sixty __read_only = 60;
#endif
@@ -85179,7 +84743,7 @@ index b2f06f3..e6354ab 100644
#endif
/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
-@@ -176,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -165,10 +172,13 @@ static int proc_taint(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos);
#endif
@@ -85187,19 +84751,23 @@ index b2f06f3..e6354ab 100644
static int proc_dointvec_minmax_sysadmin(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);
++static int proc_dostring_coredump(struct ctl_table *table, int write,
++ void __user *buffer, size_t *lenp, loff_t *ppos);
- static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos);
-@@ -210,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
+ #ifdef CONFIG_MAGIC_SYSRQ
+ /* Note: sysrq code uses it's own private copy */
+@@ -191,6 +201,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
+ }
#endif
-
+extern struct ctl_table grsecurity_table[];
-+
- static struct ctl_table kern_table[];
- static struct ctl_table vm_table[];
- static struct ctl_table fs_table[];
-@@ -224,6 +224,20 @@ extern struct ctl_table epoll_table[];
+
+ static struct ctl_table root_table[];
+ static struct ctl_table_root sysctl_table_root;
+@@ -220,6 +231,20 @@ extern struct ctl_table epoll_table[];
int sysctl_legacy_va_layout;
#endif
@@ -85219,8 +84787,8 @@ index b2f06f3..e6354ab 100644
+
/* The default sysctl tables: */
- static struct ctl_table sysctl_base_table[] = {
-@@ -272,6 +286,22 @@ static int max_extfrag_threshold = 1000;
+ static struct ctl_table root_table[] = {
+@@ -266,6 +291,22 @@ static int max_extfrag_threshold = 1000;
#endif
static struct ctl_table kern_table[] = {
@@ -85243,7 +84811,16 @@ index b2f06f3..e6354ab 100644
{
.procname = "sched_child_runs_first",
.data = &sysctl_sched_child_runs_first,
-@@ -613,7 +643,7 @@ static struct ctl_table kern_table[] = {
+@@ -420,7 +461,7 @@ static struct ctl_table kern_table[] = {
+ .data = core_pattern,
+ .maxlen = CORENAME_MAX_SIZE,
+ .mode = 0644,
+- .proc_handler = proc_dostring,
++ .proc_handler = proc_dostring_coredump,
+ },
+ {
+ .procname = "core_pipe_limit",
+@@ -550,7 +591,7 @@ static struct ctl_table kern_table[] = {
.data = &modprobe_path,
.maxlen = KMOD_PATH_LEN,
.mode = 0644,
@@ -85252,7 +84829,7 @@ index b2f06f3..e6354ab 100644
},
{
.procname = "modules_disabled",
-@@ -780,16 +810,20 @@ static struct ctl_table kern_table[] = {
+@@ -717,16 +758,20 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
@@ -85274,7 +84851,7 @@ index b2f06f3..e6354ab 100644
{
.procname = "ngroups_max",
.data = &ngroups_max,
-@@ -1031,10 +1065,17 @@ static struct ctl_table kern_table[] = {
+@@ -957,10 +1002,17 @@ static struct ctl_table kern_table[] = {
*/
{
.procname = "perf_event_paranoid",
@@ -85295,7 +84872,7 @@ index b2f06f3..e6354ab 100644
},
{
.procname = "perf_event_mlock_kb",
-@@ -1297,6 +1338,13 @@ static struct ctl_table vm_table[] = {
+@@ -1216,6 +1268,13 @@ static struct ctl_table vm_table[] = {
.proc_handler = proc_dointvec_minmax,
.extra1 = &zero,
},
@@ -85309,7 +84886,64 @@ index b2f06f3..e6354ab 100644
#else
{
.procname = "nr_trim_pages",
-@@ -1761,6 +1809,16 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -1499,7 +1558,7 @@ static struct ctl_table fs_table[] = {
+ .data = &suid_dumpable,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+- .proc_handler = proc_dointvec_minmax,
++ .proc_handler = proc_dointvec_minmax_coredump,
+ .extra1 = &zero,
+ .extra2 = &two,
+ },
+@@ -1720,6 +1779,17 @@ static int test_perm(int mode, int op)
+ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
+ {
+ int mode;
++ int error;
++
++ if (table->parent != NULL && table->parent->procname != NULL &&
++ table->procname != NULL &&
++ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
++ return -EACCES;
++ if (gr_handle_chroot_sysctl(op))
++ return -EACCES;
++ error = gr_handle_sysctl(table, op);
++ if (error)
++ return error;
+
+ if (root->permissions)
+ mode = root->permissions(root, current->nsproxy, table);
+@@ -1732,7 +1802,9 @@ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
+ static void sysctl_set_parent(struct ctl_table *parent, struct ctl_table *table)
+ {
+ for (; table->procname; table++) {
+- table->parent = parent;
++ pax_open_kernel();
++ *(void **)&table->parent = (ctl_table_no_const *)parent;
++ pax_close_kernel();
+ if (table->child)
+ sysctl_set_parent(table, table->child);
+ }
+@@ -1856,7 +1928,8 @@ struct ctl_table_header *__register_sysctl_paths(
+ const struct ctl_path *path, struct ctl_table *table)
+ {
+ struct ctl_table_header *header;
+- struct ctl_table *new, **prevp;
++ struct ctl_table **prevp;
++ ctl_table_no_const *new;
+ unsigned int n, npath;
+ struct ctl_table_set *set;
+
+@@ -1877,7 +1950,7 @@ struct ctl_table_header *__register_sysctl_paths(
+ if (!header)
+ return NULL;
+
+- new = (struct ctl_table *) (header + 1);
++ new = (ctl_table_no_const *) (header + 1);
+
+ /* Now connect the dots */
+ prevp = &header->ctl_table;
+@@ -2124,6 +2197,16 @@ int proc_dostring(struct ctl_table *table, int write,
buffer, lenp, ppos);
}
@@ -85326,7 +84960,7 @@ index b2f06f3..e6354ab 100644
static size_t proc_skip_spaces(char **buf)
{
size_t ret;
-@@ -1866,6 +1924,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
+@@ -2229,6 +2312,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
len = strlen(tmp);
if (len > *size)
len = *size;
@@ -85335,7 +84969,7 @@ index b2f06f3..e6354ab 100644
if (copy_to_user(*buf, tmp, len))
return -EFAULT;
*size -= len;
-@@ -2030,7 +2090,7 @@ int proc_dointvec(struct ctl_table *table, int write,
+@@ -2393,7 +2478,7 @@ int proc_dointvec(struct ctl_table *table, int write,
static int proc_taint(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -85344,7 +84978,7 @@ index b2f06f3..e6354ab 100644
unsigned long tmptaint = get_taint();
int err;
-@@ -2058,7 +2118,6 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -2421,7 +2506,6 @@ static int proc_taint(struct ctl_table *table, int write,
return err;
}
@@ -85352,7 +84986,7 @@ index b2f06f3..e6354ab 100644
static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-@@ -2067,7 +2126,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
+@@ -2430,7 +2514,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
}
@@ -85360,7 +84994,42 @@ index b2f06f3..e6354ab 100644
struct do_proc_dointvec_minmax_conv_param {
int *min;
-@@ -2214,8 +2272,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
+@@ -2488,6 +2571,34 @@ int proc_dointvec_minmax(struct ctl_table *table, int write,
+ do_proc_dointvec_minmax_conv, ¶m);
+ }
+
++static void validate_coredump_safety(void)
++{
++ if (suid_dumpable == SUID_DUMPABLE_SAFE &&
++ core_pattern[0] != '/' && core_pattern[0] != '|') {
++ printk(KERN_WARNING "Unsafe core_pattern used with "\
++ "suid_dumpable=2. Pipe handler or fully qualified "\
++ "core dump path required.\n");
++ }
++}
++
++static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
++ void __user *buffer, size_t *lenp, loff_t *ppos)
++{
++ int error = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
++ if (!error)
++ validate_coredump_safety();
++ return error;
++}
++
++static int proc_dostring_coredump(struct ctl_table *table, int write,
++ void __user *buffer, size_t *lenp, loff_t *ppos)
++{
++ int error = proc_dostring(table, write, buffer, lenp, ppos);
++ if (!error)
++ validate_coredump_safety();
++ return error;
++}
++
+ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int write,
+ void __user *buffer,
+ size_t *lenp, loff_t *ppos,
+@@ -2545,8 +2656,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
*i = val;
} else {
val = convdiv * (*i) / convmul;
@@ -85373,7 +85042,7 @@ index b2f06f3..e6354ab 100644
err = proc_put_long(&buffer, &left, val, false);
if (err)
break;
-@@ -2611,6 +2672,12 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -2941,6 +3055,12 @@ int proc_dostring(struct ctl_table *table, int write,
return -ENOSYS;
}
@@ -85386,21 +85055,101 @@ index b2f06f3..e6354ab 100644
int proc_dointvec(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
-@@ -2667,5 +2734,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2997,6 +3117,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
EXPORT_SYMBOL(proc_dostring);
+EXPORT_SYMBOL(proc_dostring_modpriv);
EXPORT_SYMBOL(proc_doulongvec_minmax);
EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
+ EXPORT_SYMBOL(register_sysctl_table);
+diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
+index 9f9aa32..d0c4f42 100644
+--- a/kernel/sysctl_binary.c
++++ b/kernel/sysctl_binary.c
+@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
+ int i;
+
+ set_fs(KERNEL_DS);
+- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
++ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
+ set_fs(old_fs);
+ if (result < 0)
+ goto out_kfree;
+@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
+ }
+
+ set_fs(KERNEL_DS);
+- result = vfs_write(file, buffer, str - buffer, &pos);
++ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
+ set_fs(old_fs);
+ if (result < 0)
+ goto out_kfree;
+@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
+ int i;
+
+ set_fs(KERNEL_DS);
+- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
++ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
+ set_fs(old_fs);
+ if (result < 0)
+ goto out_kfree;
+@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
+ }
+
+ set_fs(KERNEL_DS);
+- result = vfs_write(file, buffer, str - buffer, &pos);
++ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
+ set_fs(old_fs);
+ if (result < 0)
+ goto out_kfree;
+@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
+ int i;
+
+ set_fs(KERNEL_DS);
+- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
++ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
+ set_fs(old_fs);
+ if (result < 0)
+ goto out;
+@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
+ __le16 dnaddr;
+
+ set_fs(KERNEL_DS);
+- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
++ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
+ set_fs(old_fs);
+ if (result < 0)
+ goto out;
+@@ -1234,7 +1234,7 @@ static ssize_t bin_dn_node_address(struct file *file,
+ le16_to_cpu(dnaddr) & 0x3ff);
+
+ set_fs(KERNEL_DS);
+- result = vfs_write(file, buf, len, &pos);
++ result = vfs_write(file, (const char __force_user *)buf, len, &pos);
+ set_fs(old_fs);
+ if (result < 0)
+ goto out;
+diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
+index 362da65..ab8ef8c 100644
+--- a/kernel/sysctl_check.c
++++ b/kernel/sysctl_check.c
+@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
+ set_fail(&fail, table, "Directory with extra2");
+ } else {
+ if ((table->proc_handler == proc_dostring) ||
++ (table->proc_handler == proc_dostring_modpriv) ||
+ (table->proc_handler == proc_dointvec) ||
+ (table->proc_handler == proc_dointvec_minmax) ||
+ (table->proc_handler == proc_dointvec_jiffies) ||
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
-index 145bb4d..b2aa969 100644
+index e660464..c8b9e67 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
-@@ -28,9 +28,12 @@
+@@ -27,9 +27,12 @@
+ #include <linux/cgroup.h>
#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>
@@ -85410,7 +85159,7 @@ index 145bb4d..b2aa969 100644
/*
* Maximum length of a cpumask that can be specified in
* the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -570,6 +573,9 @@ err:
+@@ -556,6 +559,9 @@ err:
static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
{
@@ -85421,10 +85170,10 @@ index 145bb4d..b2aa969 100644
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 7c7964c..2a0d412 100644
+index 73e416d..cfc6f69 100644
--- a/kernel/time.c
+++ b/kernel/time.c
-@@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
+@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
return error;
if (tz) {
@@ -85433,14 +85182,14 @@ index 7c7964c..2a0d412 100644
+ if (!tv)
+ gr_log_timechange();
+
+ /* SMP safe, global irq locking makes it work. */
sys_tz = *tz;
update_vsyscall_tz();
- if (firsttime) {
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
-index eec50fc..65e5df6 100644
+index 8a46f5d..bbe6f9c 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
-@@ -795,7 +795,7 @@ static int __init alarmtimer_init(void)
+@@ -773,7 +773,7 @@ static int __init alarmtimer_init(void)
struct platform_device *pdev;
int error = 0;
int i;
@@ -85449,11 +85198,24 @@ index eec50fc..65e5df6 100644
.clock_getres = alarm_clock_getres,
.clock_get = alarm_clock_get,
.timer_create = alarm_timer_create,
+diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
+index c3509fb..ebec319 100644
+--- a/kernel/time/tick-broadcast.c
++++ b/kernel/time/tick-broadcast.c
+@@ -120,7 +120,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
+ * then clear the broadcast bit.
+ */
+ if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
+- int cpu = smp_processor_id();
++ cpu = smp_processor_id();
+
+ 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 947ba25..20cbade 100644
+index cb7f33e..7504d61 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
-@@ -15,6 +15,7 @@
+@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/sched.h>
@@ -85461,20 +85223,20 @@ index 947ba25..20cbade 100644
#include <linux/syscore_ops.h>
#include <linux/clocksource.h>
#include <linux/jiffies.h>
-@@ -500,6 +501,8 @@ int do_settimeofday(const struct timespec *tv)
+@@ -385,6 +386,8 @@ int do_settimeofday(const struct timespec *tv)
if (!timespec_valid_strict(tv))
return -EINVAL;
+ gr_log_timechange();
+
- raw_spin_lock_irqsave(&timekeeper_lock, flags);
- write_seqcount_begin(&timekeeper_seq);
+ write_seqlock_irqsave(&xtime_lock, flags);
+ timekeeping_forward_now();
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
-index 61ed862..3b52c65 100644
+index 3258455..f35227d 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
-@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
+@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
static void print_name_offset(struct seq_file *m, void *sym)
{
@@ -85491,7 +85253,7 @@ index 61ed862..3b52c65 100644
}
static void
-@@ -119,7 +123,11 @@ next_one:
+@@ -112,7 +116,11 @@ next_one:
static void
print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
{
@@ -85503,7 +85265,7 @@ index 61ed862..3b52c65 100644
SEQ_printf(m, " .index: %d\n",
base->index);
SEQ_printf(m, " .resolution: %Lu nsecs\n",
-@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
+@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
{
struct proc_dir_entry *pe;
@@ -85589,10 +85351,10 @@ index 0b537f2..40d6c20 100644
return -ENOMEM;
return 0;
diff --git a/kernel/timer.c b/kernel/timer.c
-index 4296d13..0164b04 100644
+index f8b05a4..ece06b3 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
-@@ -1366,7 +1366,7 @@ void update_process_times(int user_tick)
+@@ -1308,7 +1308,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
*/
@@ -85601,7 +85363,7 @@ index 4296d13..0164b04 100644
{
struct tvec_base *base = __this_cpu_read(tvec_bases);
-@@ -1429,7 +1429,7 @@ static void process_timeout(unsigned long __data)
+@@ -1435,7 +1435,7 @@ static void process_timeout(unsigned long __data)
*
* In all cases the return value is guaranteed to be non-negative.
*/
@@ -85610,11 +85372,20 @@ index 4296d13..0164b04 100644
{
struct timer_list timer;
unsigned long expire;
+@@ -1727,7 +1727,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 timers_nb = {
+ .notifier_call = timer_cpu_notify,
+ };
+
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
-index b8b8560..75b1a09 100644
+index 16fc34a..efd8bb8 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
-@@ -317,7 +317,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
+@@ -324,7 +324,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
struct blk_trace *bt = filp->private_data;
char buf[16];
@@ -85623,7 +85394,7 @@ index b8b8560..75b1a09 100644
return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
}
-@@ -375,7 +375,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
+@@ -389,7 +389,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
return 1;
bt = buf->chan->private_data;
@@ -85632,7 +85403,7 @@ index b8b8560..75b1a09 100644
return 0;
}
-@@ -476,7 +476,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
+@@ -490,7 +490,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
bt->dir = dir;
bt->dev = dev;
@@ -85642,10 +85413,10 @@ index b8b8560..75b1a09 100644
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 03cf44a..3051c64 100644
+index 226776b..175300f 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
-@@ -1950,12 +1950,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
+@@ -1599,12 +1599,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
if (unlikely(ftrace_disabled))
return 0;
@@ -85665,18 +85436,16 @@ index 03cf44a..3051c64 100644
}
/*
-@@ -4043,8 +4048,10 @@ static int ftrace_process_locs(struct module *mod,
- if (!count)
- return 0;
-
-+ pax_open_kernel();
- sort(start, count, sizeof(*start),
- ftrace_cmp_ips, ftrace_swap_ips);
-+ pax_close_kernel();
+@@ -2607,7 +2612,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
- start_pg = ftrace_allocate_pages(count);
- if (!start_pg)
-@@ -4767,8 +4774,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
+ int
+ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
+- void *data)
++ void *data)
+ {
+ struct ftrace_func_probe *entry;
+ struct ftrace_page *pg;
+@@ -3982,8 +3987,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
static int ftrace_graph_active;
@@ -85685,7 +85454,7 @@ index 03cf44a..3051c64 100644
int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
{
return 0;
-@@ -4912,6 +4917,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
+@@ -4127,6 +4130,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
return NOTIFY_DONE;
}
@@ -85696,7 +85465,7 @@ index 03cf44a..3051c64 100644
int register_ftrace_graph(trace_func_graph_ret_t retfunc,
trace_func_graph_ent_t entryfunc)
{
-@@ -4925,7 +4934,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+@@ -4140,7 +4147,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
goto out;
}
@@ -85705,10 +85474,10 @@ index 03cf44a..3051c64 100644
ftrace_graph_active++;
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index cc2f66f..05edd54 100644
+index 6fdc629..55739fe 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
-@@ -352,9 +352,9 @@ struct buffer_data_page {
+@@ -376,9 +376,9 @@ struct buffer_data_page {
*/
struct buffer_page {
struct list_head list; /* list of buffer pages */
@@ -85720,18 +85489,18 @@ index cc2f66f..05edd54 100644
unsigned long real_end; /* real end of data */
struct buffer_data_page *page; /* Actual data page */
};
-@@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
+@@ -489,8 +489,8 @@ struct ring_buffer_per_cpu {
+ unsigned long lost_events;
unsigned long last_overrun;
local_t entries_bytes;
- local_t entries;
-- local_t overrun;
- local_t commit_overrun;
-+ local_unchecked_t overrun;
+- local_t overrun;
+ local_unchecked_t commit_overrun;
- local_t dropped_events;
++ local_unchecked_t overrun;
+ local_t entries;
local_t committing;
local_t commits;
-@@ -992,8 +992,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -884,8 +884,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.
*/
@@ -85742,7 +85511,7 @@ index cc2f66f..05edd54 100644
/*
* Just make sure we have seen our old_write and synchronize
-@@ -1021,8 +1021,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -913,8 +913,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.
*/
@@ -85753,13 +85522,7 @@ index cc2f66f..05edd54 100644
/*
* No need to worry about races with clearing out the commit.
-@@ -1386,12 +1386,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;
- }
+@@ -1481,7 +1481,7 @@ rb_iter_head_event(struct ring_buffer_iter *iter)
static inline unsigned long rb_page_write(struct buffer_page *bpage)
{
@@ -85767,17 +85530,17 @@ index cc2f66f..05edd54 100644
+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
}
- static int
-@@ -1486,7 +1486,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);
- }
+ static inline unsigned rb_page_commit(struct buffer_page *bpage)
+@@ -1491,7 +1491,7 @@ static inline unsigned rb_page_commit(struct buffer_page *bpage)
+
+ 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;
+ }
-@@ -2064,7 +2064,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
+ /* Size is determined by what has been committed */
+@@ -1709,7 +1709,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
* it is our responsibility to update
* the counters.
*/
@@ -85786,7 +85549,7 @@ index cc2f66f..05edd54 100644
local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
/*
-@@ -2214,7 +2214,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1859,7 +1859,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
if (tail == BUF_PAGE_SIZE)
tail_page->real_end = 0;
@@ -85795,7 +85558,7 @@ index cc2f66f..05edd54 100644
return;
}
-@@ -2249,7 +2249,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1894,7 +1894,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
rb_event_set_padding(event);
/* Set the write back to the previous setting */
@@ -85804,7 +85567,7 @@ index cc2f66f..05edd54 100644
return;
}
-@@ -2261,7 +2261,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1906,7 +1906,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
/* Set write to end of buffer */
length = (tail + length) - BUF_PAGE_SIZE;
@@ -85813,7 +85576,7 @@ index cc2f66f..05edd54 100644
}
/*
-@@ -2287,7 +2287,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1932,7 +1932,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
* about it.
*/
if (unlikely(next_page == commit_page)) {
@@ -85822,7 +85585,7 @@ index cc2f66f..05edd54 100644
goto out_reset;
}
-@@ -2343,7 +2343,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1986,7 +1986,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
cpu_buffer->tail_page) &&
(cpu_buffer->commit_page ==
cpu_buffer->reader_page))) {
@@ -85831,7 +85594,7 @@ index cc2f66f..05edd54 100644
goto out_reset;
}
}
-@@ -2391,7 +2391,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2034,7 +2034,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
length += RB_LEN_TIME_EXTEND;
tail_page = cpu_buffer->tail_page;
@@ -85840,7 +85603,7 @@ index cc2f66f..05edd54 100644
/* set write to only the index of the write */
write &= RB_WRITE_MASK;
-@@ -2408,7 +2408,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2051,7 +2051,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);
@@ -85849,7 +85612,7 @@ index cc2f66f..05edd54 100644
/*
* If this is the first commit on the page, then update
-@@ -2441,7 +2441,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2084,7 +2084,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 =
@@ -85858,7 +85621,7 @@ index cc2f66f..05edd54 100644
unsigned long event_length = rb_event_length(event);
/*
* This is on the tail page. It is possible that
-@@ -2451,7 +2451,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2094,7 +2094,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
*/
old_index += write_mask;
new_index += write_mask;
@@ -85867,7 +85630,7 @@ index cc2f66f..05edd54 100644
if (index == old_index) {
/* update counters */
local_sub(event_length, &cpu_buffer->entries_bytes);
-@@ -2843,7 +2843,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2433,7 +2433,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
/* Do the likely case first */
if (likely(bpage->page == (void *)addr)) {
@@ -85876,7 +85639,7 @@ index cc2f66f..05edd54 100644
return;
}
-@@ -2855,7 +2855,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2445,7 +2445,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
start = bpage;
do {
if (bpage->page == (void *)addr) {
@@ -85885,7 +85648,7 @@ index cc2f66f..05edd54 100644
return;
}
rb_inc_page(cpu_buffer, &bpage);
-@@ -3139,7 +3139,7 @@ static inline unsigned long
+@@ -2670,7 +2670,7 @@ static inline unsigned long
rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
{
return local_read(&cpu_buffer->entries) -
@@ -85894,7 +85657,7 @@ index cc2f66f..05edd54 100644
}
/**
-@@ -3228,7 +3228,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
+@@ -2758,7 +2758,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
return 0;
cpu_buffer = buffer->buffers[cpu];
@@ -85903,7 +85666,7 @@ index cc2f66f..05edd54 100644
return ret;
}
-@@ -3251,7 +3251,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
+@@ -2779,7 +2779,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
return 0;
cpu_buffer = buffer->buffers[cpu];
@@ -85912,7 +85675,7 @@ index cc2f66f..05edd54 100644
return ret;
}
-@@ -3336,7 +3336,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
+@@ -2824,7 +2824,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];
@@ -85921,7 +85684,7 @@ index cc2f66f..05edd54 100644
}
return overruns;
-@@ -3512,8 +3512,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2996,8 +2996,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
/*
* Reset the reader page to size zero.
*/
@@ -85932,7 +85695,7 @@ index cc2f66f..05edd54 100644
local_set(&cpu_buffer->reader_page->page->commit, 0);
cpu_buffer->reader_page->real_end = 0;
-@@ -3547,7 +3547,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3031,7 +3031,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
* want to compare with the last_overrun.
*/
smp_mb();
@@ -85941,7 +85704,7 @@ index cc2f66f..05edd54 100644
/*
* Here's the tricky part.
-@@ -4117,8 +4117,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3579,8 +3579,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
cpu_buffer->head_page
= list_entry(cpu_buffer->pages, struct buffer_page, list);
@@ -85952,10 +85715,10 @@ index cc2f66f..05edd54 100644
local_set(&cpu_buffer->head_page->page->commit, 0);
cpu_buffer->head_page->read = 0;
-@@ -4128,14 +4128,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3589,14 +3589,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+ cpu_buffer->commit_page = cpu_buffer->head_page;
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);
@@ -85963,15 +85726,15 @@ index cc2f66f..05edd54 100644
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(&cpu_buffer->commit_overrun, 0);
+ local_set_unchecked(&cpu_buffer->overrun, 0);
-+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
- local_set(&cpu_buffer->dropped_events, 0);
local_set(&cpu_buffer->entries, 0);
local_set(&cpu_buffer->committing, 0);
-@@ -4540,8 +4540,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
+ local_set(&cpu_buffer->commits, 0);
+@@ -3994,8 +3994,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
rb_init_page(bpage);
bpage = reader->page;
reader->page = *data_page;
@@ -85983,36 +85746,60 @@ index cc2f66f..05edd54 100644
*data_page = bpage;
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index b778e96..4e84621 100644
+index ce1067f..d823ee9 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
-@@ -3335,7 +3335,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
+@@ -2653,7 +2653,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
return 0;
}
--int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
-+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
+-int set_tracer_flag(unsigned int mask, int enabled)
++int set_tracer_flag(unsigned long mask, int enabled)
{
/* do nothing if flag is already set */
if (!!(trace_flags & mask) == !!enabled)
+@@ -4245,10 +4245,9 @@ static const struct file_operations tracing_dyn_info_fops = {
+ };
+ #endif
+
+-static struct dentry *d_tracer;
+-
+ struct dentry *tracing_init_dentry(void)
+ {
++ static struct dentry *d_tracer;
+ static int once;
+
+ if (d_tracer)
+@@ -4268,10 +4267,9 @@ struct dentry *tracing_init_dentry(void)
+ return d_tracer;
+ }
+
+-static struct dentry *d_percpu;
+-
+ struct dentry *tracing_dentry_percpu(void)
+ {
++ static struct dentry *d_percpu;
+ static int once;
+ struct dentry *d_tracer;
+
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index 10c86fb..645ab0a 100644
+index c3c3f6b..7d8dbdc 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
-@@ -1029,7 +1029,7 @@ extern const char *__stop___tracepoint_str[];
- void trace_printk_init_buffers(void);
- void trace_printk_start_comm(void);
+@@ -820,7 +820,7 @@ extern const char *__start___trace_bprintk_fmt[];
+ extern const char *__stop___trace_bprintk_fmt[];
+
int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
--int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
-+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
+-int set_tracer_flag(unsigned int mask, int enabled);
++int set_tracer_flag(unsigned long mask, int enabled);
- /*
- * Normal trace_printk() and friends allocates special buffers
+ #undef FTRACE_ENTRY
+ #define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
-index 26dc348..8708ca7 100644
+index 3947835..8c0488b 100644
--- a/kernel/trace/trace_clock.c
+++ b/kernel/trace/trace_clock.c
-@@ -123,7 +123,7 @@ u64 notrace trace_clock_global(void)
+@@ -114,7 +114,7 @@ u64 notrace trace_clock_global(void)
return now;
}
@@ -86021,27 +85808,105 @@ index 26dc348..8708ca7 100644
/*
* trace_clock_counter(): simply an atomic counter.
-@@ -132,5 +132,5 @@ static atomic64_t trace_counter;
+@@ -123,5 +123,5 @@ static atomic64_t trace_counter;
*/
u64 notrace trace_clock_counter(void)
{
- return atomic64_add_return(1, &trace_counter);
-+ return atomic64_inc_return_unchecked(&trace_counter);
++ return atomic64_add_return_unchecked(1, &trace_counter);
}
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 368a4d5..7b6d1d5 100644
+index c212a7f..a2560bc 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
-@@ -1673,7 +1673,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
- return 0;
- }
+@@ -1299,10 +1299,6 @@ static LIST_HEAD(ftrace_module_file_list);
+ struct ftrace_module_file_ops {
+ struct list_head list;
+ struct module *mod;
+- struct file_operations id;
+- struct file_operations enable;
+- struct file_operations format;
+- struct file_operations filter;
+ };
+
+ static struct ftrace_module_file_ops *
+@@ -1323,17 +1319,12 @@ trace_create_file_ops(struct module *mod)
--struct ftrace_module_file_ops;
- static void __add_event_to_tracers(struct ftrace_event_call *call);
+ file_ops->mod = mod;
- /* Add an additional event_call dynamically */
+- file_ops->id = ftrace_event_id_fops;
+- file_ops->id.owner = mod;
+-
+- file_ops->enable = ftrace_enable_fops;
+- file_ops->enable.owner = mod;
+-
+- file_ops->filter = ftrace_event_filter_fops;
+- file_ops->filter.owner = mod;
+-
+- file_ops->format = ftrace_event_format_fops;
+- file_ops->format.owner = mod;
++ pax_open_kernel();
++ mod->trace_id.owner = mod;
++ mod->trace_enable.owner = mod;
++ mod->trace_filter.owner = mod;
++ mod->trace_format.owner = mod;
++ pax_close_kernel();
+
+ list_add(&file_ops->list, &ftrace_module_file_list);
+
+@@ -1357,8 +1348,8 @@ static void trace_module_add_events(struct module *mod)
+
+ for_each_event(call, start, end) {
+ __trace_add_event_call(*call, mod,
+- &file_ops->id, &file_ops->enable,
+- &file_ops->filter, &file_ops->format);
++ &mod->trace_id, &mod->trace_enable,
++ &mod->trace_filter, &mod->trace_format);
+ }
+ }
+
+diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
+index 00d527c..7c5b1a3 100644
+--- a/kernel/trace/trace_kprobe.c
++++ b/kernel/trace/trace_kprobe.c
+@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
+ long ret;
+ int maxlen = get_rloc_len(*(u32 *)dest);
+ u8 *dst = get_rloc_data(dest);
+- u8 *src = addr;
++ const u8 __user *src = (const u8 __force_user *)addr;
+ mm_segment_t old_fs = get_fs();
+ if (!maxlen)
+ return;
+@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
+ pagefault_disable();
+ do
+ ret = __copy_from_user_inatomic(dst++, src++, 1);
+- while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
++ while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
+ dst[-1] = '\0';
+ pagefault_enable();
+ set_fs(old_fs);
+@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
+ ((u8 *)get_rloc_data(dest))[0] = '\0';
+ *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
+ } else
+- *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
++ *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
+ get_rloc_offs(*(u32 *)dest));
+ }
+ /* Return the length of string -- including null terminal byte */
+@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
+ set_fs(KERNEL_DS);
+ pagefault_disable();
+ do {
+- ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
++ ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
+ len++;
+ } while (c && ret == 0 && len < MAX_STRING_SIZE);
+ pagefault_enable();
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
-index b3dcfb2..ebee344 100644
+index fd3c8aa..5f324a6 100644
--- a/kernel/trace/trace_mmiotrace.c
+++ b/kernel/trace/trace_mmiotrace.c
@@ -24,7 +24,7 @@ struct header_iter {
@@ -86059,7 +85924,7 @@ index b3dcfb2..ebee344 100644
{
- unsigned long cnt = atomic_xchg(&dropped_count, 0);
+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
- unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
+ unsigned long over = ring_buffer_overruns(iter->tr->buffer);
if (over > prev_overruns)
@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
@@ -86081,10 +85946,10 @@ index b3dcfb2..ebee344 100644
}
entry = ring_buffer_event_data(event);
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index 34e7cba..6f9a729 100644
+index 1dcf253..e1568b3 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
-@@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
+@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
if (!IS_ERR(p)) {
@@ -86093,7 +85958,7 @@ index 34e7cba..6f9a729 100644
if (p) {
s->len = p - s->buffer;
return 1;
-@@ -893,14 +893,16 @@ int register_ftrace_event(struct trace_event *event)
+@@ -810,14 +810,16 @@ int register_ftrace_event(struct trace_event *event)
goto out;
}
@@ -86115,10 +85980,10 @@ index 34e7cba..6f9a729 100644
key = event->type & (EVENT_HASHSIZE - 1);
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
-index b20428c..4845a10 100644
+index c5b20a3..6b38c73 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
-@@ -68,7 +68,7 @@ check_stack(unsigned long ip, unsigned long *stack)
+@@ -66,7 +66,7 @@ check_stack(unsigned long ip, unsigned long *stack)
return;
/* we do not handle interrupt stacks yet */
@@ -86127,46 +85992,42 @@ index b20428c..4845a10 100644
return;
local_irq_save(flags);
-diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 13fb113..a6ced3f 100644
---- a/kernel/user_namespace.c
-+++ b/kernel/user_namespace.c
-@@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
- !kgid_has_mapping(parent_ns, group))
- return -EPERM;
-
-+#ifdef CONFIG_GRKERNSEC
-+ /*
-+ * This doesn't really inspire confidence:
-+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
-+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
-+ * Increases kernel attack surface in areas developers
-+ * previously cared little about ("low importance due
-+ * to requiring "root" capability")
-+ * To be removed when this code receives *proper* review
-+ */
-+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
-+ !capable(CAP_SETGID))
-+ return -EPERM;
-+#endif
-+
- ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
- if (!ns)
- return -ENOMEM;
-@@ -860,7 +875,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
- if (atomic_read(¤t->mm->mm_users) > 1)
- return -EINVAL;
-
-- if (current->fs->users != 1)
-+ if (atomic_read(¤t->fs->users) != 1)
- return -EINVAL;
-
- if (!ns_capable(user_ns, CAP_SYS_ADMIN))
+diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
+index 209b379..7f76423 100644
+--- a/kernel/trace/trace_workqueue.c
++++ b/kernel/trace/trace_workqueue.c
+@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
+ int cpu;
+ pid_t pid;
+ /* Can be inserted from interrupt or user context, need to be atomic */
+- atomic_t inserted;
++ atomic_unchecked_t inserted;
+ /*
+ * Don't need to be atomic, works are serialized in a single workqueue thread
+ * on a single CPU.
+@@ -60,7 +60,7 @@ probe_workqueue_insertion(void *ignore,
+ spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
+ list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
+ if (node->pid == wq_thread->pid) {
+- atomic_inc(&node->inserted);
++ atomic_inc_unchecked(&node->inserted);
+ goto found;
+ }
+ }
+@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
+ tsk = get_pid_task(pid, PIDTYPE_PID);
+ if (tsk) {
+ seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
+- atomic_read(&cws->inserted), cws->executed,
++ atomic_read_unchecked(&cws->inserted), cws->executed,
+ tsk->comm);
+ put_task_struct(tsk);
+ }
diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
-index 4f69f9a..7c6f8f8 100644
+index 63da38c..639904e 100644
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
-@@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
+@@ -46,7 +46,7 @@ static void put_uts(ctl_table *table, int write, void *which)
static int proc_do_uts_string(ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
@@ -86176,45 +86037,36 @@ index 4f69f9a..7c6f8f8 100644
memcpy(&uts_table, table, sizeof(uts_table));
uts_table.data = get_uts(table, write);
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 4431610..4265616 100644
+index a8bc4d9..eae8357 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
-@@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
- static void watchdog_nmi_disable(unsigned int cpu) { return; }
- #endif /* CONFIG_HARDLOCKUP_DETECTOR */
-
--static struct smp_hotplug_thread watchdog_threads = {
-+static struct smp_hotplug_thread watchdog_threads __read_only = {
- .store = &softlockup_watchdog,
- .thread_should_run = watchdog_should_run,
- .thread_fn = watchdog,
+@@ -574,7 +574,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata cpu_nfb = {
++static struct notifier_block cpu_nfb = {
+ .notifier_call = cpu_callback
+ };
+
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 987293d..60b3043 100644
+index 0bc9ff0..4722738 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
-@@ -4658,7 +4658,7 @@ static void rebind_workers(struct worker_pool *pool)
- WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
- worker_flags |= WORKER_REBOUND;
- worker_flags &= ~WORKER_UNBOUND;
+@@ -3499,7 +3499,7 @@ static int __cpuinit trustee_thread(void *__gcwq)
+ */
+ worker_flags |= WORKER_REBIND;
+ worker_flags &= ~WORKER_ROGUE;
- ACCESS_ONCE(worker->flags) = worker_flags;
+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
- }
- spin_unlock_irq(&pool->lock);
+ /* queue rebind_work, wq doesn't matter, use the default one */
+ if (test_and_set_bit(WORK_STRUCT_PENDING_BIT,
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 094f315..244a824 100644
+index 82928f5..a3c7bb1 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
-@@ -836,7 +836,7 @@ config DEBUG_MUTEXES
-
- config DEBUG_WW_MUTEX_SLOWPATH
- bool "Wait/wound mutex debugging: Slowpath testing"
-- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
-+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
- select DEBUG_LOCK_ALLOC
- select DEBUG_SPINLOCK
- select DEBUG_MUTEXES
-@@ -849,7 +849,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
+@@ -510,7 +510,7 @@ config DEBUG_MUTEXES
config DEBUG_LOCK_ALLOC
bool "Lock debugging: detect incorrect freeing of live locks"
@@ -86223,7 +86075,7 @@ index 094f315..244a824 100644
select DEBUG_SPINLOCK
select DEBUG_MUTEXES
select LOCKDEP
-@@ -863,7 +863,7 @@ config DEBUG_LOCK_ALLOC
+@@ -524,7 +524,7 @@ config DEBUG_LOCK_ALLOC
config PROVE_LOCKING
bool "Lock debugging: prove locking correctness"
@@ -86232,7 +86084,7 @@ index 094f315..244a824 100644
select LOCKDEP
select DEBUG_SPINLOCK
select DEBUG_MUTEXES
-@@ -914,7 +914,7 @@ config LOCKDEP
+@@ -616,7 +616,7 @@ config LOCKDEP
config LOCK_STAT
bool "Lock usage statistics"
@@ -86241,24 +86093,15 @@ index 094f315..244a824 100644
select LOCKDEP
select DEBUG_SPINLOCK
select DEBUG_MUTEXES
-@@ -1376,6 +1376,7 @@ config LATENCYTOP
+@@ -1103,6 +1103,7 @@ config LATENCYTOP
depends on DEBUG_KERNEL
depends on STACKTRACE_SUPPORT
depends on PROC_FS
+ depends on !GRKERNSEC_HIDESYM
- select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
+ select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
select KALLSYMS
select KALLSYMS_ALL
-@@ -1392,7 +1393,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
- config DEBUG_STRICT_USER_COPY_CHECKS
- bool "Strict user copy size checks"
- depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
-- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
-+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
- help
- Enabling this option turns a certain set of sanity checks for user
- copy operations into compile time failures.
-@@ -1502,7 +1503,7 @@ endmenu # runtime tests
+@@ -1126,7 +1127,7 @@ source kernel/trace/Kconfig
config PROVIDE_OHCI1394_DMA_INIT
bool "Remote debugging over FireWire early on boot"
@@ -86267,7 +86110,7 @@ index 094f315..244a824 100644
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
-@@ -1531,7 +1532,7 @@ config PROVIDE_OHCI1394_DMA_INIT
+@@ -1155,7 +1156,7 @@ config PROVIDE_OHCI1394_DMA_INIT
config FIREWIRE_OHCI_REMOTE_DMA
bool "Remote debugging over FireWire with firewire-ohci"
@@ -86277,10 +86120,10 @@ index 094f315..244a824 100644
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 f3bb2cb..b358ace 100644
+index a4da283..57fec5e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
+@@ -45,7 +45,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
obj-$(CONFIG_BTREE) += btree.o
obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
@@ -86290,10 +86133,10 @@ index f3bb2cb..b358ace 100644
ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
diff --git a/lib/bitmap.c b/lib/bitmap.c
-index 06f7e4f..f3cf2b0 100644
+index 0d4a127..33a06c7 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
-@@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
+@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
{
int c, old_c, totaldigits, ndigits, nchunks, nbits;
u32 chunk;
@@ -86302,7 +86145,7 @@ index 06f7e4f..f3cf2b0 100644
bitmap_zero(maskp, nmaskbits);
-@@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
+@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user *ubuf,
{
if (!access_ok(VERIFY_READ, ubuf, ulen))
return -EFAULT;
@@ -86311,7 +86154,7 @@ index 06f7e4f..f3cf2b0 100644
ulen, 1, maskp, nmaskbits);
}
-@@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
+@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
{
unsigned a, b;
int c, old_c, totaldigits;
@@ -86320,7 +86163,7 @@ index 06f7e4f..f3cf2b0 100644
int exp_digit, in_range;
totaldigits = c = 0;
-@@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
+@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __user *ubuf,
{
if (!access_ok(VERIFY_READ, ubuf, ulen))
return -EFAULT;
@@ -86330,10 +86173,10 @@ index 06f7e4f..f3cf2b0 100644
}
EXPORT_SYMBOL(bitmap_parselist_user);
diff --git a/lib/bug.c b/lib/bug.c
-index 1686034..a9c00c8 100644
+index 1955209..cbbb2ad 100644
--- a/lib/bug.c
+++ b/lib/bug.c
-@@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
+@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
return BUG_TRAP_TYPE_NONE;
bug = find_bug(bugaddr);
@@ -86342,11 +86185,26 @@ index 1686034..a9c00c8 100644
file = NULL;
line = 0;
+diff --git a/lib/cpu-notifier-error-inject.c b/lib/cpu-notifier-error-inject.c
+index 4dc2032..7a2a1da 100644
+--- a/lib/cpu-notifier-error-inject.c
++++ b/lib/cpu-notifier-error-inject.c
+@@ -45,7 +45,9 @@ static struct notifier_block err_inject_cpu_notifier = {
+
+ static int err_inject_init(void)
+ {
+- err_inject_cpu_notifier.priority = priority;
++ pax_open_kernel();
++ *(int *)&err_inject_cpu_notifier.priority = priority;
++ pax_close_kernel();
+
+ return register_hotcpu_notifier(&err_inject_cpu_notifier);
+ }
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
-index bf2c8b1..1d00ccf 100644
+index a78b7c6..2c73084 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
-@@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
+@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
if (limit > 4)
return;
@@ -86356,10 +86214,10 @@ index bf2c8b1..1d00ccf 100644
return;
diff --git a/lib/devres.c b/lib/devres.c
-index 8235331..5881053 100644
+index 7c0e953..f642b5c 100644
--- a/lib/devres.c
+++ b/lib/devres.c
-@@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
+@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
void devm_iounmap(struct device *dev, void __iomem *addr)
{
WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
@@ -86368,7 +86226,7 @@ index 8235331..5881053 100644
iounmap(addr);
}
EXPORT_SYMBOL(devm_iounmap);
-@@ -224,7 +224,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
+@@ -141,7 +141,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
{
ioport_unmap(addr);
WARN_ON(devres_destroy(dev, devm_ioport_map_release,
@@ -86376,12 +86234,12 @@ index 8235331..5881053 100644
+ devm_ioport_map_match, (void __force *)addr));
}
EXPORT_SYMBOL(devm_ioport_unmap);
- #endif /* CONFIG_HAS_IOPORT */
+
diff --git a/lib/div64.c b/lib/div64.c
-index 4382ad7..08aa558 100644
+index 5b49191..d84e6fc 100644
--- a/lib/div64.c
+++ b/lib/div64.c
-@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
+@@ -58,7 +58,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
EXPORT_SYMBOL(__div64_32);
#ifndef div_s64_rem
@@ -86390,8 +86248,8 @@ index 4382ad7..08aa558 100644
{
u64 quotient;
-@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
- * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
+@@ -89,7 +89,7 @@ EXPORT_SYMBOL(div_s64_rem);
+ * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c'
*/
#ifndef div64_u64
-u64 div64_u64(u64 dividend, u64 divisor)
@@ -86400,10 +86258,10 @@ index 4382ad7..08aa558 100644
u32 high = divisor >> 32;
u64 quot;
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
-index d87a17a..ac0d79a 100644
+index fea790a..3bdd6b4 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
-@@ -768,7 +768,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
+@@ -760,7 +760,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
void dma_debug_add_bus(struct bus_type *bus)
{
@@ -86412,7 +86270,7 @@ index d87a17a..ac0d79a 100644
if (global_disable)
return;
-@@ -945,7 +945,7 @@ static void check_unmap(struct dma_debug_entry *ref)
+@@ -925,7 +925,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
{
@@ -86421,6 +86279,29 @@ index d87a17a..ac0d79a 100644
err_printk(dev, NULL, "DMA-API: device driver maps memory from"
"stack [addr=%p]\n", addr);
}
+diff --git a/lib/extable.c b/lib/extable.c
+index 4cac81e..63e9b8f 100644
+--- a/lib/extable.c
++++ b/lib/extable.c
+@@ -13,6 +13,7 @@
+ #include <linux/init.h>
+ #include <linux/sort.h>
+ #include <asm/uaccess.h>
++#include <asm/pgtable.h>
+
+ #ifndef ARCH_HAS_SORT_EXTABLE
+ /*
+@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const void *b)
+ void sort_extable(struct exception_table_entry *start,
+ struct exception_table_entry *finish)
+ {
++ pax_open_kernel();
+ sort(start, finish - start, sizeof(struct exception_table_entry),
+ cmp_ex, NULL);
++ pax_close_kernel();
+ }
+
+ #ifdef CONFIG_MODULES
diff --git a/lib/inflate.c b/lib/inflate.c
index 013a761..c28f3fc 100644
--- a/lib/inflate.c
@@ -86435,7 +86316,7 @@ index 013a761..c28f3fc 100644
#endif
diff --git a/lib/ioremap.c b/lib/ioremap.c
-index 0c9216c..863bd89 100644
+index da4e2ad..6373b5f 100644
--- a/lib/ioremap.c
+++ b/lib/ioremap.c
@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
@@ -86471,10 +86352,19 @@ index bd2bea9..6b3c95e 100644
return false;
diff --git a/lib/kobject.c b/lib/kobject.c
-index 084f7b1..d265b8a 100644
+index 83bd5b3..8a0c75f 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
-@@ -875,9 +875,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
+@@ -844,7 +844,7 @@ static struct kset *kset_create(const char *name,
+ kset = kzalloc(sizeof(*kset), GFP_KERNEL);
+ if (!kset)
+ return NULL;
+- retval = kobject_set_name(&kset->kobj, name);
++ retval = kobject_set_name(&kset->kobj, "%s", name);
+ if (retval) {
+ kfree(kset);
+ return NULL;
+@@ -898,9 +898,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
static DEFINE_SPINLOCK(kobj_ns_type_lock);
@@ -86486,21 +86376,34 @@ index 084f7b1..d265b8a 100644
{
enum kobj_ns_type type = ops->type;
int error;
+diff --git a/lib/kref.c b/lib/kref.c
+index 3efb882..8492f4c 100644
+--- a/lib/kref.c
++++ b/lib/kref.c
+@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
+ */
+ int kref_put(struct kref *kref, void (*release)(struct kref *kref))
+ {
+- WARN_ON(release == NULL);
++ BUG_ON(release == NULL);
+ WARN_ON(release == (void (*)(struct kref *))kfree);
+
+ if (atomic_dec_and_test(&kref->refcount)) {
diff --git a/lib/list_debug.c b/lib/list_debug.c
-index c24c2f7..f0296f4 100644
+index b8029a5..2b120e1 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>
+@@ -8,7 +8,9 @@
+
+ #include <linux/module.h>
+ #include <linux/list.h>
+#include <linux/mm.h>
+#ifdef CONFIG_DEBUG_LIST
/*
* Insert a new entry between two known consecutive entries.
*
-@@ -19,21 +21,40 @@
+@@ -16,18 +18,40 @@
* the prev/next entries already!
*/
@@ -86545,16 +86448,13 @@ index c24c2f7..f0296f4 100644
- "list_add corruption. prev->next should be "
- "next (%p), but was %p. (prev=%p).\n",
- next, prev->next, prev);
-- WARN(new == prev || new == next,
-- "list_add double add: new=%p, prev=%p, next=%p.\n",
-- new, prev, next);
+ if (!__list_add_debug(new, prev, next))
+ return;
+
next->prev = new;
new->next = next;
new->prev = prev;
-@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
+@@ -35,28 +59,46 @@ void __list_add(struct list_head *new,
}
EXPORT_SYMBOL(__list_add);
@@ -86615,25 +86515,10 @@ index c24c2f7..f0296f4 100644
}
EXPORT_SYMBOL(__list_del_entry);
-@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
- void __list_add_rcu(struct list_head *new,
- struct list_head *prev, struct list_head *next)
- {
-- 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,
-- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
-- next, prev->next, prev);
-+ if (!__list_add_debug(new, prev, next))
-+ return;
-+
- new->next = next;
- new->prev = prev;
- rcu_assign_pointer(list_next_rcu(prev), new);
- next->prev = new;
+@@ -73,3 +115,76 @@ void list_del(struct list_head *entry)
+ entry->prev = LIST_POISON2;
}
- EXPORT_SYMBOL(__list_add_rcu);
+ EXPORT_SYMBOL(list_del);
+#endif
+
+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
@@ -86707,87 +86592,35 @@ index c24c2f7..f0296f4 100644
+ pax_close_kernel();
+}
+EXPORT_SYMBOL(pax_list_del_rcu);
-diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
-index 1a53d49..ace934c 100644
---- a/lib/percpu-refcount.c
-+++ b/lib/percpu-refcount.c
-@@ -29,7 +29,7 @@
- * can't hit 0 before we've added up all the percpu refs.
- */
-
--#define PCPU_COUNT_BIAS (1U << 31)
-+#define PCPU_COUNT_BIAS (1U << 30)
-
- /**
- * percpu_ref_init - initialize a percpu refcount
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
-index 7811ed3..f80ca19 100644
+index d9df745..e73c2fe 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
-@@ -93,7 +93,7 @@ struct radix_tree_preload {
+@@ -80,7 +80,7 @@ struct radix_tree_preload {
int nr;
- struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
+ struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
};
-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
static inline void *ptr_to_indirect(void *ptr)
{
-diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
-index bb2b201..46abaf9 100644
---- a/lib/strncpy_from_user.c
-+++ b/lib/strncpy_from_user.c
-@@ -21,7 +21,7 @@
- */
- static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
- {
-- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
-+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
- long res = 0;
+diff --git a/lib/scatterlist.c b/lib/scatterlist.c
+index 4ceb05d..2ffcb3c 100644
+--- a/lib/scatterlist.c
++++ b/lib/scatterlist.c
+@@ -419,7 +419,8 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
+ if (miter->addr) {
+ miter->__offset += miter->consumed;
- /*
-diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
-index a28df52..3d55877 100644
---- a/lib/strnlen_user.c
-+++ b/lib/strnlen_user.c
-@@ -26,7 +26,7 @@
- */
- static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
- {
-- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
-+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
- long align, res = 0;
- unsigned long c;
-
-diff --git a/lib/swiotlb.c b/lib/swiotlb.c
-index 4e8686c..3e8c92f 100644
---- a/lib/swiotlb.c
-+++ b/lib/swiotlb.c
-@@ -664,7 +664,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
+- if (miter->__flags & SG_MITER_TO_SG)
++ if ((miter->__flags & SG_MITER_TO_SG) &&
++ !PageSlab(miter->page))
+ flush_kernel_dcache_page(miter->page);
- void
- swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
-- dma_addr_t dev_addr)
-+ dma_addr_t dev_addr, struct dma_attrs *attrs)
- {
- phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
-
-diff --git a/lib/usercopy.c b/lib/usercopy.c
-index 4f5b1dd..7cab418 100644
---- a/lib/usercopy.c
-+++ b/lib/usercopy.c
-@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
- WARN(1, "Buffer overflow detected!\n");
- }
- EXPORT_SYMBOL(copy_from_user_overflow);
-+
-+void copy_to_user_overflow(void)
-+{
-+ WARN(1, "Buffer overflow detected!\n");
-+}
-+EXPORT_SYMBOL(copy_to_user_overflow);
+ if (miter->__flags & SG_MITER_ATOMIC) {
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index 26559bd..ed614df 100644
+index d74c317..1170419 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -16,6 +16,9 @@
@@ -86798,10 +86631,19 @@ index 26559bd..ed614df 100644
+#define __INCLUDED_BY_HIDESYM 1
+#endif
#include <stdarg.h>
- #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
+ #include <linux/module.h>
#include <linux/types.h>
-@@ -1154,7 +1157,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
- return number(buf, end, *(const netdev_features_t *)addr, spec);
+@@ -413,7 +416,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
+ char sym[KSYM_SYMBOL_LEN];
+ if (ext == 'B')
+ sprint_backtrace(sym, value);
+- else if (ext != 'f' && ext != 's')
++ else if (ext != 'f' && ext != 's' && ext != 'a')
+ sprint_symbol(sym, value);
+ else
+ kallsyms_lookup(value, NULL, NULL, NULL, sym);
+@@ -777,7 +780,11 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
+ return string(buf, end, uuid, spec);
}
+#ifdef CONFIG_GRKERNSEC_HIDESYM
@@ -86812,16 +86654,17 @@ index 26559bd..ed614df 100644
/*
* Show a '%p' thing. A kernel extension is that the '%p' is followed
-@@ -1167,6 +1174,7 @@ int kptr_restrict __read_mostly;
- * - 'f' For simple symbolic function names without offset
+@@ -791,6 +798,8 @@ int kptr_restrict __read_mostly;
* - 'S' For symbolic direct pointers with offset
* - 's' For symbolic direct pointers without offset
-+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
- * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
* - 'B' For backtraced symbolic direct pointers with offset
++ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
++ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
* - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
-@@ -1231,12 +1239,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
-
+ * - '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
+@@ -835,12 +844,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+ {
if (!ptr && *fmt != 'K') {
/*
- * Print (null) with the same width as a pointer so it makes
@@ -86829,37 +86672,50 @@ index 26559bd..ed614df 100644
* tabular output look nice.
*/
if (spec.field_width == -1)
- spec.field_width = default_width;
+ spec.field_width = 2 * sizeof(void *);
- return string(buf, end, "(null)", spec);
+ return string(buf, end, "(nil)", spec);
}
switch (*fmt) {
-@@ -1246,6 +1254,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -850,6 +859,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
/* Fallthrough */
case 'S':
case 's':
+#ifdef CONFIG_GRKERNSEC_HIDESYM
+ break;
+#else
-+ return symbol_string(buf, end, ptr, spec, fmt);
++ return symbol_string(buf, end, ptr, spec, *fmt);
+#endif
+ case 'A':
++ case 'a':
case 'B':
- return symbol_string(buf, end, ptr, spec, fmt);
+ return symbol_string(buf, end, ptr, spec, *fmt);
case 'R':
-@@ -1301,6 +1315,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
- va_end(va);
- return buf;
- }
+@@ -878,9 +894,17 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+ case 'U':
+ return uuid_string(buf, end, ptr, spec, fmt);
+ case 'V':
+- return buf + vsnprintf(buf, end > buf ? end - buf : 0,
+- ((struct va_format *)ptr)->fmt,
+- *(((struct va_format *)ptr)->va));
++ {
++ va_list va;
++
++ va_copy(va, *((struct va_format *)ptr)->va);
++ buf += vsnprintf(buf, end > buf ? end - buf : 0,
++ ((struct va_format *)ptr)->fmt, va);
++ va_end(va);
++ return buf;
++ }
+ case 'P':
+ break;
case 'K':
/*
* %pK cannot be used in IRQ context because its test
-@@ -1336,6 +1352,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
- ((const struct file *)ptr)->f_path.dentry,
- spec, fmt);
+@@ -898,6 +922,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+ ptr = NULL;
+ break;
}
+
+#ifdef CONFIG_GRKERNSEC_HIDESYM
@@ -86878,8 +86734,8 @@ index 26559bd..ed614df 100644
+
spec.flags |= SMALL;
if (spec.field_width == -1) {
- spec.field_width = default_width;
-@@ -2059,11 +2090,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+ spec.field_width = 2 * sizeof(void *);
+@@ -1609,11 +1648,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
typeof(type) value; \
if (sizeof(type) == 8) { \
args = PTR_ALIGN(args, sizeof(u32)); \
@@ -86894,7 +86750,7 @@ index 26559bd..ed614df 100644
} \
args += sizeof(type); \
value; \
-@@ -2126,7 +2157,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -1676,7 +1715,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
case FORMAT_TYPE_STR: {
const char *str_arg = args;
args += strlen(str_arg) + 1;
@@ -86911,10 +86767,10 @@ index 0000000..7cd6065
@@ -0,0 +1 @@
+-grsec
diff --git a/mm/Kconfig b/mm/Kconfig
-index 394838f..0e5f816 100644
+index 011b110..05d1b6f 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
-@@ -317,10 +317,11 @@ config KSM
+@@ -241,10 +241,11 @@ config KSM
root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
config DEFAULT_MMAP_MIN_ADDR
@@ -86929,7 +86785,7 @@ index 394838f..0e5f816 100644
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.
-@@ -351,7 +352,7 @@ config MEMORY_FAILURE
+@@ -274,7 +275,7 @@ config MEMORY_FAILURE
config HWPOISON_INJECT
tristate "HWPoison pages injector"
@@ -86939,7 +86795,7 @@ index 394838f..0e5f816 100644
config NOMMU_INITIAL_TRIM_EXCESS
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index ce682f7..1fb54f9 100644
+index 2b49dd2..0527d62 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -12,7 +12,7 @@
@@ -86951,20 +86807,29 @@ index ce682f7..1fb54f9 100644
struct backing_dev_info default_backing_dev_info = {
.name = "default",
-@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
+@@ -759,7 +759,6 @@ EXPORT_SYMBOL(bdi_destroy);
+ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
+ unsigned int cap)
+ {
+- char tmp[32];
+ int err;
+
+ bdi->name = name;
+@@ -768,8 +767,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
+ if (err)
return err;
- err = bdi_register(bdi, NULL, "%.28s-%ld", name,
-- atomic_long_inc_return(&bdi_seq));
-+ atomic_long_inc_return_unchecked(&bdi_seq));
+- sprintf(tmp, "%.28s%s", name, "-%d");
+- err = bdi_register(bdi, NULL, tmp, atomic_long_inc_return(&bdi_seq));
++ err = bdi_register(bdi, NULL, "%.28s-%ld", name, atomic_long_inc_return_unchecked(&bdi_seq));
if (err) {
bdi_destroy(bdi);
return err;
diff --git a/mm/filemap.c b/mm/filemap.c
-index ae4846f..b0acebe 100644
+index 556858c..71a567d 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -1768,7 +1768,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+@@ -1773,7 +1773,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)
@@ -86972,8 +86837,8 @@ index ae4846f..b0acebe 100644
+ return -ENODEV;
file_accessed(file);
vma->vm_ops = &generic_file_vm_ops;
- return 0;
-@@ -1950,7 +1950,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
+ vma->vm_flags |= VM_CAN_NONLINEAR;
+@@ -2021,7 +2021,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
while (bytes) {
char __user *buf = iov->iov_base + base;
@@ -86982,16 +86847,16 @@ index ae4846f..b0acebe 100644
base = 0;
left = __copy_from_user_inatomic(vaddr, buf, copy);
-@@ -1979,7 +1979,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
+@@ -2050,7 +2050,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
BUG_ON(!in_atomic());
- kaddr = kmap_atomic(page);
+ kaddr = kmap_atomic(page, KM_USER0);
if (likely(i->nr_segs == 1)) {
- int left;
+ size_t left;
char __user *buf = i->iov->iov_base + i->iov_offset;
left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
copied = bytes - left;
-@@ -2007,7 +2007,7 @@ size_t iov_iter_copy_from_user(struct page *page,
+@@ -2078,7 +2078,7 @@ size_t iov_iter_copy_from_user(struct page *page,
kaddr = kmap(page);
if (likely(i->nr_segs == 1)) {
@@ -87000,7 +86865,7 @@ index ae4846f..b0acebe 100644
char __user *buf = i->iov->iov_base + i->iov_offset;
left = __copy_from_user(kaddr + offset, buf, bytes);
copied = bytes - left;
-@@ -2037,7 +2037,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
+@@ -2108,7 +2108,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
* zero-length segments (without overruning the iovec).
*/
while (bytes || unlikely(i->count && !iov->iov_len)) {
@@ -87009,7 +86874,7 @@ index ae4846f..b0acebe 100644
copy = min(bytes, iov->iov_len - base);
BUG_ON(!i->count || i->count < copy);
-@@ -2108,6 +2108,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
+@@ -2179,6 +2179,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
*pos = i_size_read(inode);
if (limit != RLIM_INFINITY) {
@@ -87018,10 +86883,10 @@ index ae4846f..b0acebe 100644
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
diff --git a/mm/fremap.c b/mm/fremap.c
-index 5bff081..d8189a9 100644
+index 9ed4fd4..c42648d 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
-@@ -163,6 +163,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
retry:
vma = find_vma(mm, start);
@@ -87034,21 +86899,22 @@ index 5bff081..d8189a9 100644
* 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 b32b70c..e512eb0 100644
+index 2a07f97..2cdc054 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
-@@ -138,8 +138,9 @@ 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]);
+ pax_open_kernel();
- pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
+ pte_clear(&init_mm, (unsigned long)page_address(page),
+ &pkmap_page_table[i]);
-
+ pax_close_kernel();
set_page_address(page, NULL);
need_flush = 1;
}
-@@ -198,9 +199,11 @@ start:
+@@ -199,9 +200,11 @@ start:
}
}
vaddr = PKMAP_ADDR(last_pkmap_nr);
@@ -87061,11 +86927,24 @@ index b32b70c..e512eb0 100644
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
+diff --git a/mm/huge_memory.c b/mm/huge_memory.c
+index ed0ed8a..cc835b9 100644
+--- a/mm/huge_memory.c
++++ b/mm/huge_memory.c
+@@ -704,7 +704,7 @@ out:
+ * run pte_offset_map on the pmd, if an huge pmd could
+ * materialize from under us from a different thread.
+ */
+- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
++ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
+ return VM_FAULT_OOM;
+ /* 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 0b7656e..d21cefc 100644
+index ddf2128..af57f40 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
-@@ -2094,15 +2094,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
+@@ -1990,15 +1990,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
struct hstate *h = &default_hstate;
unsigned long tmp;
int ret;
@@ -87086,7 +86965,7 @@ index 0b7656e..d21cefc 100644
if (ret)
goto out;
-@@ -2147,15 +2149,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
+@@ -2055,15 +2057,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
struct hstate *h = &default_hstate;
unsigned long tmp;
int ret;
@@ -87107,7 +86986,7 @@ index 0b7656e..d21cefc 100644
if (ret)
goto out;
-@@ -2605,6 +2609,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2482,6 +2486,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
return 1;
}
@@ -87134,8 +87013,8 @@ index 0b7656e..d21cefc 100644
+
/*
* 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
-@@ -2721,6 +2746,11 @@ retry_avoidcopy:
+ */
+@@ -2584,6 +2609,11 @@ retry_avoidcopy:
make_huge_pte(vma, new_page, 1));
page_remove_rmap(old_page);
hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -87146,8 +87025,8 @@ index 0b7656e..d21cefc 100644
+
/* Make the old page be freed below */
new_page = old_page;
- }
-@@ -2883,6 +2913,10 @@ retry:
+ mmu_notifier_invalidate_range_end(mm,
+@@ -2735,6 +2765,10 @@ retry:
&& (vma->vm_flags & VM_SHARED)));
set_huge_pte_at(mm, address, ptep, new_pte);
@@ -87158,7 +87037,7 @@ index 0b7656e..d21cefc 100644
if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
/* Optimization, do the COW without a second fault */
ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
-@@ -2912,6 +2946,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2764,6 +2798,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
static DEFINE_MUTEX(hugetlb_instantiation_mutex);
struct hstate *h = hstate_vma(vma);
@@ -87166,11 +87045,11 @@ index 0b7656e..d21cefc 100644
+ struct vm_area_struct *vma_m;
+#endif
+
- address &= huge_page_mask(h);
-
ptep = huge_pte_offset(mm, address);
-@@ -2925,6 +2963,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
- VM_FAULT_SET_HINDEX(hstate_index(h));
+ if (ptep) {
+ entry = huge_ptep_get(ptep);
+@@ -2775,6 +2813,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+ VM_FAULT_SET_HINDEX(h - hstates);
}
+#ifdef CONFIG_PAX_SEGMEXEC
@@ -87197,10 +87076,10 @@ index 0b7656e..d21cefc 100644
if (!ptep)
return VM_FAULT_OOM;
diff --git a/mm/internal.h b/mm/internal.h
-index 684f7aa..9eb9edc 100644
+index 0c26b5e..1cc340f 100644
--- a/mm/internal.h
+++ b/mm/internal.h
-@@ -97,6 +97,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
+@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
* in mm/page_alloc.c
*/
extern void __free_pages_bootmem(struct page *page, unsigned int order);
@@ -87208,20 +87087,11 @@ index 684f7aa..9eb9edc 100644
extern void prep_compound_page(struct page *page, unsigned long order);
#ifdef CONFIG_MEMORY_FAILURE
extern bool is_free_buddy_page(struct page *page);
-@@ -352,7 +353,7 @@ extern u32 hwpoison_filter_enable;
-
- extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
- unsigned long, unsigned long,
-- unsigned long, unsigned long);
-+ unsigned long, unsigned long) __intentional_overflow(-1);
-
- extern void set_pageblock_order(void);
- unsigned long reclaim_clean_pages_from_list(struct zone *zone,
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
-index e126b0e..e986018 100644
+index f3b2a00..5899e43 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
-@@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
+@@ -357,7 +357,7 @@ static void print_unreferenced(struct seq_file *seq,
for (i = 0; i < object->trace_len; i++) {
void *ptr = (void *)object->trace[i];
@@ -87230,7 +87100,7 @@ index e126b0e..e986018 100644
}
}
-@@ -1851,7 +1851,7 @@ static int __init kmemleak_late_init(void)
+@@ -1745,7 +1745,7 @@ static int __init kmemleak_late_init(void)
return -ENOMEM;
}
@@ -87262,10 +87132,10 @@ index d53adf9..03a24bf 100644
set_fs(old_fs);
diff --git a/mm/madvise.c b/mm/madvise.c
-index 539eeb9..e24a987 100644
+index 23d3a6b..e10d35a 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
-@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
+@@ -46,6 +46,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
@@ -87276,7 +87146,7 @@ index 539eeb9..e24a987 100644
switch (behavior) {
case MADV_NORMAL:
new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
-@@ -126,6 +130,13 @@ success:
+@@ -111,6 +115,13 @@ success:
/*
* vm_flags is protected by the mmap_sem held in write mode.
*/
@@ -87290,8 +87160,8 @@ index 539eeb9..e24a987 100644
vma->vm_flags = new_flags;
out:
-@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
- struct vm_area_struct **prev,
+@@ -169,6 +180,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
+ struct vm_area_struct ** prev,
unsigned long start, unsigned long end)
{
+
@@ -87302,7 +87172,7 @@ index 539eeb9..e24a987 100644
*prev = vma;
if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
return -EINVAL;
-@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
+@@ -181,6 +197,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);
@@ -87324,46 +87194,46 @@ index 539eeb9..e24a987 100644
return 0;
}
-@@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
+@@ -386,6 +417,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
if (end < start)
- return error;
+ goto out;
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
+ if (end > SEGMEXEC_TASK_SIZE)
-+ return error;
++ goto out;
+ } else
+#endif
+
+ if (end > TASK_SIZE)
-+ return error;
++ goto out;
+
error = 0;
if (end == start)
- return error;
+ goto out;
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
-index bf3351b..aea800d 100644
+index 1b03878..d62c02b 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
int sysctl_memory_failure_recovery __read_mostly = 1;
--atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
-+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
+-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
++atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
-@@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
- pfn, t->comm, t->pid);
+@@ -202,7 +202,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
si.si_signo = SIGBUS;
si.si_errno = 0;
+ si.si_code = BUS_MCEERR_AO;
- si.si_addr = (void *)addr;
+ si.si_addr = (void __user *)addr;
#ifdef __ARCH_SI_TRAPNO
si.si_trapno = trapno;
#endif
-@@ -762,7 +762,7 @@ static struct page_state {
+@@ -750,7 +750,7 @@ static struct page_state {
unsigned long res;
char *msg;
int (*action)(struct page *p, unsigned long pfn);
@@ -87372,106 +87242,79 @@ index bf3351b..aea800d 100644
{ reserved, reserved, "reserved kernel", me_kernel },
/*
* free pages are specially detected outside this table:
-@@ -1053,7 +1053,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
- nr_pages = 1 << compound_order(hpage);
- else /* normal page or thp */
- nr_pages = 1;
-- atomic_long_add(nr_pages, &num_poisoned_pages);
-+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
+@@ -1010,7 +1010,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
+ }
+
+ nr_pages = 1 << compound_trans_order(hpage);
+- atomic_long_add(nr_pages, &mce_bad_pages);
++ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
/*
* We need/can do nothing about count=0 pages.
-@@ -1083,7 +1083,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)
if (!PageHWPoison(hpage)
|| (hwpoison_filter(p) && TestClearPageHWPoison(p))
|| (p != hpage && TestSetPageHWPoison(hpage))) {
-- atomic_long_sub(nr_pages, &num_poisoned_pages);
-+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
+- atomic_long_sub(nr_pages, &mce_bad_pages);
++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
return 0;
}
set_page_hwpoison_huge_page(hpage);
-@@ -1152,7 +1152,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1098,7 +1098,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
}
if (hwpoison_filter(p)) {
if (TestClearPageHWPoison(p))
-- atomic_long_sub(nr_pages, &num_poisoned_pages);
-+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
+- atomic_long_sub(nr_pages, &mce_bad_pages);
++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
unlock_page(hpage);
put_page(hpage);
return 0;
-@@ -1370,7 +1370,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1315,7 +1315,7 @@ int unpoison_memory(unsigned long pfn)
return 0;
}
if (TestClearPageHWPoison(p))
-- atomic_long_dec(&num_poisoned_pages);
-+ atomic_long_dec_unchecked(&num_poisoned_pages);
+- atomic_long_sub(nr_pages, &mce_bad_pages);
++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
return 0;
}
-@@ -1384,7 +1384,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1329,7 +1329,7 @@ int unpoison_memory(unsigned long pfn)
*/
if (TestClearPageHWPoison(page)) {
pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
-- atomic_long_sub(nr_pages, &num_poisoned_pages);
-+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
+- atomic_long_sub(nr_pages, &mce_bad_pages);
++ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
freeit = 1;
if (PageHuge(page))
clear_page_hwpoison_huge_page(page);
-@@ -1521,7 +1521,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
- } else {
- set_page_hwpoison_huge_page(hpage);
- dequeue_hwpoisoned_huge_page(hpage);
-- atomic_long_add(1 << compound_order(hpage),
-+ atomic_long_add_unchecked(1 << compound_order(hpage),
- &num_poisoned_pages);
- }
- return ret;
-@@ -1560,7 +1560,7 @@ static int __soft_offline_page(struct page *page, int flags)
- put_page(page);
- pr_info("soft_offline: %#lx: invalidated\n", pfn);
- SetPageHWPoison(page);
-- atomic_long_inc(&num_poisoned_pages);
-+ atomic_long_inc_unchecked(&num_poisoned_pages);
- return 0;
+@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
}
+ done:
+ if (!PageHWPoison(hpage))
+- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
++ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
+ set_page_hwpoison_huge_page(hpage);
+ dequeue_hwpoisoned_huge_page(hpage);
+ /* keep elevated page count for bad page */
+@@ -1581,7 +1581,7 @@ int soft_offline_page(struct page *page, int flags)
+ return ret;
-@@ -1605,7 +1605,7 @@ static int __soft_offline_page(struct page *page, int flags)
- if (!is_free_buddy_page(page))
- pr_info("soft offline: %#lx: page leaked\n",
- pfn);
-- atomic_long_inc(&num_poisoned_pages);
-+ atomic_long_inc_unchecked(&num_poisoned_pages);
- }
- } else {
- pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
-@@ -1666,11 +1666,11 @@ int soft_offline_page(struct page *page, int flags)
- if (PageHuge(page)) {
- set_page_hwpoison_huge_page(hpage);
- dequeue_hwpoisoned_huge_page(hpage);
-- atomic_long_add(1 << compound_order(hpage),
-+ atomic_long_add_unchecked(1 << compound_order(hpage),
- &num_poisoned_pages);
- } else {
- SetPageHWPoison(page);
-- atomic_long_inc(&num_poisoned_pages);
-+ atomic_long_inc_unchecked(&num_poisoned_pages);
- }
- }
- unset:
+ done:
+- atomic_long_add(1, &mce_bad_pages);
++ atomic_long_add_unchecked(1, &mce_bad_pages);
+ SetPageHWPoison(page);
+ /* keep elevated page count for bad page */
+ return ret;
diff --git a/mm/memory.c b/mm/memory.c
-index d176154..cd1b387 100644
+index d5f913b..6f403ad 100644
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -402,6 +402,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);
-
-+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
- start &= PUD_MASK;
- if (start < floor)
+@@ -462,8 +462,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
return;
-@@ -416,6 +417,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+
pmd = pmd_offset(pud, start);
++
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
pud_clear(pud);
pmd_free_tlb(tlb, pmd, start);
+#endif
@@ -87479,15 +87322,11 @@ index d176154..cd1b387 100644
}
static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
-@@ -435,6 +438,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);
+@@ -494,9 +498,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+ if (end - 1 > ceiling - 1)
+ return;
+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
- start &= PGDIR_MASK;
- if (start < floor)
- return;
-@@ -449,6 +453,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);
@@ -87496,7 +87335,7 @@ index d176154..cd1b387 100644
}
/*
-@@ -1636,12 +1642,6 @@ no_page_table:
+@@ -1582,12 +1589,6 @@ no_page_table:
return page;
}
@@ -87509,8 +87348,8 @@ index d176154..cd1b387 100644
/**
* __get_user_pages() - pin user pages in memory
* @tsk: task_struct of target task
-@@ -1728,10 +1728,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
-
+@@ -1660,10 +1661,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+ (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
i = 0;
- do {
@@ -87522,7 +87361,7 @@ index d176154..cd1b387 100644
if (!vma && in_gate_area(mm, start)) {
unsigned long pg = start & PAGE_MASK;
pgd_t *pgd;
-@@ -1780,7 +1780,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1711,7 +1712,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
goto next_page;
}
@@ -87531,7 +87370,7 @@ index d176154..cd1b387 100644
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
return i ? : -EFAULT;
-@@ -1809,11 +1809,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1738,11 +1739,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
int ret;
unsigned int fault_flags = 0;
@@ -87543,16 +87382,16 @@ index d176154..cd1b387 100644
if (foll_flags & FOLL_WRITE)
fault_flags |= FAULT_FLAG_WRITE;
if (nonblocking)
-@@ -1893,7 +1888,7 @@ next_page:
- start += page_increm * PAGE_SIZE;
- nr_pages -= page_increm;
+@@ -1816,7 +1812,7 @@ next_page:
+ start += PAGE_SIZE;
+ nr_pages--;
} while (nr_pages && start < vma->vm_end);
- } while (nr_pages);
+ }
return i;
}
EXPORT_SYMBOL(__get_user_pages);
-@@ -2100,6 +2095,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
+@@ -2023,6 +2019,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));
@@ -87563,29 +87402,30 @@ index d176154..cd1b387 100644
retval = 0;
pte_unmap_unlock(pte, ptl);
return retval;
-@@ -2144,9 +2143,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)) {
+@@ -2057,10 +2057,22 @@ out:
+ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
+ struct page *page)
+ {
+
+#ifdef CONFIG_PAX_SEGMEXEC
-+ struct vm_area_struct *vma_m;
++ struct vm_area_struct *vma_m;
+#endif
+
- BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
- BUG_ON(vma->vm_flags & VM_PFNMAP);
- vma->vm_flags |= VM_MIXEDMAP;
+ if (addr < vma->vm_start || addr >= vma->vm_end)
+ return -EFAULT;
+ if (!page_count(page))
+ return -EINVAL;
+
+#ifdef CONFIG_PAX_SEGMEXEC
-+ vma_m = pax_find_mirror_vma(vma);
-+ if (vma_m)
-+ vma_m->vm_flags |= VM_MIXEDMAP;
++ vma_m = pax_find_mirror_vma(vma);
++ if (vma_m)
++ vma_m->vm_flags |= VM_INSERTPAGE;
+#endif
+
- }
+ vma->vm_flags |= VM_INSERTPAGE;
return insert_page(vma, addr, page, vma->vm_page_prot);
}
-@@ -2229,6 +2240,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
+@@ -2146,6 +2158,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
unsigned long pfn)
{
BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -87593,7 +87433,7 @@ index d176154..cd1b387 100644
if (addr < vma->vm_start || addr >= vma->vm_end)
return -EFAULT;
-@@ -2476,7 +2488,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
+@@ -2400,7 +2413,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
BUG_ON(pud_huge(*pud));
@@ -87604,7 +87444,7 @@ index d176154..cd1b387 100644
if (!pmd)
return -ENOMEM;
do {
-@@ -2496,7 +2510,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
+@@ -2420,7 +2435,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
unsigned long next;
int err;
@@ -87615,7 +87455,7 @@ index d176154..cd1b387 100644
if (!pud)
return -ENOMEM;
do {
-@@ -2584,6 +2600,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
+@@ -2508,6 +2525,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
copy_user_highpage(dst, src, va, vma);
}
@@ -87691,7 +87531,7 @@ index d176154..cd1b387 100644
+ page_add_anon_rmap(page_m, vma_m, address_m);
+ inc_mm_counter_fast(mm, MM_ANONPAGES);
+ set_pte_at(mm, address_m, pte_m, entry_m);
-+ update_mmu_cache(vma_m, address_m, pte_m);
++ update_mmu_cache(vma_m, address_m, entry_m);
+out:
+ if (ptl != ptl_m)
+ spin_unlock(ptl_m);
@@ -87730,7 +87570,7 @@ index d176154..cd1b387 100644
+ page_add_file_rmap(page_m);
+ inc_mm_counter_fast(mm, MM_FILEPAGES);
+ set_pte_at(mm, address_m, pte_m, entry_m);
-+ update_mmu_cache(vma_m, address_m, pte_m);
++ update_mmu_cache(vma_m, address_m, entry_m);
+out:
+ if (ptl != ptl_m)
+ spin_unlock(ptl_m);
@@ -87802,7 +87642,7 @@ index d176154..cd1b387 100644
/*
* 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
-@@ -2800,6 +2996,12 @@ gotten:
+@@ -2719,6 +2916,12 @@ gotten:
*/
page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
if (likely(pte_same(*page_table, orig_pte))) {
@@ -87815,7 +87655,7 @@ index d176154..cd1b387 100644
if (old_page) {
if (!PageAnon(old_page)) {
dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2851,6 +3053,10 @@ gotten:
+@@ -2770,6 +2973,10 @@ gotten:
page_remove_rmap(old_page);
}
@@ -87826,7 +87666,7 @@ index d176154..cd1b387 100644
/* Free the old page.. */
new_page = old_page;
ret |= VM_FAULT_WRITE;
-@@ -3128,6 +3334,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3049,6 +3256,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);
@@ -87836,9 +87676,9 @@ index d176154..cd1b387 100644
+#endif
+
unlock_page(page);
- if (page != swapcache) {
+ if (swapcache) {
/*
-@@ -3151,6 +3362,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3072,6 +3284,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);
@@ -87850,7 +87690,7 @@ index d176154..cd1b387 100644
unlock:
pte_unmap_unlock(page_table, ptl);
out:
-@@ -3170,40 +3386,6 @@ out_release:
+@@ -3091,40 +3308,6 @@ out_release:
}
/*
@@ -87891,7 +87731,7 @@ index d176154..cd1b387 100644
* 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.
-@@ -3212,27 +3394,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3133,27 +3316,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)
{
@@ -87924,7 +87764,7 @@ index d176154..cd1b387 100644
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -3256,6 +3434,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3172,6 +3351,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
if (!pte_none(*page_table))
goto release;
@@ -87936,7 +87776,7 @@ index d176154..cd1b387 100644
inc_mm_counter_fast(mm, MM_ANONPAGES);
page_add_new_anon_rmap(page, vma, address);
setpte:
-@@ -3263,6 +3446,12 @@ setpte:
+@@ -3179,6 +3363,12 @@ setpte:
/* No need to invalidate - it was non-present before */
update_mmu_cache(vma, address, page_table);
@@ -87949,7 +87789,7 @@ index d176154..cd1b387 100644
unlock:
pte_unmap_unlock(page_table, ptl);
return 0;
-@@ -3406,6 +3595,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3322,6 +3512,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))) {
@@ -87962,7 +87802,7 @@ index d176154..cd1b387 100644
flush_icache_page(vma, page);
entry = mk_pte(page, vma->vm_page_prot);
if (flags & FAULT_FLAG_WRITE)
-@@ -3427,6 +3622,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3341,6 +3537,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);
@@ -87977,7 +87817,7 @@ index d176154..cd1b387 100644
} else {
if (cow_page)
mem_cgroup_uncharge_page(cow_page);
-@@ -3737,6 +3940,12 @@ static int handle_pte_fault(struct mm_struct *mm,
+@@ -3494,6 +3698,12 @@ int handle_pte_fault(struct mm_struct *mm,
if (flags & FAULT_FLAG_WRITE)
flush_tlb_fix_spurious_fault(vma, address);
}
@@ -87990,7 +87830,7 @@ index d176154..cd1b387 100644
unlock:
pte_unmap_unlock(pte, ptl);
return 0;
-@@ -3753,9 +3962,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3510,6 +3720,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
pmd_t *pmd;
pte_t *pte;
@@ -87998,6 +87838,10 @@ index d176154..cd1b387 100644
+ struct vm_area_struct *vma_m;
+#endif
+
+ __set_current_state(TASK_RUNNING);
+
+ count_vm_event(PGFAULT);
+@@ -3521,6 +3735,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);
@@ -88032,7 +87876,16 @@ index d176154..cd1b387 100644
retry:
pgd = pgd_offset(mm, address);
pud = pud_alloc(mm, pgd, address);
-@@ -3894,6 +4135,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
+@@ -3562,7 +3804,7 @@ retry:
+ * run pte_offset_map on the pmd, if an huge pmd could
+ * materialize from under us from a different thread.
+ */
+- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
++ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
+ return VM_FAULT_OOM;
+ /* if an huge pmd materialized from under us just retry later */
+ if (unlikely(pmd_trans_huge(*pmd)))
+@@ -3599,6 +3841,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
spin_unlock(&mm->page_table_lock);
return 0;
}
@@ -88056,7 +87909,7 @@ index d176154..cd1b387 100644
#endif /* __PAGETABLE_PUD_FOLDED */
#ifndef __PAGETABLE_PMD_FOLDED
-@@ -3924,6 +4182,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
+@@ -3629,11 +3888,35 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
spin_unlock(&mm->page_table_lock);
return 0;
}
@@ -88086,17 +87939,24 @@ index d176154..cd1b387 100644
+}
#endif /* __PAGETABLE_PMD_FOLDED */
- #if !defined(__HAVE_ARCH_GATE_AREA)
-@@ -3937,7 +4219,7 @@ static int __init gate_vma_init(void)
+-int make_pages_present(unsigned long addr, unsigned long end)
++ssize_t make_pages_present(unsigned long addr, unsigned long end)
+ {
+- int ret, len, write;
++ ssize_t ret, len, write;
+ struct vm_area_struct * vma;
+
+ vma = find_vma(current->mm, addr);
+@@ -3666,7 +3949,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;
- gate_vma.vm_page_prot = __P101;
+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
-
- return 0;
- }
-@@ -4071,8 +4353,8 @@ out:
+ /*
+ * Make sure the vDSO gets into every core dump.
+ * Dumping its contents makes post-mortem fully interpretable later
+@@ -3806,8 +4089,8 @@ out:
return ret;
}
@@ -88107,7 +87967,7 @@ index d176154..cd1b387 100644
{
resource_size_t phys_addr;
unsigned long prot = 0;
-@@ -4098,8 +4380,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
+@@ -3832,8 +4115,8 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
* Access another process' address space as given in mm. If non-NULL, use the
* given task for page fault accounting.
*/
@@ -88118,7 +87978,7 @@ index d176154..cd1b387 100644
{
struct vm_area_struct *vma;
void *old_buf = buf;
-@@ -4107,7 +4389,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -3841,7 +4124,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
down_read(&mm->mmap_sem);
/* ignore errors, just check how much was successfully transferred */
while (len) {
@@ -88127,7 +87987,7 @@ index d176154..cd1b387 100644
void *maddr;
struct page *page = NULL;
-@@ -4166,8 +4448,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -3900,8 +4183,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
*
* The caller must hold a reference on @mm.
*/
@@ -88138,7 +87998,7 @@ index d176154..cd1b387 100644
{
return __access_remote_vm(NULL, mm, addr, buf, len, write);
}
-@@ -4177,11 +4459,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+@@ -3911,11 +4194,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
* Source/target buffer must be kernel space,
* Do not walk the page table directly, use get_user_pages
*/
@@ -88154,10 +88014,10 @@ index d176154..cd1b387 100644
mm = get_task_mm(tsk);
if (!mm)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
-index 0472964..7d5a0ea 100644
+index 4d1e637..9e0a005 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
-@@ -746,6 +746,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -655,6 +655,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
unsigned long vmstart;
unsigned long vmend;
@@ -88165,10 +88025,10 @@ index 0472964..7d5a0ea 100644
+ struct vm_area_struct *vma_m;
+#endif
+
- vma = find_vma(mm, start);
+ vma = find_vma_prev(mm, start, &prev);
if (!vma || vma->vm_start > start)
return -EFAULT;
-@@ -789,6 +793,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -693,6 +697,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
err = vma_replace_policy(vma, new_pol);
if (err)
goto out;
@@ -88185,7 +88045,7 @@ index 0472964..7d5a0ea 100644
}
out:
-@@ -1252,6 +1266,17 @@ static long do_mbind(unsigned long start, unsigned long len,
+@@ -1126,6 +1140,17 @@ static long do_mbind(unsigned long start, unsigned long len,
if (end < start)
return -EINVAL;
@@ -88203,59 +88063,73 @@ index 0472964..7d5a0ea 100644
if (end == start)
return 0;
-@@ -1480,8 +1505,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
- */
+@@ -1344,6 +1369,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+ if (!mm)
+ goto out;
+
++#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
++ if (mm != current->mm &&
++ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
++ err = -EPERM;
++ goto out;
++ }
++#endif
++
+ /*
+ * Check if this process has the right to modify the specified
+ * process. The right exists if the process has administrative
+@@ -1353,8 +1386,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+ rcu_read_lock();
tcred = __task_cred(task);
- if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
-- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
+ if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
+- cred->uid != tcred->suid && cred->uid != tcred->uid &&
- !capable(CAP_SYS_NICE)) {
-+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
++ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
rcu_read_unlock();
err = -EPERM;
- goto out_put;
-@@ -1512,6 +1536,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
goto out;
- }
+diff --git a/mm/migrate.c b/mm/migrate.c
+index 09d6a9d..c514c22 100644
+--- a/mm/migrate.c
++++ b/mm/migrate.c
+@@ -1389,6 +1389,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
+ if (!mm)
+ return -EINVAL;
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ if (mm != current->mm &&
+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
-+ mmput(mm);
+ err = -EPERM;
+ goto out;
+ }
+#endif
+
- err = do_migrate_pages(mm, old, new,
- capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
-
-diff --git a/mm/migrate.c b/mm/migrate.c
-index c046927..6996b40 100644
---- a/mm/migrate.c
-+++ b/mm/migrate.c
-@@ -1404,8 +1404,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
- */
+ /*
+ * Check if this process has the right to modify the specified
+ * process. The right exists if the process has administrative
+@@ -1398,8 +1406,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
+ rcu_read_lock();
tcred = __task_cred(task);
- if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
-- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
+ if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
+- cred->uid != tcred->suid && cred->uid != tcred->uid &&
- !capable(CAP_SYS_NICE)) {
-+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
++ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
rcu_read_unlock();
err = -EPERM;
goto out;
diff --git a/mm/mlock.c b/mm/mlock.c
-index d480cd6..0f98458 100644
+index 4f4f53b..dbc8aec 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
-@@ -14,6 +14,7 @@
- #include <linux/pagevec.h>
+@@ -13,6 +13,7 @@
+ #include <linux/pagemap.h>
#include <linux/mempolicy.h>
#include <linux/syscalls.h>
+#include <linux/security.h>
#include <linux/sched.h>
#include <linux/export.h>
#include <linux/rmap.h>
-@@ -568,7 +569,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -376,7 +377,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
{
unsigned long nstart, end, tmp;
struct vm_area_struct * vma, * prev;
@@ -88264,17 +88138,17 @@ index d480cd6..0f98458 100644
VM_BUG_ON(start & ~PAGE_MASK);
VM_BUG_ON(len != PAGE_ALIGN(len));
-@@ -577,6 +578,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
return -EINVAL;
if (end == start)
return 0;
+ if (end > TASK_SIZE)
+ return -EINVAL;
+
- vma = find_vma(current->mm, start);
+ vma = find_vma_prev(current->mm, start, &prev);
if (!vma || vma->vm_start > start)
return -ENOMEM;
-@@ -588,6 +592,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -395,6 +399,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
for (nstart = start ; ; ) {
vm_flags_t newflags;
@@ -88285,8 +88159,8 @@ index d480cd6..0f98458 100644
+
/* Here we know that vma->vm_start <= nstart < vma->vm_end. */
- newflags = vma->vm_flags & ~VM_LOCKED;
-@@ -700,6 +709,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
+ newflags = vma->vm_flags | VM_LOCKED;
+@@ -500,6 +509,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
lock_limit >>= PAGE_SHIFT;
/* check against resource limits */
@@ -88294,7 +88168,21 @@ index d480cd6..0f98458 100644
if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
error = do_mlock(start, len, 1);
up_write(¤t->mm->mmap_sem);
-@@ -734,6 +744,11 @@ static int do_mlockall(int flags)
+@@ -523,23 +533,29 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
+ static int do_mlockall(int flags)
+ {
+ struct vm_area_struct * vma, * prev = NULL;
+- unsigned int def_flags = 0;
+
+ if (flags & MCL_FUTURE)
+- def_flags = VM_LOCKED;
+- current->mm->def_flags = def_flags;
++ current->mm->def_flags |= VM_LOCKED;
++ else
++ current->mm->def_flags &= ~VM_LOCKED;
+ if (flags == MCL_FUTURE)
+ goto out;
+
for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
vm_flags_t newflags;
@@ -88303,10 +88191,17 @@ index d480cd6..0f98458 100644
+ break;
+#endif
+
- newflags = vma->vm_flags & ~VM_LOCKED;
- if (flags & MCL_CURRENT)
- newflags |= VM_LOCKED;
-@@ -767,6 +782,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+ newflags = vma->vm_flags | VM_LOCKED;
+ if (!(flags & MCL_CURRENT))
+ newflags &= ~VM_LOCKED;
+
+ /* Ignore errors */
+ mlock_fixup(vma, &prev, vma->vm_start, vma->vm_end, newflags);
++ cond_resched();
+ }
+ out:
+ return 0;
+@@ -566,6 +582,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
lock_limit >>= PAGE_SHIFT;
ret = -ENOMEM;
@@ -88314,19 +88209,41 @@ index d480cd6..0f98458 100644
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
+diff --git a/mm/mm_init.c b/mm/mm_init.c
+index 1ffd97a..240aa20 100644
+--- a/mm/mm_init.c
++++ b/mm/mm_init.c
+@@ -11,6 +11,17 @@
+ #include <linux/export.h>
+ #include "internal.h"
+
++#ifdef CONFIG_PAX_MEMORY_SANITIZE
++bool pax_sanitize_slab __read_only = true;
++static int __init pax_sanitize_slab_setup(char *str)
++{
++ pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
++ printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
++ return 1;
++}
++__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
++#endif
++
+ #ifdef CONFIG_DEBUG_MEMORY_INIT
+ int mminit_loglevel;
+
diff --git a/mm/mmap.c b/mm/mmap.c
-index 9d54851..e8c6035 100644
+index dff37a6..49e182f 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -36,6 +36,7 @@
- #include <linux/sched/sysctl.h>
- #include <linux/notifier.h>
- #include <linux/memory.h>
+@@ -30,6 +30,7 @@
+ #include <linux/perf_event.h>
+ #include <linux/audit.h>
+ #include <linux/khugepaged.h>
+#include <linux/random.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-@@ -52,6 +53,16 @@
+@@ -46,6 +47,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -88343,7 +88260,7 @@ index 9d54851..e8c6035 100644
static void unmap_region(struct mm_struct *mm,
struct vm_area_struct *vma, struct vm_area_struct *prev,
unsigned long start, unsigned long end);
-@@ -71,16 +82,25 @@ static void unmap_region(struct mm_struct *mm,
+@@ -71,22 +82,32 @@ static void unmap_region(struct mm_struct *mm,
* x: (no) no x: (no) yes x: (no) yes x: (yes) yes
*
*/
@@ -88372,23 +88289,22 @@ index 9d54851..e8c6035 100644
}
EXPORT_SYMBOL(vm_get_page_prot);
-@@ -89,6 +109,7 @@ int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
+ int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
+ int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
- unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
- unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
/*
* Make sure vm_committed_as in one cacheline and not cacheline shared with
* other variables. It can be updated by several CPUs frequently.
-@@ -247,6 +268,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -228,6 +249,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)
-@@ -291,6 +313,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+ if (vma->vm_file) {
+@@ -272,6 +294,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
* not page aligned -Ram Gupta
*/
rlim = rlimit(RLIMIT_DATA);
@@ -88396,7 +88312,7 @@ index 9d54851..e8c6035 100644
if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
(mm->end_data - mm->start_data) > rlim)
goto out;
-@@ -933,6 +956,12 @@ static int
+@@ -689,6 +712,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)
{
@@ -88409,7 +88325,7 @@ index 9d54851..e8c6035 100644
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
if (vma->vm_pgoff == vm_pgoff)
-@@ -952,6 +981,12 @@ static int
+@@ -708,6 +737,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)
{
@@ -88422,7 +88338,7 @@ index 9d54851..e8c6035 100644
if (is_mergeable_vma(vma, file, vm_flags) &&
is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
pgoff_t vm_pglen;
-@@ -994,13 +1029,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
+@@ -750,13 +785,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,
@@ -88444,7 +88360,7 @@ index 9d54851..e8c6035 100644
/*
* We later require that vma->vm_flags == vm_flags,
* so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -1016,6 +1058,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -772,6 +814,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;
@@ -88460,7 +88376,7 @@ index 9d54851..e8c6035 100644
/*
* Can it merge with the predecessor?
*/
-@@ -1035,9 +1086,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -791,9 +842,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);
@@ -88486,7 +88402,7 @@ index 9d54851..e8c6035 100644
if (err)
return NULL;
khugepaged_enter_vma_merge(prev);
-@@ -1051,12 +1117,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -807,12 +873,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)) {
@@ -88516,7 +88432,7 @@ index 9d54851..e8c6035 100644
if (err)
return NULL;
khugepaged_enter_vma_merge(area);
-@@ -1165,8 +1246,10 @@ none:
+@@ -921,15 +1002,22 @@ none:
void vm_stat_account(struct mm_struct *mm, unsigned long flags,
struct file *file, long pages)
{
@@ -88526,19 +88442,23 @@ index 9d54851..e8c6035 100644
+#ifdef CONFIG_PAX_RANDMMAP
+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
+#endif
++
++ mm->total_vm += pages;
- mm->total_vm += pages;
-
-@@ -1174,7 +1257,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
+ if (file) {
mm->shared_vm += pages;
if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
mm->exec_vm += pages;
- } else if (flags & stack_flags)
+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
mm->stack_vm += pages;
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
++#endif
+ if (flags & (VM_RESERVED|VM_IO))
+ mm->reserved_vm += pages;
}
- #endif /* CONFIG_PROC_FS */
-@@ -1212,7 +1295,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -955,7 +1043,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.)
*/
@@ -88547,7 +88467,7 @@ index 9d54851..e8c6035 100644
if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
prot |= PROT_EXEC;
-@@ -1238,7 +1321,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -981,7 +1069,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.
*/
@@ -88556,7 +88476,7 @@ index 9d54851..e8c6035 100644
if (addr & ~PAGE_MASK)
return addr;
-@@ -1249,6 +1332,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -992,6 +1080,43 @@ 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;
@@ -88600,7 +88520,7 @@ index 9d54851..e8c6035 100644
if (flags & MAP_LOCKED)
if (!can_do_mlock())
return -EPERM;
-@@ -1260,6 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1003,6 +1128,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;
@@ -88608,17 +88528,17 @@ index 9d54851..e8c6035 100644
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
}
-@@ -1344,6 +1465,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
- vm_flags |= VM_NORESERVE;
- }
+@@ -1073,6 +1199,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+ if (error)
+ return error;
+ if (!gr_acl_handle_mmap(file, prot))
+ return -EACCES;
-+
- addr = mmap_region(file, addr, len, vm_flags, pgoff);
- if (!IS_ERR_VALUE(addr) &&
- ((vm_flags & VM_LOCKED) ||
-@@ -1437,7 +1561,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
++
+ return mmap_region(file, addr, len, flags, vm_flags, pgoff);
+ }
+ EXPORT_SYMBOL(do_mmap_pgoff);
+@@ -1153,7 +1282,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 */
@@ -88627,9 +88547,9 @@ index 9d54851..e8c6035 100644
return 0;
/* The backer wishes to know when pages are first written to? */
-@@ -1483,7 +1607,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
- struct rb_node **rb_link, *rb_parent;
+@@ -1202,17 +1331,32 @@ 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;
+#ifdef CONFIG_PAX_SEGMEXEC
+ struct vm_area_struct *vma_m = NULL;
@@ -88641,29 +88561,28 @@ index 9d54851..e8c6035 100644
+ */
+ verify_mm_writelocked(mm);
+
- /* Check against address space limit. */
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
-+#endif
-+
- if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
- unsigned long nr_pages;
-
-@@ -1502,11 +1641,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
-
/* Clear old maps */
error = -ENOMEM;
-munmap_back:
- if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
+ if (vma && vma->vm_start < addr + len) {
if (do_munmap(mm, addr, len))
return -ENOMEM;
- goto munmap_back;
-+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
++ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
++ BUG_ON(vma && vma->vm_start < addr + len);
}
- /*
-@@ -1537,6 +1675,16 @@ munmap_back:
+ /* Check against address space limit. */
++
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
++#endif
++
+ if (!may_expand_vm(mm, len >> PAGE_SHIFT))
+ return -ENOMEM;
+
+@@ -1258,6 +1402,16 @@ munmap_back:
goto unacct_error;
}
@@ -88680,10 +88599,27 @@ index 9d54851..e8c6035 100644
vma->vm_mm = mm;
vma->vm_start = addr;
vma->vm_end = addr + len;
-@@ -1556,6 +1704,13 @@ munmap_back:
+@@ -1266,8 +1420,9 @@ munmap_back:
+ vma->vm_pgoff = pgoff;
+ INIT_LIST_HEAD(&vma->anon_vma_chain);
+
++ error = -EINVAL; /* when rejecting VM_GROWSDOWN|VM_GROWSUP */
++
+ if (file) {
+- error = -EINVAL;
+ if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
+ goto free_vma;
+ if (vm_flags & VM_DENYWRITE) {
+@@ -1281,6 +1436,19 @@ munmap_back:
+ error = file->f_op->mmap(file, vma);
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;
@@ -88691,31 +88627,40 @@ index 9d54851..e8c6035 100644
+ }
+#endif
+
- /* Can addr have changed??
- *
- * Answer: Yes, several device drivers can do it in their
-@@ -1589,6 +1744,12 @@ munmap_back:
- }
+ if (vm_flags & VM_EXECUTABLE)
+ added_exe_file_vma(mm);
+@@ -1293,6 +1461,8 @@ munmap_back:
+ pgoff = vma->vm_pgoff;
+ vm_flags = vma->vm_flags;
+ } else if (vm_flags & VM_SHARED) {
++ if (unlikely(vm_flags & (VM_GROWSDOWN|VM_GROWSUP)))
++ goto free_vma;
+ error = shmem_zero_setup(vma);
+ if (error)
+ goto free_vma;
+@@ -1316,14 +1486,19 @@ munmap_back:
vma_link(mm, vma, prev, rb_link, rb_parent);
-+
+ file = vma->vm_file;
+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (vma_m)
+ BUG_ON(pax_mirror_vma(vma_m, vma));
+#endif
+
/* Once vma denies write, undo our temporary denial count */
- if (vm_flags & VM_DENYWRITE)
- allow_write_access(file);
-@@ -1597,6 +1758,7 @@ out:
+ if (correct_wcount)
+ atomic_inc(&inode->i_writecount);
+ out:
perf_event_mmap(vma);
+- mm->total_vm += len >> PAGE_SHIFT;
vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
+ track_exec_limit(mm, addr, addr + len, vm_flags);
if (vm_flags & VM_LOCKED) {
- if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
- vma == get_gate_vma(current->mm)))
-@@ -1629,6 +1791,12 @@ unmap_and_free_vma:
+ if (!mlock_vma_pages_range(vma, addr, addr + len))
+ mm->locked_vm += (len >> PAGE_SHIFT);
+@@ -1341,6 +1516,12 @@ unmap_and_free_vma:
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
charged = 0;
free_vma:
@@ -88728,27 +88673,26 @@ index 9d54851..e8c6035 100644
kmem_cache_free(vm_area_cachep, vma);
unacct_error:
if (charged)
-@@ -1636,7 +1804,63 @@ unacct_error:
+@@ -1348,6 +1529,73 @@ unacct_error:
return error;
}
--unsigned long unmapped_area(struct vm_unmapped_area_info *info)
+#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 ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
++ return ((random32() & 0xFF) + 1) << 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)
++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
-+ if (addr > sysctl_heap_stack_gap)
-+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
++ if (*addr > sysctl_heap_stack_gap)
++ vma = find_vma(current->mm, *addr - sysctl_heap_stack_gap);
+ else
+ vma = find_vma(current->mm, 0);
+ if (vma && (vma->vm_flags & VM_GROWSUP))
@@ -88757,17 +88701,28 @@ index 9d54851..e8c6035 100644
+ return true;
+ }
+
-+ if (addr + len > vma->vm_start)
++ if (*addr + len > vma->vm_start)
+ return false;
+
-+ if (vma->vm_flags & VM_GROWSDOWN)
-+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
++ if (offset) {
++ if (vma->vm_prev && *addr == vma->vm_prev->vm_end && (vma->vm_start - len - vma->vm_prev->vm_end >= offset)) {
++ *addr = vma->vm_prev->vm_end + offset;
++ return true;
++ }
++ return offset <= vma->vm_start - *addr - len;
++ } else if (vma->vm_flags & VM_GROWSDOWN)
++ return sysctl_heap_stack_gap <= vma->vm_start - *addr - len;
+#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;
++ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
++ if (*addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap)
++ return true;
++ if (vma->vm_start - len - vma->vm_prev->vm_end >= sysctl_heap_stack_gap) {
++ *addr = vma->vm_start - len;
++ return true;
++ }
++ return false;
++ }
+#endif
-+ else if (offset)
-+ return offset <= vma->vm_start - addr - len;
+
+ return true;
+}
@@ -88789,84 +88744,18 @@ index 9d54851..e8c6035 100644
+ return -ENOMEM;
+}
+
-+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
- {
- /*
- * We implement the search by looking for an rbtree node that
-@@ -1684,11 +1908,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
- }
- }
-
-- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
-+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
- check_current:
- /* Check if current node has a suitable gap */
- if (gap_start > high_limit)
- return -ENOMEM;
-+
-+ if (gap_end - gap_start > info->threadstack_offset)
-+ gap_start += info->threadstack_offset;
-+ else
-+ gap_start = gap_end;
-+
-+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
-+ if (gap_end - gap_start > sysctl_heap_stack_gap)
-+ gap_start += sysctl_heap_stack_gap;
-+ else
-+ gap_start = gap_end;
-+ }
-+ if (vma->vm_flags & VM_GROWSDOWN) {
-+ if (gap_end - gap_start > sysctl_heap_stack_gap)
-+ gap_end -= sysctl_heap_stack_gap;
-+ else
-+ gap_end = gap_start;
-+ }
- if (gap_end >= low_limit && gap_end - gap_start >= length)
- goto found;
-
-@@ -1738,7 +1980,7 @@ found:
- return gap_start;
- }
-
--unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
-+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
- {
- struct mm_struct *mm = current->mm;
- struct vm_area_struct *vma;
-@@ -1792,6 +2034,24 @@ check_current:
- gap_end = vma->vm_start;
- if (gap_end < low_limit)
- return -ENOMEM;
-+
-+ if (gap_end - gap_start > info->threadstack_offset)
-+ gap_end -= info->threadstack_offset;
-+ else
-+ gap_end = gap_start;
-+
-+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
-+ if (gap_end - gap_start > sysctl_heap_stack_gap)
-+ gap_start += sysctl_heap_stack_gap;
-+ else
-+ gap_start = gap_end;
-+ }
-+ if (vma->vm_flags & VM_GROWSDOWN) {
-+ if (gap_end - gap_start > sysctl_heap_stack_gap)
-+ gap_end -= sysctl_heap_stack_gap;
-+ else
-+ gap_end = gap_start;
-+ }
- if (gap_start <= high_limit && gap_end - gap_start >= length)
- goto found;
-
-@@ -1855,6 +2115,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ /* Get an address range which is currently unmapped.
+ * For shmat() with addr=0.
+ *
+@@ -1367,6 +1615,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
- struct vm_unmapped_area_info info;
+ unsigned long start_addr;
+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
if (len > TASK_SIZE)
return -ENOMEM;
-@@ -1862,19 +2123,29 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1374,18 +1623,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
if (flags & MAP_FIXED)
return addr;
@@ -88876,37 +88765,90 @@ index 9d54851..e8c6035 100644
+
if (addr) {
addr = PAGE_ALIGN(addr);
- vma = find_vma(mm, 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;
+- return addr;
++ if (TASK_SIZE - len >= addr) {
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, &addr, len, offset))
++ return addr;
++ }
+ }
+ if (len > mm->cached_hole_size) {
+- start_addr = addr = mm->free_area_cache;
++ start_addr = addr = mm->free_area_cache;
+ } else {
+- start_addr = addr = TASK_UNMAPPED_BASE;
+- mm->cached_hole_size = 0;
++ start_addr = addr = mm->mmap_base;
++ mm->cached_hole_size = 0;
}
- info.flags = 0;
- info.length = len;
- info.low_limit = TASK_UNMAPPED_BASE;
-+
-+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap;
-+#endif
+ full_search:
+@@ -1396,34 +1650,40 @@ full_search:
+ * Start a new search - just in case we missed
+ * some holes.
+ */
+- if (start_addr != TASK_UNMAPPED_BASE) {
+- addr = TASK_UNMAPPED_BASE;
+- start_addr = addr;
++ if (start_addr != mm->mmap_base) {
++ start_addr = addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
+ goto full_search;
+ }
+ return -ENOMEM;
+ }
+- if (!vma || addr + len <= vma->vm_start) {
+- /*
+- * Remember the place where we stopped the search:
+- */
+- mm->free_area_cache = addr + len;
+- return addr;
+- }
++ 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;
+ addr = vma->vm_end;
+ }
+
- info.high_limit = TASK_SIZE;
- info.align_mask = 0;
-+ info.threadstack_offset = offset;
- return vm_unmapped_area(&info);
++ /*
++ * Remember the place where we stopped the search:
++ */
++ mm->free_area_cache = addr + len;
++ return addr;
}
#endif
-@@ -1893,6 +2164,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+
+ void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
+ {
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
++ return;
++#endif
++
+ /*
+ * Is this a new hole at the lowest possible address?
+ */
+- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
++ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
+ mm->free_area_cache = addr;
+ mm->cached_hole_size = ~0UL;
+ }
+@@ -1441,7 +1701,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;
- struct vm_unmapped_area_info info;
+- unsigned long addr = addr0;
++ unsigned long base = mm->mmap_base, addr = addr0;
+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
/* requested length too big for entire address space */
if (len > TASK_SIZE)
-@@ -1901,12 +2173,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1450,13 +1711,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
if (flags & MAP_FIXED)
return addr;
@@ -88917,43 +88859,159 @@ index 9d54851..e8c6035 100644
/* requesting a specific address */
if (addr) {
addr = PAGE_ALIGN(addr);
- vma = find_vma(mm, 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;
+- return addr;
++ if (TASK_SIZE - len >= addr) {
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, &addr, len, offset))
++ return addr;
++ }
}
-@@ -1915,6 +2190,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- info.low_limit = PAGE_SIZE;
- info.high_limit = mm->mmap_base;
- info.align_mask = 0;
-+ info.threadstack_offset = offset;
- addr = vm_unmapped_area(&info);
+ /* check if free_area_cache is useful for us */
+@@ -1470,10 +1736,11 @@ 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)
++ addr -= len;
++ vma = find_vma(mm, addr);
++ if (check_heap_stack_gap(vma, &addr, len, offset))
+ /* remember the address as a hint for next time */
+- return (mm->free_area_cache = addr-len);
++ return (mm->free_area_cache = addr);
+ }
+
+ if (mm->mmap_base < len)
+@@ -1488,7 +1755,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+ * 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);
+@@ -1497,8 +1764,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;
+- } while (len < vma->vm_start);
++ addr = skip_heap_stack_gap(vma, len, offset);
++ } while (!IS_ERR_VALUE(addr));
+
+ bottomup:
/*
-@@ -1927,6 +2203,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- VM_BUG_ON(addr != -ENOMEM);
- info.flags = 0;
- info.low_limit = TASK_UNMAPPED_BASE;
+@@ -1507,13 +1774,21 @@ bottomup:
+ * can happen with large stack limits and large mmap()
+ * allocations.
+ */
++ mm->mmap_base = TASK_UNMAPPED_BASE;
+
+#ifdef CONFIG_PAX_RANDMMAP
-+ if (mm->pax_flags & MF_PAX_RANDMMAP)
-+ info.low_limit += mm->delta_mmap;
++ if (mm->pax_flags & MF_PAX_RANDMMAP)
++ mm->mmap_base += mm->delta_mmap;
+#endif
+
- info.high_limit = TASK_SIZE;
- addr = vm_unmapped_area(&info);
- }
-@@ -2028,6 +2310,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
- return vma;
++ mm->free_area_cache = mm->mmap_base;
+ mm->cached_hole_size = ~0UL;
+- mm->free_area_cache = TASK_UNMAPPED_BASE;
+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
+ /*
+ * Restore the topdown base:
+ */
+- mm->free_area_cache = mm->mmap_base;
++ mm->mmap_base = base;
++ mm->free_area_cache = base;
+ mm->cached_hole_size = ~0UL;
+
+ return addr;
+@@ -1522,6 +1797,12 @@ bottomup:
+
+ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+ {
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
++ return;
++#endif
++
+ /*
+ * Is this a new hole at the highest possible address?
+ */
+@@ -1529,8 +1810,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+ mm->free_area_cache = addr;
+
+ /* dont allow allocations above current base */
+- if (mm->free_area_cache > mm->mmap_base)
++ if (mm->free_area_cache > mm->mmap_base) {
+ mm->free_area_cache = mm->mmap_base;
++ mm->cached_hole_size = ~0UL;
++ }
}
+ unsigned long
+@@ -1603,40 +1886,50 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+
+ EXPORT_SYMBOL(find_vma);
+
+-/* Same as find_vma, but also return a pointer to the previous VMA in *pprev. */
++/*
++ * Same as find_vma, but also return a pointer to the previous VMA in *pprev.
++ */
+ struct vm_area_struct *
+ find_vma_prev(struct mm_struct *mm, unsigned long addr,
+ struct vm_area_struct **pprev)
+ {
+- struct vm_area_struct *vma = NULL, *prev = NULL;
+- struct rb_node *rb_node;
+- if (!mm)
+- goto out;
+-
+- /* Guard against addr being lower than the first VMA */
+- vma = mm->mmap;
+-
+- /* Go through the RB tree quickly. */
+- rb_node = mm->mm_rb.rb_node;
+-
+- while (rb_node) {
+- struct vm_area_struct *vma_tmp;
+- vma_tmp = rb_entry(rb_node, struct vm_area_struct, vm_rb);
+-
+- if (addr < vma_tmp->vm_end) {
+- rb_node = rb_node->rb_left;
+- } else {
+- prev = vma_tmp;
+- if (!prev->vm_next || (addr < prev->vm_next->vm_end))
+- break;
++ struct vm_area_struct *vma;
++
++ vma = find_vma(mm, addr);
++ if (vma) {
++ *pprev = vma->vm_prev;
++ } else {
++ struct rb_node *rb_node = mm->mm_rb.rb_node;
++ *pprev = NULL;
++ while (rb_node) {
++ *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
+ rb_node = rb_node->rb_right;
+ }
+ }
++ return vma;
++}
++
+#ifdef CONFIG_PAX_SEGMEXEC
+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
+{
+ struct vm_area_struct *vma_m;
-+
+
+-out:
+- *pprev = prev;
+- return prev ? prev->vm_next : vma;
+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
+ BUG_ON(vma->vm_mirror);
@@ -88966,15 +89024,14 @@ index 9d54851..e8c6035 100644
+ 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));
++ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
+ return vma_m;
-+}
+ }
+#endif
-+
+
/*
* Verify that the stack growth is acceptable and
- * update accounting. This is shared with both the
-@@ -2044,6 +2348,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1654,6 +1947,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
return -ENOMEM;
/* Stack limit test */
@@ -88982,7 +89039,7 @@ index 9d54851..e8c6035 100644
if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
return -ENOMEM;
-@@ -2054,6 +2359,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1664,6 +1958,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;
@@ -88990,7 +89047,15 @@ index 9d54851..e8c6035 100644
if (locked > limit && !capable(CAP_IPC_LOCK))
return -ENOMEM;
}
-@@ -2083,37 +2389,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1682,7 +1977,6 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+ return -ENOMEM;
+
+ /* Ok, everything looks good - let it rip */
+- mm->total_vm += grow;
+ if (vma->vm_flags & VM_LOCKED)
+ mm->locked_vm += grow;
+ vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);
+@@ -1694,37 +1988,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.
*/
@@ -89048,7 +89113,7 @@ index 9d54851..e8c6035 100644
unsigned long size, grow;
size = address - vma->vm_start;
-@@ -2148,6 +2465,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
+@@ -1739,6 +2044,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
}
}
}
@@ -89056,8 +89121,8 @@ index 9d54851..e8c6035 100644
+ vma_unlock_anon_vma(vma->vm_next);
vma_unlock_anon_vma(vma);
khugepaged_enter_vma_merge(vma);
- validate_mm(vma->vm_mm);
-@@ -2162,6 +2481,8 @@ int expand_downwards(struct vm_area_struct *vma,
+ return error;
+@@ -1752,6 +2059,8 @@ int expand_downwards(struct vm_area_struct *vma,
unsigned long address)
{
int error;
@@ -89066,7 +89131,7 @@ index 9d54851..e8c6035 100644
/*
* We must make sure the anon_vma is allocated
-@@ -2175,6 +2496,15 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -1765,6 +2074,15 @@ int expand_downwards(struct vm_area_struct *vma,
if (error)
return error;
@@ -89082,7 +89147,7 @@ index 9d54851..e8c6035 100644
vma_lock_anon_vma(vma);
/*
-@@ -2184,9 +2514,17 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -1774,9 +2092,17 @@ int expand_downwards(struct vm_area_struct *vma,
*/
/* Somebody else might have raced and expanded it already */
@@ -89101,24 +89166,19 @@ index 9d54851..e8c6035 100644
size = vma->vm_end - address;
grow = (vma->vm_start - address) >> PAGE_SHIFT;
-@@ -2211,13 +2549,27 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -1786,18 +2112,48 @@ int expand_downwards(struct vm_area_struct *vma,
+ if (!error) {
+ vma->vm_start = address;
vma->vm_pgoff -= grow;
- anon_vma_interval_tree_post_update_vma(vma);
- vma_gap_update(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);
-+ vma_gap_update(vma_m);
+ }
+#endif
+
- spin_unlock(&vma->vm_mm->page_table_lock);
-
-+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
perf_event_mmap(vma);
}
}
@@ -89127,12 +89187,54 @@ index 9d54851..e8c6035 100644
+ if (lockprev)
+ vma_unlock_anon_vma(prev);
khugepaged_enter_vma_merge(vma);
- validate_mm(vma->vm_mm);
return error;
-@@ -2315,6 +2667,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
+ }
+
++/*
++ * Note how expand_stack() refuses to expand the stack all the way to
++ * abut the next virtual mapping, *unless* that mapping itself is also
++ * a stack mapping. We want to leave room for a guard page, after all
++ * (the guard page itself is not added here, that is done by the
++ * actual page faulting logic)
++ *
++ * This matches the behavior of the guard page logic (see mm/memory.c:
++ * check_stack_guard_page()), which only allows the guard page to be
++ * removed under these circumstances.
++ */
+ #ifdef CONFIG_STACK_GROWSUP
+ int expand_stack(struct vm_area_struct *vma, unsigned long address)
+ {
++ struct vm_area_struct *next;
++
++ address &= PAGE_MASK;
++ next = vma->vm_next;
++ if (next && next->vm_start == address + PAGE_SIZE) {
++ if (!(next->vm_flags & VM_GROWSUP))
++ return -ENOMEM;
++ }
+ return expand_upwards(vma, address);
+ }
+
+@@ -1820,6 +2176,14 @@ find_extend_vma(struct mm_struct *mm, unsigned long addr)
+ #else
+ int expand_stack(struct vm_area_struct *vma, unsigned long address)
+ {
++ struct vm_area_struct *prev;
++
++ address &= PAGE_MASK;
++ prev = vma->vm_prev;
++ if (prev && prev->vm_end == address) {
++ if (!(prev->vm_flags & VM_GROWSDOWN))
++ return -ENOMEM;
++ }
+ return expand_downwards(vma, address);
+ }
+
+@@ -1860,7 +2224,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
do {
long nrpages = vma_pages(vma);
+- mm->total_vm -= nrpages;
+#ifdef CONFIG_PAX_SEGMEXEC
+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
+ vma = remove_vma(vma);
@@ -89140,10 +89242,10 @@ index 9d54851..e8c6035 100644
+ }
+#endif
+
- if (vma->vm_flags & VM_ACCOUNT)
- nr_accounted += nrpages;
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
-@@ -2359,6 +2718,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
+ vma = remove_vma(vma);
+ } while (vma);
+@@ -1905,6 +2275,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 {
@@ -89157,10 +89259,10 @@ index 9d54851..e8c6035 100644
+ }
+#endif
+
- vma_rb_erase(vma, &mm->mm_rb);
+ rb_erase(&vma->vm_rb, &mm->mm_rb);
mm->map_count--;
tail_vma = vma;
-@@ -2384,14 +2753,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1933,14 +2313,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
struct vm_area_struct *new;
int err = -ENOMEM;
@@ -89194,7 +89296,7 @@ index 9d54851..e8c6035 100644
/* most fields are the same, copy all, and then fixup */
*new = *vma;
-@@ -2404,6 +2792,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1953,6 +2352,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
}
@@ -89214,25 +89316,26 @@ index 9d54851..e8c6035 100644
+ }
+#endif
+
- err = vma_dup_policy(vma, new);
- if (err)
- goto out_free_vma;
-@@ -2423,6 +2827,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+ pol = mpol_dup(vma_policy(vma));
+ if (IS_ERR(pol)) {
+ err = PTR_ERR(pol);
+@@ -1978,6 +2393,42 @@ 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);
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (!err && vma_m) {
-+ struct mempolicy *pol = vma_policy(new);
-+
+ if (anon_vma_clone(new_m, vma_m))
+ goto out_free_mpol;
+
+ mpol_get(pol);
-+ set_vma_policy(new_m, 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);
@@ -89246,8 +89349,11 @@ index 9d54851..e8c6035 100644
+ 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 (new_m->vm_file) {
++ if (vma_m->vm_flags & VM_EXECUTABLE)
++ removed_exe_file_vma(mm);
+ fput(new_m->vm_file);
++ }
+ mpol_put(pol);
+ }
+ }
@@ -89256,13 +89362,13 @@ index 9d54851..e8c6035 100644
/* Success. */
if (!err)
return 0;
-@@ -2432,10 +2868,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
- new->vm_ops->close(new);
- if (new->vm_file)
+@@ -1990,10 +2441,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+ removed_exe_file_vma(mm);
fput(new->vm_file);
+ }
- unlink_anon_vmas(new);
out_free_mpol:
- mpol_put(vma_policy(new));
+ mpol_put(pol);
out_free_vma:
+
+#ifdef CONFIG_PAX_SEGMEXEC
@@ -89276,7 +89382,7 @@ index 9d54851..e8c6035 100644
kmem_cache_free(vm_area_cachep, new);
out_err:
return err;
-@@ -2448,6 +2892,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2006,6 +2465,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)
{
@@ -89292,7 +89398,7 @@ index 9d54851..e8c6035 100644
if (mm->map_count >= sysctl_max_map_count)
return -ENOMEM;
-@@ -2459,11 +2912,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2017,11 +2485,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
* work. This now handles partial unmappings.
* Jeremy Fitzhardinge <jeremy@goop.org>
*/
@@ -89323,7 +89429,7 @@ index 9d54851..e8c6035 100644
if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
return -EINVAL;
-@@ -2538,6 +3010,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
+@@ -2096,6 +2583,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);
@@ -89332,22 +89438,20 @@ index 9d54851..e8c6035 100644
return 0;
}
-@@ -2546,6 +3020,13 @@ int vm_munmap(unsigned long start, size_t len)
- int ret;
- struct mm_struct *mm = current->mm;
+@@ -2108,22 +2597,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
+
+ profile_munmap(addr);
-+
+#ifdef CONFIG_PAX_SEGMEXEC
+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
-+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
++ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
+ return -EINVAL;
+#endif
+
down_write(&mm->mmap_sem);
- ret = do_munmap(mm, start, len);
+ ret = do_munmap(mm, addr, len);
up_write(&mm->mmap_sem);
-@@ -2559,16 +3040,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
- return vm_munmap(addr, len);
+ return ret;
}
-static inline void verify_mm_writelocked(struct mm_struct *mm)
@@ -89363,7 +89467,7 @@ index 9d54851..e8c6035 100644
/*
* this is really a simplified "do_mmap". it only handles
* anonymous maps. eventually we may be able to do some
-@@ -2582,6 +3053,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2137,6 +2622,7 @@ 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;
@@ -89371,7 +89475,7 @@ index 9d54851..e8c6035 100644
len = PAGE_ALIGN(len);
if (!len)
-@@ -2589,16 +3061,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2148,16 +2634,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
@@ -89403,16 +89507,18 @@ index 9d54851..e8c6035 100644
locked += mm->locked_vm;
lock_limit = rlimit(RLIMIT_MEMLOCK);
lock_limit >>= PAGE_SHIFT;
-@@ -2615,21 +3101,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2174,22 +2674,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
/*
* Clear old maps. this also does some error checking for us
*/
- munmap_back:
- if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
+ if (vma && vma->vm_start < addr + len) {
if (do_munmap(mm, addr, len))
return -ENOMEM;
- goto munmap_back;
-+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
++ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
++ BUG_ON(vma && vma->vm_start < addr + len);
}
/* Check against address space limits *after* clearing old maps... */
@@ -89423,12 +89529,12 @@ index 9d54851..e8c6035 100644
if (mm->map_count > sysctl_max_map_count)
return -ENOMEM;
-- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
-+ if (security_vm_enough_memory_mm(mm, charged))
+- if (security_vm_enough_memory(len >> PAGE_SHIFT))
++ if (security_vm_enough_memory(charged))
return -ENOMEM;
/* Can we just expand an old private anonymous mapping? */
-@@ -2643,7 +3128,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2203,7 +2703,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
*/
vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
if (!vma) {
@@ -89437,46 +89543,52 @@ index 9d54851..e8c6035 100644
return -ENOMEM;
}
-@@ -2657,10 +3142,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2217,11 +2717,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
perf_event_mmap(vma);
- mm->total_vm += len >> PAGE_SHIFT;
+ mm->total_vm += charged;
- if (flags & VM_LOCKED)
-- mm->locked_vm += (len >> PAGE_SHIFT);
-+ mm->locked_vm += charged;
- vma->vm_flags |= VM_SOFTDIRTY;
+ if (flags & VM_LOCKED) {
+ if (!mlock_vma_pages_range(vma, addr, addr + len))
+- mm->locked_vm += (len >> PAGE_SHIFT);
++ mm->locked_vm += charged;
+ }
+ track_exec_limit(mm, addr, addr + len, flags);
return addr;
}
-@@ -2722,6 +3208,7 @@ void exit_mmap(struct mm_struct *mm)
- while (vma) {
- if (vma->vm_flags & VM_ACCOUNT)
- nr_accounted += vma_pages(vma);
+@@ -2268,8 +2769,10 @@ void exit_mmap(struct mm_struct *mm)
+ * Walk the list again, actually closing and freeing it,
+ * with preemption enabled, without holding any MM locks.
+ */
+- while (vma)
++ while (vma) {
+ vma->vm_mirror = NULL;
vma = remove_vma(vma);
- }
- vm_unacct_memory(nr_accounted);
-@@ -2738,6 +3225,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;
++ }
+
+ BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
+ }
+@@ -2283,6 +2786,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;
+#ifdef CONFIG_PAX_SEGMEXEC
+ struct vm_area_struct *vma_m = NULL;
+#endif
+
-+ if (security_mmap_addr(vma->vm_start))
++ if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
+ return -EPERM;
+
/*
* The vm_pgoff of a purely anonymous vma should be irrelevant
* until its first write fault, when page's anon_vma and index
-@@ -2761,7 +3255,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2305,7 +2815,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
+ if ((vma->vm_flags & VM_ACCOUNT) &&
security_vm_enough_memory_mm(mm, vma_pages(vma)))
return -ENOMEM;
-
++
+#ifdef CONFIG_PAX_SEGMEXEC
+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
@@ -89495,16 +89607,16 @@ index 9d54851..e8c6035 100644
return 0;
}
-@@ -2780,6 +3288,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2323,6 +2848,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
struct rb_node **rb_link, *rb_parent;
- bool faulted_in_anon_vma = true;
+ struct mempolicy *pol;
+ BUG_ON(vma->vm_mirror);
+
/*
* If anonymous vma has not yet been faulted, update new pgoff
* to match new location, to increase its chance of merging.
-@@ -2844,6 +3354,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2373,6 +2900,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
return NULL;
}
@@ -89524,7 +89636,7 @@ index 9d54851..e8c6035 100644
+ return -ENOMEM;
+ pol_m = vma_policy(vma_m);
+ mpol_get(pol_m);
-+ set_vma_policy(vma_m, pol_m);
++ vma_set_policy(vma_m, pol_m);
+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
@@ -89533,7 +89645,7 @@ index 9d54851..e8c6035 100644
+ get_file(vma_m->vm_file);
+ if (vma_m->vm_ops && vma_m->vm_ops->open)
+ vma_m->vm_ops->open(vma_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));
++ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &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;
@@ -89544,7 +89656,7 @@ index 9d54851..e8c6035 100644
/*
* Return true if the calling process may expand its vm space by the passed
* number of pages
-@@ -2855,6 +3398,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
+@@ -2384,6 +2944,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
@@ -89552,7 +89664,7 @@ index 9d54851..e8c6035 100644
if (cur + npages > lim)
return 0;
return 1;
-@@ -2925,6 +3469,22 @@ int install_special_mapping(struct mm_struct *mm,
+@@ -2454,6 +3015,22 @@ int install_special_mapping(struct mm_struct *mm,
vma->vm_start = addr;
vma->vm_end = addr + len;
@@ -89572,22 +89684,20 @@ index 9d54851..e8c6035 100644
+ }
+#endif
+
- vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
+ vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 412ba2b..cb41d42 100644
+index 5a688a2..fffb9f6 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
-@@ -23,10 +23,18 @@
+@@ -23,10 +23,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
#include <linux/perf_event.h>
-+#include <linux/sched/sysctl.h>
+
+#ifdef CONFIG_PAX_MPROTECT
+#include <linux/elf.h>
-+#include <linux/binfmts.h>
+#endif
+
#include <asm/uaccess.h>
@@ -89598,8 +89708,8 @@ index 412ba2b..cb41d42 100644
#ifndef pgprot_modify
static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -236,6 +244,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
- return pages;
+@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
+ flush_tlb_range(vma, start, end);
}
+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
@@ -89639,7 +89749,7 @@ index 412ba2b..cb41d42 100644
+ if (is_vm_hugetlb_page(vma))
+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
+ else
-+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
++ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
+ }
+}
+#endif
@@ -89647,7 +89757,7 @@ index 412ba2b..cb41d42 100644
int
mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
unsigned long start, unsigned long end, unsigned long newflags)
-@@ -248,11 +298,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
int error;
int dirty_accountable = 0;
@@ -89677,7 +89787,7 @@ index 412ba2b..cb41d42 100644
/*
* If we make a private mapping writable we increase our commit;
* but (without finer accounting) cannot reduce our commit if we
-@@ -269,6 +337,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
}
}
@@ -89720,7 +89830,7 @@ index 412ba2b..cb41d42 100644
/*
* First try to merge with previous and/or next vma.
*/
-@@ -299,9 +403,21 @@ success:
+@@ -204,9 +306,21 @@ success:
* vm_flags and vm_page_prot are protected by the mmap_sem
* held in write mode.
*/
@@ -89743,7 +89853,7 @@ index 412ba2b..cb41d42 100644
if (vma_wants_writenotify(vma)) {
vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
-@@ -340,6 +456,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
end = start + len;
if (end <= start)
return -ENOMEM;
@@ -89761,7 +89871,7 @@ index 412ba2b..cb41d42 100644
if (!arch_validate_prot(prot))
return -EINVAL;
-@@ -347,7 +474,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
/*
* Does the application expect PROT_READ to imply PROT_EXEC:
*/
@@ -89770,7 +89880,7 @@ index 412ba2b..cb41d42 100644
prot |= PROT_EXEC;
vm_flags = calc_vm_prot_bits(prot);
-@@ -379,6 +506,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
if (start > vma->vm_start)
prev = vma;
@@ -89782,7 +89892,7 @@ index 412ba2b..cb41d42 100644
for (nstart = start ; ; ) {
unsigned long newflags;
-@@ -389,6 +521,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
/* newflags >> 4 shift VM_MAY% in place of VM_% */
if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
@@ -89797,7 +89907,7 @@ index 412ba2b..cb41d42 100644
error = -EACCES;
goto out;
}
-@@ -403,6 +543,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
if (error)
goto out;
@@ -89808,23 +89918,31 @@ index 412ba2b..cb41d42 100644
if (nstart < prev->vm_end)
diff --git a/mm/mremap.c b/mm/mremap.c
-index 0843feb..4f5b2e6 100644
+index d6959cb..c9e1e45 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
-@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
+@@ -106,6 +106,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);
+
+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
-+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
++ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
+ pte = pte_exprotect(pte);
+#endif
+
- pte = move_soft_dirty_pte(pte);
set_pte_at(mm, new_addr, new_pte, pte);
}
-@@ -337,6 +343,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
+
+@@ -251,7 +257,6 @@ static unsigned long move_vma(struct vm_area_struct *vma,
+ * If this were a serious issue, we'd add a flag to do_munmap().
+ */
+ hiwater_vm = mm->hiwater_vm;
+- mm->total_vm += new_len >> PAGE_SHIFT;
+ vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
+
+ if (do_munmap(mm, old_addr, old_len) < 0) {
+@@ -290,6 +295,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
if (is_vm_hugetlb_page(vma))
goto Einval;
@@ -89836,7 +89954,7 @@ index 0843feb..4f5b2e6 100644
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
goto Efault;
-@@ -392,20 +403,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
+@@ -346,20 +356,25 @@ static unsigned long mremap_to(unsigned long addr,
unsigned long ret = -EINVAL;
unsigned long charged = 0;
unsigned long map_flags;
@@ -89866,18 +89984,18 @@ index 0843feb..4f5b2e6 100644
+ if (addr + old_len > new_addr && new_addr + new_len > addr)
goto out;
- ret = do_munmap(mm, new_addr, new_len);
-@@ -474,6 +490,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+ ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
+@@ -431,6 +446,7 @@ unsigned long do_mremap(unsigned long addr,
+ struct vm_area_struct *vma;
unsigned long ret = -EINVAL;
unsigned long charged = 0;
- bool locked = false;
+ unsigned long pax_task_size = TASK_SIZE;
if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
- return ret;
-@@ -495,6 +512,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+ goto out;
+@@ -449,6 +465,17 @@ unsigned long do_mremap(unsigned long addr,
if (!new_len)
- return ret;
+ goto out;
+#ifdef CONFIG_PAX_SEGMEXEC
+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
@@ -89888,25 +90006,34 @@ index 0843feb..4f5b2e6 100644
+
+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
+ old_len > pax_task_size || addr > pax_task_size-old_len)
-+ return ret;
++ goto out;
+
- down_write(¤t->mm->mmap_sem);
-
if (flags & MREMAP_FIXED) {
-@@ -545,6 +573,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
- new_addr = addr;
+ if (flags & MREMAP_MAYMOVE)
+ ret = mremap_to(addr, old_len, new_addr, new_len);
+@@ -490,7 +517,6 @@ unsigned long do_mremap(unsigned long addr,
+ goto out;
+ }
+
+- mm->total_vm += pages;
+ vm_stat_account(mm, vma->vm_flags, vma->vm_file, pages);
+ if (vma->vm_flags & VM_LOCKED) {
+ mm->locked_vm += pages;
+@@ -498,6 +524,7 @@ unsigned long do_mremap(unsigned long addr,
+ addr + new_len);
}
ret = addr;
+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
goto out;
}
}
-@@ -568,7 +597,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -524,7 +551,13 @@ unsigned long do_mremap(unsigned long addr,
+ ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
+ if (ret)
goto out;
- }
-
++
+ map_flags = vma->vm_flags;
- ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
+ ret = move_vma(vma, addr, old_len, new_len, new_addr);
+ if (!(ret & ~PAGE_MASK)) {
+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
@@ -89914,19 +90041,56 @@ index 0843feb..4f5b2e6 100644
}
out:
if (ret & ~PAGE_MASK)
+diff --git a/mm/nobootmem.c b/mm/nobootmem.c
+index 07c08c4..8d4ad26 100644
+--- a/mm/nobootmem.c
++++ b/mm/nobootmem.c
+@@ -109,19 +109,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
+ unsigned long __init free_all_memory_core_early(int nodeid)
+ {
+ int i;
+- u64 start, end;
++ u64 start, end, startrange, endrange;
+ unsigned long count = 0;
+- struct range *range = NULL;
++ struct range *range = NULL, rangerange = { 0, 0 };
+ int nr_range;
+
+ nr_range = get_free_all_memory_range(&range, nodeid);
++ startrange = __pa(range) >> PAGE_SHIFT;
++ endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
+
+ for (i = 0; i < nr_range; i++) {
+ start = range[i].start;
+ end = range[i].end;
++ if (start <= endrange && startrange < end) {
++ BUG_ON(rangerange.start | rangerange.end);
++ rangerange = range[i];
++ continue;
++ }
+ count += end - start;
+ __free_pages_memory(start, end);
+ }
++ start = rangerange.start;
++ end = rangerange.end;
++ count += end - start;
++ __free_pages_memory(start, end);
+
+ return count;
+ }
diff --git a/mm/nommu.c b/mm/nommu.c
-index ecd1f15..77039bd 100644
+index 1db7971..5dba7b6 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -64,7 +64,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
+@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
+ int sysctl_overcommit_ratio = 50; /* default is 50% */
+ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
- unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
- unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
-int heap_stack_gap = 0;
atomic_long_t mmap_pages_allocated;
-@@ -844,15 +843,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
EXPORT_SYMBOL(find_vma);
/*
@@ -89942,7 +90106,7 @@ index ecd1f15..77039bd 100644
* expand a stack to a given address
* - not supported under NOMMU conditions
*/
-@@ -1563,6 +1553,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -1555,6 +1545,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;
@@ -89950,9 +90114,9 @@ index ecd1f15..77039bd 100644
*region = *vma->vm_region;
new->vm_region = region;
-@@ -1993,8 +1984,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
+@@ -1971,8 +1962,8 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
}
- EXPORT_SYMBOL(generic_file_remap_pages);
+ EXPORT_SYMBOL(filemap_fault);
-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
- unsigned long addr, void *buf, int len, int write)
@@ -89961,7 +90125,7 @@ index ecd1f15..77039bd 100644
{
struct vm_area_struct *vma;
-@@ -2035,8 +2026,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -2013,8 +2004,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
*
* The caller must hold a reference on @mm.
*/
@@ -89972,7 +90136,7 @@ index ecd1f15..77039bd 100644
{
return __access_remote_vm(NULL, mm, addr, buf, len, write);
}
-@@ -2045,7 +2036,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+@@ -2023,7 +2014,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
* Access another process' address space.
* - source/target buffer must be kernel space
*/
@@ -89982,10 +90146,10 @@ index ecd1f15..77039bd 100644
struct mm_struct *mm;
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
-index 6380758..4064aec 100644
+index ea3f83b..001a216 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
-@@ -690,7 +690,7 @@ static inline long long pos_ratio_polynom(unsigned long setpoint,
+@@ -522,7 +522,7 @@ unsigned long bdi_dirty_limit(struct backing_dev_info *bdi, unsigned long dirty)
* card's bdi_dirty may rush to many times higher than bdi_setpoint.
* - the bdi dirty thresh drops quickly due to change of JBOD workload
*/
@@ -89994,19 +90158,28 @@ index 6380758..4064aec 100644
unsigned long thresh,
unsigned long bg_thresh,
unsigned long dirty,
+@@ -1380,7 +1380,7 @@ ratelimit_handler(struct notifier_block *self, unsigned long u, void *v)
+ return NOTIFY_DONE;
+ }
+
+-static struct notifier_block __cpuinitdata ratelimit_nb = {
++static struct notifier_block ratelimit_nb = {
+ .notifier_call = ratelimit_handler,
+ .next = NULL,
+ };
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index dd886fa..7686339 100644
+index d8762b2..7c1d26d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -61,6 +61,7 @@
- #include <linux/page-debug-flags.h>
- #include <linux/hugetlb.h>
- #include <linux/sched/rt.h>
+@@ -57,6 +57,7 @@
+ #include <linux/ftrace_event.h>
+ #include <linux/memcontrol.h>
+ #include <linux/prefetch.h>
+#include <linux/random.h>
- #include <asm/sections.h>
#include <asm/tlbflush.h>
-@@ -354,7 +355,7 @@ out:
+ #include <asm/div64.h>
+@@ -341,7 +342,7 @@ out:
* This usage means that zero-order pages may not be compound.
*/
@@ -90015,7 +90188,7 @@ index dd886fa..7686339 100644
{
__free_pages_ok(page, compound_order(page));
}
-@@ -712,6 +713,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -654,6 +655,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
int i;
int bad = 0;
@@ -90023,10 +90196,10 @@ index dd886fa..7686339 100644
+ unsigned long index = 1UL << order;
+#endif
+
- trace_mm_page_free(page, order);
+ trace_mm_page_free_direct(page, order);
kmemcheck_free_shadow(page, order);
-@@ -728,6 +733,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -669,6 +674,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
debug_check_no_obj_freed(page_address(page),
PAGE_SIZE << order);
}
@@ -90039,7 +90212,7 @@ index dd886fa..7686339 100644
arch_free_page(page, order);
kernel_map_pages(page, 1 << order, 0);
-@@ -750,6 +761,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
+@@ -692,6 +703,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
local_irq_restore(flags);
}
@@ -90057,30 +90230,30 @@ index dd886fa..7686339 100644
+EXPORT_SYMBOL(latent_entropy);
+#endif
+
- void __init __free_pages_bootmem(struct page *page, unsigned int order)
- {
- unsigned int nr_pages = 1 << order;
-@@ -765,6 +790,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
- __ClearPageReserved(p);
- set_page_count(p, 0);
+ /*
+ * permit the bootmem allocator to evade page validation on high-order frees
+ */
+@@ -715,6 +740,19 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
+ set_page_count(p, 0);
+ }
+#ifdef CONFIG_PAX_LATENT_ENTROPY
-+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
-+ u64 hash = 0;
-+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
-+ const u64 *data = lowmem_page_address(page);
-+
-+ for (index = 0; index < end; index++)
-+ hash ^= hash + data[index];
-+ latent_entropy ^= hash;
-+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
-+ }
++ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
++ u64 hash = 0;
++ size_t index, end = PAGE_SIZE * (1UL << order) / sizeof hash;
++ const u64 *data = lowmem_page_address(page);
++
++ for (index = 0; index < end; index++)
++ hash ^= hash + data[index];
++ latent_entropy ^= hash;
++ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
++ }
+#endif
+
- page_zone(page)->managed_pages += nr_pages;
- set_page_refcounted(page);
- __free_pages(page, order);
-@@ -870,8 +908,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
+ set_page_refcounted(page);
+ __free_pages(page, order);
+ }
+@@ -784,8 +822,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);
@@ -90091,24 +90264,11 @@ index dd886fa..7686339 100644
if (order && (gfp_flags & __GFP_COMP))
prep_compound_page(page, order);
-diff --git a/mm/page_io.c b/mm/page_io.c
-index 8c79a47..a689e0d 100644
---- a/mm/page_io.c
-+++ b/mm/page_io.c
-@@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
- struct file *swap_file = sis->swap_file;
- struct address_space *mapping = swap_file->f_mapping;
- struct iovec iov = {
-- .iov_base = kmap(page),
-+ .iov_base = (void __force_user *)kmap(page),
- .iov_len = PAGE_SIZE,
- };
-
diff --git a/mm/percpu.c b/mm/percpu.c
-index 8c8e08f..73a5cda 100644
+index 5c29750..99f6386 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
-@@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
+@@ -121,7 +121,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
static unsigned int pcpu_high_unit_cpu __read_mostly;
/* the address of the first chunk which starts with the kernel static area */
@@ -90118,7 +90278,7 @@ index 8c8e08f..73a5cda 100644
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
-index fd26d04..0cea1b0 100644
+index 70e814a..38e1f43 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -13,6 +13,7 @@
@@ -90156,23 +90316,45 @@ index fd26d04..0cea1b0 100644
}
if (nr_pages == 0)
-@@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
+@@ -298,23 +299,23 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
goto free_proc_pages;
}
+- task_lock(task);
+- if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
+- task_unlock(task);
+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
-+ rc = -EPERM;
-+ goto put_task_struct;
-+ }
-+
- mm = mm_access(task, PTRACE_MODE_ATTACH);
- if (!mm || IS_ERR(mm)) {
- rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
+ rc = -EPERM;
+ goto put_task_struct;
+ }
+- mm = task->mm;
+
+- if (!mm || (task->flags & PF_KTHREAD)) {
+- task_unlock(task);
+- rc = -EINVAL;
++ mm = mm_access(task, PTRACE_MODE_ATTACH);
++ if (!mm || IS_ERR(mm)) {
++ rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
++ /*
++ * Explicitly map EACCES to EPERM as EPERM is a more a
++ * appropriate error code for process_vw_readv/writev
++ */
++ if (rc == -EACCES)
++ rc = -EPERM;
+ goto put_task_struct;
+ }
+
+- atomic_inc(&mm->mm_users);
+- task_unlock(task);
+-
+ for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
+ rc = process_vm_rw_single_vec(
+ (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
diff --git a/mm/rmap.c b/mm/rmap.c
-index fd3ee7a..3613079 100644
+index 8685697..e047d10 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
-@@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
struct anon_vma *anon_vma = vma->anon_vma;
struct anon_vma_chain *avc;
@@ -90183,7 +90365,7 @@ index fd3ee7a..3613079 100644
might_sleep();
if (unlikely(!anon_vma)) {
struct mm_struct *mm = vma->vm_mm;
-@@ -172,6 +176,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -162,6 +166,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
if (!avc)
goto out_enomem;
@@ -90196,7 +90378,7 @@ index fd3ee7a..3613079 100644
anon_vma = find_mergeable_anon_vma(vma);
allocated = NULL;
if (!anon_vma) {
-@@ -185,6 +195,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -175,6 +185,21 @@ 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)) {
@@ -90207,15 +90389,18 @@ index fd3ee7a..3613079 100644
+ if (vma_m) {
+ BUG_ON(vma_m->anon_vma);
+ vma_m->anon_vma = anon_vma;
-+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
++ avc_m->anon_vma = anon_vma;
++ avc_m->vma = vma;
++ list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
++ list_add(&avc_m->same_anon_vma, &anon_vma->head);
+ avc_m = NULL;
+ }
+#endif
+
vma->anon_vma = anon_vma;
- anon_vma_chain_link(vma, avc, anon_vma);
- allocated = NULL;
-@@ -195,12 +217,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+ avc->anon_vma = anon_vma;
+ avc->vma = vma;
+@@ -188,12 +213,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
if (unlikely(allocated))
put_anon_vma(allocated);
@@ -90240,7 +90425,7 @@ index fd3ee7a..3613079 100644
anon_vma_chain_free(avc);
out_enomem:
return -ENOMEM;
-@@ -236,7 +270,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
+@@ -244,7 +281,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
* Attach the anon_vmas from src to dst.
* Returns 0 on success, -ENOMEM on failure.
*/
@@ -90249,7 +90434,7 @@ index fd3ee7a..3613079 100644
{
struct anon_vma_chain *avc, *pavc;
struct anon_vma *root = NULL;
-@@ -269,7 +303,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
+@@ -277,7 +314,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.
*/
@@ -90258,7 +90443,7 @@ index fd3ee7a..3613079 100644
{
struct anon_vma_chain *avc;
struct anon_vma *anon_vma;
-@@ -373,8 +407,10 @@ static void anon_vma_ctor(void *data)
+@@ -381,8 +418,10 @@ static void anon_vma_ctor(void *data)
void __init anon_vma_init(void)
{
anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
@@ -90272,28 +90457,28 @@ index fd3ee7a..3613079 100644
/*
diff --git a/mm/shmem.c b/mm/shmem.c
-index 8297623..6b9dfe9 100644
+index a78acf0..a31df98 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -33,7 +33,7 @@
+@@ -31,7 +31,7 @@
+ #include <linux/export.h>
#include <linux/swap.h>
- #include <linux/aio.h>
-static struct vfsmount *shm_mnt;
+struct vfsmount *shm_mnt;
#ifdef CONFIG_SHMEM
/*
-@@ -77,7 +77,7 @@ static struct vfsmount *shm_mnt;
+@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
#define BOGO_DIRENT_SIZE 20
/* Symlink up to this size is kmalloc'ed instead of using a swappable page */
-#define SHORT_SYMLINK_LEN 128
+#define SHORT_SYMLINK_LEN 64
- /*
- * shmem_fallocate and shmem_writepage communicate via inode->i_private
-@@ -2232,6 +2232,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
+ struct shmem_xattr {
+ struct list_head list; /* anchored by shmem_inode_info->xattr_list */
+@@ -1809,6 +1809,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[] = {
@@ -90305,7 +90490,7 @@ index 8297623..6b9dfe9 100644
{ XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
{ XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
};
-@@ -2287,6 +2292,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
+@@ -1862,6 +1867,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
if (err)
return err;
@@ -90318,10 +90503,10 @@ index 8297623..6b9dfe9 100644
+ }
+#endif
+
- return simple_xattr_set(&info->xattrs, name, value, size, flags);
- }
+ if (size == 0)
+ value = ""; /* empty EA, do not remove */
-@@ -2599,8 +2613,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
+@@ -2195,8 +2209,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 */
@@ -90332,10 +90517,39 @@ index 8297623..6b9dfe9 100644
return -ENOMEM;
diff --git a/mm/slab.c b/mm/slab.c
-index 2580db0..0523956 100644
+index 4c3b671..884702c 100644
--- a/mm/slab.c
+++ b/mm/slab.c
-@@ -366,10 +366,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
+@@ -151,7 +151,7 @@
+
+ /* Legal flag mask for kmem_cache_create(). */
+ #if DEBUG
+-# define CREATE_MASK (SLAB_RED_ZONE | \
++# define CREATE_MASK (SLAB_USERCOPY | SLAB_NO_SANITIZE | SLAB_RED_ZONE | \
+ SLAB_POISON | SLAB_HWCACHE_ALIGN | \
+ SLAB_CACHE_DMA | \
+ SLAB_STORE_USER | \
+@@ -159,8 +159,8 @@
+ SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
+ SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
+ #else
+-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
+- SLAB_CACHE_DMA | \
++# define CREATE_MASK (SLAB_USERCOPY | SLAB_NO_SANITIZE | \
++ SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | \
+ SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
+ SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
+ SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
+@@ -288,7 +288,7 @@ struct kmem_list3 {
+ * Need this for bootstrapping a per node allocator.
+ */
+ #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
+-static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
++static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
+ #define CACHE_CACHE 0
+ #define SIZE_AC MAX_NUMNODES
+ #define SIZE_L3 (2 * MAX_NUMNODES)
+@@ -389,10 +389,12 @@ static void kmem_list3_init(struct kmem_list3 *parent)
if ((x)->max_freeable < i) \
(x)->max_freeable = i; \
} while (0)
@@ -90352,7 +90566,7 @@ index 2580db0..0523956 100644
#else
#define STATS_INC_ACTIVE(x) do { } while (0)
#define STATS_DEC_ACTIVE(x) do { } while (0)
-@@ -386,6 +388,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
+@@ -409,6 +411,8 @@ static void kmem_list3_init(struct kmem_list3 *parent)
#define STATS_INC_ALLOCMISS(x) do { } while (0)
#define STATS_INC_FREEHIT(x) do { } while (0)
#define STATS_INC_FREEMISS(x) do { } while (0)
@@ -90361,7 +90575,7 @@ index 2580db0..0523956 100644
#endif
#if DEBUG
-@@ -477,7 +481,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
+@@ -538,7 +542,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,
@@ -90370,22 +90584,89 @@ index 2580db0..0523956 100644
{
u32 offset = (obj - slab->s_mem);
return reciprocal_divide(offset, cache->reciprocal_buffer_size);
-@@ -1571,12 +1575,12 @@ void __init kmem_cache_init(void)
- */
+@@ -559,12 +563,13 @@ EXPORT_SYMBOL(malloc_sizes);
+ struct cache_names {
+ char *name;
+ char *name_dma;
++ char *name_usercopy;
+ };
- kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
-- kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
-+ kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
+ static struct cache_names __initdata cache_names[] = {
+-#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
++#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)", .name_usercopy = "size-" #x "(USERCOPY)" },
+ #include <linux/kmalloc_sizes.h>
+- {NULL,}
++ {NULL}
+ #undef CACHE
+ };
- if (INDEX_AC != INDEX_NODE)
- kmalloc_caches[INDEX_NODE] =
- create_kmalloc_cache("kmalloc-node",
-- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
-+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
+@@ -752,6 +757,12 @@ static inline struct kmem_cache *__find_general_cachep(size_t size,
+ if (unlikely(gfpflags & GFP_DMA))
+ return csizep->cs_dmacachep;
+ #endif
++
++#ifdef CONFIG_PAX_USERCOPY_SLABS
++ if (unlikely(gfpflags & GFP_USERCOPY))
++ return csizep->cs_usercopycachep;
++#endif
++
+ return csizep->cs_cachep;
+ }
- slab_early_init = 0;
+@@ -1370,7 +1381,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
+ return notifier_from_errno(err);
+ }
+
+-static struct notifier_block __cpuinitdata cpucache_notifier = {
++static struct notifier_block cpucache_notifier = {
+ &cpuup_callback, NULL, 0
+ };
-@@ -3577,6 +3581,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
+@@ -1572,7 +1583,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);
+
+ if (INDEX_AC != INDEX_L3) {
+@@ -1580,7 +1591,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);
+ }
+
+@@ -1598,7 +1609,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);
+ }
+ #ifdef CONFIG_ZONE_DMA
+@@ -1610,6 +1621,16 @@ void __init kmem_cache_init(void)
+ SLAB_PANIC,
+ NULL);
+ #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);
++#endif
++
+ sizes++;
+ names++;
+ }
+@@ -3662,6 +3683,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
struct array_cache *ac = cpu_cache_get(cachep);
check_irq_off();
@@ -90393,7 +90674,7 @@ index 2580db0..0523956 100644
+#ifdef CONFIG_PAX_MEMORY_SANITIZE
+ if (pax_sanitize_slab) {
+ if (!(cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))) {
-+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
++ memset(objp, PAX_MEMORY_SANITIZE_VALUE, obj_size(cachep));
+
+ if (cachep->ctor)
+ cachep->ctor(objp);
@@ -90407,7 +90688,7 @@ index 2580db0..0523956 100644
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
-@@ -3805,6 +3824,7 @@ void kfree(const void *objp)
+@@ -3879,6 +3915,7 @@ void kfree(const void *objp)
if (unlikely(ZERO_OR_NULL_PTR(objp)))
return;
@@ -90415,7 +90696,17 @@ index 2580db0..0523956 100644
local_irq_save(flags);
kfree_debugcheck(objp);
c = virt_to_cache(objp);
-@@ -4246,14 +4266,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
+@@ -4216,6 +4253,9 @@ static void print_slabinfo_header(struct seq_file *m)
+ seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
+ "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
+ seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
++#ifdef CONFIG_PAX_MEMORY_SANITIZE
++ seq_puts(m, " : pax <sanitized> <not_sanitized>");
++#endif
+ #endif
+ seq_putc(m, '\n');
+ }
+@@ -4325,14 +4365,22 @@ static int s_show(struct seq_file *m, void *p)
}
/* cpu stats */
{
@@ -90440,11 +90731,11 @@ index 2580db0..0523956 100644
+ }
+#endif
#endif
- }
-
-@@ -4471,13 +4499,71 @@ static const struct file_operations proc_slabstats_operations = {
- static int __init slab_proc_init(void)
+ seq_putc(m, '\n');
+ return 0;
+@@ -4587,13 +4635,71 @@ static int __init slab_proc_init(void)
{
+ proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
#ifdef CONFIG_DEBUG_SLAB_LEAK
- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
@@ -90473,7 +90764,7 @@ index 2580db0..0523956 100644
+ if (!PageSlab(page))
+ return false;
+
-+ cachep = page->slab_cache;
++ cachep = page_get_cache(page);
+ return cachep->flags & SLAB_USERCOPY;
+}
+
@@ -90497,15 +90788,15 @@ index 2580db0..0523956 100644
+ if (!PageSlab(page))
+ return NULL;
+
-+ cachep = page->slab_cache;
++ cachep = page_get_cache(page);
+ if (!(cachep->flags & SLAB_USERCOPY))
+ return cachep->name;
+
-+ slabp = page->slab_page;
++ slabp = page_get_slab(page);
+ objnr = obj_to_index(cachep, slabp, ptr);
+ BUG_ON(objnr >= cachep->num);
+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
-+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
++ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
+ return NULL;
+
+ return cachep->name;
@@ -90515,198 +90806,57 @@ index 2580db0..0523956 100644
/**
* ksize - get the actual amount of memory allocated for a given object
* @objp: Pointer to the object
-diff --git a/mm/slab.h b/mm/slab.h
-index a535033..2f98fe5 100644
---- a/mm/slab.h
-+++ b/mm/slab.h
-@@ -32,6 +32,15 @@ extern struct list_head slab_caches;
- /* The slab cache that manages slab cache information */
- extern struct kmem_cache *kmem_cache;
-
-+#ifdef CONFIG_PAX_MEMORY_SANITIZE
-+#ifdef CONFIG_X86_64
-+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
-+#else
-+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
-+#endif
-+extern bool pax_sanitize_slab;
-+#endif
-+
- unsigned long calculate_alignment(unsigned long flags,
- unsigned long align, unsigned long size);
-
-@@ -67,7 +76,8 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
-
- /* Legal flag mask for kmem_cache_create(), for various configurations */
- #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
-- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
-+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
-+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
-
- #if defined(CONFIG_DEBUG_SLAB)
- #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
-@@ -231,6 +241,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
- return s;
-
- page = virt_to_head_page(x);
-+
-+ BUG_ON(!PageSlab(page));
-+
- cachep = page->slab_cache;
- if (slab_equal_or_root(cachep, s))
- return cachep;
-diff --git a/mm/slab_common.c b/mm/slab_common.c
-index e2e98af..3b1a163 100644
---- a/mm/slab_common.c
-+++ b/mm/slab_common.c
-@@ -23,11 +23,22 @@
-
- #include "slab.h"
-
--enum slab_state slab_state;
-+enum slab_state slab_state __read_only;
- LIST_HEAD(slab_caches);
- DEFINE_MUTEX(slab_mutex);
- struct kmem_cache *kmem_cache;
-
-+#ifdef CONFIG_PAX_MEMORY_SANITIZE
-+bool pax_sanitize_slab __read_only = true;
-+static int __init pax_sanitize_slab_setup(char *str)
-+{
-+ pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
-+ printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
-+ return 1;
-+}
-+__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
-+#endif
-+
- #ifdef CONFIG_DEBUG_VM
- static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
- size_t size)
-@@ -212,7 +223,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
-
- err = __kmem_cache_create(s, flags);
- if (!err) {
-- s->refcount = 1;
-+ atomic_set(&s->refcount, 1);
- list_add(&s->list, &slab_caches);
- memcg_cache_list_add(memcg, s);
- } else {
-@@ -258,8 +269,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)) {
-@@ -305,7 +315,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
- panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
- name, size, err);
+diff --git a/mm/slob.c b/mm/slob.c
+index 8105be4..8c1ce34 100644
+--- a/mm/slob.c
++++ b/mm/slob.c
+@@ -29,7 +29,7 @@
+ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
+ * alloc_pages() directly, allocating compound pages so the page order
+ * does not have to be separately tracked, and also stores the exact
+- * allocation size in page->private so that it can be used to accurately
++ * allocation size in slob_page->size so that it can be used to accurately
+ * provide ksize(). These objects are detected in kfree() because slob_page()
+ * is false for them.
+ *
+@@ -58,6 +58,7 @@
+ */
-- s->refcount = -1; /* Exempt from merging for now */
-+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
+ #include <linux/kernel.h>
++#include <linux/sched.h>
+ #include <linux/slab.h>
+ #include <linux/mm.h>
+ #include <linux/swap.h> /* struct reclaim_state */
+@@ -100,9 +101,8 @@ struct slob_page {
+ union {
+ struct {
+ unsigned long flags; /* mandatory */
+- atomic_t _count; /* mandatory */
+ slobidx_t units; /* free units left in page */
+- unsigned long pad[2];
++ unsigned long size; /* size when >=PAGE_SIZE */
+ slob_t *free; /* first free slob_t in page */
+ struct list_head list; /* linked list of free pages */
+ };
+@@ -135,7 +135,7 @@ static LIST_HEAD(free_slob_large);
+ */
+ static inline int is_slob_page(struct slob_page *sp)
+ {
+- return PageSlab((struct page *)sp);
++ return PageSlab((struct page *)sp) && !sp->size;
}
- struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
-@@ -318,7 +328,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
+ static inline void set_slob_page(struct slob_page *sp)
+@@ -150,7 +150,7 @@ static inline void clear_slob_page(struct slob_page *sp)
- create_boot_cache(s, name, size, flags);
- list_add(&s->list, &slab_caches);
-- s->refcount = 1;
-+ atomic_set(&s->refcount, 1);
- return s;
+ static inline struct slob_page *slob_page(const void *addr)
+ {
+- return (struct slob_page *)virt_to_page(addr);
++ return (struct slob_page *)virt_to_head_page(addr);
}
-@@ -330,6 +340,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
- EXPORT_SYMBOL(kmalloc_dma_caches);
- #endif
-
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
-+EXPORT_SYMBOL(kmalloc_usercopy_caches);
-+#endif
-+
/*
- * Conversion table for small slabs sizes / 8 to the index in the
- * kmalloc array. This is necessary for slabs < 192 since we have non power
-@@ -394,6 +409,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
- return kmalloc_dma_caches[index];
-
- #endif
-+
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+ if (unlikely((flags & GFP_USERCOPY)))
-+ return kmalloc_usercopy_caches[index];
-+
-+#endif
-+
- return kmalloc_caches[index];
- }
-
-@@ -450,7 +472,7 @@ void __init create_kmalloc_caches(unsigned long flags)
- for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
- if (!kmalloc_caches[i]) {
- kmalloc_caches[i] = create_kmalloc_cache(NULL,
-- 1 << i, flags);
-+ 1 << i, SLAB_USERCOPY | flags);
- }
-
- /*
-@@ -459,10 +481,10 @@ void __init create_kmalloc_caches(unsigned long flags)
- * earlier power of two caches
- */
- if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
-- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
-+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
-
- if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
-- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
-+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
- }
-
- /* Kmalloc array is now usable */
-@@ -495,6 +517,23 @@ void __init create_kmalloc_caches(unsigned long flags)
- }
- }
- #endif
-+
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
-+ struct kmem_cache *s = kmalloc_caches[i];
-+
-+ if (s) {
-+ int size = kmalloc_size(i);
-+ char *n = kasprintf(GFP_NOWAIT,
-+ "usercopy-kmalloc-%d", size);
-+
-+ BUG_ON(!n);
-+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
-+ size, SLAB_USERCOPY | flags);
-+ }
-+ }
-+#endif
-+
- }
- #endif /* !CONFIG_SLOB */
-
-@@ -535,6 +574,9 @@ void print_slabinfo_header(struct seq_file *m)
- seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
- "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
- seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
-+#ifdef CONFIG_PAX_MEMORY_SANITIZE
-+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
-+#endif
- #endif
- seq_putc(m, '\n');
- }
-diff --git a/mm/slob.c b/mm/slob.c
-index 4bf8809..98a6914 100644
---- a/mm/slob.c
-+++ b/mm/slob.c
-@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
+@@ -210,7 +210,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
/*
* Return the size of a slob block.
*/
@@ -90715,7 +90865,7 @@ index 4bf8809..98a6914 100644
{
if (s->units > 0)
return s->units;
-@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
+@@ -220,7 +220,7 @@ static slobidx_t slob_units(slob_t *s)
/*
* Return the next free slob block pointer after this one.
*/
@@ -90724,7 +90874,7 @@ index 4bf8809..98a6914 100644
{
slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
slobidx_t next;
-@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
+@@ -235,7 +235,7 @@ static slob_t *slob_next(slob_t *s)
/*
* Returns true if s is the last free block in its page.
*/
@@ -90733,65 +90883,28 @@ index 4bf8809..98a6914 100644
{
return !((unsigned long)slob_next(s) & ~PAGE_MASK);
}
-
--static void *slob_new_pages(gfp_t gfp, int order, int node)
-+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
- {
-- void *page;
-+ struct page *page;
-
- #ifdef CONFIG_NUMA
- if (node != NUMA_NO_NODE)
-@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
+@@ -254,6 +254,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
if (!page)
return NULL;
-- return page_address(page);
-+ __SetPageSlab(page);
-+ return page;
++ set_slob_page(page);
+ return page_address(page);
}
--static void slob_free_pages(void *b, int order)
-+static void slob_free_pages(struct page *sp, int order)
- {
- if (current->reclaim_state)
- current->reclaim_state->reclaimed_slab += 1 << order;
-- free_pages((unsigned long)b, order);
-+ __ClearPageSlab(sp);
-+ page_mapcount_reset(sp);
-+ sp->private = 0;
-+ __free_pages(sp, order);
- }
-
- /*
-@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
-
- /* Not enough space: must allocate a new page */
- if (!b) {
-- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
-- if (!b)
-+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
-+ if (!sp)
+@@ -370,11 +371,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
+ if (!b)
return NULL;
-- sp = virt_to_page(b);
-- __SetPageSlab(sp);
-+ b = page_address(sp);
+ sp = slob_page(b);
+- set_slob_page(sp);
spin_lock_irqsave(&slob_lock, flags);
sp->units = SLOB_UNITS(PAGE_SIZE);
- sp->freelist = b;
-+ sp->private = 0;
+ sp->free = b;
++ sp->size = 0;
INIT_LIST_HEAD(&sp->list);
set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
set_slob_page_free(sp, slob_list);
-@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
- if (slob_page_free(sp))
- clear_slob_page_free(sp);
- spin_unlock_irqrestore(&slob_lock, flags);
-- __ClearPageSlab(sp);
-- page_mapcount_reset(sp);
-- slob_free_pages(b, 0);
-+ slob_free_pages(sp, 0);
+@@ -418,6 +419,11 @@ static void slob_free(void *block, int size)
return;
}
@@ -90803,22 +90916,20 @@ index 4bf8809..98a6914 100644
if (!slob_page_free(sp)) {
/* This slob page is about to become partially free. Easy! */
sp->units = units;
-@@ -424,11 +431,10 @@ out:
+@@ -476,10 +482,9 @@ out:
+ * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
*/
- 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)
+-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)
{
- unsigned int *m;
-- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
-- void *ret;
+- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ slob_t *m;
-+ void *ret = NULL;
+ void *ret;
gfp &= gfp_allowed_mask;
-
-@@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
+@@ -494,7 +499,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
if (!m)
return NULL;
@@ -90829,22 +90940,20 @@ index 4bf8809..98a6914 100644
+ m[1].units = align;
ret = (void *)m + align;
- trace_kmalloc_node(caller, ret,
- size, size + align, gfp, node);
- } else {
- unsigned int order = get_order(size);
-+ struct page *page;
-
- if (likely(order))
+ trace_kmalloc_node(_RET_IP_, ret,
+@@ -506,16 +514,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
gfp |= __GFP_COMP;
-- ret = slob_new_pages(gfp, order, node);
-+ page = slob_new_pages(gfp, order, node);
-+ if (page) {
-+ ret = page_address(page);
-+ page->private = size;
-+ }
+ ret = slob_new_pages(gfp, order, node);
+ if (ret) {
+- struct page *page;
+- page = virt_to_page(ret);
+- page->private = size;
++ struct slob_page *sp;
++ sp = slob_page(ret);
++ sp->size = size;
+ }
- trace_kmalloc_node(caller, ret,
+ trace_kmalloc_node(_RET_IP_, ret,
size, PAGE_SIZE << order, gfp, node);
}
@@ -90852,37 +90961,34 @@ index 4bf8809..98a6914 100644
+ return ret;
+}
+
-+static __always_inline void *
-+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
++void *__kmalloc_node(size_t size, gfp_t gfp, int node)
+{
+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
-+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
++ void *ret = __kmalloc_node_align(size, gfp, node, align);
+
+ if (!ZERO_OR_NULL_PTR(ret))
+ kmemleak_alloc(ret, size, 1, gfp);
return ret;
}
-
-@@ -493,34 +517,112 @@ void kfree(const void *block)
+ EXPORT_SYMBOL(__kmalloc_node);
+@@ -530,16 +547,92 @@ void kfree(const void *block)
return;
kmemleak_free(block);
+ VM_BUG_ON(!virt_addr_valid(block));
- sp = virt_to_page(block);
-- if (PageSlab(sp)) {
-+ VM_BUG_ON(!PageSlab(sp));
-+ if (!sp->private) {
- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ sp = slob_page(block);
+ if (is_slob_page(sp)) {
+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
- unsigned int *m = (unsigned int *)(block - align);
- slob_free(m, *m + align);
- } else
+ slob_t *m = (slob_t *)(block - align);
+ slob_free(m, m[0].units + align);
+ } else {
-+ __ClearPageSlab(sp);
-+ page_mapcount_reset(sp);
-+ sp->private = 0;
- __free_pages(sp, compound_order(sp));
++ clear_slob_page(sp);
++ free_slob_page(sp);
++ sp->size = 0;
+ put_page(&sp->page);
+ }
}
EXPORT_SYMBOL(kfree);
@@ -90900,7 +91006,7 @@ index 4bf8809..98a6914 100644
+#ifdef CONFIG_PAX_USERCOPY
+const char *check_heap_object(const void *ptr, unsigned long n)
+{
-+ struct page *page;
++ struct slob_page *sp;
+ const slob_t *free;
+ const void *base;
+ unsigned long flags;
@@ -90911,13 +91017,13 @@ index 4bf8809..98a6914 100644
+ if (!virt_addr_valid(ptr))
+ return NULL;
+
-+ page = virt_to_head_page(ptr);
-+ if (!PageSlab(page))
++ sp = slob_page(ptr);
++ if (!PageSlab((struct page *)sp))
+ return NULL;
+
-+ if (page->private) {
-+ base = page;
-+ if (base <= ptr && n <= page->private - (ptr - base))
++ if (sp->size) {
++ base = page_address(&sp->page);
++ if (base <= ptr && n <= sp->size - (ptr - base))
+ return NULL;
+ return "<slob>";
+ }
@@ -90925,9 +91031,9 @@ index 4bf8809..98a6914 100644
+ /* some tricky double walking to find the chunk */
+ spin_lock_irqsave(&slob_lock, flags);
+ base = (void *)((unsigned long)ptr & PAGE_MASK);
-+ free = page->freelist;
++ free = sp->free;
+
-+ while (!slob_last(free) && (void *)free <= ptr) {
++ while ((void *)free <= ptr) {
+ base = free + slob_units(free);
+ free = slob_next(free);
+ }
@@ -90961,84 +91067,80 @@ index 4bf8809..98a6914 100644
/* can't use ksize for kmem_cache_alloc memory, only kmalloc */
size_t ksize(const void *block)
{
- struct page *sp;
- int align;
-- unsigned int *m;
-+ slob_t *m;
-
- BUG_ON(!block);
- if (unlikely(block == ZERO_SIZE_PTR))
- return 0;
-
- sp = virt_to_page(block);
-- if (unlikely(!PageSlab(sp)))
-- return PAGE_SIZE << compound_order(sp);
-+ VM_BUG_ON(!PageSlab(sp));
-+ if (sp->private)
-+ return sp->private;
-
- align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
-- m = (unsigned int *)(block - align);
-- return SLOB_UNITS(*m) * SLOB_UNIT;
-+ m = (slob_t *)(block - align);
-+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
+@@ -552,10 +645,10 @@ size_t ksize(const void *block)
+ sp = slob_page(block);
+ if (is_slob_page(sp)) {
+ int align = max(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);
++ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
+ } else
+- return sp->page.private;
++ return sp->size;
}
EXPORT_SYMBOL(ksize);
-@@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
-
- void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
+@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
{
-- void *b;
-+ void *b = NULL;
+ 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
- flags &= gfp_allowed_mask;
+ if (c) {
+ c->name = name;
+@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
lockdep_trace_alloc(flags);
+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
++ b = __kmalloc_node_align(c->size, flags, node, c->align);
+#else
if (c->size < PAGE_SIZE) {
b = slob_alloc(c->size, flags, c->align, node);
- trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
+ trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
SLOB_UNITS(c->size) * SLOB_UNIT,
flags, node);
} else {
-- b = slob_new_pages(flags, get_order(c->size), node);
-+ struct page *sp;
++ struct slob_page *sp;
+
-+ sp = slob_new_pages(flags, get_order(c->size), node);
-+ if (sp) {
-+ b = page_address(sp);
-+ sp->private = c->size;
-+ }
- trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
+ b = slob_new_pages(flags, get_order(c->size), node);
++ sp = slob_page(b);
++ sp->size = c->size;
+ trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
PAGE_SIZE << get_order(c->size),
flags, node);
}
+#endif
- if (b && c->ctor)
+ if (c->ctor)
c->ctor(b);
-@@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
static void __kmem_cache_free(void *b, int size)
{
- if (size < PAGE_SIZE)
-+ struct page *sp;
++ struct slob_page *sp = slob_page(b);
+
-+ sp = virt_to_page(b);
-+ BUG_ON(!PageSlab(sp));
-+ if (!sp->private)
++ if (is_slob_page(sp))
slob_free(b, size);
- else
-- slob_free_pages(b, get_order(size));
-+ slob_free_pages(sp, get_order(size));
+- else
++ else {
++ clear_slob_page(sp);
++ free_slob_page(sp);
++ sp->size = 0;
+ slob_free_pages(b, get_order(size));
++ }
}
static void kmem_rcu_free(struct rcu_head *head)
-@@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head)
+@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_head *head)
void kmem_cache_free(struct kmem_cache *c, void *b)
{
@@ -91074,10 +91176,19 @@ index 4bf8809..98a6914 100644
EXPORT_SYMBOL(kmem_cache_free);
diff --git a/mm/slub.c b/mm/slub.c
-index c3eb3d3..022c9fa 100644
+index 5710788..3d095c0 100644
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -207,7 +207,7 @@ struct track {
+@@ -186,7 +186,7 @@ static enum {
+ PARTIAL, /* Kmem_cache_node works */
+ UP, /* Everything works but does not show up in sysfs */
+ SYSFS /* Sysfs up */
+-} slab_state = DOWN;
++} slab_state __read_only = DOWN;
+
+ /* A list of all slab caches on the system */
+ static DECLARE_RWSEM(slub_lock);
+@@ -208,7 +208,7 @@ struct track {
enum track_item { TRACK_ALLOC, TRACK_FREE };
@@ -91095,13 +91206,13 @@ index c3eb3d3..022c9fa 100644
s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
#ifdef CONFIG_STACKTRACE
{
-@@ -2616,6 +2616,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
+@@ -2537,6 +2537,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
slab_free_hook(s, x);
+#ifdef CONFIG_PAX_MEMORY_SANITIZE
+ if (pax_sanitize_slab && !(s->flags & SLAB_NO_SANITIZE)) {
-+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
++ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->objsize);
+ if (s->ctor)
+ s->ctor(x);
+ }
@@ -91110,7 +91221,16 @@ index c3eb3d3..022c9fa 100644
redo:
/*
* Determine the currently cpus per cpu slab.
-@@ -2683,7 +2691,7 @@ static int slub_min_objects;
+@@ -2572,6 +2580,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);
+@@ -2605,7 +2615,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.)
*/
@@ -91119,17 +91239,51 @@ index c3eb3d3..022c9fa 100644
/*
* Calculate the order of allocation given an slab object size.
-@@ -2960,6 +2968,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
- s->inuse = size;
+@@ -3055,7 +3065,7 @@ static int kmem_cache_open(struct kmem_cache *s,
+ else
+ s->cpu_partial = 30;
- if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
-+#ifdef CONFIG_PAX_MEMORY_SANITIZE
-+ (pax_sanitize_slab && !(flags & SLAB_NO_SANITIZE)) ||
+- s->refcount = 1;
++ atomic_set(&s->refcount, 1);
+ #ifdef CONFIG_NUMA
+ s->remote_node_defrag_ratio = 1000;
+ #endif
+@@ -3159,8 +3169,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
+ void kmem_cache_destroy(struct kmem_cache *s)
+ {
+ down_write(&slub_lock);
+- s->refcount--;
+- if (!s->refcount) {
++ if (atomic_dec_and_test(&s->refcount)) {
+ list_del(&s->list);
+ up_write(&slub_lock);
+ if (kmem_cache_close(s)) {
+@@ -3189,6 +3198,10 @@ static struct kmem_cache *kmem_cache;
+ static struct kmem_cache *kmalloc_dma_caches[SLUB_PAGE_SHIFT];
+ #endif
+
++#ifdef CONFIG_PAX_USERCOPY_SLABS
++static struct kmem_cache *kmalloc_usercopy_caches[SLUB_PAGE_SHIFT];
+#endif
- s->ctor)) {
- /*
- * Relocate free pointer after the object if it is not
-@@ -3305,6 +3316,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
++
+ static int __init setup_slub_min_order(char *str)
+ {
+ get_option(&str, &slub_min_order);
+@@ -3303,6 +3316,13 @@ static struct kmem_cache *get_slab(size_t size, gfp_t flags)
+ return kmalloc_dma_caches[index];
+
+ #endif
++
++#ifdef CONFIG_PAX_USERCOPY_SLABS
++ if (flags & SLAB_USERCOPY)
++ return kmalloc_usercopy_caches[index];
++
++#endif
++
+ return kmalloc_caches[index];
+ }
+
+@@ -3371,6 +3391,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
EXPORT_SYMBOL(__kmalloc_node);
#endif
@@ -91152,7 +91306,7 @@ index c3eb3d3..022c9fa 100644
+ if (!PageSlab(page))
+ return false;
+
-+ s = page->slab_cache;
++ s = page->slab;
+ return s->flags & SLAB_USERCOPY;
+}
+
@@ -91174,12 +91328,12 @@ index c3eb3d3..022c9fa 100644
+ if (!PageSlab(page))
+ return NULL;
+
-+ s = page->slab_cache;
++ s = page->slab;
+ if (!(s->flags & SLAB_USERCOPY))
+ return s->name;
+
+ offset = (ptr - page_address(page)) % s->size;
-+ if (offset <= s->object_size && n <= s->object_size - offset)
++ if (offset <= s->objsize && n <= s->objsize - offset)
+ return NULL;
+
+ return s->name;
@@ -91189,7 +91343,7 @@ index c3eb3d3..022c9fa 100644
size_t ksize(const void *object)
{
struct page *page;
-@@ -3333,6 +3397,7 @@ void kfree(const void *x)
+@@ -3435,6 +3508,7 @@ void kfree(const void *x)
if (unlikely(ZERO_OR_NULL_PTR(x)))
return;
@@ -91197,7 +91351,60 @@ index c3eb3d3..022c9fa 100644
page = virt_to_head_page(x);
if (unlikely(!PageSlab(page))) {
BUG_ON(!PageCompound(page));
-@@ -3638,7 +3703,7 @@ static int slab_unmergeable(struct kmem_cache *s)
+@@ -3645,7 +3719,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
+ int node;
+
+ list_add(&s->list, &slab_caches);
+- s->refcount = -1;
++ atomic_set(&s->refcount, -1);
+
+ for_each_node_state(node, N_NORMAL_MEMORY) {
+ struct kmem_cache_node *n = get_node(s, node);
+@@ -3762,17 +3836,17 @@ void __init kmem_cache_init(void)
+
+ /* Caches that are not of the two-to-the-power-of size */
+ if (KMALLOC_MIN_SIZE <= 32) {
+- kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
++ kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
+ caches++;
+ }
+
+ if (KMALLOC_MIN_SIZE <= 64) {
+- kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
++ kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
+ caches++;
+ }
+
+ for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
+- kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
++ kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
+ caches++;
+ }
+
+@@ -3814,6 +3888,22 @@ void __init kmem_cache_init(void)
+ }
+ }
+ #endif
++
++#ifdef CONFIG_PAX_USERCOPY_SLABS
++ for (i = 0; i < SLUB_PAGE_SHIFT; i++) {
++ struct kmem_cache *s = kmalloc_caches[i];
++
++ if (s && s->size) {
++ char *name = kasprintf(GFP_NOWAIT,
++ "usercopy-kmalloc-%d", s->objsize);
++
++ BUG_ON(!name);
++ kmalloc_usercopy_caches[i] = create_kmalloc_cache(name,
++ s->objsize, SLAB_USERCOPY);
++ }
++ }
++#endif
++
+ printk(KERN_INFO
+ "SLUB: Genslabs=%d, HWalign=%d, Order=%d-%d, MinObjects=%d,"
+ " CPUs=%d, Nodes=%d\n",
+@@ -3840,7 +3930,7 @@ static int slab_unmergeable(struct kmem_cache *s)
/*
* We may have set a slab to be unmergeable during bootstrap.
*/
@@ -91206,25 +91413,34 @@ index c3eb3d3..022c9fa 100644
return 1;
return 0;
-@@ -3696,7 +3761,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
-
- s = find_mergeable(memcg, size, align, flags, name, ctor);
+@@ -3899,7 +3989,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
+ down_write(&slub_lock);
+ s = find_mergeable(size, align, flags, name, ctor);
if (s) {
- s->refcount++;
+ atomic_inc(&s->refcount);
/*
* Adjust the object sizes so that we clear
* the complete object on kzalloc.
-@@ -3705,7 +3770,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
+@@ -3908,7 +3998,7 @@ struct kmem_cache *kmem_cache_create(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);
- s = NULL;
+ goto err;
}
- }
-@@ -3825,7 +3890,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
+ up_write(&slub_lock);
+@@ -3979,7 +4069,7 @@ static int __cpuinit slab_cpuup_callback(struct notifier_block *nfb,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata slab_notifier = {
++static struct notifier_block slab_notifier = {
+ .notifier_call = slab_cpuup_callback
+ };
+
+@@ -4037,7 +4127,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
}
#endif
@@ -91233,7 +91449,7 @@ index c3eb3d3..022c9fa 100644
static int count_inuse(struct page *page)
{
return page->inuse;
-@@ -4214,12 +4279,12 @@ static void resiliency_test(void)
+@@ -4424,12 +4514,12 @@ static void resiliency_test(void)
validate_slab_cache(kmalloc_caches[9]);
}
#else
@@ -91248,7 +91464,7 @@ index c3eb3d3..022c9fa 100644
enum slab_stat_type {
SL_ALL, /* All slabs */
SL_PARTIAL, /* Only partially allocated slabs */
-@@ -4459,7 +4524,7 @@ SLAB_ATTR_RO(ctor);
+@@ -4670,7 +4760,7 @@ SLAB_ATTR_RO(ctor);
static ssize_t aliases_show(struct kmem_cache *s, char *buf)
{
@@ -91257,32 +91473,7 @@ index c3eb3d3..022c9fa 100644
}
SLAB_ATTR_RO(aliases);
-@@ -4547,6 +4612,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
- SLAB_ATTR_RO(cache_dma);
- #endif
-
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
-+{
-+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
-+}
-+SLAB_ATTR_RO(usercopy);
-+#endif
-+
- static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
- {
- return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
-@@ -4881,6 +4954,9 @@ static struct attribute *slab_attrs[] = {
- #ifdef CONFIG_ZONE_DMA
- &cache_dma_attr.attr,
- #endif
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+ &usercopy_attr.attr,
-+#endif
- #ifdef CONFIG_NUMA
- &remote_node_defrag_ratio_attr.attr,
- #endif
-@@ -5113,6 +5189,7 @@ static char *create_unique_id(struct kmem_cache *s)
+@@ -5237,6 +5327,7 @@ static char *create_unique_id(struct kmem_cache *s)
return name;
}
@@ -91290,7 +91481,7 @@ index c3eb3d3..022c9fa 100644
static int sysfs_slab_add(struct kmem_cache *s)
{
int err;
-@@ -5136,7 +5213,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
+@@ -5265,7 +5356,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
}
s->kobj.kset = slab_kset;
@@ -91299,7 +91490,7 @@ index c3eb3d3..022c9fa 100644
if (err) {
kobject_put(&s->kobj);
return err;
-@@ -5170,6 +5247,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
+@@ -5299,6 +5390,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
kobject_del(&s->kobj);
kobject_put(&s->kobj);
}
@@ -91307,7 +91498,7 @@ index c3eb3d3..022c9fa 100644
/*
* Need to buffer aliases during bootup until sysfs becomes
-@@ -5183,6 +5261,7 @@ struct saved_alias {
+@@ -5312,6 +5404,7 @@ struct saved_alias {
static struct saved_alias *alias_list;
@@ -91315,7 +91506,7 @@ index c3eb3d3..022c9fa 100644
static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
{
struct saved_alias *al;
-@@ -5205,6 +5284,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
+@@ -5334,6 +5427,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
alias_list = al;
return 0;
}
@@ -91324,10 +91515,10 @@ index c3eb3d3..022c9fa 100644
static int __init slab_sysfs_init(void)
{
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
-index 27eeab3..7c3f7f2 100644
+index 1b7e22a..3fcd4f3 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
-@@ -130,7 +130,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
+@@ -128,7 +128,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
void *p = vmemmap_alloc_block(PAGE_SIZE, node);
if (!p)
return NULL;
@@ -91336,7 +91527,7 @@ index 27eeab3..7c3f7f2 100644
}
return pud;
}
-@@ -142,7 +142,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
+@@ -140,7 +140,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
void *p = vmemmap_alloc_block(PAGE_SIZE, node);
if (!p)
return NULL;
@@ -91345,24 +91536,19 @@ index 27eeab3..7c3f7f2 100644
}
return pgd;
}
-diff --git a/mm/sparse.c b/mm/sparse.c
-index 4ac1d7e..bbfcb1f 100644
---- a/mm/sparse.c
-+++ b/mm/sparse.c
-@@ -745,7 +745,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
-
- for (i = 0; i < PAGES_PER_SECTION; i++) {
- if (PageHWPoison(&memmap[i])) {
-- atomic_long_sub(1, &num_poisoned_pages);
-+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
- ClearPageHWPoison(&memmap[i]);
- }
- }
diff --git a/mm/swap.c b/mm/swap.c
-index 759c3ca..7c1a5b4 100644
+index 55b266d..a532537 100644
--- a/mm/swap.c
+++ b/mm/swap.c
-@@ -77,6 +77,8 @@ static void __put_compound_page(struct page *page)
+@@ -31,6 +31,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/memcontrol.h>
+ #include <linux/gfp.h>
++#include <linux/hugetlb.h>
+
+ #include "internal.h"
+
+@@ -71,6 +72,8 @@ static void __put_compound_page(struct page *page)
__page_cache_release(page);
dtor = get_compound_page_dtor(page);
@@ -91372,10 +91558,10 @@ index 759c3ca..7c1a5b4 100644
}
diff --git a/mm/swapfile.c b/mm/swapfile.c
-index de7c904..c84bf11 100644
+index fad1830..6aa3a7f 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
-@@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
+@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
/* Activity counter to indicate that a swapon or swapoff has occurred */
@@ -91384,7 +91570,7 @@ index de7c904..c84bf11 100644
static inline unsigned char swap_count(unsigned char ent)
{
-@@ -1949,7 +1949,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
+@@ -1668,7 +1668,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
}
filp_close(swap_file, NULL);
err = 0;
@@ -91393,7 +91579,7 @@ index de7c904..c84bf11 100644
wake_up_interruptible(&proc_poll_wait);
out_dput:
-@@ -1966,8 +1966,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
+@@ -1684,8 +1684,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
poll_wait(file, &proc_poll_wait, wait);
@@ -91404,7 +91590,7 @@ index de7c904..c84bf11 100644
return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
}
-@@ -2065,7 +2065,7 @@ static int swaps_open(struct inode *inode, struct file *file)
+@@ -1783,7 +1783,7 @@ static int swaps_open(struct inode *inode, struct file *file)
return ret;
seq = file->private_data;
@@ -91413,8 +91599,8 @@ index de7c904..c84bf11 100644
return 0;
}
-@@ -2524,7 +2524,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
- (frontswap_map) ? "FS" : "");
+@@ -2117,7 +2117,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
+ (p->flags & SWP_DISCARDABLE) ? "D" : "");
mutex_unlock(&swapon_mutex);
- atomic_inc(&proc_poll_event);
@@ -91423,10 +91609,10 @@ index de7c904..c84bf11 100644
if (S_ISREG(inode->i_mode))
diff --git a/mm/util.c b/mm/util.c
-index eaf63fc2..32b2629 100644
+index 136ac4f..f917fa9 100644
--- a/mm/util.c
+++ b/mm/util.c
-@@ -294,6 +294,12 @@ done:
+@@ -243,6 +243,12 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
void arch_pick_mmap_layout(struct mm_struct *mm)
{
mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -91437,13 +91623,13 @@ index eaf63fc2..32b2629 100644
+#endif
+
mm->get_unmapped_area = arch_get_unmapped_area;
+ mm->unmap_area = arch_unmap_area;
}
- #endif
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 1074543..136dbe0 100644
+index eeba3bb..a22618a 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
+@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
pte = pte_offset_kernel(pmd, addr);
do {
@@ -91465,7 +91651,7 @@ index 1074543..136dbe0 100644
} while (pte++, addr += PAGE_SIZE, addr != end);
}
-@@ -120,16 +131,29 @@ 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;
@@ -91497,7 +91683,7 @@ index 1074543..136dbe0 100644
return 0;
}
-@@ -139,7 +163,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;
@@ -91506,7 +91692,7 @@ index 1074543..136dbe0 100644
if (!pmd)
return -ENOMEM;
do {
-@@ -156,7 +180,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;
@@ -91515,7 +91701,7 @@ index 1074543..136dbe0 100644
if (!pud)
return -ENOMEM;
do {
-@@ -216,6 +240,12 @@ int is_vmalloc_or_module_addr(const void *x)
+@@ -196,6 +220,12 @@ int is_vmalloc_or_module_addr(const void *x)
if (addr >= MODULES_VADDR && addr < MODULES_END)
return 1;
#endif
@@ -91528,7 +91714,7 @@ index 1074543..136dbe0 100644
return is_vmalloc_addr(x);
}
-@@ -236,8 +266,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
+@@ -216,8 +246,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
if (!pgd_none(*pgd)) {
pud_t *pud = pud_offset(pgd, addr);
@@ -91543,7 +91729,7 @@ index 1074543..136dbe0 100644
if (!pmd_none(*pmd)) {
pte_t *ptep, pte;
-@@ -1303,6 +1339,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
+@@ -1295,6 +1331,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
struct vm_struct *area;
BUG_ON(in_interrupt());
@@ -91557,10 +91743,10 @@ index 1074543..136dbe0 100644
+ }
+#endif
+
- if (flags & VM_IOREMAP)
- align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
+ if (flags & VM_IOREMAP) {
+ int bit = fls(size);
-@@ -1528,6 +1574,11 @@ void *vmap(struct page **pages, unsigned int count,
+@@ -1527,6 +1573,11 @@ void *vmap(struct page **pages, unsigned int count,
if (count > totalram_pages)
return NULL;
@@ -91572,21 +91758,21 @@ index 1074543..136dbe0 100644
area = get_vm_area_caller((count << PAGE_SHIFT), flags,
__builtin_return_address(0));
if (!area)
-@@ -1629,6 +1680,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
+@@ -1628,6 +1679,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
if (!size || (size >> PAGE_SHIFT) > totalram_pages)
goto fail;
+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
+ if (!(pgprot_val(prot) & _PAGE_NX))
-+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
++ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
+ else
+#endif
+
- area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
start, end, node, gfp_mask, caller);
if (!area)
-@@ -1805,10 +1863,9 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1801,10 +1859,9 @@ EXPORT_SYMBOL(vzalloc_node);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
@@ -91595,19 +91781,35 @@ index 1074543..136dbe0 100644
{
- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
- NUMA_NO_NODE, __builtin_return_address(0));
+ -1, __builtin_return_address(0));
}
-@@ -2115,6 +2172,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
- {
- struct vm_struct *area;
+@@ -2099,6 +2156,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;
+ BUG_ON(vma->vm_mirror);
+
- size = PAGE_ALIGN(size);
+ if ((PAGE_SIZE-1) & (unsigned long)addr)
+ return -EINVAL;
+
+@@ -2351,8 +2410,8 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
+ return NULL;
+ }
+
+- vms = kzalloc(sizeof(vms[0]) * nr_vms, GFP_KERNEL);
+- vas = kzalloc(sizeof(vas[0]) * nr_vms, GFP_KERNEL);
++ vms = kcalloc(nr_vms, sizeof(vms[0]), GFP_KERNEL);
++ vas = kcalloc(nr_vms, sizeof(vas[0]), GFP_KERNEL);
+ if (!vas || !vms)
+ goto err_free;
+
+@@ -2536,11 +2595,15 @@ static int s_show(struct seq_file *m, void *p)
+ {
+ struct vm_struct *v = p;
- if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
-@@ -2600,7 +2659,11 @@ static int s_show(struct seq_file *m, void *p)
+- seq_printf(m, "0x%p-0x%p %7ld",
++ seq_printf(m, "0x%pP-0x%pP %7ld",
v->addr, v->addr + v->size, v->size);
if (v->caller)
@@ -91620,10 +91822,10 @@ index 1074543..136dbe0 100644
if (v->nr_pages)
seq_printf(m, " pages=%d", v->nr_pages);
diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 9bb3145..98e5f68 100644
+index 8fd603b..495a5a1 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
-@@ -79,7 +79,7 @@ void vm_events_fold_cpu(int cpu)
+@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
*/
@@ -91632,45 +91834,34 @@ index 9bb3145..98e5f68 100644
EXPORT_SYMBOL(vm_stat);
#ifdef CONFIG_SMP
-@@ -423,7 +423,7 @@ static inline void fold_diff(int *diff)
-
- for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
- if (diff[i])
-- atomic_long_add(diff[i], &vm_stat[i]);
-+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
- }
-
- /*
-@@ -455,7 +455,7 @@ static void refresh_cpu_vm_stats(void)
- v = this_cpu_xchg(p->vm_stat_diff[i], 0);
- if (v) {
-
+@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
+ v = p->vm_stat_diff[i];
+ p->vm_stat_diff[i] = 0;
+ local_irq_restore(flags);
- atomic_long_add(v, &zone->vm_stat[i]);
+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
global_diff[i] += v;
#ifdef CONFIG_NUMA
/* 3 seconds idle till flush */
-@@ -517,7 +517,7 @@ void cpu_vm_stats_fold(int cpu)
+@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
- v = p->vm_stat_diff[i];
- p->vm_stat_diff[i] = 0;
-- atomic_long_add(v, &zone->vm_stat[i]);
-+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
- global_diff[i] += v;
- }
- }
-@@ -537,8 +537,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]);
- }
+ for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
+ if (global_diff[i])
+- atomic_long_add(global_diff[i], &vm_stat[i]);
++ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
}
+
#endif
-@@ -1280,10 +1280,20 @@ static int __init setup_vmstat(void)
+@@ -1193,7 +1193,7 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
+ return NOTIFY_OK;
+ }
+
+-static struct notifier_block __cpuinitdata vmstat_notifier =
++static struct notifier_block vmstat_notifier =
+ { &vmstat_cpuup_callback, NULL, 0 };
+ #endif
+
+@@ -1208,10 +1208,20 @@ static int __init setup_vmstat(void)
start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
@@ -91696,10 +91887,10 @@ index 9bb3145..98e5f68 100644
return 0;
}
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
-index 61fc573..b5e47d0 100644
+index 963f285..3e3874d 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
-@@ -472,7 +472,7 @@ out:
+@@ -513,7 +513,7 @@ out:
return NOTIFY_DONE;
}
@@ -91708,9 +91899,9 @@ index 61fc573..b5e47d0 100644
.notifier_call = vlan_device_event,
};
-@@ -547,8 +547,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
+@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
err = -EPERM;
- if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
+ if (!capable(CAP_NET_ADMIN))
break;
- if ((args.u.name_type >= 0) &&
- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
@@ -91719,10 +91910,10 @@ index 61fc573..b5e47d0 100644
vn = net_generic(net, vlan_net_id);
diff --git a/net/9p/mod.c b/net/9p/mod.c
-index 6ab36ae..6f1841b 100644
+index 2664d12..b2803fe 100644
--- a/net/9p/mod.c
+++ b/net/9p/mod.c
-@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
+@@ -57,7 +57,7 @@ static LIST_HEAD(v9fs_trans_list);
void v9fs_register_trans(struct p9_trans_module *m)
{
spin_lock(&v9fs_trans_lock);
@@ -91731,7 +91922,7 @@ index 6ab36ae..6f1841b 100644
spin_unlock(&v9fs_trans_lock);
}
EXPORT_SYMBOL(v9fs_register_trans);
-@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
+@@ -70,7 +70,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
void v9fs_unregister_trans(struct p9_trans_module *m)
{
spin_lock(&v9fs_trans_lock);
@@ -91741,10 +91932,10 @@ index 6ab36ae..6f1841b 100644
}
EXPORT_SYMBOL(v9fs_unregister_trans);
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
-index 3ffda1b..fceac96 100644
+index fdfdb57..38d368c 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
-@@ -432,7 +432,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
+@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
oldfs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
@@ -91754,7 +91945,7 @@ index 3ffda1b..fceac96 100644
if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
-index 876fbe8..8bbea9f 100644
+index f41f026..fe76ea8 100644
--- a/net/atm/atm_misc.c
+++ b/net/atm/atm_misc.c
@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
@@ -91794,7 +91985,7 @@ index 876fbe8..8bbea9f 100644
#undef __HANDLE_ITEM
}
diff --git a/net/atm/lec.h b/net/atm/lec.h
-index 4149db1..f2ab682 100644
+index dfc0719..47c5322 100644
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -48,7 +48,7 @@ struct lane2_ops {
@@ -91807,7 +91998,7 @@ index 4149db1..f2ab682 100644
/*
* ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
diff --git a/net/atm/proc.c b/net/atm/proc.c
-index bbb6461..cf04016 100644
+index 0d020de..011c7bb 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
@@ -91824,7 +92015,7 @@ index bbb6461..cf04016 100644
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 0447d5d..3cf4728 100644
+index 23f45ce..c748f1a 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
@@ -91846,124 +92037,125 @@ index 0447d5d..3cf4728 100644
#undef __HANDLE_ITEM
}
diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
-index 919a5ce..cc6b444 100644
+index ebe0ef3..d5b0a8e 100644
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
-@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
- {
- char path[sizeof("net/ax25/") + IFNAMSIZ];
- int k;
-- struct ctl_table *table;
-+ ctl_table_no_const *table;
+@@ -31,7 +31,7 @@ static int min_ds_timeout[1], max_ds_timeout[] = {65535000};
+
+ static struct ctl_table_header *ax25_table_header;
- table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
- if (!table)
+-static ctl_table *ax25_table;
++static ctl_table_no_const *ax25_table;
+ static int ax25_table_size;
+
+ static struct ctl_path ax25_path[] = {
+@@ -174,7 +174,7 @@ void ax25_register_sysctl(void)
+ }
+
+ for (n = 0, ax25_dev = ax25_dev_list; ax25_dev != NULL; ax25_dev = ax25_dev->next) {
+- struct ctl_table *child = kmemdup(ax25_param_table,
++ ctl_table_no_const *child = kmemdup(ax25_param_table,
+ sizeof(ax25_param_table),
+ GFP_ATOMIC);
+ if (!child) {
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
-index 0a8a80c..f7e89aa 100644
+index 3512e25..2b33401 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
-@@ -121,7 +121,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
+@@ -541,7 +541,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
+
+ /* change sequence number to network order */
+ batman_ogm_packet->seqno =
+- htonl((uint32_t)atomic_read(&hard_iface->seqno));
++ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
- /* randomize initial seqno to avoid collision */
- get_random_bytes(&random_seqno, sizeof(random_seqno));
-- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
-+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
+ batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
+ batman_ogm_packet->tt_crc = htons((uint16_t)
+@@ -561,7 +561,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
+ else
+ batman_ogm_packet->gw_flags = NO_FLAGS;
- hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
- ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
-@@ -703,9 +703,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
- batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff);
+- atomic_inc(&hard_iface->seqno);
++ atomic_inc_unchecked(&hard_iface->seqno);
- /* change sequence number to network order */
-- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
-+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
- batadv_ogm_packet->seqno = htonl(seqno);
-- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
-+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
-
- batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn);
- batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc);
-@@ -1111,7 +1111,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
+ slide_own_bcast_window(hard_iface);
+ bat_ogm_queue_add(bat_priv, hard_iface->packet_buff,
+@@ -922,7 +922,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
return;
/* could be changed by schedule_own_packet() */
-- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
-+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
+- if_incoming_seqno = atomic_read(&if_incoming->seqno);
++ if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
+
+ has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
- 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 c478e6b..469fd2f 100644
+index 7704df4..beb4e16 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
-@@ -453,7 +453,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
+@@ -326,8 +326,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
dev_add_pack(&hard_iface->batman_adv_ptype);
+- atomic_set(&hard_iface->seqno, 1);
- atomic_set(&hard_iface->frag_seqno, 1);
++ atomic_set_unchecked(&hard_iface->seqno, 1);
+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
- batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
- hard_iface->net_dev->name);
+ bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
+ hard_iface->net_dev->name);
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 813db4e..847edac 100644
+index f9cc957..efd9dae 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
-@@ -263,7 +263,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
- primary_if->net_dev->dev_addr, ETH_ALEN);
+@@ -634,7 +634,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
/* set broadcast sequence number */
-- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
-+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
- bcast_packet->seqno = htonl(seqno);
+ bcast_packet->seqno =
+- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
++ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
- batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
-@@ -483,7 +483,7 @@ static int batadv_softif_init_late(struct net_device *dev)
- atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
+ add_bcast_packet_to_list(bat_priv, skb, 1);
- atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
+@@ -828,7 +828,7 @@ struct net_device *softif_create(const char *name)
+ atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
+
+ atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
- atomic_set(&bat_priv->bcast_seqno, 1);
+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
- atomic_set(&bat_priv->tt.vn, 0);
- atomic_set(&bat_priv->tt.local_changes, 0);
- atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
+ atomic_set(&bat_priv->ttvn, 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 b2c94e1..3d47e07 100644
+index ab8d0fe..ceba3fd 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
-@@ -51,7 +51,7 @@
- struct batadv_hard_iface_bat_iv {
- unsigned char *ogm_buff;
- int ogm_buff_len;
-- atomic_t ogm_seqno;
-+ atomic_unchecked_t ogm_seqno;
- };
-
- /**
-@@ -76,7 +76,7 @@ struct batadv_hard_iface {
+@@ -38,8 +38,8 @@ struct hard_iface {
int16_t if_num;
char if_status;
struct net_device *net_dev;
+- atomic_t seqno;
- atomic_t frag_seqno;
++ atomic_unchecked_t seqno;
+ atomic_unchecked_t frag_seqno;
- uint8_t num_bcasts;
+ unsigned char *packet_buff;
+ int packet_len;
struct kobject *hardif_obj;
- atomic_t refcount;
-@@ -560,7 +560,7 @@ struct batadv_priv {
- #ifdef CONFIG_BATMAN_ADV_DEBUG
- atomic_t log_level;
- #endif
+@@ -154,7 +154,7 @@ struct bat_priv {
+ atomic_t orig_interval; /* uint */
+ atomic_t hop_penalty; /* uint */
+ atomic_t log_level; /* uint */
- atomic_t bcast_seqno;
+ atomic_unchecked_t bcast_seqno;
atomic_t bcast_queue_left;
atomic_t batman_queue_left;
- char num_ifaces;
+ atomic_t ttvn; /* translation table version number */
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
-index 48b31d3..62a0bcb 100644
+index 07d1c1d..7e9bea9 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
-@@ -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;
+@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+ frag1->flags = UNI_FRAG_HEAD | large_tail;
frag2->flags = large_tail;
- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
@@ -91971,11 +92163,37 @@ index 48b31d3..62a0bcb 100644
frag1->seqno = htons(seqno - 1);
frag2->seqno = htons(seqno);
+diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
+index 9b67f3d..f6d7e5c 100644
+--- a/net/bluetooth/Makefile
++++ b/net/bluetooth/Makefile
+@@ -8,6 +8,6 @@ obj-$(CONFIG_BT_BNEP) += bnep/
+ obj-$(CONFIG_BT_CMTP) += cmtp/
+ obj-$(CONFIG_BT_HIDP) += hidp/
+
+-bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o hci_sock.o hci_sysfs.o lib.o
+-bluetooth-$(CONFIG_BT_L2CAP) += l2cap_core.o l2cap_sock.o smp.o
++bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o hci_sock.o hci_sysfs.o lib.o smp.o
++bluetooth-$(CONFIG_BT_L2CAP) += l2cap_core.o l2cap_sock.o
+ bluetooth-$(CONFIG_BT_SCO) += sco.o
+diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
+index aa12649..a22d595 100644
+--- a/net/bluetooth/hci_conn.c
++++ b/net/bluetooth/hci_conn.c
+@@ -235,7 +235,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
+ memset(&cp, 0, sizeof(cp));
+
+ cp.handle = cpu_to_le16(conn->handle);
+- memcpy(cp.ltk, ltk, sizeof(ltk));
++ memcpy(cp.ltk, ltk, sizeof(cp.ltk));
+
+ hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
+ }
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
-index 9bd7d95..6c4884f 100644
+index 8361ee4..a4f0f18 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,
+@@ -607,7 +607,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char
uf.event_mask[1] = *((u32 *) f->event_mask + 1);
}
@@ -91984,11 +92202,28 @@ index 9bd7d95..6c4884f 100644
if (copy_from_user(&uf, optval, len)) {
err = -EFAULT;
break;
+diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
+index 0274157..f8afbf3c7 100644
+--- a/net/bluetooth/hidp/core.c
++++ b/net/bluetooth/hidp/core.c
+@@ -945,9 +945,9 @@ static int hidp_setup_hid(struct hidp_session *session,
+ hid->version = req->version;
+ hid->country = req->country;
+
+- strncpy(hid->name, req->name, sizeof(req->name) - 1);
+- strncpy(hid->phys, batostr(&bt_sk(session->ctrl_sock->sk)->src), 64);
+- strncpy(hid->uniq, batostr(&bt_sk(session->ctrl_sock->sk)->dst), 64);
++ strncpy(hid->name, req->name, sizeof(hid->name) - 1);
++ strncpy(hid->phys, batostr(&bt_sk(session->ctrl_sock->sk)->src), sizeof(hid->phys) - 1);
++ strncpy(hid->uniq, batostr(&bt_sk(session->ctrl_sock->sk)->dst), sizeof(hid->uniq) - 1);
+
+ hid->dev.parent = hidp_get_device(session);
+ hid->ll_driver = &hidp_hid_driver;
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
-index 63fa111..b166ec6 100644
+index dd7c019..9d19c31 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
-@@ -3511,8 +3511,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
+@@ -2181,8 +2181,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
break;
case L2CAP_CONF_RFC:
@@ -92000,12 +92235,12 @@ index 63fa111..b166ec6 100644
+ memcpy(&rfc, (void *)val, olen);
if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
- rfc.mode != chan->mode)
+ rfc.mode != chan->mode)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
-index 0098af8..fb5a31f 100644
+index 158887a..1b70c49 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
-@@ -485,7 +485,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+@@ -484,7 +484,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;
@@ -92015,16 +92250,16 @@ index 0098af8..fb5a31f 100644
u32 opt;
BT_DBG("sk %p", sk);
-@@ -507,7 +508,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+@@ -506,7 +507,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;
+ opts.txwin_size = (__u16)chan->tx_win;
- len = min_t(unsigned int, sizeof(opts), optlen);
+ len = min(sizeof(opts), len);
if (copy_from_user((char *) &opts, optval, len)) {
err = -EFAULT;
break;
-@@ -587,7 +588,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -572,7 +573,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;
@@ -92034,7 +92269,7 @@ index 0098af8..fb5a31f 100644
u32 opt;
BT_DBG("sk %p", sk);
-@@ -610,7 +612,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -595,7 +597,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
sec.level = BT_SECURITY_LOW;
@@ -92043,7 +92278,7 @@ index 0098af8..fb5a31f 100644
if (copy_from_user((char *) &sec, optval, len)) {
err = -EFAULT;
break;
-@@ -707,7 +709,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -671,7 +673,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
@@ -92053,10 +92288,10 @@ index 0098af8..fb5a31f 100644
err = -EFAULT;
break;
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index 30b3721..c1bd0a0 100644
+index 82ce164..00bd057 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
-@@ -666,7 +666,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
+@@ -685,7 +685,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
struct sock *sk = sock->sk;
struct bt_security sec;
int err = 0;
@@ -92065,7 +92300,7 @@ index 30b3721..c1bd0a0 100644
u32 opt;
BT_DBG("sk %p", sk);
-@@ -688,7 +688,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
+@@ -707,7 +707,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
sec.level = BT_SECURITY_LOW;
@@ -92074,41 +92309,32 @@ index 30b3721..c1bd0a0 100644
if (copy_from_user((char *) &sec, optval, len)) {
err = -EFAULT;
break;
-diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
-index 84fcf9f..e389b27 100644
---- a/net/bluetooth/rfcomm/tty.c
-+++ b/net/bluetooth/rfcomm/tty.c
-@@ -684,7 +684,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
- BT_DBG("tty %p id %d", tty, tty->index);
-
- BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
-- dev->channel, dev->port.count);
-+ dev->channel, atomic_read(&dev->port.count));
-
- err = tty_port_open(&dev->port, tty, filp);
- if (err)
-@@ -707,7 +707,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
- struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
-
- BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
-- dev->port.count);
-+ atomic_read(&dev->port.count));
+diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
+index a06deca..2269299 100644
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -1410,7 +1410,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
+ nexthdr = ip6h->nexthdr;
+ offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
+
+- if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
++ if (nexthdr != IPPROTO_ICMPV6)
+ return 0;
- tty_port_close(&dev->port, tty, filp);
- }
+ /* Okay, we found ICMPv6 header */
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
-index 5180938..7c470c3 100644
+index 5449294..c1d8d99 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
-@@ -181,6 +181,7 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
+@@ -158,6 +158,7 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
ub->qlen++;
- pm = nlmsg_data(nlh);
+ pm = NLMSG_DATA(nlh);
+ memset(pm, 0, sizeof(*pm));
/* Fill in the ulog data */
pm->version = EBT_ULOG_VERSION;
-@@ -193,8 +194,6 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
+@@ -170,8 +171,6 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
pm->hook = hooknr;
if (uloginfo->prefix != NULL)
strcpy(pm->prefix, uloginfo->prefix);
@@ -92117,7 +92343,7 @@ index 5180938..7c470c3 100644
if (in) {
strcpy(pm->physindev, in->name);
-@@ -204,16 +203,14 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
+@@ -181,16 +180,14 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
strcpy(pm->indev, br_port_get_rcu(in)->br->dev->name);
else
strcpy(pm->indev, in->name);
@@ -92137,10 +92363,10 @@ index 5180938..7c470c3 100644
if (skb_copy_bits(skb, -ETH_HLEN, pm->data, copy_len) < 0)
BUG();
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
-index ac78024..161a80c 100644
+index 5864cc4..6ddb362 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
-@@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
tmp.valid_hooks = t->table->valid_hooks;
}
mutex_unlock(&ebt_mutex);
@@ -92149,7 +92375,7 @@ index ac78024..161a80c 100644
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
-@@ -2331,7 +2331,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
+@@ -2323,7 +2323,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
goto out;
tmp.valid_hooks = t->valid_hooks;
@@ -92158,7 +92384,7 @@ index ac78024..161a80c 100644
ret = -EFAULT;
break;
}
-@@ -2342,7 +2342,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
+@@ -2334,7 +2334,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
tmp.entries_size = t->table->entries_size;
tmp.valid_hooks = t->table->valid_hooks;
@@ -92167,19 +92393,152 @@ index ac78024..161a80c 100644
ret = -EFAULT;
break;
}
+diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
+index 53a8e37..45c033e 100644
+--- a/net/caif/caif_socket.c
++++ b/net/caif/caif_socket.c
+@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
+ #ifdef CONFIG_DEBUG_FS
+ struct debug_fs_counter {
+ atomic_t caif_nr_socks;
+- atomic_t caif_sock_create;
+- atomic_t num_connect_req;
+- atomic_t num_connect_resp;
+- atomic_t num_connect_fail_resp;
+- atomic_t num_disconnect;
+- atomic_t num_remote_shutdown_ind;
+- atomic_t num_tx_flow_off_ind;
+- atomic_t num_tx_flow_on_ind;
+- atomic_t num_rx_flow_off;
+- atomic_t num_rx_flow_on;
++ atomic_unchecked_t caif_sock_create;
++ atomic_unchecked_t num_connect_req;
++ atomic_unchecked_t num_connect_resp;
++ atomic_unchecked_t num_connect_fail_resp;
++ atomic_unchecked_t num_disconnect;
++ atomic_unchecked_t num_remote_shutdown_ind;
++ atomic_unchecked_t num_tx_flow_off_ind;
++ atomic_unchecked_t num_tx_flow_on_ind;
++ atomic_unchecked_t num_rx_flow_off;
++ atomic_unchecked_t num_rx_flow_on;
+ };
+ static struct debug_fs_counter cnt;
+ #define dbfs_atomic_inc(v) atomic_inc_return(v)
++#define dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
+ #define dbfs_atomic_dec(v) atomic_dec_return(v)
+ #else
+ #define dbfs_atomic_inc(v) 0
+@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+ atomic_read(&cf_sk->sk.sk_rmem_alloc),
+ sk_rcvbuf_lowwater(cf_sk));
+ set_rx_flow_off(cf_sk);
+- dbfs_atomic_inc(&cnt.num_rx_flow_off);
++ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
+ caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
+ }
+
+@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+ set_rx_flow_off(cf_sk);
+ if (net_ratelimit())
+ pr_debug("sending flow OFF due to rmem_schedule\n");
+- dbfs_atomic_inc(&cnt.num_rx_flow_off);
++ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
+ caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
+ }
+ skb->dev = NULL;
+@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer *layr,
+ switch (flow) {
+ case CAIF_CTRLCMD_FLOW_ON_IND:
+ /* OK from modem to start sending again */
+- dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
++ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_on_ind);
+ set_tx_flow_on(cf_sk);
+ cf_sk->sk.sk_state_change(&cf_sk->sk);
+ break;
+
+ case CAIF_CTRLCMD_FLOW_OFF_IND:
+ /* Modem asks us to shut up */
+- dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
++ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_off_ind);
+ set_tx_flow_off(cf_sk);
+ cf_sk->sk.sk_state_change(&cf_sk->sk);
+ break;
+@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
+ /* We're now connected */
+ caif_client_register_refcnt(&cf_sk->layer,
+ cfsk_hold, cfsk_put);
+- dbfs_atomic_inc(&cnt.num_connect_resp);
++ dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
+ cf_sk->sk.sk_state = CAIF_CONNECTED;
+ set_tx_flow_on(cf_sk);
+ cf_sk->sk.sk_state_change(&cf_sk->sk);
+@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
+
+ case CAIF_CTRLCMD_INIT_FAIL_RSP:
+ /* Connect request failed */
+- dbfs_atomic_inc(&cnt.num_connect_fail_resp);
++ dbfs_atomic_inc_unchecked(&cnt.num_connect_fail_resp);
+ cf_sk->sk.sk_err = ECONNREFUSED;
+ cf_sk->sk.sk_state = CAIF_DISCONNECTED;
+ cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
+@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
+
+ case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
+ /* Modem has closed this connection, or device is down. */
+- dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
++ dbfs_atomic_inc_unchecked(&cnt.num_remote_shutdown_ind);
+ cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
+ cf_sk->sk.sk_err = ECONNRESET;
+ set_rx_flow_on(cf_sk);
+@@ -297,7 +298,7 @@ static void caif_check_flow_release(struct sock *sk)
+ return;
+
+ if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
+- dbfs_atomic_inc(&cnt.num_rx_flow_on);
++ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_on);
+ set_rx_flow_on(cf_sk);
+ caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
+ }
+@@ -856,7 +857,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
+ /*ifindex = id of the interface.*/
+ cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
+
+- dbfs_atomic_inc(&cnt.num_connect_req);
++ dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
+ cf_sk->layer.receive = caif_sktrecv_cb;
+
+ err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
+@@ -945,7 +946,7 @@ static int caif_release(struct socket *sock)
+ spin_unlock_bh(&sk->sk_receive_queue.lock);
+ sock->sk = NULL;
+
+- dbfs_atomic_inc(&cnt.num_disconnect);
++ dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
+
+ WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
+ if (cf_sk->debugfs_socket_dir != NULL)
+@@ -1124,7 +1125,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
+ cf_sk->conn_req.protocol = protocol;
+ /* Increase the number of sockets created. */
+ dbfs_atomic_inc(&cnt.caif_nr_socks);
+- num = dbfs_atomic_inc(&cnt.caif_sock_create);
++ num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
+ #ifdef CONFIG_DEBUG_FS
+ if (!IS_ERR(debugfsdir)) {
+
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
-index 0f45522..dab651f 100644
+index 84efbe4..51d47bc 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
-@@ -10,6 +10,7 @@
+@@ -9,6 +9,7 @@
+ #include <linux/stddef.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
- #include <linux/pkt_sched.h>
+#include <linux/sched.h>
#include <net/caif/caif_layer.h>
#include <net/caif/cfpkt.h>
#include <net/caif/cfctrl.h>
-@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
+@@ -42,8 +43,8 @@ struct cflayer *cfctrl_create(void)
memset(&dev_info, 0, sizeof(dev_info));
dev_info.id = 0xff;
cfsrvl_init(&this->serv, 0, &dev_info, false);
@@ -92190,7 +92549,7 @@ index 0f45522..dab651f 100644
this->serv.layer.receive = cfctrl_recv;
sprintf(this->serv.layer.name, "ctrl");
this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
-@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
+@@ -129,8 +130,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
struct cfctrl_request_info *req)
{
spin_lock_bh(&ctrl->info_list_lock);
@@ -92201,7 +92560,7 @@ index 0f45522..dab651f 100644
list_add_tail(&req->list, &ctrl->list);
spin_unlock_bh(&ctrl->info_list_lock);
}
-@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
+@@ -148,7 +149,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
if (p != first)
pr_warn("Requests are not received in order\n");
@@ -92210,11 +92569,85 @@ index 0f45522..dab651f 100644
p->sequence_no);
list_del(&p->list);
goto out;
+diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
+index 8656909..a2ae45d 100644
+--- a/net/caif/chnl_net.c
++++ b/net/caif/chnl_net.c
+@@ -74,7 +74,6 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
+ struct sk_buff *skb;
+ struct chnl_net *priv = container_of(layr, struct chnl_net, chnl);
+ int pktlen;
+- int err = 0;
+ const u8 *ip_version;
+ u8 buf;
+
+@@ -95,8 +94,11 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
+
+ /* check the version of IP */
+ ip_version = skb_header_pointer(skb, 0, 1, &buf);
+- if (!ip_version)
++ if (!ip_version) {
++ kfree_skb(skb);
+ return -EINVAL;
++ }
++
+ switch (*ip_version >> 4) {
+ case 4:
+ skb->protocol = htons(ETH_P_IP);
+@@ -105,6 +107,8 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
+ skb->protocol = htons(ETH_P_IPV6);
+ break;
+ default:
++ kfree_skb(skb);
++ priv->netdev->stats.rx_errors++;
+ return -EINVAL;
+ }
+
+@@ -123,7 +127,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
+ priv->netdev->stats.rx_packets++;
+ priv->netdev->stats.rx_bytes += pktlen;
+
+- return err;
++ return 0;
+ }
+
+ static int delete_device(struct chnl_net *dev)
+@@ -221,12 +225,16 @@ static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
+
+ if (skb->len > priv->netdev->mtu) {
+ pr_warn("Size of skb exceeded MTU\n");
+- return -ENOSPC;
++ kfree_skb(skb);
++ dev->stats.tx_errors++;
++ return NETDEV_TX_OK;
+ }
+
+ if (!priv->flowenabled) {
+ pr_debug("dropping packets flow off\n");
+- return NETDEV_TX_BUSY;
++ kfree_skb(skb);
++ dev->stats.tx_dropped++;
++ return NETDEV_TX_OK;
+ }
+
+ if (priv->conn_req.protocol == CAIFPROTO_DATAGRAM_LOOP)
+@@ -240,9 +248,8 @@ static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
+ /* Send the packet down the stack. */
+ result = priv->chnl.dn->transmit(priv->chnl.dn, pkt);
+ if (result) {
+- if (result == -EAGAIN)
+- result = NETDEV_TX_BUSY;
+- return result;
++ dev->stats.tx_dropped++;
++ return NETDEV_TX_OK;
+ }
+
+ /* Update statistics. */
diff --git a/net/can/af_can.c b/net/can/af_can.c
-index 3ab8dd2..b9aef13 100644
+index 0ce2ad0..cb92a90 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
-@@ -862,7 +862,7 @@ static const struct net_proto_family can_family_ops = {
+@@ -818,7 +818,7 @@ static const struct net_proto_family can_family_ops = {
};
/* notifier block for netdevice event */
@@ -92224,18 +92657,18 @@ index 3ab8dd2..b9aef13 100644
};
diff --git a/net/can/gw.c b/net/can/gw.c
-index 3f9b0f3..fc6d4fa 100644
+index f78f898..d7aa843 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
-@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
- "default: " __stringify(CGW_DEFAULT_HOPS) ")");
+@@ -67,7 +67,6 @@ MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
+ MODULE_ALIAS("can-gw");
- static HLIST_HEAD(cgw_list);
+ HLIST_HEAD(cgw_list);
-static struct notifier_block notifier;
static struct kmem_cache *cgw_cache __read_mostly;
-@@ -954,6 +953,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -911,6 +910,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
return err;
}
@@ -92245,8 +92678,8 @@ index 3f9b0f3..fc6d4fa 100644
+
static __init int cgw_module_init(void)
{
- /* sanitize given module parameter */
-@@ -969,7 +972,6 @@ static __init int cgw_module_init(void)
+ printk(banner);
+@@ -922,7 +925,6 @@ static __init int cgw_module_init(void)
return -ENOMEM;
/* set notifier */
@@ -92254,46 +92687,26 @@ index 3f9b0f3..fc6d4fa 100644
register_netdevice_notifier(¬ifier);
if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
-diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
-index 4a5df7b..9ad1f1d 100644
---- a/net/ceph/messenger.c
-+++ b/net/ceph/messenger.c
-@@ -186,7 +186,7 @@ static void con_fault(struct ceph_connection *con);
- #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
-
- static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
--static atomic_t addr_str_seq = ATOMIC_INIT(0);
-+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
-
- static struct page *zero_page; /* used in certain error cases */
-
-@@ -197,7 +197,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
- struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
- struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
-
-- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
-+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
- s = addr_str[i];
-
- switch (ss->ss_family) {
diff --git a/net/compat.c b/net/compat.c
-index 8903258..24e30e5 100644
+index 8c979cc..453a165 100644
--- a/net/compat.c
+++ b/net/compat.c
-@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
+@@ -71,9 +71,11 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
+ __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
+ __get_user(kmsg->msg_flags, &umsg->msg_flags))
return -EFAULT;
- if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
- return -EINVAL;
- kmsg->msg_name = compat_ptr(tmp1);
- kmsg->msg_iov = compat_ptr(tmp2);
- kmsg->msg_control = compat_ptr(tmp3);
++ if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
++ return -EINVAL;
+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
return 0;
}
-@@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
+@@ -85,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
if (kern_msg->msg_namelen) {
if (mode == VERIFY_READ) {
@@ -92302,7 +92715,7 @@ index 8903258..24e30e5 100644
kern_msg->msg_namelen,
kern_address);
if (err < 0)
-@@ -98,7 +98,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
+@@ -96,7 +98,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
kern_msg->msg_name = NULL;
tot_len = iov_from_user_compat_to_kern(kern_iov,
@@ -92311,7 +92724,7 @@ index 8903258..24e30e5 100644
kern_msg->msg_iovlen);
if (tot_len >= 0)
kern_msg->msg_iov = kern_iov;
-@@ -118,20 +118,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
+@@ -116,20 +118,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
#define CMSG_COMPAT_FIRSTHDR(msg) \
(((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
@@ -92335,16 +92748,16 @@ index 8903258..24e30e5 100644
msg->msg_controllen)
return NULL;
return (struct compat_cmsghdr __user *)ptr;
-@@ -221,7 +221,7 @@ Efault:
-
- int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
+@@ -221,7 +223,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
{
+ struct compat_timeval ctv;
+ struct compat_timespec cts[3];
- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
struct compat_cmsghdr cmhdr;
- struct compat_timeval ctv;
- struct compat_timespec cts[3];
-@@ -277,7 +277,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
+ int cmlen;
+
+@@ -273,7 +275,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
{
@@ -92353,7 +92766,22 @@ index 8903258..24e30e5 100644
int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
int fdnum = scm->fp->count;
struct file **fp = scm->fp->fp;
-@@ -365,7 +365,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
+@@ -326,14 +328,6 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
+ __scm_destroy(scm);
+ }
+
+-/*
+- * A struct sock_filter is architecture independent.
+- */
+-struct compat_sock_fprog {
+- u16 len;
+- compat_uptr_t filter; /* struct sock_filter * */
+-};
+-
+ static int do_set_attach_filter(struct socket *sock, int level, int optname,
+ char __user *optval, unsigned int optlen)
+ {
+@@ -370,7 +364,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
return -EFAULT;
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -92362,7 +92790,7 @@ index 8903258..24e30e5 100644
set_fs(old_fs);
return err;
-@@ -426,7 +426,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
+@@ -431,7 +425,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);
@@ -92371,7 +92799,7 @@ index 8903258..24e30e5 100644
set_fs(old_fs);
if (!err) {
-@@ -569,7 +569,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
+@@ -566,7 +560,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
case MCAST_JOIN_GROUP:
case MCAST_LEAVE_GROUP:
{
@@ -92380,7 +92808,7 @@ index 8903258..24e30e5 100644
struct group_req __user *kgr =
compat_alloc_user_space(sizeof(struct group_req));
u32 interface;
-@@ -590,7 +590,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
+@@ -587,7 +581,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
case MCAST_BLOCK_SOURCE:
case MCAST_UNBLOCK_SOURCE:
{
@@ -92389,7 +92817,7 @@ index 8903258..24e30e5 100644
struct group_source_req __user *kgsr = compat_alloc_user_space(
sizeof(struct group_source_req));
u32 interface;
-@@ -611,7 +611,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
+@@ -608,7 +602,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
}
case MCAST_MSFILTER:
{
@@ -92398,7 +92826,7 @@ index 8903258..24e30e5 100644
struct group_filter __user *kgf;
u32 interface, fmode, numsrc;
-@@ -649,7 +649,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
+@@ -646,7 +640,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 *))
{
@@ -92407,7 +92835,7 @@ index 8903258..24e30e5 100644
struct group_filter __user *kgf;
int __user *koptlen;
u32 interface, fmode, numsrc;
-@@ -807,7 +807,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
+@@ -799,7 +793,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
if (call < SYS_SOCKET || call > SYS_SENDMMSG)
return -EINVAL;
@@ -92417,10 +92845,10 @@ index 8903258..24e30e5 100644
a0 = a[0];
a1 = a[1];
diff --git a/net/core/datagram.c b/net/core/datagram.c
-index af814e7..3d761de 100644
+index 68bbf9f..5ef0d12 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
-@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
+@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
}
kfree_skb(skb);
@@ -92430,10 +92858,25 @@ index af814e7..3d761de 100644
return err;
diff --git a/net/core/dev.c b/net/core/dev.c
-index 3430b1e..d6453ad 100644
+index 8e455b8..4ebd90f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -1680,14 +1680,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
+@@ -1142,10 +1142,14 @@ 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)) {
++#ifdef CONFIG_GRKERNSEC_MODHARDEN
++ ___request_module(true, "grsec_modharden_netdev", "%s", name);
++#else
+ if (!request_module("%s", name))
+ pr_err("Loading kernel module for a network device "
+ "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
+ "instead\n", name);
++#endif
+ }
+ }
+ EXPORT_SYMBOL(dev_load);
+@@ -1597,7 +1601,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)) {
@@ -92442,7 +92885,8 @@ index 3430b1e..d6453ad 100644
kfree_skb(skb);
return NET_RX_DROP;
}
- }
+@@ -1607,7 +1611,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
+ nf_reset(skb);
if (unlikely(!is_skb_forwardable(dev, skb))) {
- atomic_long_inc(&dev->rx_dropped);
@@ -92450,7 +92894,7 @@ index 3430b1e..d6453ad 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -2432,7 +2432,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
+@@ -2047,7 +2051,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
struct dev_gso_cb {
void (*destructor)(struct sk_buff *skb);
@@ -92459,7 +92903,7 @@ index 3430b1e..d6453ad 100644
#define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
-@@ -3207,7 +3207,7 @@ enqueue:
+@@ -2967,7 +2971,7 @@ enqueue:
local_irq_restore(flags);
@@ -92468,7 +92912,7 @@ index 3430b1e..d6453ad 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -3279,7 +3279,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -3041,7 +3045,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
@@ -92477,16 +92921,16 @@ index 3430b1e..d6453ad 100644
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
-@@ -3613,7 +3613,7 @@ ncls:
- ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
+@@ -3340,7 +3344,7 @@ ncls:
+ if (pt_prev) {
+ ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
} else {
- drop:
- atomic_long_inc(&skb->dev->rx_dropped);
+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
kfree_skb(skb);
/* Jamal, now you will not able to escape explaining
* me how you were going to use this. :-)
-@@ -4273,7 +4273,7 @@ void netif_napi_del(struct napi_struct *napi)
+@@ -3905,7 +3909,7 @@ void netif_napi_del(struct napi_struct *napi)
}
EXPORT_SYMBOL(netif_napi_del);
@@ -92495,7 +92939,30 @@ index 3430b1e..d6453ad 100644
{
struct softnet_data *sd = &__get_cpu_var(softnet_data);
unsigned long time_limit = jiffies + 2;
-@@ -5977,7 +5977,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
+@@ -4375,8 +4379,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
+ else
+ seq_printf(seq, "%04x", ntohs(pt->type));
+
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ seq_printf(seq, " %-8s %p\n",
++ pt->dev ? pt->dev->name : "", NULL);
++#else
+ seq_printf(seq, " %-8s %pF\n",
+ pt->dev ? pt->dev->name : "", pt->func);
++#endif
+ }
+
+ return 0;
+@@ -4438,7 +4447,7 @@ static void __net_exit dev_proc_net_exit(struct net *net)
+ proc_net_remove(net, "dev");
+ }
+
+-static struct pernet_operations __net_initdata dev_proc_ops = {
++static struct pernet_operations __net_initconst dev_proc_ops = {
+ .init = dev_proc_net_init,
+ .exit = dev_proc_net_exit,
+ };
+@@ -5933,7 +5942,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
} else {
netdev_stats_to_stats64(storage, &dev->stats);
}
@@ -92504,26 +92971,105 @@ index 3430b1e..d6453ad 100644
return storage;
}
EXPORT_SYMBOL(dev_get_stats);
-diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
-index 5b7d0e1..cb960fc 100644
---- a/net/core/dev_ioctl.c
-+++ b/net/core/dev_ioctl.c
-@@ -365,9 +365,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)) {
-+#ifdef CONFIG_GRKERNSEC_MODHARDEN
-+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
-+#else
- if (!request_module("%s", name))
- pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
- name);
-+#endif
- }
+@@ -6512,7 +6521,7 @@ static void __net_exit netdev_exit(struct net *net)
+ kfree(net->dev_index_head);
}
- EXPORT_SYMBOL(dev_load);
+
+-static struct pernet_operations __net_initdata netdev_net_ops = {
++static struct pernet_operations __net_initconst netdev_net_ops = {
+ .init = netdev_init,
+ .exit = netdev_exit,
+ };
+@@ -6574,7 +6583,7 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list)
+ rtnl_unlock();
+ }
+
+-static struct pernet_operations __net_initdata default_device_ops = {
++static struct pernet_operations __net_initconst default_device_ops = {
+ .exit = default_device_exit,
+ .exit_batch = default_device_exit_batch,
+ };
+diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
+index cd09414..d070f83 100644
+--- a/net/core/dev_addr_lists.c
++++ b/net/core/dev_addr_lists.c
+@@ -723,7 +723,7 @@ static void __net_exit dev_mc_net_exit(struct net *net)
+ proc_net_remove(net, "dev_mcast");
+ }
+
+-static struct pernet_operations __net_initdata dev_mc_net_ops = {
++static struct pernet_operations __net_initconst dev_mc_net_ops = {
+ .init = dev_mc_net_init,
+ .exit = dev_mc_net_exit,
+ };
+diff --git a/net/core/ethtool.c b/net/core/ethtool.c
+index 2367246..4a0a677 100644
+--- a/net/core/ethtool.c
++++ b/net/core/ethtool.c
+@@ -1612,10 +1612,19 @@ static int ethtool_get_dump_data(struct net_device *dev,
+ if (ret)
+ return ret;
+
+- len = (tmp.len > dump.len) ? dump.len : tmp.len;
++ len = min(tmp.len, dump.len);
+ if (!len)
+ return -EFAULT;
+
++ /* Don't ever let the driver think there's more space available
++ * than it requested with .get_dump_flag().
++ */
++ dump.len = len;
++
++ /* Always allocate enough space to hold the whole thing so that the
++ * driver does not need to check the length and bother with partial
++ * dumping.
++ */
+ data = vzalloc(tmp.len);
+ if (!data)
+ return -ENOMEM;
+@@ -1623,6 +1632,16 @@ static int ethtool_get_dump_data(struct net_device *dev,
+ if (ret)
+ goto out;
+
++ /* There are two sane possibilities:
++ * 1. The driver's .get_dump_data() does not touch dump.len.
++ * 2. Or it may set dump.len to how much it really writes, which
++ * should be tmp.len (or len if it can do a partial dump).
++ * In any case respond to userspace with the actual length of data
++ * it's receiving.
++ */
++ WARN_ON(dump.len != len && dump.len != tmp.len);
++ dump.len = len;
++
+ if (copy_to_user(useraddr, &dump, sizeof(dump))) {
+ ret = -EFAULT;
+ goto out;
+diff --git a/net/core/filter.c b/net/core/filter.c
+index 5dea452..d775edc 100644
+--- a/net/core/filter.c
++++ b/net/core/filter.c
+@@ -39,6 +39,7 @@
+ #include <linux/filter.h>
+ #include <linux/reciprocal_div.h>
+ #include <linux/ratelimit.h>
++#include <linux/seccomp.h>
+
+ /* No hurry in this branch */
+ static void *__load_pointer(const struct sk_buff *skb, int k, unsigned int size)
+@@ -350,6 +351,11 @@ load_b:
+ A = 0;
+ continue;
+ }
++#ifdef CONFIG_SECCOMP_FILTER
++ case BPF_S_ANC_SECCOMP_LD_W:
++ A = seccomp_bpf_load(fentry->k);
++ continue;
++#endif
+ default:
+ WARN_RATELIMIT(1, "Unknown code:%u jt:%u tf:%u k:%u\n",
+ fentry->code, fentry->jt,
diff --git a/net/core/flow.c b/net/core/flow.c
-index dfa602c..3103d88 100644
+index e318c7e..168b1d0 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -61,7 +61,7 @@ struct flow_cache {
@@ -92544,7 +93090,7 @@ index dfa602c..3103d88 100644
return 0;
if (fle->object && !fle->object->ops->check(fle->object))
return 0;
-@@ -258,7 +258,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
+@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
fcp->hash_count++;
}
@@ -92553,7 +93099,7 @@ index dfa602c..3103d88 100644
flo = fle->object;
if (!flo)
goto ret_object;
-@@ -279,7 +279,7 @@ nocache:
+@@ -280,7 +280,7 @@ nocache:
}
flo = resolver(net, key, family, dir, flo, ctx);
if (fle) {
@@ -92563,10 +93109,10 @@ index dfa602c..3103d88 100644
fle->object = flo;
else
diff --git a/net/core/iovec.c b/net/core/iovec.c
-index b77eeec..2890aca 100644
+index c40f27e..7f49254 100644
--- a/net/core/iovec.c
+++ b/net/core/iovec.c
-@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
+@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
if (m->msg_namelen) {
if (mode == VERIFY_READ) {
void __user *namep;
@@ -92575,7 +93121,7 @@ index b77eeec..2890aca 100644
err = move_addr_to_kernel(namep, m->msg_namelen,
address);
if (err < 0)
-@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
+@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
}
size = m->msg_iovlen * sizeof(struct iovec);
@@ -92584,42 +93130,11 @@ index b77eeec..2890aca 100644
return -EFAULT;
m->msg_iov = iov;
-diff --git a/net/core/neighbour.c b/net/core/neighbour.c
-index 6072610..7374c18 100644
---- a/net/core/neighbour.c
-+++ b/net/core/neighbour.c
-@@ -2774,7 +2774,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
- {
- int size, ret;
-- struct ctl_table tmp = *ctl;
-+ ctl_table_no_const tmp = *ctl;
-
- tmp.extra1 = &zero;
- tmp.extra2 = &unres_qlen_max;
-diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
-index 2bf8329..7960607 100644
---- a/net/core/net-procfs.c
-+++ b/net/core/net-procfs.c
-@@ -283,8 +283,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
- else
- seq_printf(seq, "%04x", ntohs(pt->type));
-
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ seq_printf(seq, " %-8s %pf\n",
-+ pt->dev ? pt->dev->name : "", NULL);
-+#else
- seq_printf(seq, " %-8s %pf\n",
- pt->dev ? pt->dev->name : "", pt->func);
-+#endif
- }
-
- return 0;
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
-index d954b56..b0a0f7a 100644
+index 0329404..ab4e13a 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
-@@ -1356,7 +1356,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr)
+@@ -1334,7 +1334,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr)
}
EXPORT_SYMBOL(netdev_class_remove_file);
@@ -92629,10 +93144,10 @@ index d954b56..b0a0f7a 100644
kobj_ns_type_register(&net_ns_type_operations);
return class_register(&net_class);
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
-index 81d3a9a..a0bd7a8 100644
+index dd00b71..74d1779 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
-@@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
+@@ -422,7 +422,7 @@ static int __register_pernet_operations(struct list_head *list,
int error;
LIST_HEAD(net_exit_list);
@@ -92641,7 +93156,7 @@ index 81d3a9a..a0bd7a8 100644
if (ops->init || (ops->id && ops->size)) {
for_each_net(net) {
error = ops_init(ops, net);
-@@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
+@@ -435,7 +435,7 @@ static int __register_pernet_operations(struct list_head *list,
out_undo:
/* If I have an error cleanup all namespaces I initialized */
@@ -92650,7 +93165,7 @@ index 81d3a9a..a0bd7a8 100644
ops_exit_list(ops, &net_exit_list);
ops_free_list(ops, &net_exit_list);
return error;
-@@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
+@@ -446,7 +446,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
struct net *net;
LIST_HEAD(net_exit_list);
@@ -92659,7 +93174,7 @@ index 81d3a9a..a0bd7a8 100644
for_each_net(net)
list_add_tail(&net->exit_list, &net_exit_list);
ops_exit_list(ops, &net_exit_list);
-@@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
+@@ -580,7 +580,7 @@ int register_pernet_device(struct pernet_operations *ops)
mutex_lock(&net_mutex);
error = register_pernet_operations(&pernet_list, ops);
if (!error && (first_device == &pernet_list))
@@ -92668,33 +93183,11 @@ index 81d3a9a..a0bd7a8 100644
mutex_unlock(&net_mutex);
return error;
}
-diff --git a/net/core/netpoll.c b/net/core/netpoll.c
-index fc75c9e..8c8e9be 100644
---- a/net/core/netpoll.c
-+++ b/net/core/netpoll.c
-@@ -428,7 +428,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
- struct udphdr *udph;
- struct iphdr *iph;
- struct ethhdr *eth;
-- static atomic_t ip_ident;
-+ static atomic_unchecked_t ip_ident;
- struct ipv6hdr *ip6h;
-
- udp_len = len + sizeof(*udph);
-@@ -499,7 +499,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
- put_unaligned(0x45, (unsigned char *)iph);
- iph->tos = 0;
- put_unaligned(htons(ip_len), &(iph->tot_len));
-- iph->id = htons(atomic_inc_return(&ip_ident));
-+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
- iph->frag_off = 0;
- iph->ttl = 64;
- iph->protocol = IPPROTO_UDP;
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
-index 2a0e21d..6ad7642 100644
+index 5b7d5f2..ecb9676 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
-@@ -58,7 +58,7 @@ struct rtnl_link {
+@@ -57,7 +57,7 @@ struct rtnl_link {
rtnl_doit_func doit;
rtnl_dumpit_func dumpit;
rtnl_calcit_func calcit;
@@ -92703,10 +93196,10 @@ index 2a0e21d..6ad7642 100644
static DEFINE_MUTEX(rtnl_mutex);
-@@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
- if (rtnl_link_ops_get(ops->kind))
- return -EEXIST;
-
+@@ -284,10 +284,13 @@ static LIST_HEAD(link_ops);
+ */
+ int __rtnl_link_register(struct rtnl_link_ops *ops)
+ {
- if (!ops->dellink)
- ops->dellink = unregister_netdevice_queue;
+ if (!ops->dellink) {
@@ -92720,7 +93213,7 @@ index 2a0e21d..6ad7642 100644
return 0;
}
EXPORT_SYMBOL_GPL(__rtnl_link_register);
-@@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
+@@ -334,7 +337,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
for_each_net(net) {
__rtnl_kill_links(net, ops);
}
@@ -92730,10 +93223,10 @@ index 2a0e21d..6ad7642 100644
EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
diff --git a/net/core/scm.c b/net/core/scm.c
-index b442e7e..6f5b5a2 100644
+index ff52ad0..aff1c0f 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
-@@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
+@@ -220,7 +220,7 @@ EXPORT_SYMBOL(__scm_send);
int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
{
struct cmsghdr __user *cm
@@ -92742,7 +93235,7 @@ index b442e7e..6f5b5a2 100644
struct cmsghdr cmhdr;
int cmlen = CMSG_LEN(len);
int err;
-@@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
+@@ -243,7 +243,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;
@@ -92751,7 +93244,7 @@ index b442e7e..6f5b5a2 100644
goto out;
cmlen = CMSG_SPACE(len);
if (msg->msg_controllen < cmlen)
-@@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
+@@ -259,7 +259,7 @@ EXPORT_SYMBOL(put_cmsg);
void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
{
struct cmsghdr __user *cm
@@ -92760,7 +93253,7 @@ index b442e7e..6f5b5a2 100644
int fdmax = 0;
int fdnum = scm->fp->count;
-@@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
+@@ -279,7 +279,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
if (fdnum < fdmax)
fdmax = fdnum;
@@ -92768,12 +93261,30 @@ index b442e7e..6f5b5a2 100644
+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
i++, cmfptr++)
{
- struct socket *sock;
+ int new_fd;
+diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c
+index 925991a..209a505 100644
+--- a/net/core/secure_seq.c
++++ b/net/core/secure_seq.c
+@@ -12,12 +12,10 @@
+
+ static u32 net_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned;
+
+-static int __init net_secret_init(void)
++void net_secret_init(void)
+ {
+ get_random_bytes(net_secret, sizeof(net_secret));
+- return 0;
+ }
+-late_initcall(net_secret_init);
+
+ #ifdef CONFIG_INET
+ static u32 seq_scale(u32 seq)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index d81cff1..e31f952 100644
+index af9c3c6..76914a3 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -3082,13 +3082,15 @@ void __init skb_init(void)
+@@ -2902,13 +2902,15 @@ void __init skb_init(void)
skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
sizeof(struct sk_buff),
0,
@@ -92792,10 +93303,10 @@ index d81cff1..e31f952 100644
}
diff --git a/net/core/sock.c b/net/core/sock.c
-index 0b39e7a..5e9f91e 100644
+index 8a2c2dd..3ba3cf1 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -393,7 +393,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -289,7 +289,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) {
@@ -92804,16 +93315,16 @@ index 0b39e7a..5e9f91e 100644
trace_sock_rcvqueue_full(sk, skb);
return -ENOMEM;
}
-@@ -403,7 +403,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -299,7 +299,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
return err;
- if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
+ if (!sk_rmem_schedule(sk, skb->truesize)) {
- atomic_inc(&sk->sk_drops);
+ atomic_inc_unchecked(&sk->sk_drops);
return -ENOBUFS;
}
-@@ -423,7 +423,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -319,7 +319,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
skb_dst_force(skb);
spin_lock_irqsave(&list->lock, flags);
@@ -92822,25 +93333,43 @@ index 0b39e7a..5e9f91e 100644
__skb_queue_tail(list, skb);
spin_unlock_irqrestore(&list->lock, flags);
-@@ -443,7 +443,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -339,7 +339,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)) {
+ if (sk_rcvqueues_full(sk, skb)) {
- atomic_inc(&sk->sk_drops);
+ atomic_inc_unchecked(&sk->sk_drops);
goto discard_and_relse;
}
if (nested)
-@@ -461,7 +461,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -357,7 +357,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)) {
+ } else if (sk_add_backlog(sk, skb)) {
bh_unlock_sock(sk);
- atomic_inc(&sk->sk_drops);
+ atomic_inc_unchecked(&sk->sk_drops);
goto discard_and_relse;
}
-@@ -949,12 +949,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -406,7 +406,7 @@ struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie)
+ }
+ EXPORT_SYMBOL(sk_dst_check);
+
+-static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen)
++static int sock_bindtodevice(struct sock *sk, char __user *optval, unsigned int optlen)
+ {
+ int ret = -ENOPROTOOPT;
+ #ifdef CONFIG_NETDEVICES
+@@ -420,7 +420,7 @@ static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen)
+ goto out;
+
+ ret = -EINVAL;
+- if (optlen < 0)
++ if (optlen > INT_MAX)
+ goto out;
+
+ /* Bind this socket to a particular device like "eth0",
+@@ -786,12 +786,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
struct timeval tm;
} v;
@@ -92856,7 +93385,15 @@ index 0b39e7a..5e9f91e 100644
return -EINVAL;
memset(&v, 0, sizeof(v));
-@@ -1106,11 +1106,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -932,18 +932,18 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+ if (len > sizeof(peercred))
+ len = sizeof(peercred);
+ cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
+- if (copy_to_user(optval, &peercred, len))
++ if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
+ return -EFAULT;
+ goto lenout;
+ }
case SO_PEERNAME:
{
@@ -92870,7 +93407,7 @@ index 0b39e7a..5e9f91e 100644
return -EINVAL;
if (copy_to_user(optval, address, len))
return -EFAULT;
-@@ -1183,7 +1183,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -978,7 +978,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
if (len > lv)
len = lv;
@@ -92879,7 +93416,7 @@ index 0b39e7a..5e9f91e 100644
return -EFAULT;
lenout:
if (put_user(len, optlen))
-@@ -2326,7 +2326,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
+@@ -2027,7 +2027,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
*/
smp_wmb();
atomic_set(&sk->sk_refcnt, 1);
@@ -92888,109 +93425,29 @@ index 0b39e7a..5e9f91e 100644
}
EXPORT_SYMBOL(sock_init_data);
-@@ -2451,6 +2451,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
- int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
- int level, int type)
- {
-+ struct sock_extended_err ee;
- struct sock_exterr_skb *serr;
- struct sk_buff *skb, *skb2;
- int copied, err;
-@@ -2472,7 +2473,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
- sock_recv_timestamp(msg, sk, skb);
-
- serr = SKB_EXT_ERR(skb);
-- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
-+ ee = serr->ee;
-+ put_cmsg(msg, level, type, sizeof ee, &ee);
-
- msg->msg_flags |= MSG_ERRQUEUE;
- err = copied;
-diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
-index a0e9cf6..ef7f9ed 100644
---- a/net/core/sock_diag.c
-+++ b/net/core/sock_diag.c
-@@ -9,26 +9,33 @@
- #include <linux/inet_diag.h>
- #include <linux/sock_diag.h>
-
--static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
-+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
- static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
- static DEFINE_MUTEX(sock_diag_table_mutex);
-
- int sock_diag_check_cookie(void *sk, __u32 *cookie)
- {
-+#ifndef CONFIG_GRKERNSEC_HIDESYM
- if ((cookie[0] != INET_DIAG_NOCOOKIE ||
- cookie[1] != INET_DIAG_NOCOOKIE) &&
- ((u32)(unsigned long)sk != cookie[0] ||
- (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
- return -ESTALE;
- else
-+#endif
- return 0;
- }
- EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
-
- void sock_diag_save_cookie(void *sk, __u32 *cookie)
- {
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+ cookie[0] = 0;
-+ cookie[1] = 0;
-+#else
- cookie[0] = (u32)(unsigned long)sk;
- cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
-+#endif
+@@ -2564,7 +2564,7 @@ static __net_exit void proto_exit_net(struct net *net)
}
- EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
-@@ -113,8 +120,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
- mutex_lock(&sock_diag_table_mutex);
- if (sock_diag_handlers[hndl->family])
- err = -EBUSY;
-- else
-+ else {
-+ pax_open_kernel();
- sock_diag_handlers[hndl->family] = hndl;
-+ pax_close_kernel();
-+ }
- mutex_unlock(&sock_diag_table_mutex);
- return err;
-@@ -130,7 +140,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
-
- mutex_lock(&sock_diag_table_mutex);
- BUG_ON(sock_diag_handlers[family] != hnld);
-+ pax_open_kernel();
- sock_diag_handlers[family] = NULL;
-+ pax_close_kernel();
- mutex_unlock(&sock_diag_table_mutex);
- }
- EXPORT_SYMBOL_GPL(sock_diag_unregister);
+-static __net_initdata struct pernet_operations proto_net_ops = {
++static __net_initconst struct pernet_operations proto_net_ops = {
+ .init = proto_init_net,
+ .exit = proto_exit_net,
+ };
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
-index cca4441..5e616de 100644
+index f0bdd36..957fc06 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
-@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
+@@ -28,7 +28,7 @@ static int rps_sock_flow_sysctl(ctl_table *table, int write,
{
unsigned int orig_size, size;
int ret, i;
-- struct ctl_table tmp = {
+- ctl_table tmp = {
+ ctl_table_no_const tmp = {
.data = &size,
.maxlen = sizeof(size),
.mode = table->mode
-@@ -199,7 +199,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
- {
- char id[IFNAMSIZ];
-- struct ctl_table tbl = {
-+ ctl_table_no_const tbl = {
- .data = id,
- .maxlen = IFNAMSIZ,
- };
-@@ -378,13 +378,12 @@ static struct ctl_table netns_core_table[] = {
+@@ -210,29 +210,27 @@ __net_initdata struct ctl_path net_core_path[] = {
static __net_init int sysctl_core_net_init(struct net *net)
{
@@ -93006,16 +93463,14 @@ index cca4441..5e616de 100644
if (tbl == NULL)
goto err_dup;
-@@ -394,17 +393,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
- if (net->user_ns != &init_user_ns) {
- tbl[0].procname = NULL;
- }
+ tbl[0].data = &net->core.sysctl_somaxconn;
- }
--
-- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
-+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
++ net->core.sysctl_hdr = register_net_sysctl_table(net, net_core_path, tbl);
+ } else
-+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
++ net->core.sysctl_hdr = register_net_sysctl_table(net, net_core_path, netns_core_table);
+
+- net->core.sysctl_hdr = register_net_sysctl_table(net,
+- net_core_path, tbl);
if (net->core.sysctl_hdr == NULL)
goto err_reg;
@@ -93028,7 +93483,7 @@ index cca4441..5e616de 100644
err_dup:
return -ENOMEM;
}
-@@ -419,7 +417,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
+@@ -247,7 +245,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
kfree(tbl);
}
@@ -93038,10 +93493,10 @@ index cca4441..5e616de 100644
.exit = sysctl_core_net_exit,
};
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
-index dd4d506..fb2fb87 100644
+index 16fbf8c..ff4b0fc 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
-@@ -465,6 +465,7 @@ static struct proto dn_proto = {
+@@ -469,6 +469,7 @@ static struct proto dn_proto = {
.sysctl_rmem = sysctl_decnet_rmem,
.max_header = DN_MAX_NSP_DATA_HEADER + 64,
.obj_size = sizeof(struct dn_sock),
@@ -93050,10 +93505,10 @@ index dd4d506..fb2fb87 100644
static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
-index 5325b54..a0d4d69 100644
+index d50a13c..1f612ff 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
-@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
+@@ -175,7 +175,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
if (len > *lenp) len = *lenp;
@@ -93062,7 +93517,7 @@ index 5325b54..a0d4d69 100644
return -EFAULT;
*lenp = len;
-@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
+@@ -238,7 +238,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
if (len > *lenp) len = *lenp;
@@ -93071,11 +93526,24 @@ index 5325b54..a0d4d69 100644
return -EFAULT;
*lenp = len;
+diff --git a/net/econet/Kconfig b/net/econet/Kconfig
+index 39a2d29..f39c0fe 100644
+--- a/net/econet/Kconfig
++++ b/net/econet/Kconfig
+@@ -4,7 +4,7 @@
+
+ config ECONET
+ tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
+- depends on EXPERIMENTAL && INET
++ depends on EXPERIMENTAL && INET && BROKEN
+ ---help---
+ Econet is a fairly old and slow networking protocol mainly used by
+ Acorn computers to access file and print servers. It uses native
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
-index ff41b4d6..6125050 100644
+index 19d6aef..4f610f4 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
-@@ -548,7 +548,7 @@ static int lowpan_header_create(struct sk_buff *skb,
+@@ -329,7 +329,7 @@ static int lowpan_header_create(struct sk_buff *skb,
hc06_ptr += 3;
} else {
/* compress nothing */
@@ -93085,12 +93553,41 @@ index ff41b4d6..6125050 100644
*hc06_ptr = tmp;
hc06_ptr += 4;
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
-index cfeb85c..385989a 100644
+index 5d228de..91bdee5 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
-@@ -1675,13 +1675,9 @@ static int __init inet_init(void)
+@@ -114,6 +114,7 @@
+ #include <net/inet_common.h>
+ #include <net/xfrm.h>
+ #include <net/net_namespace.h>
++#include <net/secure_seq.h>
+ #ifdef CONFIG_IP_MROUTE
+ #include <linux/mroute.h>
+ #endif
+@@ -241,8 +242,10 @@ void build_ehash_secret(void)
+ get_random_bytes(&rnd, sizeof(rnd));
+ } while (rnd == 0);
+
+- if (cmpxchg(&inet_ehash_secret, 0, rnd) == 0)
++ if (cmpxchg(&inet_ehash_secret, 0, rnd) == 0) {
+ get_random_bytes(&ipv6_hash_secret, sizeof(ipv6_hash_secret));
++ net_secret_init();
++ }
+ }
+ EXPORT_SYMBOL(build_ehash_secret);
+
+@@ -1612,7 +1615,7 @@ static __net_exit void ipv4_mib_exit_net(struct net *net)
+ snmp_mib_free((void __percpu **)net->mib.tcp_statistics);
+ }
- BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
+-static __net_initdata struct pernet_operations ipv4_mib_ops = {
++static __net_initconst struct pernet_operations ipv4_mib_ops = {
+ .init = ipv4_mib_init_net,
+ .exit = ipv4_mib_exit_net,
+ };
+@@ -1646,13 +1649,9 @@ static int __init inet_init(void)
+
+ BUILD_BUG_ON(sizeof(struct inet_skb_parm) > sizeof(dummy_skb->cb));
- sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
- if (!sysctl_local_reserved_ports)
@@ -93103,7 +93600,7 @@ index cfeb85c..385989a 100644
rc = proto_register(&udp_prot, 1);
if (rc)
-@@ -1790,8 +1786,6 @@ out_unregister_udp_proto:
+@@ -1759,8 +1758,6 @@ out_unregister_udp_proto:
proto_unregister(&udp_prot);
out_unregister_tcp_proto:
proto_unregister(&tcp_prot);
@@ -93112,8 +93609,49 @@ index cfeb85c..385989a 100644
goto out;
}
+diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
+index 59a7041..060976d 100644
+--- a/net/ipv4/arp.c
++++ b/net/ipv4/arp.c
+@@ -945,24 +945,25 @@ static void parp_redo(struct sk_buff *skb)
+ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
+ struct packet_type *pt, struct net_device *orig_dev)
+ {
+- struct arphdr *arp;
++ const struct arphdr *arp;
+
+- /* ARP header, plus 2 device addresses, plus 2 IP addresses. */
+- if (!pskb_may_pull(skb, arp_hdr_len(dev)))
+- goto freeskb;
+-
+- arp = arp_hdr(skb);
+- if (arp->ar_hln != dev->addr_len ||
+- dev->flags & IFF_NOARP ||
++ if (dev->flags & IFF_NOARP ||
+ skb->pkt_type == PACKET_OTHERHOST ||
+- skb->pkt_type == PACKET_LOOPBACK ||
+- arp->ar_pln != 4)
++ skb->pkt_type == PACKET_LOOPBACK)
+ goto freeskb;
+
+ skb = skb_share_check(skb, GFP_ATOMIC);
+- if (skb == NULL)
++ if (!skb)
+ goto out_of_mem;
+
++ /* ARP header, plus 2 device addresses, plus 2 IP addresses. */
++ if (!pskb_may_pull(skb, arp_hdr_len(dev)))
++ goto freeskb;
++
++ arp = arp_hdr(skb);
++ if (arp->ar_hln != dev->addr_len || arp->ar_pln != 4)
++ goto freeskb;
++
+ memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));
+
+ return NF_HOOK(NFPROTO_ARP, NF_ARP_IN, skb, dev, NULL, arp_process);
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c
-index b28e863..19e3637 100644
+index 424fafb..ec07510 100644
--- a/net/ipv4/datagram.c
+++ b/net/ipv4/datagram.c
@@ -57,7 +57,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
@@ -93126,28 +93664,22 @@ index b28e863..19e3637 100644
}
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index a1b5bcb..62ec5c6 100644
+index e41c40f..fbed7a7 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
-@@ -1533,7 +1533,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
- idx = 0;
- head = &net->dev_index_head[h];
- rcu_read_lock();
-- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
-+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
- net->dev_base_seq;
- hlist_for_each_entry_rcu(dev, head, index_hlist) {
- if (idx < s_idx)
-@@ -1844,7 +1844,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
- idx = 0;
- head = &net->dev_index_head[h];
- rcu_read_lock();
-- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
-+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
- net->dev_base_seq;
- hlist_for_each_entry_rcu(dev, head, index_hlist) {
- if (idx < s_idx)
-@@ -2069,7 +2069,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
+@@ -827,9 +827,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
+@@ -1584,7 +1584,7 @@ static int ipv4_doint_and_flush(ctl_table *ctl, int write,
#define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
@@ -93155,8 +93687,8 @@ index a1b5bcb..62ec5c6 100644
+static const struct devinet_sysctl_table {
struct ctl_table_header *sysctl_header;
struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
- } devinet_sysctl = {
-@@ -2191,7 +2191,7 @@ static __net_init int devinet_init_net(struct net *net)
+ char *dev_name;
+@@ -1729,7 +1729,7 @@ static __net_init int devinet_init_net(struct net *net)
int err;
struct ipv4_devconf *all, *dflt;
#ifdef CONFIG_SYSCTL
@@ -93165,7 +93697,7 @@ index a1b5bcb..62ec5c6 100644
struct ctl_table_header *forw_hdr;
#endif
-@@ -2209,7 +2209,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -1747,7 +1747,7 @@ static __net_init int devinet_init_net(struct net *net)
goto err_alloc_dflt;
#ifdef CONFIG_SYSCTL
@@ -93174,19 +93706,19 @@ index a1b5bcb..62ec5c6 100644
if (tbl == NULL)
goto err_alloc_ctl;
-@@ -2229,7 +2229,10 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -1767,7 +1767,10 @@ static __net_init int devinet_init_net(struct net *net)
goto err_reg_dflt;
err = -ENOMEM;
-- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
+- forw_hdr = register_net_sysctl_table(net, net_ipv4_path, tbl);
+ if (!net_eq(net, &init_net))
-+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
++ forw_hdr = register_net_sysctl_table(net, net_ipv4_path, tbl);
+ else
-+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
++ forw_hdr = register_net_sysctl_table(net, net_ipv4_path, ctl_forward_entry);
if (forw_hdr == NULL)
goto err_reg_ctl;
net->ipv4.forw_hdr = forw_hdr;
-@@ -2245,8 +2248,7 @@ err_reg_ctl:
+@@ -1783,8 +1786,7 @@ err_reg_ctl:
err_reg_dflt:
__devinet_sysctl_unregister(all);
err_reg_all:
@@ -93196,17 +93728,39 @@ index a1b5bcb..62ec5c6 100644
err_alloc_ctl:
#endif
if (dflt != &ipv4_devconf_dflt)
+@@ -1811,7 +1813,7 @@ static __net_exit void devinet_exit_net(struct net *net)
+ kfree(net->ipv4.devconf_all);
+ }
+
+-static __net_initdata struct pernet_operations devinet_ops = {
++static __net_initconst struct pernet_operations devinet_ops = {
+ .init = devinet_init_net,
+ .exit = devinet_exit_net,
+ };
+diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
+index 238fc3b..4455673 100644
+--- a/net/ipv4/esp4.c
++++ b/net/ipv4/esp4.c
+@@ -472,7 +472,7 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
+ }
+
+ return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
+- net_adj) & ~(align - 1)) + (net_adj - 2);
++ net_adj) & ~(align - 1)) + net_adj - 2;
+ }
+
+ static void esp4_err(struct sk_buff *skb, u32 info)
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
-index b3f627a..b0f3e99 100644
+index 92fc5f6..b790d91 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
-@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
+@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
#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(dev_net(dev), -1);
break;
case NETDEV_DOWN:
fib_del_ifaddr(ifa, NULL);
@@ -93215,20 +93769,20 @@ index b3f627a..b0f3e99 100644
if (ifa->ifa_dev->ifa_list == NULL) {
/* Last address was deleted from this interface.
* Disable IP.
-@@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
+@@ -1011,7 +1011,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(net);
+ rt_cache_flush(dev_net(dev), -1);
break;
case NETDEV_DOWN:
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index d5dbca5..6251d5f 100644
+index d01f9c6..284c56c 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
-@@ -766,7 +766,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
+@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
nh->nh_saddr = inet_select_addr(nh->nh_dev,
nh->nh_gw,
nh->nh_parent->fib_scope);
@@ -93237,8 +93791,21 @@ index d5dbca5..6251d5f 100644
return nh->nh_saddr;
}
+diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
+index ab188ae..662585c 100644
+--- a/net/ipv4/icmp.c
++++ b/net/ipv4/icmp.c
+@@ -1195,7 +1195,7 @@ fail:
+ return err;
+ }
+
+-static struct pernet_operations __net_initdata icmp_sk_ops = {
++static struct pernet_operations __net_initconst icmp_sk_ops = {
+ .init = icmp_sk_init,
+ .exit = icmp_sk_exit,
+ };
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
-index 6acb541..9ea617d 100644
+index 907ef2c..eba7111 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -37,7 +37,7 @@ struct local_ports sysctl_local_ports __read_mostly = {
@@ -93250,8 +93817,73 @@ index 6acb541..9ea617d 100644
EXPORT_SYMBOL(sysctl_local_reserved_ports);
void inet_get_local_port_range(int *low, int *high)
+diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
+index ccee270..db23c3c 100644
+--- a/net/ipv4/inet_diag.c
++++ b/net/ipv4/inet_diag.c
+@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct sock *sk,
+ r->idiag_retrans = 0;
+
+ r->id.idiag_if = sk->sk_bound_dev_if;
++
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ r->id.idiag_cookie[0] = 0;
++ r->id.idiag_cookie[1] = 0;
++#else
+ r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
+ r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
++#endif
+
+ r->id.idiag_sport = inet->inet_sport;
+ r->id.idiag_dport = inet->inet_dport;
+@@ -210,8 +216,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
+ r->idiag_family = tw->tw_family;
+ r->idiag_retrans = 0;
+ r->id.idiag_if = tw->tw_bound_dev_if;
++
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ r->id.idiag_cookie[0] = 0;
++ r->id.idiag_cookie[1] = 0;
++#else
+ r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
+ r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
++#endif
++
+ r->id.idiag_sport = tw->tw_sport;
+ r->id.idiag_dport = tw->tw_dport;
+ r->id.idiag_src[0] = tw->tw_rcv_saddr;
+@@ -294,12 +307,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
+ if (sk == NULL)
+ goto unlock;
+
++#ifndef CONFIG_GRKERNSEC_HIDESYM
+ err = -ESTALE;
+ if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
+ req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
+ ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
+ (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
+ goto out;
++#endif
+
+ err = -ENOMEM;
+ rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
+@@ -589,8 +604,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
+ r->idiag_retrans = req->retrans;
+
+ r->id.idiag_if = sk->sk_bound_dev_if;
++
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ r->id.idiag_cookie[0] = 0;
++ r->id.idiag_cookie[1] = 0;
++#else
+ r->id.idiag_cookie[0] = (u32)(unsigned long)req;
+ r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
++#endif
+
+ tmo = req->expires - jiffies;
+ if (tmo < 0)
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
-index 96da9c7..b956690 100644
+index 984ec65..392d206 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -18,12 +18,15 @@
@@ -93270,7 +93902,16 @@ index 96da9c7..b956690 100644
/*
* Allocate and initialize a new local port bind bucket.
* The bindhash mutex for snum's hash chain must be held here.
-@@ -554,6 +557,8 @@ ok:
+@@ -268,7 +271,7 @@ begintw:
+ }
+ if (unlikely(!INET_TW_MATCH(sk, net, hash, acookie,
+ saddr, daddr, ports, dif))) {
+- sock_put(sk);
++ inet_twsk_put(inet_twsk(sk));
+ goto begintw;
+ }
+ goto out;
+@@ -530,6 +533,8 @@ ok:
twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
spin_unlock(&head->lock);
@@ -93280,10 +93921,10 @@ index 96da9c7..b956690 100644
inet_twsk_deschedule(tw, death_row);
while (twrefcnt) {
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
-index 33d5537..da337a4 100644
+index 58c4e696..4f025f0 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
-@@ -503,8 +503,8 @@ relookup:
+@@ -487,8 +487,8 @@ relookup:
if (p) {
p->daddr = *daddr;
atomic_set(&p->refcnt, 1);
@@ -93295,10 +93936,10 @@ index 33d5537..da337a4 100644
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 b66910a..cfe416e 100644
+index 8f441b2..a56d38e 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
-@@ -282,7 +282,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
+@@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
return 0;
start = qp->rid;
@@ -93307,7 +93948,7 @@ index b66910a..cfe416e 100644
qp->rid = end;
rc = qp->q.fragments && (end - start) > max;
-@@ -759,12 +759,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
+@@ -773,21 +773,21 @@ static struct ctl_table ip4_frags_ctl_table[] = {
static int __net_init ip4_frags_ns_ctl_register(struct net *net)
{
@@ -93322,20 +93963,19 @@ index b66910a..cfe416e 100644
if (table == NULL)
goto err_alloc;
-@@ -775,9 +774,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
- /* Don't export sysctls to unprivileged users */
- if (net->user_ns != &init_user_ns)
- table[0].procname = NULL;
+ table[0].data = &net->ipv4.frags.high_thresh;
+ table[1].data = &net->ipv4.frags.low_thresh;
+ table[2].data = &net->ipv4.frags.timeout;
- }
-+ hdr = register_net_sysctl(net, "net/ipv4", table);
++ hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, table);
+ } else
-+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
++ hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, ip4_frags_ns_ctl_table);
-- hdr = register_net_sysctl(net, "net/ipv4", table);
+- hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, table);
if (hdr == NULL)
goto err_reg;
-@@ -785,8 +785,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
+@@ -795,8 +795,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
return 0;
err_reg:
@@ -93346,19 +93986,19 @@ index b66910a..cfe416e 100644
return -ENOMEM;
}
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index d7aea4c..a8ee872 100644
+index 5f28fab..ebd7a97 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
-@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
- module_param(log_ecn_error, bool, 0644);
- MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
+@@ -118,7 +118,7 @@
+ Alexey Kuznetsov.
+ */
-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
+static struct rtnl_link_ops ipgre_link_ops;
static int ipgre_tunnel_init(struct net_device *dev);
-
- static int ipgre_net_id __read_mostly;
-@@ -731,7 +731,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
+ static void ipgre_tunnel_setup(struct net_device *dev);
+ static int ipgre_tunnel_bind_dev(struct net_device *dev);
+@@ -1669,7 +1669,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
[IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
};
@@ -93367,7 +94007,7 @@ index d7aea4c..a8ee872 100644
.kind = "gre",
.maxtype = IFLA_GRE_MAX,
.policy = ipgre_policy,
-@@ -745,7 +745,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
+@@ -1682,7 +1682,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
.fill_info = ipgre_fill_info,
};
@@ -93376,11 +94016,24 @@ index d7aea4c..a8ee872 100644
.kind = "gretap",
.maxtype = IFLA_GRE_MAX,
.policy = ipgre_policy,
+diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
+index daf408e..16191f0 100644
+--- a/net/ipv4/ip_output.c
++++ b/net/ipv4/ip_output.c
+@@ -833,7 +833,7 @@ static int __ip_append_data(struct sock *sk,
+ csummode = CHECKSUM_PARTIAL;
+
+ cork->length += length;
+- if (((length > mtu) || (skb && skb_is_gso(skb))) &&
++ if (((length > mtu) || (skb && skb_has_frags(skb))) &&
+ (sk->sk_protocol == IPPROTO_UDP) &&
+ (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len) {
+ err = ip_ufo_append_data(sk, queue, getfrag, from, length,
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
-index d9c4f11..02b82dbc 100644
+index 3b36002..27e6634 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
-@@ -1152,7 +1152,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+@@ -1120,7 +1120,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;
@@ -93390,7 +94043,7 @@ index d9c4f11..02b82dbc 100644
return -EFAULT;
return 0;
}
-@@ -1283,7 +1284,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+@@ -1248,7 +1249,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
if (sk->sk_type != SOCK_STREAM)
return -ENOPROTOOPT;
@@ -93399,33 +94052,11 @@ index d9c4f11..02b82dbc 100644
msg.msg_controllen = len;
msg.msg_flags = flags;
-diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
-index 6e87f85..2c28e240 100644
---- a/net/ipv4/ip_vti.c
-+++ b/net/ipv4/ip_vti.c
-@@ -44,7 +44,7 @@
- #include <net/net_namespace.h>
- #include <net/netns/generic.h>
-
--static struct rtnl_link_ops vti_link_ops __read_mostly;
-+static struct rtnl_link_ops vti_link_ops;
-
- static int vti_net_id __read_mostly;
- static int vti_tunnel_init(struct net_device *dev);
-@@ -424,7 +424,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
- [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
- };
-
--static struct rtnl_link_ops vti_link_ops __read_mostly = {
-+static struct rtnl_link_ops vti_link_ops = {
- .kind = "vti",
- .maxtype = IFLA_VTI_MAX,
- .policy = vti_policy,
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
-index efa1138..20dbba0 100644
+index 99ec116..c5628fe 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
-@@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
+@@ -318,7 +318,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
mm_segment_t oldfs = get_fs();
set_fs(get_ds());
@@ -93434,7 +94065,7 @@ index efa1138..20dbba0 100644
set_fs(oldfs);
return res;
}
-@@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
+@@ -329,7 +329,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
mm_segment_t oldfs = get_fs();
set_fs(get_ds());
@@ -93443,7 +94074,7 @@ index efa1138..20dbba0 100644
set_fs(oldfs);
return res;
}
-@@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
+@@ -340,7 +340,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
mm_segment_t oldfs = get_fs();
set_fs(get_ds());
@@ -93452,30 +94083,23 @@ index efa1138..20dbba0 100644
set_fs(oldfs);
return res;
}
-diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
-index 7f80fb4..b0328f6 100644
---- a/net/ipv4/ipip.c
-+++ b/net/ipv4/ipip.c
-@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
- static int ipip_net_id __read_mostly;
-
- static int ipip_tunnel_init(struct net_device *dev);
--static struct rtnl_link_ops ipip_link_ops __read_mostly;
-+static struct rtnl_link_ops ipip_link_ops;
-
- static int ipip_err(struct sk_buff *skb, u32 info)
- {
-@@ -408,7 +408,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
- [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
- };
+diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
+index b5e64e4..4a9a5c4 100644
+--- a/net/ipv4/ipmr.c
++++ b/net/ipv4/ipmr.c
+@@ -1320,6 +1320,10 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi
+ if (get_user(v, (u32 __user *)optval))
+ return -EFAULT;
--static struct rtnl_link_ops ipip_link_ops __read_mostly = {
-+static struct rtnl_link_ops ipip_link_ops = {
- .kind = "ipip",
- .maxtype = IFLA_IPTUN_MAX,
- .policy = ipip_policy,
++ /* "pimreg%u" should not exceed 16 bytes (IFNAMSIZ) */
++ if (v != RT_TABLE_DEFAULT && v >= 1000000000)
++ return -EINVAL;
++
+ rtnl_lock();
+ ret = 0;
+ if (sk == rtnl_dereference(mrt->mroute_sk)) {
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
-index 85a4f21..1beb1f5 100644
+index fd7a3f6..21e76da 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -880,14 +880,14 @@ static int compat_table_info(const struct xt_table_info *info,
@@ -93524,10 +94148,10 @@ index 85a4f21..1beb1f5 100644
case ARPT_SO_GET_ENTRIES:
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
-index d23118d..6ad7277 100644
+index 24e556e..f6918b4 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -1068,14 +1068,14 @@ static int compat_table_info(const struct xt_table_info *info,
+@@ -1069,14 +1069,14 @@ static int compat_table_info(const struct xt_table_info *info,
#endif
static int get_info(struct net *net, void __user *user,
@@ -93545,7 +94169,7 @@ index d23118d..6ad7277 100644
sizeof(struct ipt_getinfo));
return -EINVAL;
}
-@@ -1112,7 +1112,7 @@ static int get_info(struct net *net, void __user *user,
+@@ -1113,7 +1113,7 @@ static int get_info(struct net *net, void __user *user,
info.size = private->size;
strcpy(info.name, name);
@@ -93554,7 +94178,7 @@ index d23118d..6ad7277 100644
ret = -EFAULT;
else
ret = 0;
-@@ -1966,7 +1966,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+@@ -1967,7 +1967,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
switch (cmd) {
case IPT_SO_GET_INFO:
@@ -93563,7 +94187,7 @@ index d23118d..6ad7277 100644
break;
case IPT_SO_GET_ENTRIES:
ret = compat_get_entries(sock_net(sk), user, len);
-@@ -2013,7 +2013,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+@@ -2014,7 +2014,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
switch (cmd) {
case IPT_SO_GET_INFO:
@@ -93573,19 +94197,19 @@ index d23118d..6ad7277 100644
case IPT_SO_GET_ENTRIES:
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
-index cbc2215..9cb993c 100644
+index b550815..c3b44d5 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
-@@ -220,6 +220,7 @@ static void ipt_ulog_packet(struct net *net,
+@@ -202,6 +202,7 @@ static void ipt_ulog_packet(unsigned int hooknum,
ub->qlen++;
- pm = nlmsg_data(nlh);
+ pm = NLMSG_DATA(nlh);
+ memset(pm, 0, sizeof(*pm));
/* We might not have a timestamp, get one */
if (skb->tstamp.tv64 == 0)
-@@ -238,8 +239,6 @@ static void ipt_ulog_packet(struct net *net,
- }
+@@ -218,8 +219,6 @@ static void ipt_ulog_packet(unsigned int hooknum,
+ strncpy(pm->prefix, prefix, sizeof(pm->prefix));
else if (loginfo->prefix[0] != '\0')
strncpy(pm->prefix, loginfo->prefix, sizeof(pm->prefix));
- else
@@ -93593,7 +94217,7 @@ index cbc2215..9cb993c 100644
if (in && in->hard_header_len > 0 &&
skb->mac_header != skb->network_header &&
-@@ -251,13 +250,9 @@ static void ipt_ulog_packet(struct net *net,
+@@ -231,13 +230,9 @@ static void ipt_ulog_packet(unsigned int hooknum,
if (in)
strncpy(pm->indev_name, in->name, sizeof(pm->indev_name));
@@ -93608,123 +94232,36 @@ index cbc2215..9cb993c 100644
/* copy_len <= skb->len, so can't fail. */
if (skb_copy_bits(skb, 0, pm->payload, copy_len) < 0)
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
-index d7d9882..d700c68 100644
+index 294a380..885a292 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
-@@ -55,7 +55,7 @@
-
-
- struct ping_table ping_table;
--struct pingv6_ops pingv6_ops;
-+struct pingv6_ops *pingv6_ops;
- EXPORT_SYMBOL_GPL(pingv6_ops);
-
- static u16 ping_port_rover;
-@@ -335,7 +335,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
- return -ENODEV;
- }
- }
-- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
-+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
- scoped);
- rcu_read_unlock();
-
-@@ -541,7 +541,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
- }
- #if IS_ENABLED(CONFIG_IPV6)
- } else if (skb->protocol == htons(ETH_P_IPV6)) {
-- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
-+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
- #endif
- }
-
-@@ -559,7 +559,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
- info, (u8 *)icmph);
- #if IS_ENABLED(CONFIG_IPV6)
- } else if (family == AF_INET6) {
-- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
-+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
- info, (u8 *)icmph);
- #endif
- }
-@@ -850,7 +850,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
- return ip_recv_error(sk, msg, len);
- #if IS_ENABLED(CONFIG_IPV6)
- } else if (family == AF_INET6) {
-- return pingv6_ops.ipv6_recv_error(sk, msg, len);
-+ return pingv6_ops->ipv6_recv_error(sk, msg, len);
- #endif
- }
- }
-@@ -874,11 +874,14 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-
- /* Copy the address and add cmsg data. */
- if (family == AF_INET) {
-- sin = (struct sockaddr_in *) msg->msg_name;
-- sin->sin_family = AF_INET;
-- sin->sin_port = 0 /* skb->h.uh->source */;
-- sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
-- memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
-+ struct sockaddr_in *sin = (struct sockaddr_in *)msg->msg_name;
-+
-+ if (sin) {
-+ sin->sin_family = AF_INET;
-+ sin->sin_port = 0 /* skb->h.uh->source */;
-+ sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
-+ memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
-+ }
-
- if (isk->cmsg_flags)
- ip_cmsg_recv(msg, skb);
-@@ -887,20 +890,23 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
- } else if (family == AF_INET6) {
- struct ipv6_pinfo *np = inet6_sk(sk);
- struct ipv6hdr *ip6 = ipv6_hdr(skb);
-- sin6 = (struct sockaddr_in6 *) msg->msg_name;
-- sin6->sin6_family = AF_INET6;
-- sin6->sin6_port = 0;
-- sin6->sin6_addr = ip6->saddr;
-+ struct sockaddr_in6 *sin6 =
-+ (struct sockaddr_in6 *)msg->msg_name;
-
-- sin6->sin6_flowinfo = 0;
-- if (np->sndflow)
-- sin6->sin6_flowinfo = ip6_flowinfo(ip6);
--
-- sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
-- IP6CB(skb)->iif);
-+ if (sin6) {
-+ sin6->sin6_family = AF_INET6;
-+ sin6->sin6_port = 0;
-+ sin6->sin6_addr = ip6->saddr;
-+ sin6->sin6_flowinfo = 0;
-+ if (np->sndflow)
-+ sin6->sin6_flowinfo = ip6_flowinfo(ip6);
-+ sin6->sin6_scope_id =
-+ ipv6_iface_scope_id(&sin6->sin6_addr,
-+ IP6CB(skb)->iif);
-+ }
-
- if (inet6_sk(sk)->rxopt.all)
-- pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);
-+ pingv6_ops->ip6_datagram_recv_ctl(sk, msg, skb);
- #endif
- } else {
- BUG();
-@@ -1090,7 +1096,7 @@ static void ping_v4_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),
+@@ -836,7 +836,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),
atomic_read(&sp->sk_refcnt), sp,
- atomic_read(&sp->sk_drops), len);
+ atomic_read_unchecked(&sp->sk_drops), len);
}
- static int ping_v4_seq_show(struct seq_file *seq, void *v)
+ static int ping_seq_show(struct seq_file *seq, void *v)
+diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
+index f7fdbe9..63740b7 100644
+--- a/net/ipv4/proc.c
++++ b/net/ipv4/proc.c
+@@ -487,7 +487,7 @@ static __net_exit void ip_proc_exit_net(struct net *net)
+ proc_net_remove(net, "sockstat");
+ }
+
+-static __net_initdata struct pernet_operations ip_proc_ops = {
++static __net_initconst struct pernet_operations ip_proc_ops = {
+ .init = ip_proc_init_net,
+ .exit = ip_proc_exit_net,
+ };
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
-index 193db03..05ba36c 100644
+index 2815014..1d39ae6 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)
+@@ -305,7 +305,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
int raw_rcv(struct sock *sk, struct sk_buff *skb)
{
if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
@@ -93733,7 +94270,7 @@ index 193db03..05ba36c 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -748,16 +748,20 @@ static int raw_init(struct sock *sk)
+@@ -740,16 +740,20 @@ static int raw_init(struct sock *sk)
static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
{
@@ -93755,7 +94292,7 @@ index 193db03..05ba36c 100644
if (get_user(len, optlen))
goto out;
-@@ -767,8 +771,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
+@@ -759,8 +763,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
if (len > sizeof(struct icmp_filter))
len = sizeof(struct icmp_filter);
ret = -EFAULT;
@@ -93766,20 +94303,80 @@ index 193db03..05ba36c 100644
goto out;
ret = 0;
out: return ret;
-@@ -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),
+@@ -988,7 +992,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),
- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
-+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
++ atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ NULL,
++#else
++ sp,
++#endif
++ atomic_read_unchecked(&sp->sk_drops));
}
static int raw_seq_show(struct seq_file *seq, void *v)
+@@ -1051,7 +1061,7 @@ static __net_exit void raw_exit_net(struct net *net)
+ proc_net_remove(net, "raw");
+ }
+
+-static __net_initdata struct pernet_operations raw_net_ops = {
++static __net_initconst struct pernet_operations raw_net_ops = {
+ .init = raw_init_net,
+ .exit = raw_exit_net,
+ };
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 6011615..f418576 100644
+index c45a155a3..dadea8d 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
-@@ -2613,34 +2613,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
+@@ -313,7 +313,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
+
+ static inline int rt_genid(struct net *net)
+ {
+- return atomic_read(&net->ipv4.rt_genid);
++ return atomic_read_unchecked(&net->ipv4.rt_genid);
+ }
+
+ #ifdef CONFIG_PROC_FS
+@@ -641,7 +641,7 @@ static void __net_exit ip_rt_do_proc_exit(struct net *net)
+ #endif
+ }
+
+-static struct pernet_operations ip_rt_proc_ops __net_initdata = {
++static struct pernet_operations ip_rt_proc_ops __net_initconst = {
+ .init = ip_rt_do_proc_init,
+ .exit = ip_rt_do_proc_exit,
+ };
+@@ -937,7 +937,7 @@ static void rt_cache_invalidate(struct net *net)
+ unsigned char shuffle;
+
+ get_random_bytes(&shuffle, sizeof(shuffle));
+- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
++ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
+ redirect_genid++;
+ inetpeer_invalidate_tree(AF_INET);
+ }
+@@ -3023,7 +3023,7 @@ static int rt_fill_info(struct net *net,
+ error = rt->dst.error;
+ if (peer) {
+ inet_peer_refcheck(rt->peer);
+- id = atomic_read(&peer->ip_id_count) & 0xffff;
++ id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
+ if (peer->tcp_ts_stamp) {
+ ts = peer->tcp_ts;
+ tsage = get_seconds() - peer->tcp_ts_stamp;
+@@ -3222,7 +3222,7 @@ static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write,
+ {
+ if (write) {
+ int flush_delay;
+- ctl_table ctl;
++ ctl_table_no_const ctl;
+ struct net *net;
+
+ memcpy(&ctl, __ctl, sizeof(ctl));
+@@ -3371,6 +3371,7 @@ static struct ctl_table ipv4_route_flush_table[] = {
.maxlen = sizeof(int),
.mode = 0200,
.proc_handler = ipv4_sysctl_rtcache_flush,
@@ -93787,6 +94384,7 @@ index 6011615..f418576 100644
},
{ },
};
+@@ -3384,25 +3385,23 @@ static __net_initdata struct ctl_path ipv4_route_path[] = {
static __net_init int sysctl_route_net_init(struct net *net)
{
@@ -93799,18 +94397,15 @@ index 6011615..f418576 100644
+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
if (tbl == NULL)
goto err_dup;
-
- /* Don't export sysctls to unprivileged users */
- if (net->user_ns != &init_user_ns)
- tbl[0].procname = NULL;
- }
- tbl[0].extra1 = net;
-+ tbl[0].extra1 = net;
-+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
-+ } else
-+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
-- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
+- net->ipv4.route_hdr =
+- register_net_sysctl_table(net, ipv4_route_path, tbl);
++ net->ipv4.route_hdr = register_net_sysctl_table(net, ipv4_route_path, tbl);
++ } else
++ net->ipv4.route_hdr = register_net_sysctl_table(net, ipv4_route_path, ipv4_route_flush_table);
++
if (net->ipv4.route_hdr == NULL)
goto err_reg;
return 0;
@@ -93822,97 +94417,74 @@ index 6011615..f418576 100644
err_dup:
return -ENOMEM;
}
-@@ -2663,8 +2663,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
+@@ -3417,7 +3416,7 @@ static __net_exit void sysctl_route_net_exit(struct net *net)
+ kfree(tbl);
+ }
- static __net_init int rt_genid_init(struct net *net)
- {
-- atomic_set(&net->ipv4.rt_genid, 0);
-- atomic_set(&net->fnhe_genid, 0);
-+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
-+ atomic_set_unchecked(&net->fnhe_genid, 0);
- get_random_bytes(&net->ipv4.dev_addr_genid,
- sizeof(net->ipv4.dev_addr_genid));
+-static __net_initdata struct pernet_operations sysctl_route_ops = {
++static __net_initconst struct pernet_operations sysctl_route_ops = {
+ .init = sysctl_route_net_init,
+ .exit = sysctl_route_net_exit,
+ };
+@@ -3432,7 +3431,7 @@ static __net_init int rt_genid_init(struct net *net)
return 0;
+ }
+
+-static __net_initdata struct pernet_operations rt_genid_ops = {
++static __net_initconst struct pernet_operations rt_genid_ops = {
+ .init = rt_genid_init,
+ };
+
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
-index 540279f..9855b16 100644
+index 739b073..7ac6591 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
-@@ -58,7 +58,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
+@@ -53,7 +53,7 @@ static int ipv4_local_port_range(ctl_table *table, int write,
{
int ret;
int range[2];
-- struct ctl_table tmp = {
+- ctl_table tmp = {
+ ctl_table_no_const tmp = {
.data = &range,
.maxlen = sizeof(range),
.mode = table->mode,
-@@ -111,7 +111,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
+@@ -104,7 +104,7 @@ static int ipv4_ping_group_range(ctl_table *table, int write,
+ {
int ret;
- gid_t urange[2];
- kgid_t low, high;
-- struct ctl_table tmp = {
+ gid_t range[2];
+- ctl_table tmp = {
+ ctl_table_no_const tmp = {
- .data = &urange,
- .maxlen = sizeof(urange),
+ .data = &range,
+ .maxlen = sizeof(range),
.mode = table->mode,
-@@ -142,7 +142,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
+@@ -125,7 +125,7 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
char val[TCP_CA_NAME_MAX];
-- struct ctl_table tbl = {
+- ctl_table tbl = {
+ ctl_table_no_const tbl = {
.data = val,
.maxlen = TCP_CA_NAME_MAX,
};
-@@ -161,7 +161,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
+@@ -144,7 +144,7 @@ static int proc_tcp_available_congestion_control(ctl_table *ctl,
void __user *buffer, size_t *lenp,
loff_t *ppos)
{
-- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
+- ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
int ret;
tbl.data = kmalloc(tbl.maxlen, GFP_USER);
-@@ -178,7 +178,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
+@@ -161,7 +161,7 @@ static int proc_allowed_congestion_control(ctl_table *ctl,
void __user *buffer, size_t *lenp,
loff_t *ppos)
{
-- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
+- ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
int ret;
tbl.data = kmalloc(tbl.maxlen, GFP_USER);
-@@ -204,15 +204,17 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write,
- struct mem_cgroup *memcg;
- #endif
-
-- struct ctl_table tmp = {
-+ ctl_table_no_const tmp = {
- .data = &vec,
- .maxlen = sizeof(vec),
- .mode = ctl->mode,
- };
-
- if (!write) {
-- ctl->data = &net->ipv4.sysctl_tcp_mem;
-- return proc_doulongvec_minmax(ctl, write, buffer, lenp, ppos);
-+ ctl_table_no_const tcp_mem = *ctl;
-+
-+ tcp_mem.data = &net->ipv4.sysctl_tcp_mem;
-+ return proc_doulongvec_minmax(&tcp_mem, write, buffer, lenp, ppos);
- }
-
- ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos);
-@@ -240,7 +242,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
- void __user *buffer, size_t *lenp,
- loff_t *ppos)
- {
-- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
-+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
- struct tcp_fastopen_context *ctxt;
- int ret;
- u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
-@@ -483,7 +485,7 @@ static struct ctl_table ipv4_table[] = {
+@@ -361,7 +361,7 @@ static struct ctl_table ipv4_table[] = {
},
{
.procname = "ip_local_reserved_ports",
@@ -93921,7 +94493,7 @@ index 540279f..9855b16 100644
.maxlen = 65536,
.mode = 0644,
.proc_handler = proc_do_large_bitmap,
-@@ -864,11 +866,10 @@ static struct ctl_table ipv4_net_table[] = {
+@@ -744,11 +744,10 @@ EXPORT_SYMBOL_GPL(net_ipv4_ctl_path);
static __net_init int ipv4_sysctl_init_net(struct net *net)
{
@@ -93935,15 +94507,16 @@ index 540279f..9855b16 100644
if (table == NULL)
goto err_alloc;
-@@ -903,15 +904,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
+@@ -780,16 +779,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
- tcp_init_mem(net);
+ net->ipv4.sysctl_rt_cache_rebuild_count = 4;
-- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
+- net->ipv4.ipv4_hdr = register_net_sysctl_table(net,
+- net_ipv4_ctl_path, table);
+ if (!net_eq(net, &init_net))
-+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
++ net->ipv4.ipv4_hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, table);
+ else
-+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
++ net->ipv4.ipv4_hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, ipv4_net_table);
if (net->ipv4.ipv4_hdr == NULL)
goto err_reg;
@@ -93956,7 +94529,16 @@ index 540279f..9855b16 100644
err_alloc:
return -ENOMEM;
}
-@@ -933,16 +936,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
+@@ -803,7 +803,7 @@ static __net_exit void ipv4_sysctl_exit_net(struct net *net)
+ kfree(table);
+ }
+
+-static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
++static __net_initconst struct pernet_operations ipv4_sysctl_ops = {
+ .init = ipv4_sysctl_init_net,
+ .exit = ipv4_sysctl_exit_net,
+ };
+@@ -811,16 +811,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
static __init int sysctl_ipv4_init(void)
{
struct ctl_table_header *hdr;
@@ -93971,13 +94553,25 @@ index 540279f..9855b16 100644
- if (!i->procname)
- return -EINVAL;
- hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
+ hdr = register_sysctl_paths(net_ipv4_ctl_path, ipv4_table);
if (hdr == NULL)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 068c8fb..a755c52 100644
+index 872b41d..bb914c3 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -4435,7 +4435,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
+@@ -1469,7 +1469,10 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
+ tp->lost_cnt_hint -= tcp_skb_pcount(prev);
+ }
+
+- TCP_SKB_CB(skb)->tcp_flags |= TCP_SKB_CB(prev)->tcp_flags;
++ TCP_SKB_CB(prev)->tcp_flags |= TCP_SKB_CB(skb)->tcp_flags;
++ if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
++ TCP_SKB_CB(prev)->end_seq++;
++
+ if (skb == tcp_highest_sack(sk))
+ tcp_advance_highest_sack(sk, skb);
+
+@@ -4736,7 +4739,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
* simplifies code)
*/
static void
@@ -93986,7 +94580,27 @@ index 068c8fb..a755c52 100644
struct sk_buff *head, struct sk_buff *tail,
u32 start, u32 end)
{
-@@ -5520,6 +5520,7 @@ discard:
+@@ -5551,6 +5554,9 @@ slow_path:
+ if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb))
+ goto csum_error;
+
++ if (!th->ack && !th->rst)
++ goto discard;
++
+ /*
+ * Standard slow path.
+ */
+@@ -5559,8 +5565,7 @@ slow_path:
+ return 0;
+
+ step5:
+- if (th->ack &&
+- tcp_ack(sk, skb, FLAG_SLOWPATH | FLAG_UPDATE_TS_RECENT) < 0)
++ if (tcp_ack(sk, skb, FLAG_SLOWPATH | FLAG_UPDATE_TS_RECENT) < 0)
+ goto discard;
+
+ tcp_rcv_rtt_measure_ts(sk, skb);
+@@ -5791,6 +5796,7 @@ discard:
tcp_paws_reject(&tp->rx_opt, 0))
goto discard_and_undo;
@@ -93994,7 +94608,7 @@ index 068c8fb..a755c52 100644
if (th->syn) {
/* We see SYN without ACK. It is attempt of
* simultaneous connect with crossed SYNs.
-@@ -5570,6 +5571,7 @@ discard:
+@@ -5839,6 +5845,7 @@ discard:
goto discard;
#endif
}
@@ -94002,7 +94616,7 @@ index 068c8fb..a755c52 100644
/* "fifth, if neither of the SYN or RST bits is set then
* drop the segment and return."
*/
-@@ -5616,7 +5618,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+@@ -5882,7 +5889,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
goto discard;
if (th->syn) {
@@ -94011,22 +94625,47 @@ index 068c8fb..a755c52 100644
goto discard;
if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
return 1;
+@@ -5921,11 +5928,14 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+ return 0;
+ }
+
++ if (!th->ack && !th->rst)
++ 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 |
+ FLAG_UPDATE_TS_RECENT) > 0;
+
+@@ -6031,8 +6041,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+ }
+ break;
+ }
+- } else
+- goto discard;
++ }
+
+ /* step 6: check the URG bit */
+ tcp_urg(sk, skb, th);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index b14266b..c5fe725 100644
+index a97c9ad..640d986 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
-@@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
+@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
+ int sysctl_tcp_low_latency __read_mostly;
EXPORT_SYMBOL(sysctl_tcp_low_latency);
-
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
+extern int grsec_enable_blackhole;
+#endif
-+
+
#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);
-@@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
+ static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
+@@ -1636,6 +1639,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
return 0;
reset:
@@ -94036,7 +94675,7 @@ index b14266b..c5fe725 100644
tcp_v4_send_reset(rsk, skb);
discard:
kfree_skb(skb);
-@@ -1974,12 +1981,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1698,12 +1704,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);
@@ -94059,7 +94698,7 @@ index b14266b..c5fe725 100644
if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -2033,6 +2047,10 @@ csum_error:
+@@ -1753,6 +1766,10 @@ no_tcp_socket:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
@@ -94070,8 +94709,58 @@ index b14266b..c5fe725 100644
tcp_v4_send_reset(NULL, skb);
}
+@@ -2413,7 +2430,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);
+ }
+
+@@ -2463,7 +2484,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,
+@@ -2491,7 +2517,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
+@@ -2662,7 +2694,7 @@ static void __net_exit tcp_sk_exit_batch(struct list_head *net_exit_list)
+ inet_twsk_purge(&tcp_hashinfo, &tcp_death_row, AF_INET);
+ }
+
+-static struct pernet_operations __net_initdata tcp_sk_ops = {
++static struct pernet_operations __net_initconst tcp_sk_ops = {
+ .init = tcp_sk_init,
+ .exit = tcp_sk_exit,
+ .exit_batch = tcp_sk_exit_batch,
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
-index 58a3e69..7f0626e 100644
+index 66363b6..b0654a3 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -27,6 +27,10 @@
@@ -94085,23 +94774,35 @@ index 58a3e69..7f0626e 100644
int sysctl_tcp_syncookies __read_mostly = 1;
EXPORT_SYMBOL(sysctl_tcp_syncookies);
-@@ -711,7 +715,10 @@ embryonic_reset:
- * avoid becoming vulnerable to outside attack aiming at
- * resetting legit local connections.
- */
-- req->rsk_ops->send_reset(sk, skb);
+@@ -751,6 +755,10 @@ listen_overflow:
+
+ embryonic_reset:
+ NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
++
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+ if (!grsec_enable_blackhole)
++ if (!grsec_enable_blackhole)
+#endif
-+ req->rsk_ops->send_reset(sk, skb);
- } else if (fastopen) { /* received a valid RST pkt */
- reqsk_fastopen_remove(sk, req, true);
- tcp_reset(sk);
+ if (!(flg & TCP_FLAG_RST))
+ req->rsk_ops->send_reset(sk, skb);
+
+diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
+index 3add486..a5df757 100644
+--- a/net/ipv4/tcp_output.c
++++ b/net/ipv4/tcp_output.c
+@@ -1318,7 +1318,7 @@ static void tcp_cwnd_validate(struct sock *sk)
+ * modulo only when the receiver window alone is the limiting factor or
+ * when we would be allowed to send the split-due-to-Nagle skb fully.
+ */
+-static unsigned int tcp_mss_split_point(const struct sock *sk, const struct sk_buff *skb,
++static unsigned int __intentional_overflow(0) tcp_mss_split_point(const struct sock *sk, const struct sk_buff *skb,
+ unsigned int mss_now, unsigned int max_segs)
+ {
+ const struct tcp_sock *tp = tcp_sk(sk);
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
-index 611beab..c4b6e1d 100644
+index 85ee7eb..53277ab 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
-@@ -245,7 +245,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
+@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
if (cnt + width >= len)
break;
@@ -94111,7 +94812,7 @@ index 611beab..c4b6e1d 100644
cnt += width;
}
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
-index 4b85e6f..22f9ac9 100644
+index 2e0f0af..e2948bf 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -22,6 +22,10 @@
@@ -94125,7 +94826,7 @@ index 4b85e6f..22f9ac9 100644
int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
-@@ -185,6 +189,13 @@ static int tcp_write_timeout(struct sock *sk)
+@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk)
}
}
@@ -94140,10 +94841,10 @@ index 4b85e6f..22f9ac9 100644
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 0ca44df..b5e4b11 100644
+index 5decc93..79830d4 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
-@@ -87,6 +87,7 @@
+@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/module.h>
@@ -94151,8 +94852,8 @@ index 0ca44df..b5e4b11 100644
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/igmp.h>
-@@ -112,6 +113,10 @@
- #include <net/busy_poll.h>
+@@ -108,6 +109,10 @@
+ #include <trace/events/udp.h>
#include "udp_impl.h"
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -94162,7 +94863,7 @@ index 0ca44df..b5e4b11 100644
struct udp_table udp_table __read_mostly;
EXPORT_SYMBOL(udp_table);
-@@ -595,6 +600,9 @@ found:
+@@ -565,6 +570,9 @@ found:
return s;
}
@@ -94172,7 +94873,7 @@ index 0ca44df..b5e4b11 100644
/*
* This routine is called by the ICMP module when it gets some
* sort of error condition. If err < 0 then the socket should
-@@ -892,9 +900,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+@@ -857,9 +865,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
dport = usin->sin_port;
if (dport == 0)
return -EINVAL;
@@ -94191,8 +94892,8 @@ index 0ca44df..b5e4b11 100644
daddr = inet->inet_daddr;
dport = inet->inet_dport;
/* Open fast path for connected socket.
-@@ -1138,7 +1155,7 @@ static unsigned int first_packet_length(struct sock *sk)
- IS_UDPLITE(sk));
+@@ -1100,7 +1117,7 @@ static unsigned int first_packet_length(struct sock *sk)
+ udp_lib_checksum_complete(skb)) {
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
IS_UDPLITE(sk));
- atomic_inc(&sk->sk_drops);
@@ -94200,7 +94901,7 @@ index 0ca44df..b5e4b11 100644
__skb_unlink(skb, rcvq);
__skb_queue_tail(&list_kill, skb);
}
-@@ -1224,6 +1241,10 @@ try_again:
+@@ -1186,6 +1203,10 @@ try_again:
if (!skb)
goto out;
@@ -94211,17 +94912,8 @@ index 0ca44df..b5e4b11 100644
ulen = skb->len - sizeof(struct udphdr);
copied = len;
if (copied > ulen)
-@@ -1257,7 +1278,7 @@ try_again:
- if (unlikely(err)) {
- trace_kfree_skb(skb, udp_recvmsg);
- if (!peeked) {
-- atomic_inc(&sk->sk_drops);
-+ atomic_inc_unchecked(&sk->sk_drops);
- UDP_INC_STATS_USER(sock_net(sk),
- UDP_MIB_INERRORS, is_udplite);
- }
-@@ -1544,7 +1565,7 @@ csum_error:
- UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
+@@ -1488,7 +1509,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+
drop:
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
- atomic_inc(&sk->sk_drops);
@@ -94229,7 +94921,7 @@ index 0ca44df..b5e4b11 100644
kfree_skb(skb);
return -1;
}
-@@ -1563,7 +1584,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
+@@ -1507,7 +1528,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
if (!skb1) {
@@ -94238,7 +94930,7 @@ index 0ca44df..b5e4b11 100644
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
IS_UDPLITE(sk));
UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -1735,6 +1756,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+@@ -1676,6 +1697,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
goto csum_error;
UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -94248,20 +94940,27 @@ index 0ca44df..b5e4b11 100644
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
/*
-@@ -2167,7 +2191,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,
+@@ -2099,8 +2123,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,
- 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/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
-index ccde542..eeb5ff7 100644
+index a0b4c5d..a5818a1 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
-@@ -182,11 +182,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
+@@ -190,11 +190,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
fl4->flowi4_tos = iph->tos;
}
@@ -94275,55 +94974,11 @@ index ccde542..eeb5ff7 100644
return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
}
-@@ -265,19 +265,18 @@ static struct ctl_table xfrm4_policy_table[] = {
-
- static int __net_init xfrm4_net_init(struct net *net)
- {
-- struct ctl_table *table;
-+ ctl_table_no_const *table = NULL;
- struct ctl_table_header *hdr;
-
-- table = xfrm4_policy_table;
- if (!net_eq(net, &init_net)) {
-- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
-+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
- if (!table)
- goto err_alloc;
-
- table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
-- }
--
-- hdr = register_net_sysctl(net, "net/ipv4", table);
-+ hdr = register_net_sysctl(net, "net/ipv4", table);
-+ } else
-+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
- if (!hdr)
- goto err_reg;
-
-@@ -285,8 +284,7 @@ static int __net_init xfrm4_net_init(struct net *net)
- return 0;
-
- err_reg:
-- if (!net_eq(net, &init_net))
-- kfree(table);
-+ kfree(table);
- err_alloc:
- return -ENOMEM;
- }
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index cd3fb30..b7dfef7 100644
+index 5d41293..19a815f 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -586,7 +586,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
- idx = 0;
- head = &net->dev_index_head[h];
- rcu_read_lock();
-- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
-+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
- net->dev_base_seq;
- hlist_for_each_entry_rcu(dev, head, index_hlist) {
- if (idx < s_idx)
-@@ -2364,7 +2364,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
+@@ -2157,7 +2157,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
p.iph.ihl = 5;
p.iph.protocol = IPPROTO_IPV6;
p.iph.ttl = 64;
@@ -94332,71 +94987,45 @@ index cd3fb30..b7dfef7 100644
if (ops->ndo_do_ioctl) {
mm_segment_t oldfs = get_fs();
-@@ -3977,7 +3977,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
- s_ip_idx = ip_idx = cb->args[2];
+diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
+index 65dd543..e6c6e6d 100644
+--- a/net/ipv6/esp6.c
++++ b/net/ipv6/esp6.c
+@@ -164,8 +164,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
+ struct esp_data *esp = x->data;
+
+ /* skb is pure payload to encrypt */
+- err = -ENOMEM;
+-
+ aead = esp->aead;
+ alen = crypto_aead_authsize(aead);
- rcu_read_lock();
-- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
-+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
- for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
- idx = 0;
- head = &net->dev_index_head[h];
-@@ -4603,7 +4603,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
- dst_free(&ifp->rt->dst);
- break;
+@@ -200,8 +198,10 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
}
-- atomic_inc(&net->ipv6.dev_addr_genid);
-+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
- rt_genid_bump_ipv6(net);
- }
-@@ -4624,7 +4624,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
- int *valp = ctl->data;
- int val = *valp;
- loff_t pos = *ppos;
-- struct ctl_table lctl;
-+ ctl_table_no_const lctl;
- int ret;
+ tmp = esp_alloc_tmp(aead, nfrags + sglists, seqhilen);
+- if (!tmp)
++ if (!tmp) {
++ err = -ENOMEM;
+ goto error;
++ }
- /*
-@@ -4709,7 +4709,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
- int *valp = ctl->data;
- int val = *valp;
- loff_t pos = *ppos;
-- struct ctl_table lctl;
-+ ctl_table_no_const lctl;
- int ret;
+ seqhi = esp_tmp_seqhi(tmp);
+ iv = esp_tmp_iv(aead, tmp, seqhilen);
+@@ -419,7 +419,7 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)
+ net_adj = 0;
- /*
-diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
-index 7c96100..bfd994a 100644
---- a/net/ipv6/af_inet6.c
-+++ b/net/ipv6/af_inet6.c
-@@ -767,7 +767,7 @@ static int __net_init inet6_net_init(struct net *net)
-
- net->ipv6.sysctl.bindv6only = 0;
- net->ipv6.sysctl.icmpv6_time = 1*HZ;
-- atomic_set(&net->ipv6.rt_genid, 0);
-+ atomic_set_unchecked(&net->ipv6.rt_genid, 0);
-
- err = ipv6_init_mibs(net);
- if (err)
-diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
-index 48b6bd2..76d3458 100644
---- a/net/ipv6/datagram.c
-+++ b/net/ipv6/datagram.c
-@@ -904,5 +904,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
- 0,
- sock_i_ino(sp),
- atomic_read(&sp->sk_refcnt), sp,
-- atomic_read(&sp->sk_drops));
-+ atomic_read_unchecked(&sp->sk_drops));
+ return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
+- net_adj) & ~(align - 1)) + (net_adj - 2);
++ net_adj) & ~(align - 1)) + net_adj - 2;
}
+
+ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
-index eef8d94..cfa1852 100644
+index d505453..ff99535 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
-@@ -997,7 +997,7 @@ struct ctl_table ipv6_icmp_table_template[] = {
+@@ -969,7 +969,7 @@ ctl_table ipv6_icmp_table_template[] = {
struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
{
@@ -94405,73 +95034,88 @@ index eef8d94..cfa1852 100644
table = kmemdup(ipv6_icmp_table_template,
sizeof(ipv6_icmp_table_template),
-diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
-index bf4a9a0..e5f6ac5 100644
---- a/net/ipv6/ip6_gre.c
-+++ b/net/ipv6/ip6_gre.c
-@@ -74,7 +74,7 @@ struct ip6gre_net {
- struct net_device *fb_tunnel_dev;
- };
-
--static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
-+static struct rtnl_link_ops ip6gre_link_ops;
- static int ip6gre_tunnel_init(struct net_device *dev);
- static void ip6gre_tunnel_setup(struct net_device *dev);
- static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
-@@ -1286,7 +1286,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
+diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
+index 1567fb1..29af910 100644
+--- a/net/ipv6/inet6_connection_sock.c
++++ b/net/ipv6/inet6_connection_sock.c
+@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
+ #ifdef CONFIG_XFRM
+ {
+ struct rt6_info *rt = (struct rt6_info *)dst;
+- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
++ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
+ }
+ #endif
}
+@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
+ #ifdef CONFIG_XFRM
+ if (dst) {
+ struct rt6_info *rt = (struct rt6_info *)dst;
+- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
++ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
+ __sk_dst_reset(sk);
+ dst = NULL;
+ }
+diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
+index 73f1a00..e38290b 100644
+--- a/net/ipv6/inet6_hashtables.c
++++ b/net/ipv6/inet6_hashtables.c
+@@ -110,7 +110,7 @@ begintw:
+ goto out;
+ }
+ if (!INET6_TW_MATCH(sk, net, hash, saddr, daddr, ports, dif)) {
+- sock_put(sk);
++ inet_twsk_put(inet_twsk(sk));
+ goto begintw;
+ }
+ goto out;
+diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
+index 91d0711..7dc5e62 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -600,8 +600,8 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
+ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
+ {
+- static atomic_t ipv6_fragmentation_id;
+- int old, new;
++ static atomic_unchecked_t ipv6_fragmentation_id;
++ int id;
--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,
-@@ -1622,7 +1622,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
- [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
- };
-
--static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
-+static struct rtnl_link_ops ip6gre_link_ops = {
- .kind = "ip6gre",
- .maxtype = IFLA_GRE_MAX,
- .policy = ip6gre_policy,
-@@ -1635,7 +1635,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
- .fill_info = ip6gre_fill_info,
- };
-
--static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
-+static struct rtnl_link_ops ip6gre_tap_ops = {
- .kind = "ip6gretap",
- .maxtype = IFLA_GRE_MAX,
- .policy = ip6gre_policy,
-diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 583b77e..99522b8 100644
---- a/net/ipv6/ip6_tunnel.c
-+++ b/net/ipv6/ip6_tunnel.c
-@@ -89,7 +89,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
-
- static int ip6_tnl_dev_init(struct net_device *dev);
- static void ip6_tnl_dev_setup(struct net_device *dev);
--static struct rtnl_link_ops ip6_link_ops __read_mostly;
-+static struct rtnl_link_ops ip6_link_ops;
-
- static int ip6_tnl_net_id __read_mostly;
- struct ip6_tnl_net {
-@@ -1690,7 +1690,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
- [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
- };
+ if (rt && !(rt->dst.flags & DST_NOPEER)) {
+ struct inet_peer *peer;
+@@ -614,13 +614,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
+ return;
+ }
+ }
+- do {
+- old = atomic_read(&ipv6_fragmentation_id);
+- new = old + 1;
+- if (!new)
+- new = 1;
+- } while (atomic_cmpxchg(&ipv6_fragmentation_id, old, new) != old);
+- fhdr->identification = htonl(new);
++ id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
++ if (!id)
++ id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
++ fhdr->identification = htonl(id);
+ }
--static struct rtnl_link_ops ip6_link_ops __read_mostly = {
-+static struct rtnl_link_ops ip6_link_ops = {
- .kind = "ip6tnl",
- .maxtype = IFLA_IPTUN_MAX,
- .policy = ip6_tnl_policy,
+ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
+@@ -1342,7 +1339,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
+ skb = skb_peek_tail(&sk->sk_write_queue);
+ cork->length += length;
+ if (((length > mtu) ||
+- (skb && skb_is_gso(skb))) &&
++ (skb && skb_has_frags(skb))) &&
+ (sk->sk_protocol == IPPROTO_UDP) &&
+ (rt->dst.dev->features & NETIF_F_UFO)) {
+ err = ip6_ufo_append_data(sk, getfrag, from, length,
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
-index d1e2e8e..51c19ae 100644
+index b204df8..8f274f4 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
-@@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
+@@ -961,7 +961,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
if (sk->sk_type != SOCK_STREAM)
return -ENOPROTOOPT;
@@ -94481,10 +95125,10 @@ index d1e2e8e..51c19ae 100644
msg.msg_flags = flags;
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
-index 44400c2..8e11f52 100644
+index 94874b0..a47969c 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
-@@ -1078,14 +1078,14 @@ static int compat_table_info(const struct xt_table_info *info,
+@@ -1091,14 +1091,14 @@ static int compat_table_info(const struct xt_table_info *info,
#endif
static int get_info(struct net *net, void __user *user,
@@ -94502,7 +95146,7 @@ index 44400c2..8e11f52 100644
sizeof(struct ip6t_getinfo));
return -EINVAL;
}
-@@ -1122,7 +1122,7 @@ static int get_info(struct net *net, void __user *user,
+@@ -1135,7 +1135,7 @@ static int get_info(struct net *net, void __user *user,
info.size = private->size;
strcpy(info.name, name);
@@ -94511,7 +95155,7 @@ index 44400c2..8e11f52 100644
ret = -EFAULT;
else
ret = 0;
-@@ -1976,7 +1976,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+@@ -1989,7 +1989,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
switch (cmd) {
case IP6T_SO_GET_INFO:
@@ -94520,7 +95164,7 @@ index 44400c2..8e11f52 100644
break;
case IP6T_SO_GET_ENTRIES:
ret = compat_get_entries(sock_net(sk), user, len);
-@@ -2023,7 +2023,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+@@ -2036,7 +2036,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
switch (cmd) {
case IP6T_SO_GET_INFO:
@@ -94529,139 +95173,20 @@ index 44400c2..8e11f52 100644
break;
case IP6T_SO_GET_ENTRIES:
-diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
-index dffdc1a..ccc6678 100644
---- a/net/ipv6/netfilter/nf_conntrack_reasm.c
-+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
-@@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
-
- static int nf_ct_frag6_sysctl_register(struct net *net)
- {
-- struct ctl_table *table;
-+ ctl_table_no_const *table = NULL;
- struct ctl_table_header *hdr;
-
-- table = nf_ct_frag6_sysctl_table;
- if (!net_eq(net, &init_net)) {
-- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
-+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
- GFP_KERNEL);
- if (table == NULL)
- goto err_alloc;
-@@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
- table[0].data = &net->nf_frag.frags.timeout;
- table[1].data = &net->nf_frag.frags.low_thresh;
- table[2].data = &net->nf_frag.frags.high_thresh;
-- }
--
-- hdr = register_net_sysctl(net, "net/netfilter", table);
-+ hdr = register_net_sysctl(net, "net/netfilter", table);
-+ } else
-+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
- if (hdr == NULL)
- goto err_reg;
-
-@@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
- return 0;
-
- err_reg:
-- if (!net_eq(net, &init_net))
-- kfree(table);
-+ kfree(table);
- err_alloc:
- return -ENOMEM;
- }
-diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
-index 827f795..7e28e82 100644
---- a/net/ipv6/output_core.c
-+++ b/net/ipv6/output_core.c
-@@ -9,8 +9,8 @@
-
- void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
- {
-- static atomic_t ipv6_fragmentation_id;
-- int old, new;
-+ static atomic_unchecked_t ipv6_fragmentation_id;
-+ int id;
-
- #if IS_ENABLED(CONFIG_IPV6)
- if (rt && !(rt->dst.flags & DST_NOPEER)) {
-@@ -26,13 +26,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
- }
- }
- #endif
-- do {
-- old = atomic_read(&ipv6_fragmentation_id);
-- new = old + 1;
-- if (!new)
-- new = 1;
-- } while (atomic_cmpxchg(&ipv6_fragmentation_id, old, new) != old);
-- fhdr->identification = htonl(new);
-+ id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
-+ if (!id)
-+ id = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
-+ fhdr->identification = htonl(id);
- }
- EXPORT_SYMBOL(ipv6_select_ident);
-
-diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
-index 18f19df..b46ada1 100644
---- a/net/ipv6/ping.c
-+++ b/net/ipv6/ping.c
-@@ -245,6 +245,22 @@ static struct pernet_operations ping_v6_net_ops = {
- };
- #endif
-
-+static struct pingv6_ops real_pingv6_ops = {
-+ .ipv6_recv_error = ipv6_recv_error,
-+ .ip6_datagram_recv_ctl = ip6_datagram_recv_ctl,
-+ .icmpv6_err_convert = icmpv6_err_convert,
-+ .ipv6_icmp_error = ipv6_icmp_error,
-+ .ipv6_chk_addr = ipv6_chk_addr,
-+};
-+
-+static struct pingv6_ops dummy_pingv6_ops = {
-+ .ipv6_recv_error = dummy_ipv6_recv_error,
-+ .ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl,
-+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
-+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
-+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
-+};
-+
- int __init pingv6_init(void)
- {
- #ifdef CONFIG_PROC_FS
-@@ -252,11 +268,7 @@ int __init pingv6_init(void)
- if (ret)
- return ret;
- #endif
-- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
-- pingv6_ops.ip6_datagram_recv_ctl = ip6_datagram_recv_ctl;
-- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
-- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
-- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
-+ pingv6_ops = &real_pingv6_ops;
- return inet6_register_protosw(&pingv6_protosw);
- }
-
-@@ -265,11 +277,7 @@ int __init pingv6_init(void)
- */
- void pingv6_exit(void)
- {
-- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
-- pingv6_ops.ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl;
-- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
-- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
-- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
-+ pingv6_ops = &dummy_pingv6_ops;
- #ifdef CONFIG_PROC_FS
- unregister_pernet_subsys(&ping_v6_net_ops);
- #endif
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
-index a4ed241..8bf6277 100644
+index 6e6c2c4..c97891e 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
-@@ -385,7 +385,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -109,7 +109,7 @@ found:
+ */
+ static int icmpv6_filter(const struct sock *sk, const struct sk_buff *skb)
+ {
+- struct icmp6hdr *_hdr;
++ struct icmp6hdr _hdr;
+ const struct icmp6hdr *hdr;
+
+ hdr = skb_header_pointer(skb, skb_transport_offset(skb),
+@@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
{
if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
skb_checksum_complete(skb)) {
@@ -94670,7 +95195,7 @@ index a4ed241..8bf6277 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -413,7 +413,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
struct raw6_sock *rp = raw6_sk(sk);
if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
@@ -94679,7 +95204,7 @@ index a4ed241..8bf6277 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -437,7 +437,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
if (inet->hdrincl) {
if (skb_checksum_complete(skb)) {
@@ -94688,7 +95213,7 @@ index a4ed241..8bf6277 100644
kfree_skb(skb);
return NET_RX_DROP;
}
-@@ -609,7 +609,7 @@ out:
+@@ -600,7 +600,7 @@ out:
return err;
}
@@ -94697,7 +95222,7 @@ index a4ed241..8bf6277 100644
struct flowi6 *fl6, struct dst_entry **dstp,
unsigned int flags)
{
-@@ -922,12 +922,15 @@ do_confirm:
+@@ -908,12 +908,15 @@ do_confirm:
static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
char __user *optval, int optlen)
{
@@ -94714,7 +95239,7 @@ index a4ed241..8bf6277 100644
return 0;
default:
return -ENOPROTOOPT;
-@@ -940,6 +943,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -926,6 +929,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen)
{
int len;
@@ -94722,7 +95247,7 @@ index a4ed241..8bf6277 100644
switch (optname) {
case ICMPV6_FILTER:
-@@ -951,7 +955,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -937,7 +941,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
len = sizeof(struct icmp6_filter);
if (put_user(len, optlen))
return -EFAULT;
@@ -94732,11 +95257,26 @@ index a4ed241..8bf6277 100644
return -EFAULT;
return 0;
default:
+@@ -1244,7 +1249,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+ 0, 0L, 0,
+ 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));
+ }
+
+ static int raw6_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
-index 1aeb473..bea761c 100644
+index eba5deb..61e026f 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
-@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
+@@ -651,21 +651,21 @@ static struct ctl_table ip6_frags_ctl_table[] = {
static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
{
@@ -94751,20 +95291,19 @@ index 1aeb473..bea761c 100644
if (table == NULL)
goto err_alloc;
-@@ -642,9 +641,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
- /* Don't export sysctls to unprivileged users */
- if (net->user_ns != &init_user_ns)
- table[0].procname = NULL;
+ table[0].data = &net->ipv6.frags.high_thresh;
+ table[1].data = &net->ipv6.frags.low_thresh;
+ table[2].data = &net->ipv6.frags.timeout;
- }
-+ hdr = register_net_sysctl(net, "net/ipv6", table);
++ hdr = register_net_sysctl_table(net, net_ipv6_ctl_path, table);
+ } else
-+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
++ hdr = register_net_sysctl_table(net, net_ipv6_ctl_path, ip6_frags_ns_ctl_table);
-- hdr = register_net_sysctl(net, "net/ipv6", table);
+- hdr = register_net_sysctl_table(net, net_ipv6_ctl_path, table);
if (hdr == NULL)
goto err_reg;
-@@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
+@@ -673,8 +673,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
return 0;
err_reg:
@@ -94775,10 +95314,10 @@ index 1aeb473..bea761c 100644
return -ENOMEM;
}
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 04e17b3..83502e9 100644
+index 18ea73c..b0b7be2 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
-@@ -3006,7 +3006,7 @@ struct ctl_table ipv6_route_table_template[] = {
+@@ -2806,7 +2806,7 @@ ctl_table ipv6_route_table_template[] = {
struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
{
@@ -94787,33 +95326,11 @@ index 04e17b3..83502e9 100644
table = kmemdup(ipv6_route_table_template,
sizeof(ipv6_route_table_template),
-diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
-index 1926945..30a1a57 100644
---- a/net/ipv6/sit.c
-+++ b/net/ipv6/sit.c
-@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
- static void ipip6_dev_free(struct net_device *dev);
- static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
- __be32 *v4dst);
--static struct rtnl_link_ops sit_link_ops __read_mostly;
-+static struct rtnl_link_ops sit_link_ops;
-
- static int sit_net_id __read_mostly;
- struct sit_net {
-@@ -1594,7 +1594,7 @@ static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = {
- #endif
- };
-
--static struct rtnl_link_ops sit_link_ops __read_mostly = {
-+static struct rtnl_link_ops sit_link_ops = {
- .kind = "sit",
- .maxtype = IFLA_IPTUN_MAX,
- .policy = ipip6_policy,
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
-index 107b2f1..72741a9 100644
+index 166a57c..dc4e6b8 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
-@@ -40,7 +40,7 @@ static struct ctl_table ipv6_rotable[] = {
+@@ -71,7 +71,7 @@ EXPORT_SYMBOL_GPL(net_ipv6_ctl_path);
static int __net_init ipv6_sysctl_net_init(struct net *net)
{
@@ -94823,12 +95340,12 @@ index 107b2f1..72741a9 100644
struct ctl_table *ipv6_icmp_table;
int err;
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 5c71501..7e8d5d3 100644
+index c69358c..d1e5855 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
-@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
- inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
+@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
}
+ #endif
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
+extern int grsec_enable_blackhole;
@@ -94837,7 +95354,7 @@ index 5c71501..7e8d5d3 100644
static void tcp_v6_hash(struct sock *sk)
{
if (sk->sk_state != TCP_CLOSE) {
-@@ -1397,6 +1401,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1657,6 +1661,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
return 0;
reset:
@@ -94847,7 +95364,7 @@ index 5c71501..7e8d5d3 100644
tcp_v6_send_reset(sk, skb);
discard:
if (opt_skb)
-@@ -1479,12 +1486,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
+@@ -1736,12 +1743,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);
@@ -94870,7 +95387,7 @@ index 5c71501..7e8d5d3 100644
if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1536,6 +1551,10 @@ csum_error:
+@@ -1789,6 +1804,10 @@ no_tcp_socket:
bad_packet:
TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
} else {
@@ -94881,12 +95398,56 @@ index 5c71501..7e8d5d3 100644
tcp_v6_send_reset(NULL, skb);
}
+@@ -2049,7 +2068,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)
+@@ -2099,7 +2124,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,
+@@ -2134,7 +2164,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 1878609..b48e1d4 100644
+index f9e496b..729da61 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
-@@ -53,6 +53,10 @@
- #include <trace/events/skb.h>
+@@ -50,6 +50,10 @@
+ #include <linux/seq_file.h>
#include "udp_impl.h"
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -94896,48 +95457,64 @@ index 1878609..b48e1d4 100644
int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
{
const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
-@@ -420,7 +424,7 @@ try_again:
- if (unlikely(err)) {
- trace_kfree_skb(skb, udpv6_recvmsg);
- if (!peeked) {
-- atomic_inc(&sk->sk_drops);
-+ atomic_inc_unchecked(&sk->sk_drops);
- if (is_udp4)
- UDP_INC_STATS_USER(sock_net(sk),
- UDP_MIB_INERRORS,
-@@ -668,7 +672,7 @@ csum_error:
- UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
+@@ -549,7 +553,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
+
+ return 0;
drop:
- UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
- atomic_inc(&sk->sk_drops);
+ atomic_inc_unchecked(&sk->sk_drops);
+ drop_no_sk_drops_inc:
+ UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
kfree_skb(skb);
- return -1;
- }
-@@ -726,7 +730,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
- if (likely(skb1 == NULL))
- skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
- if (!skb1) {
-- atomic_inc(&sk->sk_drops);
-+ atomic_inc_unchecked(&sk->sk_drops);
- UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
- IS_UDPLITE(sk));
- UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -866,6 +870,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
- goto csum_error;
+@@ -625,7 +629,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
+ continue;
+ }
+ drop:
+- atomic_inc(&sk->sk_drops);
++ atomic_inc_unchecked(&sk->sk_drops);
+ UDP6_INC_STATS_BH(sock_net(sk),
+ UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
+ UDP6_INC_STATS_BH(sock_net(sk),
+@@ -780,6 +784,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+ UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
+ proto == IPPROTO_UDPLITE);
- UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
++ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
+#endif
- icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
+ icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
- kfree_skb(skb);
+ kfree_skb(skb);
+@@ -796,7 +803,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+ if (!sock_owned_by_user(sk))
+ udpv6_queue_rcv_skb(sk, skb);
+ else if (sk_add_backlog(sk, skb)) {
+- atomic_inc(&sk->sk_drops);
++ atomic_inc_unchecked(&sk->sk_drops);
+ bh_unlock_sock(sk);
+ sock_put(sk);
+ goto discard;
+@@ -1412,8 +1419,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
+ 0, 0L, 0,
+ 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));
+ }
+
+ int udp6_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
-index 08ed277..80e4bc8 100644
+index db78e7d..c88f974 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
-@@ -208,11 +208,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
+@@ -202,11 +202,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
}
}
@@ -94951,121 +95528,180 @@ index 08ed277..80e4bc8 100644
return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
}
-@@ -325,19 +325,19 @@ static struct ctl_table xfrm6_policy_table[] = {
-
- static int __net_init xfrm6_net_init(struct net *net)
- {
-- struct ctl_table *table;
-+ ctl_table_no_const *table = NULL;
- struct ctl_table_header *hdr;
-
-- table = xfrm6_policy_table;
- if (!net_eq(net, &init_net)) {
-- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
-+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
- if (!table)
- goto err_alloc;
-
- table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
-- }
-+ hdr = register_net_sysctl(net, "net/ipv6", table);
-+ } else
-+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
-
-- hdr = register_net_sysctl(net, "net/ipv6", table);
- if (!hdr)
- goto err_reg;
-
-@@ -345,8 +345,7 @@ static int __net_init xfrm6_net_init(struct net *net)
- return 0;
-
- err_reg:
-- if (!net_eq(net, &init_net))
-- kfree(table);
-+ kfree(table);
- err_alloc:
- return -ENOMEM;
- }
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
-index 41ac7938..75e3bb1 100644
+index 253695d..9481ce8 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
-@@ -319,11 +319,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
- add_wait_queue(&port->open_wait, &wait);
+@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+ add_wait_queue(&self->open_wait, &wait);
IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
-- __FILE__, __LINE__, tty->driver->name, port->count);
-+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
+- __FILE__,__LINE__, tty->driver->name, self->open_count );
++ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
- spin_lock_irqsave(&port->lock, flags);
- if (!tty_hung_up_p(filp))
-- port->count--;
-+ atomic_dec(&port->count);
- port->blocked_open++;
- spin_unlock_irqrestore(&port->lock, flags);
+ /* As far as I can see, we protect open_count - Jean II */
+ spin_lock_irqsave(&self->spinlock, flags);
+ if (!tty_hung_up_p(filp)) {
+ extra_count = 1;
+- self->open_count--;
++ local_dec(&self->open_count);
+ }
+ spin_unlock_irqrestore(&self->spinlock, flags);
+- self->blocked_open++;
++ local_inc(&self->blocked_open);
-@@ -358,7 +358,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+ while (1) {
+ if (tty->termios->c_cflag & CBAUD) {
+@@ -331,7 +331,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, port->count);
-+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
+- __FILE__,__LINE__, tty->driver->name, self->open_count );
++ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
schedule();
}
-@@ -368,12 +368,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
-
- spin_lock_irqsave(&port->lock, flags);
- if (!tty_hung_up_p(filp))
-- port->count++;
-+ atomic_inc(&port->count);
- port->blocked_open--;
- spin_unlock_irqrestore(&port->lock, flags);
+@@ -342,13 +342,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);
+ }
+- self->blocked_open--;
++ local_dec(&self->blocked_open);
IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
-- __FILE__, __LINE__, tty->driver->name, port->count);
-+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
+- __FILE__,__LINE__, tty->driver->name, self->open_count);
++ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
if (!retval)
- port->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -447,12 +447,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
-
+ self->flags |= ASYNC_NORMAL_ACTIVE;
+@@ -417,14 +417,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->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);
+ spin_lock_irqsave(&self->spinlock, flags);
+- self->open_count++;
++ local_inc(&self->open_count);
+
+ tty->driver_data = self;
+ self->tty = tty;
+ spin_unlock_irqrestore(&self->spinlock, flags);
IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
-- self->line, self->port.count);
-+ self->line, atomic_read(&self->port.count));
+- self->line, self->open_count);
++ self->line, local_read(&self->open_count));
/* Not really used by us, but lets do it anyway */
- self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-@@ -989,7 +989,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
- tty_kref_put(port->tty);
+ self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
+ return;
}
- port->tty = NULL;
-- port->count = 0;
-+ atomic_set(&port->count, 0);
- spin_unlock_irqrestore(&port->lock, flags);
- wake_up_interruptible(&port->open_wait);
-@@ -1346,7 +1346,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
+- 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
+@@ -520,16 +520,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__ );
+@@ -561,7 +561,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);
+@@ -1013,7 +1013,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);
+@@ -1360,7 +1360,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->port.count);
-+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
+- 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, "Max data size: %d\n", self->max_data_size);
seq_printf(m, "Max header size: %d\n", self->max_header_size);
+diff --git a/net/irda/iriap.c b/net/irda/iriap.c
+index e71e85b..29340a9 100644
+--- a/net/irda/iriap.c
++++ b/net/irda/iriap.c
+@@ -495,8 +495,11 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
+ /* case CS_ISO_8859_9: */
+ /* case CS_UNICODE: */
+ default:
+- IRDA_DEBUG(0, "%s(), charset %s, not supported\n",
+- __func__, ias_charset_types[charset]);
++ IRDA_DEBUG(0, "%s(), charset [%d] %s, not supported\n",
++ __func__, charset,
++ charset < ARRAY_SIZE(ias_charset_types) ?
++ ias_charset_types[charset] :
++ "(unknown)");
+
+ /* Aborting, close connection! */
+ iriap_disconnect_request(self);
+diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
+index 8c00416..9ea0c93 100644
+--- a/net/irda/irlap_frame.c
++++ b/net/irda/irlap_frame.c
+@@ -544,7 +544,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
+ /*
+ * We now have some discovery info to deliver!
+ */
+- discovery = kmalloc(sizeof(discovery_t), GFP_ATOMIC);
++ discovery = kzalloc(sizeof(discovery_t), GFP_ATOMIC);
+ if (!discovery) {
+ IRDA_WARNING("%s: unable to malloc!\n", __func__);
+ return;
+diff --git a/net/irda/irttp.c b/net/irda/irttp.c
+index 32e3bb0..a4e5eb8 100644
+--- a/net/irda/irttp.c
++++ b/net/irda/irttp.c
+@@ -441,6 +441,7 @@ struct tsap_cb *irttp_open_tsap(__u8 stsap_sel, int credit, notify_t *notify)
+ lsap = irlmp_open_lsap(stsap_sel, &ttp_notify, 0);
+ if (lsap == NULL) {
+ IRDA_WARNING("%s: unable to allocate LSAP!!\n", __func__);
++ __irttp_close_tsap(self);
+ return NULL;
+ }
+
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
-index 168aff5..9d43132 100644
+index e836140..f8ec098 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
-@@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
+@@ -786,10 +786,10 @@ static int iucv_sock_autobind(struct sock *sk)
write_lock_bh(&iucv_sk_list.lock);
@@ -95079,10 +95715,10 @@ index 168aff5..9d43132 100644
write_unlock_bh(&iucv_sk_list.lock);
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
-index cd5b8ec..f205e6b 100644
+index 403be43..87f09da 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
-@@ -690,7 +690,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
+@@ -690,7 +690,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
@@ -95092,10 +95728,30 @@ index cd5b8ec..f205e6b 100644
};
diff --git a/net/key/af_key.c b/net/key/af_key.c
-index 911ef03..58f9c96 100644
+index 8dbdb8e..50f4169 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
-@@ -3041,10 +3041,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
+@@ -1097,7 +1097,8 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
+
+ x->id.proto = proto;
+ x->id.spi = sa->sadb_sa_spi;
+- x->props.replay_window = sa->sadb_sa_replay;
++ x->props.replay_window = min_t(unsigned int, sa->sadb_sa_replay,
++ (sizeof(x->replay.bitmap) * 8));
+ if (sa->sadb_sa_flags & SADB_SAFLAGS_NOECN)
+ x->props.flags |= XFRM_STATE_NOECN;
+ if (sa->sadb_sa_flags & SADB_SAFLAGS_DECAP_DSCP)
+@@ -1924,6 +1925,9 @@ parse_ipsecrequests(struct xfrm_policy *xp, struct sadb_x_policy *pol)
+ int len = pol->sadb_x_policy_len*8 - sizeof(struct sadb_x_policy);
+ struct sadb_x_ipsecrequest *rq = (void*)(pol+1);
+
++ if (pol->sadb_x_policy_len * 8 < sizeof(struct sadb_x_policy))
++ return -EINVAL;
++
+ while (len >= sizeof(struct sadb_x_ipsecrequest)) {
+ if ((err = parse_ipsecrequest(xp, rq)) < 0)
+ return err;
+@@ -3020,10 +3024,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
static u32 get_acqseq(void)
{
u32 res;
@@ -95108,52 +95764,56 @@ index 911ef03..58f9c96 100644
} while (!res);
return res;
}
-diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 629dee7..4bdd2c8 100644
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -826,7 +826,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
- ret = ieee80211_vif_use_channel(sdata, chandef,
- IEEE80211_CHANCTX_EXCLUSIVE);
- }
-- } else if (local->open_count == local->monitors) {
-+ } else if (local_read(&local->open_count) == local->monitors) {
- local->_oper_chandef = *chandef;
- ieee80211_hw_config(local, 0);
+diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
+index 93a41a0..d4b4edb 100644
+--- a/net/l2tp/l2tp_netlink.c
++++ b/net/l2tp/l2tp_netlink.c
+@@ -78,8 +78,8 @@ static int l2tp_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)
+
+ hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq,
+ &l2tp_nl_family, 0, L2TP_CMD_NOOP);
+- if (IS_ERR(hdr)) {
+- ret = PTR_ERR(hdr);
++ if (!hdr) {
++ ret = -EMSGSIZE;
+ goto err_out;
}
-@@ -3125,7 +3125,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;
+@@ -228,8 +228,8 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 pid, u32 seq, int flags,
- ieee80211_queue_work(&local->hw, &local->reconfig_filter);
-@@ -3588,8 +3588,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
- if (chanctx_conf) {
- *chandef = chanctx_conf->def;
- ret = 0;
-- } else if (local->open_count > 0 &&
-- local->open_count == local->monitors &&
-+ } else if (local_read(&local->open_count) > 0 &&
-+ local_read(&local->open_count) == local->monitors &&
- sdata->vif.type == NL80211_IFTYPE_MONITOR) {
- if (local->use_chanctx)
- *chandef = local->monitor_chandef;
+ hdr = genlmsg_put(skb, pid, seq, &l2tp_nl_family, flags,
+ L2TP_CMD_TUNNEL_GET);
+- if (IS_ERR(hdr))
+- return PTR_ERR(hdr);
++ if (!hdr)
++ return -EMSGSIZE;
+
+ NLA_PUT_U8(skb, L2TP_ATTR_PROTO_VERSION, tunnel->version);
+ NLA_PUT_U32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id);
+@@ -560,8 +560,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 pid, u32 seq, int flags
+ sk = tunnel->sock;
+
+ hdr = genlmsg_put(skb, pid, seq, &l2tp_nl_family, flags, L2TP_CMD_SESSION_GET);
+- if (IS_ERR(hdr))
+- return PTR_ERR(hdr);
++ if (!hdr)
++ return -EMSGSIZE;
+
+ NLA_PUT_U32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id);
+ NLA_PUT_U32(skb, L2TP_ATTR_SESSION_ID, session->session_id);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
-index 611abfc..8c2c7e4 100644
+index 73495f1..ad51356 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -28,6 +28,7 @@
+@@ -27,6 +27,7 @@
#include <net/ieee80211_radiotap.h>
#include <net/cfg80211.h>
#include <net/mac80211.h>
+#include <asm/local.h>
#include "key.h"
#include "sta_info.h"
- #include "debug.h"
-@@ -945,7 +946,7 @@ struct ieee80211_local {
+
+@@ -764,7 +765,7 @@ struct ieee80211_local {
/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
spinlock_t queue_stop_reason_lock;
@@ -95163,10 +95823,10 @@ index 611abfc..8c2c7e4 100644
/* 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 fcecd63..a404454 100644
+index 8260cd5..f13516d 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -519,7 +519,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
break;
}
@@ -95175,34 +95835,34 @@ index fcecd63..a404454 100644
res = drv_start(local);
if (res)
goto err_del_bss;
-@@ -566,7 +566,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
- res = drv_add_interface(local, sdata);
- if (res)
- goto err_stop;
-- } else if (local->monitors == 0 && local->open_count == 0) {
-+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
- res = ieee80211_add_virtual_monitor(local);
- if (res)
- goto err_stop;
-@@ -675,7 +675,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
- atomic_inc(&local->iff_promiscs);
+@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+ memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
+
+ if (!is_valid_ether_addr(dev->dev_addr)) {
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ drv_stop(local);
+ return -EADDRNOTAVAIL;
+ }
+@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+ mutex_unlock(&local->mtx);
if (coming_up)
- local->open_count++;
+ local_inc(&local->open_count);
- if (hw_reconf_flags)
+ if (hw_reconf_flags) {
ieee80211_hw_config(local, hw_reconf_flags);
-@@ -713,7 +713,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
err_del_interface:
- drv_remove_interface(local, sdata);
+ drv_remove_interface(local, &sdata->vif);
err_stop:
- if (!local->open_count)
+ if (!local_read(&local->open_count))
drv_stop(local);
err_del_bss:
sdata->bss = NULL;
-@@ -852,7 +852,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -472,7 +472,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
}
if (going_down)
@@ -95211,40 +95871,22 @@ index fcecd63..a404454 100644
switch (sdata->vif.type) {
case NL80211_IFTYPE_AP_VLAN:
-@@ -919,7 +919,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
- }
- spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
-
-- if (local->open_count == 0)
-+ if (local_read(&local->open_count) == 0)
- ieee80211_clear_tx_pending(local);
-
- /*
-@@ -959,7 +959,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -543,7 +543,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
ieee80211_recalc_ps(local, -1);
- if (local->open_count == 0) {
+ if (local_read(&local->open_count) == 0) {
- ieee80211_stop_device(local);
-
- /* no reconfiguring after stop! */
-@@ -970,7 +970,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
- ieee80211_configure_filter(local);
- ieee80211_hw_config(local, hw_reconf_flags);
-
-- if (local->monitors == local->open_count)
-+ if (local->monitors == local_read(&local->open_count))
- ieee80211_add_virtual_monitor(local);
- }
-
+ if (local->ops->napi_poll)
+ napi_disable(&local->napi);
+ ieee80211_clear_tx_pending(local);
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index 21d5d44..4fee18a 100644
+index 7d9b21d..0687004 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -172,7 +172,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
- changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
- IEEE80211_CONF_CHANGE_POWER);
+@@ -163,7 +163,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
+ local->hw.conf.power_level = power;
+ }
- if (changed && local->open_count) {
+ if (changed && local_read(&local->open_count)) {
@@ -95252,10 +95894,10 @@ index 21d5d44..4fee18a 100644
/*
* Goal:
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
-index 3401262..d5cd68d 100644
+index 9ee7164..56c5061 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
-@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
+@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
struct ieee80211_sub_if_data *sdata;
struct sta_info *sta;
@@ -95264,7 +95906,7 @@ index 3401262..d5cd68d 100644
goto suspend;
ieee80211_scan_cancel(local);
-@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
+@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
cancel_work_sync(&local->dynamic_ps_enable_work);
del_timer_sync(&local->dynamic_ps_timer);
@@ -95273,8 +95915,8 @@ index 3401262..d5cd68d 100644
if (local->wowlan) {
int err = drv_suspend(local, wowlan);
if (err < 0) {
-@@ -116,7 +116,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
- WARN_ON(!list_empty(&local->chanctx_list));
+@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
+ }
/* stop hardware - this must stop RX */
- if (local->open_count)
@@ -95283,10 +95925,10 @@ index 3401262..d5cd68d 100644
suspend:
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
-index e126605..73d2c39 100644
+index 7d84b87..6a69cd9 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
-@@ -725,7 +725,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
+@@ -401,7 +401,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
ASSERT_RTNL();
@@ -95309,32 +95951,23 @@ index c97a065..ff61928 100644
return p;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index 69e4ef5..e8e4b92 100644
+index 7095ae5..85ba5e9 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
-@@ -1470,7 +1470,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
- }
- #endif
+@@ -1000,7 +1000,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+ drv_set_coverage_class(local, hw->wiphy->coverage_class);
+
/* everything else happens only if HW was up & running */
- if (!local->open_count)
+ if (!local_read(&local->open_count))
goto wake_up;
/*
-@@ -1695,7 +1695,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
- local->in_reconfig = false;
- barrier();
-
-- if (local->monitors == local->open_count && local->monitors > 0)
-+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
- ieee80211_add_virtual_monitor(local);
-
- /*
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
-index 6e839b6..002a233 100644
+index d5597b7..ab6d39c 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -950,6 +950,16 @@ config NETFILTER_XT_MATCH_ESP
+@@ -779,6 +779,16 @@ config NETFILTER_XT_MATCH_ESP
To compile it as a module, choose M here. If unsure, say N.
@@ -95352,22 +95985,22 @@ index 6e839b6..002a233 100644
tristate '"hashlimit" match support'
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
-index c3a0a12..90b587f 100644
+index 1a02853..5d8c22e 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
+@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
+ 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
+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
-index f2e30fb..f131862 100644
+index 86137b5..c12e721 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
-@@ -1819,7 +1819,7 @@ done:
+@@ -1679,7 +1679,7 @@ done:
return ret;
}
@@ -95376,29 +96009,42 @@ index f2e30fb..f131862 100644
.pf = PF_INET,
.get_optmin = SO_IP_SET,
.get_optmax = SO_IP_SET + 1,
+diff --git a/net/netfilter/ipset/ip_set_hash_netiface.c b/net/netfilter/ipset/ip_set_hash_netiface.c
+index e13095d..6617217 100644
+--- a/net/netfilter/ipset/ip_set_hash_netiface.c
++++ b/net/netfilter/ipset/ip_set_hash_netiface.c
+@@ -761,7 +761,7 @@ static struct ip_set_type hash_netiface_type __read_mostly = {
+ [IPSET_ATTR_IP] = { .type = NLA_NESTED },
+ [IPSET_ATTR_IP_TO] = { .type = NLA_NESTED },
+ [IPSET_ATTR_IFACE] = { .type = NLA_NUL_STRING,
+- .len = IPSET_MAXNAMELEN - 1 },
++ .len = IFNAMSIZ - 1 },
+ [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
+ [IPSET_ATTR_CIDR] = { .type = NLA_U8 },
+ [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
-index 4c8e5c0..5a79b4d 100644
+index 29fa5ba..8debc79 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
/* Increase the refcnt counter of the dest */
- ip_vs_dest_hold(dest);
+ atomic_inc(&dest->refcnt);
- conn_flags = atomic_read(&dest->conn_flags);
+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
if (cp->protocol != IPPROTO_UDP)
conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
- flags = cp->flags;
-@@ -900,7 +900,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
+ /* Bind with the destination and its corresponding transmitter */
+@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
+ atomic_set(&cp->refcnt, 1);
- cp->control = NULL;
atomic_set(&cp->n_control, 0);
- atomic_set(&cp->in_pkts, 0);
+ atomic_set_unchecked(&cp->in_pkts, 0);
- cp->packet_xmit = NULL;
- cp->app = NULL;
-@@ -1188,7 +1188,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
+ atomic_inc(&ipvs->conn_count);
+ if (flags & IP_VS_CONN_F_NO_CPORT)
+@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
/* Don't drop the entry if its number of incoming packets is not
located in [0, 8] */
@@ -95408,11 +96054,11 @@ index 4c8e5c0..5a79b4d 100644
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 74fd00c..06e7ac7 100644
+index 6dc7d7d..e45913a 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
-@@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
- ret = cp->packet_xmit(skb, cp, pd->pp, iph);
+@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
+ ret = cp->packet_xmit(skb, cp, pd->pp);
/* do not touch skb anymore */
- atomic_inc(&cp->in_pkts);
@@ -95420,29 +96066,29 @@ index 74fd00c..06e7ac7 100644
ip_vs_conn_put(cp);
return ret;
}
-@@ -1719,7 +1719,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
+@@ -1611,7 +1611,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
- pkts = atomic_add_return(1, &cp->in_pkts);
+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
- if (ipvs->sync_state & IP_VS_STATE_MASTER)
- ip_vs_sync_conn(net, cp, pkts);
+ if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
+ cp->protocol == IPPROTO_SCTP) {
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
-index a3df9bd..895ae09 100644
+index 72f4253..c9a3f57 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
-@@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
- */
+@@ -788,7 +788,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);
}
- atomic_set(&dest->conn_flags, conn_flags);
+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
/* bind the service */
- old_svc = rcu_dereference_protected(dest->svc, 1);
-@@ -1641,7 +1641,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
+ if (!dest->svc) {
+@@ -1666,7 +1666,7 @@ proc_do_sync_mode(ctl_table *table, int write,
* align with netns init in ip_vs_control_net_init()
*/
@@ -95451,7 +96097,7 @@ index a3df9bd..895ae09 100644
{
.procname = "amemthresh",
.maxlen = sizeof(int),
-@@ -2062,7 +2062,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2028,7 +2028,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),
@@ -95460,7 +96106,7 @@ index a3df9bd..895ae09 100644
atomic_read(&dest->weight),
atomic_read(&dest->activeconns),
atomic_read(&dest->inactconns));
-@@ -2073,7 +2073,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2039,7 +2039,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),
@@ -95469,7 +96115,14 @@ index a3df9bd..895ae09 100644
atomic_read(&dest->weight),
atomic_read(&dest->activeconns),
atomic_read(&dest->inactconns));
-@@ -2551,7 +2551,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
+@@ -2503,13 +2503,14 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
+ struct ip_vs_dest *dest;
+ struct ip_vs_dest_entry entry;
+
++ memset(&entry, 0, sizeof(entry));
+ list_for_each_entry(dest, &svc->destinations, n_list) {
+ if (count >= get->num_dests)
+ break;
entry.addr = dest->addr.ip;
entry.port = dest->port;
@@ -95478,16 +96131,16 @@ index a3df9bd..895ae09 100644
entry.weight = atomic_read(&dest->weight);
entry.u_threshold = dest->u_threshold;
entry.l_threshold = dest->l_threshold;
-@@ -3094,7 +3094,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_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
- nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
-- (atomic_read(&dest->conn_flags) &
-+ (atomic_read_unchecked(&dest->conn_flags) &
- IP_VS_CONN_F_FWD_MASK)) ||
- nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
- atomic_read(&dest->weight)) ||
-@@ -3684,7 +3684,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
+@@ -3043,7 +3044,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
+ NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
+
+ NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
+- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
++ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
+ NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
+ NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
+ NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
+@@ -3626,7 +3627,7 @@ int __net_init ip_vs_control_net_init_sysctl(struct net *net)
{
int idx;
struct netns_ipvs *ipvs = net_ipvs(net);
@@ -95497,54 +96150,45 @@ index a3df9bd..895ae09 100644
atomic_set(&ipvs->dropentry, 0);
spin_lock_init(&ipvs->dropentry_lock);
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
-index eff13c9..c1aab3e 100644
+index 0f16283..9ec4d21 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
-@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
+@@ -115,7 +115,7 @@ struct ip_vs_lblc_table {
* IPVS LBLC sysctl table
*/
#ifdef CONFIG_SYSCTL
--static struct ctl_table vs_vars_table[] = {
+-static ctl_table vs_vars_table[] = {
+static ctl_table_no_const vs_vars_table[] __read_only = {
{
.procname = "lblc_expiration",
.data = NULL,
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
-index 0b85500..8513fa5 100644
+index eec797f..6f3ec56 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
-@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
+@@ -288,7 +288,7 @@ struct ip_vs_lblcr_table {
* IPVS LBLCR sysctl table
*/
--static struct ctl_table vs_vars_table[] = {
+-static ctl_table vs_vars_table[] = {
+static ctl_table_no_const vs_vars_table[] __read_only = {
{
.procname = "lblcr_expiration",
.data = NULL,
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
-index f448471..995f131 100644
+index 2b6678c0..aaa41fc 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
-@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
- cp = cp->control;
- if (cp) {
- if (cp->flags & IP_VS_CONN_F_TEMPLATE)
-- pkts = atomic_add_return(1, &cp->in_pkts);
-+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
- else
- pkts = sysctl_sync_threshold(ipvs);
- ip_vs_sync_conn(net, cp->control, pkts);
-@@ -771,7 +771,7 @@ control:
- if (!cp)
- return;
- if (cp->flags & IP_VS_CONN_F_TEMPLATE)
-- pkts = atomic_add_return(1, &cp->in_pkts);
-+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
- else
- pkts = sysctl_sync_threshold(ipvs);
- goto sloop;
-@@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
+@@ -649,7 +649,7 @@ control:
+ * i.e only increment in_pkts for Templates.
+ */
+ if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
+- int pkts = atomic_add_return(1, &cp->in_pkts);
++ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
+
+ if (pkts % sysctl_sync_period(ipvs) != 1)
+ return;
+@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
if (opt)
memcpy(&cp->in_seq, opt, sizeof(*opt));
@@ -95554,10 +96198,10 @@ index f448471..995f131 100644
cp->old_state = cp->state;
/*
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
-index c47444e..b0961c6 100644
+index 38c0813..a29519d 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
-@@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
+@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
else
rc = NF_ACCEPT;
/* do not touch skb anymore */
@@ -95566,7 +96210,7 @@ index c47444e..b0961c6 100644
goto out;
}
-@@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
+@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
else
rc = NF_ACCEPT;
/* do not touch skb anymore */
@@ -95576,7 +96220,7 @@ index c47444e..b0961c6 100644
}
diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
-index 2d3030a..7ba1c0a 100644
+index 369df3f..b660190 100644
--- a/net/netfilter/nf_conntrack_acct.c
+++ b/net/netfilter/nf_conntrack_acct.c
@@ -60,7 +60,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
@@ -95589,21 +96233,21 @@ index 2d3030a..7ba1c0a 100644
table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
GFP_KERNEL);
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
-index 5d892fe..d2fc9d8 100644
+index 7489bd3..5f4df88 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -1600,6 +1600,10 @@ void nf_conntrack_init_end(void)
+@@ -1491,6 +1491,10 @@ err_proto:
+ #define UNCONFIRMED_NULLS_VAL ((1<<30)+0)
#define DYING_NULLS_VAL ((1<<30)+1)
- #define TEMPLATE_NULLS_VAL ((1<<30)+2)
+#ifdef CONFIG_GRKERNSEC_HIDESYM
+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
+#endif
+
- int nf_conntrack_init_net(struct net *net)
+ static int nf_conntrack_init_net(struct net *net)
{
int ret;
-@@ -1614,7 +1618,11 @@ int nf_conntrack_init_net(struct net *net)
+@@ -1504,7 +1508,11 @@ static int nf_conntrack_init_net(struct net *net)
goto err_stat;
}
@@ -95616,10 +96260,10 @@ index 5d892fe..d2fc9d8 100644
ret = -ENOMEM;
goto err_slabname;
diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
-index 1df1761..ce8b88a 100644
+index 14af632..9914188 100644
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
-@@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
+@@ -185,7 +185,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
#ifdef CONFIG_SYSCTL
static int nf_conntrack_event_init_sysctl(struct net *net)
{
@@ -95628,37 +96272,20 @@ index 1df1761..ce8b88a 100644
table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
GFP_KERNEL);
-diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
-index 974a2a4..52cc6ff 100644
---- a/net/netfilter/nf_conntrack_helper.c
-+++ b/net/netfilter/nf_conntrack_helper.c
-@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
-
- static int nf_conntrack_helper_init_sysctl(struct net *net)
- {
-- struct ctl_table *table;
-+ ctl_table_no_const *table;
-
- table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
- GFP_KERNEL);
-diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
-index ce30041..3861b5d 100644
---- a/net/netfilter/nf_conntrack_proto.c
-+++ b/net/netfilter/nf_conntrack_proto.c
-@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
-
- static void
- nf_ct_unregister_sysctl(struct ctl_table_header **header,
-- struct ctl_table **table,
-+ ctl_table_no_const **table,
- unsigned int users)
- {
- if (users > 0)
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
-index a99b6c3..cb372f9 100644
+index 2e664a6..c854e4a 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
-@@ -428,7 +428,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
+@@ -391,7 +391,7 @@ struct dccp_net {
+ unsigned int dccp_timeout[CT_DCCP_MAX + 1];
+ #ifdef CONFIG_SYSCTL
+ struct ctl_table_header *sysctl_header;
+- struct ctl_table *sysctl_table;
++ ctl_table_no_const *sysctl_table;
+ #endif
+ };
+
+@@ -431,7 +431,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
const char *msg;
u_int8_t state;
@@ -95667,16 +96294,16 @@ index a99b6c3..cb372f9 100644
BUG_ON(dh == NULL);
state = dccp_state_table[CT_DCCP_ROLE_CLIENT][dh->dccph_type][CT_DCCP_NONE];
-@@ -457,7 +457,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
+@@ -459,7 +459,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
+
out_invalid:
if (LOG_INVALID(net, IPPROTO_DCCP))
- nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL,
-- NULL, msg);
-+ NULL, "%s", msg);
+- nf_log_packet(nf_ct_l3num(ct), 0, skb, NULL, NULL, NULL, msg);
++ nf_log_packet(nf_ct_l3num(ct), 0, skb, NULL, NULL, NULL, "%s", msg);
return false;
}
-@@ -486,7 +486,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
+@@ -483,7 +483,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
u_int8_t type, old_state, new_state;
enum ct_dccp_roles role;
@@ -95685,7 +96312,7 @@ index a99b6c3..cb372f9 100644
BUG_ON(dh == NULL);
type = dh->dccph_type;
-@@ -577,7 +577,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
+@@ -575,7 +575,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
unsigned int cscov;
const char *msg;
@@ -95694,30 +96321,73 @@ index a99b6c3..cb372f9 100644
if (dh == NULL) {
msg = "nf_ct_dccp: short packet ";
goto out_invalid;
-@@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
+@@ -612,7 +612,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
out_invalid:
if (LOG_INVALID(net, IPPROTO_DCCP))
-- nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, msg);
-+ nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, "%s", msg);
+- nf_log_packet(pf, 0, skb, NULL, NULL, NULL, msg);
++ nf_log_packet(pf, 0, skb, NULL, NULL, NULL, "%s", msg);
return -NF_ACCEPT;
}
+diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
+index 57ad466..e53ab60 100644
+--- a/net/netfilter/nf_conntrack_proto_tcp.c
++++ b/net/netfilter/nf_conntrack_proto_tcp.c
+@@ -519,7 +519,7 @@ static bool tcp_in_window(const struct nf_conn *ct,
+ const struct nf_conntrack_tuple *tuple = &ct->tuplehash[dir].tuple;
+ __u32 seq, ack, sack, end, win, swin;
+ s16 receiver_offset;
+- bool res;
++ bool res, in_recv_win;
+
+ /*
+ * Get the required data from the packet.
+@@ -642,14 +642,18 @@ static bool tcp_in_window(const struct nf_conn *ct,
+ receiver->td_end, receiver->td_maxend, receiver->td_maxwin,
+ receiver->td_scale);
+
++ /* Is the ending sequence in the receive window (if available)? */
++ in_recv_win = !receiver->td_maxwin ||
++ after(end, sender->td_end - receiver->td_maxwin - 1);
++
+ pr_debug("tcp_in_window: I=%i II=%i III=%i IV=%i\n",
+ before(seq, sender->td_maxend + 1),
+- after(end, sender->td_end - receiver->td_maxwin - 1),
++ (in_recv_win ? 1 : 0),
+ before(sack, receiver->td_end + 1),
+ after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1));
+
+ if (before(seq, sender->td_maxend + 1) &&
+- after(end, sender->td_end - receiver->td_maxwin - 1) &&
++ in_recv_win &&
+ before(sack, receiver->td_end + 1) &&
+ after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1)) {
+ /*
+@@ -718,7 +722,7 @@ static bool tcp_in_window(const struct nf_conn *ct,
+ nf_log_packet(pf, 0, skb, NULL, NULL, NULL,
+ "nf_ct_tcp: %s ",
+ before(seq, sender->td_maxend + 1) ?
+- after(end, sender->td_end - receiver->td_maxwin - 1) ?
++ in_recv_win ?
+ before(sack, receiver->td_end + 1) ?
+ after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1) ? "BUG"
+ : "ACK is under the lower bound (possible overly delayed ACK)"
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
-index f641751..d3c5b51 100644
+index 05e9feb..3b519f3 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
+@@ -475,7 +475,7 @@ static struct ctl_path nf_ct_path[] = {
static int nf_conntrack_standalone_init_sysctl(struct net *net)
{
- struct ctl_table *table;
+ ctl_table_no_const *table;
- table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
- GFP_KERNEL);
+ if (net_eq(net, &init_net)) {
+ nf_ct_netfilter_header =
diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
-index 902fb0a..87f7fdb 100644
+index af7dd31..7535cd7 100644
--- a/net/netfilter/nf_conntrack_timestamp.c
+++ b/net/netfilter/nf_conntrack_timestamp.c
@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
@@ -95730,26 +96400,26 @@ index 902fb0a..87f7fdb 100644
table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
GFP_KERNEL);
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
-index 85296d4..8becdec 100644
+index 957374a..dcbce7a 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
-@@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
+@@ -222,7 +222,7 @@ static struct ctl_path nf_log_sysctl_path[] = {
+ };
- #ifdef CONFIG_SYSCTL
static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
+ static struct ctl_table_header *nf_log_dir_header;
- static int nf_log_proc_dostring(struct ctl_table *table, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
-@@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
- rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
+ static int nf_log_proc_dostring(ctl_table *table, int write,
+@@ -253,14 +253,16 @@ static int nf_log_proc_dostring(ctl_table *table, int write,
+ rcu_assign_pointer(nf_loggers[tindex], logger);
mutex_unlock(&nf_log_mutex);
} else {
+ ctl_table_no_const nf_log_table = *table;
+
mutex_lock(&nf_log_mutex);
- logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
+ logger = rcu_dereference_protected(nf_loggers[tindex],
lockdep_is_held(&nf_log_mutex));
if (!logger)
- table->data = "NONE";
@@ -95785,27 +96455,134 @@ index f042ae5..30ea486 100644
}
EXPORT_SYMBOL(nf_unregister_sockopt);
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
-index d92cc31..e46f350 100644
+index 66b2c54..4ea49be 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
-@@ -82,7 +82,7 @@ static int nfnl_log_net_id __read_mostly;
- struct nfnl_log_net {
- spinlock_t instances_lock;
- struct hlist_head instance_table[INSTANCE_BUCKETS];
-- atomic_t global_seq;
-+ atomic_unchecked_t global_seq;
+@@ -70,7 +70,7 @@ struct nfulnl_instance {
};
- static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
-@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
+ static DEFINE_SPINLOCK(instances_lock);
+-static atomic_t global_seq;
++static atomic_unchecked_t global_seq;
+
+ #define INSTANCE_BUCKETS 16
+ static struct hlist_head instance_table[INSTANCE_BUCKETS];
+@@ -388,6 +388,7 @@ __build_packet_message(struct nfulnl_instance *inst,
+ nfmsg->version = NFNETLINK_V0;
+ nfmsg->res_id = htons(inst->group_num);
+
++ memset(&pmsg, 0, sizeof(pmsg));
+ pmsg.hw_protocol = skb->protocol;
+ pmsg.hook = hooknum;
+
+@@ -456,7 +457,10 @@ __build_packet_message(struct nfulnl_instance *inst,
+ if (indev && skb->dev &&
+ skb->mac_header != skb->network_header) {
+ struct nfulnl_msg_packet_hw phw;
+- int len = dev_parse_header(skb, phw.hw_addr);
++ int len;
++
++ memset(&phw, 0, sizeof(phw));
++ len = dev_parse_header(skb, phw.hw_addr);
+ if (len > 0) {
+ phw.hw_addrlen = htons(len);
+ NLA_PUT(inst->skb, NFULA_HWADDR, sizeof(phw), &phw);
+@@ -502,7 +506,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,
-- htonl(atomic_inc_return(&log->global_seq))))
-+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
- goto nla_put_failure;
+ if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
+ NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
+- htonl(atomic_inc_return(&global_seq)));
++ htonl(atomic_inc_return_unchecked(&global_seq)));
if (data_len) {
+ struct nlattr *nla;
+diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
+index a80b0cb..f7e08e7 100644
+--- a/net/netfilter/nfnetlink_queue.c
++++ b/net/netfilter/nfnetlink_queue.c
+@@ -344,7 +344,10 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
+ if (indev && entskb->dev &&
+ entskb->mac_header != entskb->network_header) {
+ struct nfqnl_msg_packet_hw phw;
+- int len = dev_parse_header(entskb, phw.hw_addr);
++ int len;
++
++ memset(&phw, 0, sizeof(phw));
++ len = dev_parse_header(entskb, phw.hw_addr);
+ if (len) {
+ phw.hw_addrlen = htons(len);
+ NLA_PUT(skb, NFQA_HWADDR, sizeof(phw), &phw);
+diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c
+index 9e63b43..a61bc90 100644
+--- a/net/netfilter/xt_TCPMSS.c
++++ b/net/netfilter/xt_TCPMSS.c
+@@ -50,7 +50,8 @@ tcpmss_mangle_packet(struct sk_buff *skb,
+ unsigned int minlen)
+ {
+ struct tcphdr *tcph;
+- unsigned int tcplen, i;
++ int len, tcp_hdrlen;
++ unsigned int i;
+ __be16 oldval;
+ u16 newmss;
+ u8 *opt;
+@@ -58,11 +59,14 @@ tcpmss_mangle_packet(struct sk_buff *skb,
+ if (!skb_make_writable(skb, skb->len))
+ return -1;
+
+- tcplen = skb->len - tcphoff;
++ len = skb->len - tcphoff;
++ if (len < (int)sizeof(struct tcphdr))
++ return -1;
++
+ tcph = (struct tcphdr *)(skb_network_header(skb) + tcphoff);
++ tcp_hdrlen = tcph->doff * 4;
+
+- /* Header cannot be larger than the packet */
+- if (tcplen < tcph->doff*4)
++ if (len < tcp_hdrlen)
+ return -1;
+
+ if (info->mss == XT_TCPMSS_CLAMP_PMTU) {
+@@ -83,9 +87,8 @@ tcpmss_mangle_packet(struct sk_buff *skb,
+ newmss = info->mss;
+
+ opt = (u_int8_t *)tcph;
+- for (i = sizeof(struct tcphdr); i < tcph->doff*4; i += optlen(opt, i)) {
+- if (opt[i] == TCPOPT_MSS && tcph->doff*4 - i >= TCPOLEN_MSS &&
+- opt[i+1] == TCPOLEN_MSS) {
++ for (i = sizeof(struct tcphdr); i <= tcp_hdrlen - TCPOLEN_MSS; i += optlen(opt, i)) {
++ if (opt[i] == TCPOPT_MSS && opt[i+1] == TCPOLEN_MSS) {
+ u_int16_t oldmss;
+
+ oldmss = (opt[i+2] << 8) | opt[i+3];
+@@ -108,9 +111,10 @@ tcpmss_mangle_packet(struct sk_buff *skb,
+ }
+
+ /* There is data after the header so the option can't be added
+- without moving it, and doing so may make the SYN packet
+- itself too large. Accept the packet unmodified instead. */
+- if (tcplen > tcph->doff*4)
++ * without moving it, and doing so may make the SYN packet
++ * itself too large. Accept the packet unmodified instead.
++ */
++ if (len > tcp_hdrlen)
+ return 0;
+
+ /*
+@@ -127,10 +131,10 @@ tcpmss_mangle_packet(struct sk_buff *skb,
+ skb_put(skb, TCPOLEN_MSS);
+
+ opt = (u_int8_t *)tcph + sizeof(struct tcphdr);
+- memmove(opt + TCPOLEN_MSS, opt, tcplen - sizeof(struct tcphdr));
++ memmove(opt + TCPOLEN_MSS, opt, len - sizeof(struct tcphdr));
+
+ inet_proto_csum_replace2(&tcph->check, skb,
+- htons(tcplen), htons(tcplen + TCPOLEN_MSS), 1);
++ htons(len), htons(len + TCPOLEN_MSS), 1);
+ opt[0] = TCPOPT_MSS;
+ opt[1] = TCPOLEN_MSS;
+ opt[2] = (newmss & 0xff00) >> 8;
diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
new file mode 100644
index 0000000..c566332
@@ -95898,10 +96675,10 @@ index 4fe4fb4..87a89e5 100644
return 0;
}
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
-index 8df7f64..c5d6821 100644
+index 3d1d55d..1ee2a18 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
-@@ -249,7 +249,7 @@ static void netlink_overrun(struct sock *sk)
+@@ -753,7 +753,7 @@ static void netlink_overrun(struct sock *sk)
sk->sk_error_report(sk);
}
}
@@ -95909,21 +96686,30 @@ index 8df7f64..c5d6821 100644
+ atomic_inc_unchecked(&sk->sk_drops);
}
- static void netlink_rcv_wake(struct sock *sk)
-@@ -2942,7 +2942,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
+ static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
+@@ -2013,7 +2013,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
sk_wmem_alloc_get(s),
- nlk->cb_running,
+ nlk->cb,
atomic_read(&s->sk_refcnt),
- atomic_read(&s->sk_drops),
+ atomic_read_unchecked(&s->sk_drops),
sock_i_ino(s)
);
+@@ -2120,7 +2120,7 @@ static void __init netlink_add_usersock_entry(void)
+ netlink_table_ungrab();
+ }
+
+-static struct pernet_operations __net_initdata netlink_net_ops = {
++static struct pernet_operations __net_initconst netlink_net_ops = {
+ .init = netlink_net_init,
+ .exit = netlink_net_exit,
+ };
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
-index 0c741ce..f8c8ca7 100644
+index 874f8ff..339bb58 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
-@@ -310,18 +310,20 @@ int genl_register_ops(struct genl_family *family, struct genl_ops *ops)
+@@ -288,18 +288,20 @@ int genl_register_ops(struct genl_family *family, struct genl_ops *ops)
goto errout;
}
@@ -95939,33 +96725,41 @@ index 0c741ce..f8c8ca7 100644
+ *(unsigned int *)&ops->flags |= GENL_CMD_CAP_HASPOL;
+ pax_close_kernel();
- genl_lock_all();
+ genl_lock();
- list_add_tail(&ops->ops_list, &family->ops_list);
+ pax_list_add_tail((struct list_head *)&ops->ops_list, &family->ops_list);
- genl_unlock_all();
+ genl_unlock();
- genl_ctrl_event(CTRL_CMD_NEWOPS, ops);
+ genl_ctrl_event(CTRL_CMD_NEWOPS, (void *)ops);
err = 0;
errout:
return err;
-@@ -351,9 +353,9 @@ int genl_unregister_ops(struct genl_family *family, struct genl_ops *ops)
- genl_lock_all();
+@@ -329,9 +331,9 @@ int genl_unregister_ops(struct genl_family *family, struct genl_ops *ops)
+ genl_lock();
list_for_each_entry(rc, &family->ops_list, ops_list) {
if (rc == ops) {
- list_del(&ops->ops_list);
+ pax_list_del((struct list_head *)&ops->ops_list);
- genl_unlock_all();
+ genl_unlock();
- genl_ctrl_event(CTRL_CMD_DELOPS, ops);
+ genl_ctrl_event(CTRL_CMD_DELOPS, (void *)ops);
return 0;
}
}
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
-index 698814b..7cfde4e 100644
+index 3df7c5a..8f324b0 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
-@@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
+@@ -839,6 +839,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
+ struct sock *sk = sock->sk;
+ struct nr_sock *nr = nr_sk(sk);
+
++ memset(sax, 0, sizeof(*sax));
+ lock_sock(sk);
+ if (peer != 0) {
+ if (sk->sk_state != TCP_ESTABLISHED) {
+@@ -853,7 +854,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
*uaddr_len = sizeof(struct full_sockaddr_ax25);
} else {
sax->fsa_ax25.sax25_family = AF_NETROM;
@@ -95974,28 +96768,47 @@ index 698814b..7cfde4e 100644
*uaddr_len = sizeof(struct sockaddr_ax25);
}
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 2e8286b..b2659ee 100644
+index a2ac2c3..070be35 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
-@@ -1692,7 +1692,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -1670,7 +1670,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
spin_lock(&sk->sk_receive_queue.lock);
- po->stats.stats1.tp_packets++;
+ po->stats.tp_packets++;
- skb->dropcount = atomic_read(&sk->sk_drops);
+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
__skb_queue_tail(&sk->sk_receive_queue, skb);
spin_unlock(&sk->sk_receive_queue.lock);
sk->sk_data_ready(sk, skb->len);
-@@ -1701,7 +1701,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -1679,7 +1679,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.stats1.tp_drops++;
+ po->stats.tp_drops++;
- atomic_inc(&sk->sk_drops);
+ atomic_inc_unchecked(&sk->sk_drops);
spin_unlock(&sk->sk_receive_queue.lock);
drop_n_restore:
-@@ -3250,7 +3250,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -2609,6 +2609,7 @@ out:
+
+ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
+ {
++ struct sock_extended_err ee;
+ struct sock_exterr_skb *serr;
+ struct sk_buff *skb, *skb2;
+ int copied, err;
+@@ -2630,8 +2631,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);
++ ee = serr->ee;
+ put_cmsg(msg, SOL_PACKET, PACKET_TX_TIMESTAMP,
+- sizeof(serr->ee), &serr->ee);
++ sizeof ee, &ee);
+
+ msg->msg_flags |= MSG_ERRQUEUE;
+ err = copied;
+@@ -3261,7 +3263,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
case PACKET_HDRLEN:
if (len > sizeof(int))
len = sizeof(int);
@@ -96004,17 +96817,34 @@ index 2e8286b..b2659ee 100644
return -EFAULT;
switch (val) {
case TPACKET_V1:
-@@ -3293,7 +3293,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
- len = lv;
+@@ -3311,7 +3313,11 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+
if (put_user(len, optlen))
return -EFAULT;
- if (copy_to_user(optval, data, len))
-+ if (len > sizeof(st) || copy_to_user(optval, data, len))
++
++ if ((data == &val && len > sizeof(val)) ||
++ (data == &st_u.stats3 && len > sizeof(st_u.stats3)) ||
++ (data == &st && len > sizeof(st)) ||
++ copy_to_user(optval, data, len))
return -EFAULT;
return 0;
}
+diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
+index d65f699..855d175 100644
+--- a/net/phonet/af_phonet.c
++++ b/net/phonet/af_phonet.c
+@@ -469,7 +469,7 @@ int __init_or_module phonet_proto_register(unsigned int protocol,
+ {
+ int err = 0;
+
+- if (protocol >= PHONET_NPROTO)
++ if (protocol < 0 || protocol >= PHONET_NPROTO)
+ return -EINVAL;
+
+ err = proto_register(pp->prot, 1);
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
-index e774117..900b8b7 100644
+index 007546d..9a8e5c6 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
@@ -96035,7 +96865,7 @@ index e774117..900b8b7 100644
err = -ENOBUFS;
break;
}
-@@ -580,7 +580,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -557,7 +557,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
}
if (pn->rx_credits == 0) {
@@ -96045,27 +96875,34 @@ index e774117..900b8b7 100644
break;
}
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
-index 77e38f7..f4ef5c3 100644
+index 4c7eff3..59c727f 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
-@@ -612,7 +612,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,
+@@ -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,
- 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, "");
return 0;
diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
-index c02a8c4..3c5b600 100644
+index cea1c7d..e74ee16 100644
--- a/net/phonet/sysctl.c
+++ b/net/phonet/sysctl.c
-@@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write,
+@@ -62,7 +62,7 @@ static int proc_local_port_range(ctl_table *table, int write,
{
int ret;
int range[2] = {local_port_range[0], local_port_range[1]};
-- struct ctl_table tmp = {
+- ctl_table tmp = {
+ ctl_table_no_const tmp = {
.data = &range,
.maxlen = sizeof(range),
@@ -96102,7 +96939,7 @@ index e5b65ac..f3b6fb7 100644
if (likely(*recent == gen))
return 0;
diff --git a/net/rds/ib.h b/net/rds/ib.h
-index 7280ab8..e04f4ea 100644
+index edfaaaf..8c89879 100644
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -128,7 +128,7 @@ struct rds_ib_connection {
@@ -96115,10 +96952,10 @@ index 7280ab8..e04f4ea 100644
spinlock_t i_ack_lock; /* protect i_ack_next */
u64 i_ack_next; /* next ACK to send */
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
-index 31b74f5..dc1fbfa 100644
+index 51c8689..36c555f 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
-@@ -717,7 +717,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
+@@ -718,7 +718,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
/* Clear the ACK state */
clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
#ifdef KERNEL_HAS_ATOMIC64
@@ -96128,10 +96965,10 @@ index 31b74f5..dc1fbfa 100644
ic->i_ack_next = 0;
#endif
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
-index 8eb9501..0c386ff 100644
+index e29e0ca..fa3a6a3 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
-@@ -597,7 +597,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
+@@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
int ack_required)
{
@@ -96140,7 +96977,7 @@ index 8eb9501..0c386ff 100644
if (ack_required) {
smp_mb__before_clear_bit();
set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
-@@ -609,7 +609,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
+@@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
smp_mb__after_clear_bit();
@@ -96163,7 +97000,7 @@ index 04ce3b1..48119a6 100644
spinlock_t i_ack_lock; /* protect i_ack_next */
u64 i_ack_next; /* next ACK to send */
diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
-index a91e1db..cf3053f 100644
+index 9556d28..f046d0e 100644
--- a/net/rds/iw_cm.c
+++ b/net/rds/iw_cm.c
@@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
@@ -96176,7 +97013,7 @@ index a91e1db..cf3053f 100644
ic->i_ack_next = 0;
#endif
diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
-index 4503335..db566b4 100644
+index 5e57347..3916042 100644
--- a/net/rds/iw_recv.c
+++ b/net/rds/iw_recv.c
@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
@@ -96198,7 +97035,7 @@ index 4503335..db566b4 100644
#endif
diff --git a/net/rds/rds.h b/net/rds/rds.h
-index ec1d731..90a3a8d 100644
+index 7eaba18..a3c303f 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -449,7 +449,7 @@ struct rds_transport {
@@ -96224,7 +97061,7 @@ index edac9ef..16bcb98 100644
set_fs(oldfs);
}
diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
-index 81cf5a4..b5826ff 100644
+index 1b4fd68..2234175 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)
@@ -96237,10 +97074,10 @@ index 81cf5a4..b5826ff 100644
set_fs(oldfs);
}
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
-index e61aa60..f07cc89 100644
+index 74c064c..fdec26f 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
-@@ -40,7 +40,7 @@ static const struct proto_ops rxrpc_rpc_ops;
+@@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ops;
__be32 rxrpc_epoch;
/* current debugging ID */
@@ -96250,7 +97087,7 @@ index e61aa60..f07cc89 100644
/* count of skbs currently in use */
atomic_t rxrpc_n_skbs;
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
-index e4d9cbc..b229649 100644
+index f99cfce..cc529dd 100644
--- a/net/rxrpc/ar-ack.c
+++ b/net/rxrpc/ar-ack.c
@@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
@@ -96317,7 +97154,7 @@ index e4d9cbc..b229649 100644
send_message_2:
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
-index a3bbb36..3341fb9 100644
+index bf656c2..48f9d27 100644
--- a/net/rxrpc/ar-call.c
+++ b/net/rxrpc/ar-call.c
@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
@@ -96356,7 +97193,7 @@ index e7ed43a..6afa140 100644
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
-index 529572f..c758ca7 100644
+index 1a2b0633..e8d1382 100644
--- a/net/rxrpc/ar-input.c
+++ b/net/rxrpc/ar-input.c
@@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
@@ -96372,13 +97209,13 @@ index 529572f..c758ca7 100644
/* request ACK generation for any ACK or DATA packet that requests
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
-index a693aca..81e7293 100644
+index 8e22bd3..f66d1c0 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -272,8 +272,8 @@ struct rxrpc_connection {
int error; /* error code for local abort */
int debug_id; /* debug ID for printks */
- unsigned int call_counter; /* call ID counter */
+ unsigned call_counter; /* call ID counter */
- atomic_t serial; /* packet serial number counter */
- atomic_t hi_serial; /* highest serial number received */
+ atomic_unchecked_t serial; /* packet serial number counter */
@@ -96404,6 +97241,28 @@ index a693aca..81e7293 100644
extern struct workqueue_struct *rxrpc_workqueue;
/*
+diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
+index 43ea7de..eafaa2e 100644
+--- a/net/rxrpc/ar-key.c
++++ b/net/rxrpc/ar-key.c
+@@ -232,7 +232,7 @@ static int rxrpc_krb5_decode_principal(struct krb5_principal *princ,
+ if (toklen <= (n_parts + 1) * 4)
+ return -EINVAL;
+
+- princ->name_parts = kcalloc(sizeof(char *), n_parts, GFP_KERNEL);
++ princ->name_parts = kcalloc(n_parts, sizeof(char *), GFP_KERNEL);
+ if (!princ->name_parts)
+ return -ENOMEM;
+
+@@ -356,7 +356,7 @@ static int rxrpc_krb5_decode_tagged_array(struct krb5_tagged_data **_td,
+
+ _debug("n_elem %d", n_elem);
+
+- td = kcalloc(sizeof(struct krb5_tagged_data), n_elem,
++ td = kcalloc(n_elem, sizeof(struct krb5_tagged_data),
+ GFP_KERNEL);
+ if (!td)
+ return -ENOMEM;
diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
index 87f7135..74d3703 100644
--- a/net/rxrpc/ar-local.c
@@ -96418,7 +97277,7 @@ index 87f7135..74d3703 100644
}
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
-index e1ac183..b43e10e 100644
+index 338d793..47391d0 100644
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -682,9 +682,9 @@ static int rxrpc_send_data(struct kiocb *iocb,
@@ -96434,7 +97293,7 @@ index e1ac183..b43e10e 100644
sp->hdr.userStatus = 0;
sp->hdr.securityIndex = conn->security_ix;
diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
-index bebaa43..2644591 100644
+index 2754f09..b20e38f 100644
--- a/net/rxrpc/ar-peer.c
+++ b/net/rxrpc/ar-peer.c
@@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
@@ -96475,7 +97334,7 @@ index 92df566..87ec1bf 100644
if (peer->srx.transport.family == AF_INET) {
switch (peer->srx.transport_type) {
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
-index f226709..0e735a8 100644
+index 7635107..4670276 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
@@ -96497,10 +97356,10 @@ index f226709..0e735a8 100644
ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
-index e7b2d4f..bb1efd0 100644
+index 0b6a391..febcef2 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
-@@ -962,7 +962,7 @@ static const struct inet6_protocol sctpv6_protocol = {
+@@ -961,7 +961,7 @@ static const struct inet6_protocol sctpv6_protocol = {
.flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
};
@@ -96509,7 +97368,7 @@ index e7b2d4f..bb1efd0 100644
.sa_family = AF_INET6,
.sctp_xmit = sctp_v6_xmit,
.setsockopt = ipv6_setsockopt,
-@@ -994,7 +994,7 @@ static struct sctp_af sctp_af_inet6 = {
+@@ -993,7 +993,7 @@ static struct sctp_af sctp_af_inet6 = {
#endif
};
@@ -96518,7 +97377,7 @@ index e7b2d4f..bb1efd0 100644
.event_msgname = sctp_inet6_event_msgname,
.skb_msgname = sctp_inet6_skb_msgname,
.af_supported = sctp_inet6_af_supported,
-@@ -1019,7 +1019,7 @@ void sctp_v6_pf_init(void)
+@@ -1018,7 +1018,7 @@ void sctp_v6_pf_init(void)
void sctp_v6_pf_exit(void)
{
@@ -96527,11 +97386,38 @@ index e7b2d4f..bb1efd0 100644
}
/* Initialize IPv6 support and register with socket layer. */
+diff --git a/net/sctp/probe.c b/net/sctp/probe.c
+index bc6cd75..749e4eb 100644
+--- a/net/sctp/probe.c
++++ b/net/sctp/probe.c
+@@ -63,7 +63,7 @@ static struct {
+ struct timespec tstart;
+ } sctpw;
+
+-static void printl(const char *fmt, ...)
++static __printf(1, 2) void printl(const char *fmt, ...)
+ {
+ va_list args;
+ int len;
+diff --git a/net/sctp/proc.c b/net/sctp/proc.c
+index 1e2eee8..ce3967e 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)
+ seq_printf(seq,
+ "%8pK %8pK %-3d %-3d %-2d %-4d "
+ "%4d %8d %8d %7d %5lu %-5d %5d ",
+- assoc, sk, sctp_sk(sk)->type, sk->sk_state,
++ assoc, sk,
++ sctp_sk(sk)->type, sk->sk_state,
+ assoc->state, hash,
+ assoc->assoc_id,
+ assoc->sndbuf_used,
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
-index 5e17092..19be1d4 100644
+index 6f6ad86..d52dc47 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
-@@ -832,8 +832,10 @@ int sctp_register_af(struct sctp_af *af)
+@@ -862,8 +862,10 @@ int sctp_register_af(struct sctp_af *af)
return 0;
}
@@ -96543,7 +97429,7 @@ index 5e17092..19be1d4 100644
return 1;
}
-@@ -963,7 +965,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
+@@ -994,7 +996,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
static struct sctp_af sctp_af_inet;
@@ -96552,7 +97438,7 @@ index 5e17092..19be1d4 100644
.event_msgname = sctp_inet_event_msgname,
.skb_msgname = sctp_inet_skb_msgname,
.af_supported = sctp_inet_af_supported,
-@@ -1034,7 +1036,7 @@ static const struct net_protocol sctp_protocol = {
+@@ -1064,7 +1066,7 @@ static const struct net_protocol sctp_protocol = {
};
/* IPv4 address related functions. */
@@ -96561,7 +97447,7 @@ index 5e17092..19be1d4 100644
.sa_family = AF_INET,
.sctp_xmit = sctp_v4_xmit,
.setsockopt = ip_setsockopt,
-@@ -1119,7 +1121,7 @@ static void sctp_v4_pf_init(void)
+@@ -1149,7 +1151,7 @@ static void sctp_v4_pf_init(void)
static void sctp_v4_pf_exit(void)
{
@@ -96571,10 +97457,10 @@ index 5e17092..19be1d4 100644
static int sctp_v4_protosw_init(void)
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
-index 1a6eef3..17e898f 100644
+index 76388b0..a967f68 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
-@@ -440,7 +440,7 @@ static void sctp_generate_sack_event(unsigned long data)
+@@ -441,7 +441,7 @@ static void sctp_generate_sack_event(unsigned long data)
sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);
}
@@ -96584,10 +97470,10 @@ index 1a6eef3..17e898f 100644
sctp_generate_t1_cookie_event,
sctp_generate_t1_init_event,
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 911b71b..90ade0a 100644
+index c53d01e..9659111 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
-@@ -2153,11 +2153,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
+@@ -2160,11 +2160,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
{
struct sctp_association *asoc;
struct sctp_ulpevent *event;
@@ -96602,7 +97488,7 @@ index 911b71b..90ade0a 100644
/*
* At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
-@@ -4213,13 +4215,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
+@@ -4150,13 +4152,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
int __user *optlen)
{
@@ -96620,7 +97506,7 @@ index 911b71b..90ade0a 100644
return -EFAULT;
return 0;
}
-@@ -4237,6 +4242,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
+@@ -4174,6 +4179,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
*/
static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
{
@@ -96629,7 +97515,7 @@ index 911b71b..90ade0a 100644
/* Applicable to UDP-style socket only */
if (sctp_style(sk, TCP))
return -EOPNOTSUPP;
-@@ -4245,7 +4252,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
+@@ -4182,7 +4189,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
len = sizeof(int);
if (put_user(len, optlen))
return -EFAULT;
@@ -96639,7 +97525,7 @@ index 911b71b..90ade0a 100644
return -EFAULT;
return 0;
}
-@@ -4617,12 +4625,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
+@@ -4546,12 +4554,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
*/
static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
{
@@ -96656,7 +97542,7 @@ index 911b71b..90ade0a 100644
return -EFAULT;
return 0;
}
-@@ -4663,6 +4674,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+@@ -4592,6 +4603,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;
@@ -96665,50 +97551,81 @@ index 911b71b..90ade0a 100644
if (copy_to_user(to, &temp, addrlen))
return -EFAULT;
to += addrlen;
-diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
-index 6b36561..4f21064 100644
---- a/net/sctp/sysctl.c
-+++ b/net/sctp/sysctl.c
-@@ -301,7 +301,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl,
- {
- struct net *net = current->nsproxy->net_ns;
- char tmp[8];
-- struct ctl_table tbl;
-+ ctl_table_no_const tbl;
- int ret;
- int changed = 0;
- char *none = "none";
-@@ -344,7 +344,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl,
+diff --git a/net/sctp/ssnmap.c b/net/sctp/ssnmap.c
+index 442ad4e..825ea94 100644
+--- a/net/sctp/ssnmap.c
++++ b/net/sctp/ssnmap.c
+@@ -41,8 +41,6 @@
+ #include <net/sctp/sctp.h>
+ #include <net/sctp/sm.h>
+
+-#define MAX_KMALLOC_SIZE 131072
+-
+ static struct sctp_ssnmap *sctp_ssnmap_init(struct sctp_ssnmap *map, __u16 in,
+ __u16 out);
- int sctp_sysctl_net_register(struct net *net)
- {
-- struct ctl_table *table;
-+ ctl_table_no_const *table;
- int i;
+@@ -65,7 +63,7 @@ struct sctp_ssnmap *sctp_ssnmap_new(__u16 in, __u16 out,
+ int size;
- table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
+ size = sctp_ssnmap_size(in, out);
+- if (size <= MAX_KMALLOC_SIZE)
++ if (size <= KMALLOC_MAX_SIZE)
+ retval = kmalloc(size, gfp);
+ else
+ retval = (struct sctp_ssnmap *)
+@@ -82,7 +80,7 @@ struct sctp_ssnmap *sctp_ssnmap_new(__u16 in, __u16 out,
+ return retval;
+
+ fail_map:
+- if (size <= MAX_KMALLOC_SIZE)
++ if (size <= KMALLOC_MAX_SIZE)
+ kfree(retval);
+ else
+ free_pages((unsigned long)retval, get_order(size));
+@@ -124,7 +122,7 @@ void sctp_ssnmap_free(struct sctp_ssnmap *map)
+ int size;
+
+ size = sctp_ssnmap_size(map->in.len, map->out.len);
+- if (size <= MAX_KMALLOC_SIZE)
++ if (size <= KMALLOC_MAX_SIZE)
+ kfree(map);
+ else
+ free_pages((unsigned long)map, get_order(size));
+diff --git a/net/sctp/transport.c b/net/sctp/transport.c
+index 8da4481..d02565e 100644
+--- a/net/sctp/transport.c
++++ b/net/sctp/transport.c
+@@ -317,7 +317,7 @@ void sctp_transport_update_rto(struct sctp_transport *tp, __u32 rtt)
+ * 1/8, rto_alpha would be expressed as 3.
+ */
+ tp->rttvar = tp->rttvar - (tp->rttvar >> sctp_rto_beta)
+- + ((abs(tp->srtt - rtt)) >> sctp_rto_beta);
++ + (((__u32)abs64((__s64)tp->srtt - (__s64)rtt)) >> sctp_rto_beta);
+ tp->srtt = tp->srtt - (tp->srtt >> sctp_rto_alpha)
+ + (rtt >> sctp_rto_alpha);
+ } else {
diff --git a/net/socket.c b/net/socket.c
-index c226ace..561e8f7 100644
+index cf546a3..3cb0fca 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -88,6 +88,7 @@
+ #include <linux/nsproxy.h>
#include <linux/magic.h>
#include <linux/slab.h>
- #include <linux/xattr.h>
+#include <linux/in.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -111,6 +112,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
- unsigned int sysctl_net_busy_poll __read_mostly;
- #endif
+@@ -105,6 +106,8 @@
+ #include <linux/sockios.h>
+ #include <linux/atalk.h>
+#include <linux/grsock.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);
-@@ -162,7 +165,7 @@ static const struct file_operations socket_file_ops = {
+@@ -156,7 +159,7 @@ static const struct file_operations socket_file_ops = {
*/
static DEFINE_SPINLOCK(net_family_lock);
@@ -96717,7 +97634,7 @@ index c226ace..561e8f7 100644
/*
* Statistics counters of the socket lists
-@@ -327,7 +330,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
+@@ -321,7 +324,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
&sockfs_dentry_operations, SOCKFS_MAGIC);
}
@@ -96726,7 +97643,7 @@ index c226ace..561e8f7 100644
static struct file_system_type sock_fs_type = {
.name = "sockfs",
-@@ -1254,6 +1257,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1187,6 +1190,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
return -EAFNOSUPPORT;
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
@@ -96735,7 +97652,7 @@ index c226ace..561e8f7 100644
/* Compatibility.
-@@ -1274,6 +1279,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1207,6 +1212,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
if (err)
return err;
@@ -96756,9 +97673,9 @@ index c226ace..561e8f7 100644
/*
* Allocate the socket and allow the family to set things up. if
* the protocol is 0, the family is instructed to select an appropriate
-@@ -1512,6 +1531,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1431,6 +1450,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
if (sock) {
- err = move_addr_to_kernel(umyaddr, addrlen, &address);
+ err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address);
if (err >= 0) {
+ if (gr_handle_sock_server((struct sockaddr *)&address)) {
+ err = -EACCES;
@@ -96771,7 +97688,7 @@ index c226ace..561e8f7 100644
err = security_socket_bind(sock,
(struct sockaddr *)&address,
addrlen);
-@@ -1520,6 +1547,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1439,6 +1466,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
(struct sockaddr *)
&address, addrlen);
}
@@ -96779,8 +97696,8 @@ index c226ace..561e8f7 100644
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1543,10 +1571,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
- if ((unsigned int)backlog > somaxconn)
+@@ -1462,10 +1490,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
+ if ((unsigned)backlog > somaxconn)
backlog = somaxconn;
+ if (gr_handle_sock_server_other(sock->sk)) {
@@ -96800,7 +97717,7 @@ index c226ace..561e8f7 100644
fput_light(sock->file, fput_needed);
}
return err;
-@@ -1590,6 +1628,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1509,6 +1547,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
newsock->type = sock->type;
newsock->ops = sock->ops;
@@ -96819,7 +97736,7 @@ index c226ace..561e8f7 100644
/*
* We don't need try_module_get here, as the listening socket (sock)
* has the protocol module (sock->ops->owner) held.
-@@ -1635,6 +1685,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1547,6 +1597,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
fd_install(newfd, newfile);
err = newfd;
@@ -96828,7 +97745,7 @@ index c226ace..561e8f7 100644
out_put:
fput_light(sock->file, fput_needed);
out:
-@@ -1667,6 +1719,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1579,6 +1631,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
int, addrlen)
{
struct socket *sock;
@@ -96836,7 +97753,7 @@ index c226ace..561e8f7 100644
struct sockaddr_storage address;
int err, fput_needed;
-@@ -1677,6 +1730,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1589,6 +1642,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
if (err < 0)
goto out_put;
@@ -96854,16 +97771,16 @@ index c226ace..561e8f7 100644
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-@@ -1758,6 +1822,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
+@@ -1670,6 +1734,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
* the protocol.
*/
+asmlinkage long sys_sendto(int, void *, size_t, unsigned, struct sockaddr *, int);
+
SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
- unsigned int, flags, struct sockaddr __user *, addr,
+ unsigned, flags, struct sockaddr __user *, addr,
int, addr_len)
-@@ -1824,7 +1890,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
+@@ -1736,7 +1802,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
struct socket *sock;
struct iovec iov;
struct msghdr msg;
@@ -96872,7 +97789,38 @@ index c226ace..561e8f7 100644
int err, err2;
int fput_needed;
-@@ -2044,7 +2110,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -1876,6 +1942,16 @@ struct used_address {
+ unsigned int name_len;
+ };
+
++static int copy_msghdr_from_user(struct msghdr *kmsg,
++ struct msghdr __user *umsg)
++{
++ if (copy_from_user(kmsg, umsg, sizeof(struct msghdr)))
++ return -EFAULT;
++ if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
++ return -EINVAL;
++ return 0;
++}
++
+ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
+ struct msghdr *msg_sys, unsigned flags,
+ struct used_address *used_address)
+@@ -1894,8 +1970,11 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
+ if (MSG_CMSG_COMPAT & flags) {
+ if (get_compat_msghdr(msg_sys, msg_compat))
+ return -EFAULT;
+- } else if (copy_from_user(msg_sys, msg, sizeof(struct msghdr)))
+- return -EFAULT;
++ } else {
++ err = copy_msghdr_from_user(msg_sys, msg);
++ if (err)
++ return err;
++ }
+
+ /* do not move before msg_sys is valid */
+ err = -EMSGSIZE;
+@@ -1950,7 +2029,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
* checking falls down on this.
*/
if (copy_from_user(ctl_buf,
@@ -96881,8 +97829,8 @@ index c226ace..561e8f7 100644
ctl_len))
goto out_freectl;
msg_sys->msg_control = ctl_buf;
-@@ -2195,7 +2261,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
- int err, total_len, len;
+@@ -2101,7 +2180,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+ int err, iov_size, total_len, len;
/* kernel mode address */
- struct sockaddr_storage addr;
@@ -96890,7 +97838,21 @@ index c226ace..561e8f7 100644
/* user mode address pointers */
struct sockaddr __user *uaddr;
-@@ -2226,7 +2292,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2110,8 +2189,11 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+ if (MSG_CMSG_COMPAT & flags) {
+ if (get_compat_msghdr(msg_sys, msg_compat))
+ return -EFAULT;
+- } else if (copy_from_user(msg_sys, msg, sizeof(struct msghdr)))
+- return -EFAULT;
++ } else {
++ err = copy_msghdr_from_user(msg_sys, msg);
++ if (err)
++ return err;
++ }
+
+ err = -EMSGSIZE;
+ if (msg_sys->msg_iovlen > UIO_MAXIOV)
+@@ -2131,7 +2213,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
* kernel msghdr to use the kernel address space)
*/
@@ -96898,8 +97860,51 @@ index c226ace..561e8f7 100644
+ uaddr = (void __force_user *)msg_sys->msg_name;
uaddr_len = COMPAT_NAMELEN(msg);
if (MSG_CMSG_COMPAT & flags) {
- err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
-@@ -2981,7 +3047,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
+ err = verify_compat_iovec(msg_sys, iov,
+@@ -2772,7 +2854,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
+ }
+
+ ifr = compat_alloc_user_space(buf_size);
+- rxnfc = (void *)ifr + ALIGN(sizeof(struct ifreq), 8);
++ rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
+
+ if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
+ return -EFAULT;
+@@ -2796,12 +2878,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,
+- (void *)(&rxnfc->fs.m_ext + 1) -
+- (void *)rxnfc) ||
++ (void __user *)(&rxnfc->fs.m_ext + 1) -
++ (void __user *)rxnfc) ||
+ copy_in_user(&rxnfc->fs.ring_cookie,
+ &compat_rxnfc->fs.ring_cookie,
+- (void *)(&rxnfc->fs.location + 1) -
+- (void *)&rxnfc->fs.ring_cookie) ||
++ (void __user *)(&rxnfc->fs.location + 1) -
++ (void __user *)&rxnfc->fs.ring_cookie) ||
+ copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
+ sizeof(rxnfc->rule_cnt)))
+ return -EFAULT;
+@@ -2813,12 +2895,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
+
+ if (convert_out) {
+ if (copy_in_user(compat_rxnfc, rxnfc,
+- (const void *)(&rxnfc->fs.m_ext + 1) -
+- (const void *)rxnfc) ||
++ (const void __user *)(&rxnfc->fs.m_ext + 1) -
++ (const void __user *)rxnfc) ||
+ copy_in_user(&compat_rxnfc->fs.ring_cookie,
+ &rxnfc->fs.ring_cookie,
+- (const void *)(&rxnfc->fs.location + 1) -
+- (const void *)&rxnfc->fs.ring_cookie) ||
++ (const void __user *)(&rxnfc->fs.location + 1) -
++ (const void __user *)&rxnfc->fs.ring_cookie) ||
+ copy_in_user(&compat_rxnfc->rule_cnt, &rxnfc->rule_cnt,
+ sizeof(rxnfc->rule_cnt)))
+ return -EFAULT;
+@@ -2888,7 +2970,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
old_fs = get_fs();
set_fs(KERNEL_DS);
err = dev_ioctl(net, cmd,
@@ -96908,7 +97913,7 @@ index c226ace..561e8f7 100644
set_fs(old_fs);
return err;
-@@ -3090,7 +3156,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
+@@ -2997,7 +3079,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -96917,8 +97922,8 @@ index c226ace..561e8f7 100644
set_fs(old_fs);
if (cmd == SIOCGIFMAP && !err) {
-@@ -3195,7 +3261,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
- ret |= get_user(rtdev, &(ur4->rt_dev));
+@@ -3102,7 +3184,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);
- r4.rt_dev = (char __user __force *)devname;
@@ -96926,7 +97931,7 @@ index c226ace..561e8f7 100644
devname[15] = 0;
} else
r4.rt_dev = NULL;
-@@ -3421,8 +3487,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
+@@ -3342,8 +3424,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
int __user *uoptlen;
int err;
@@ -96937,7 +97942,7 @@ index c226ace..561e8f7 100644
set_fs(KERNEL_DS);
if (level == SOL_SOCKET)
-@@ -3442,7 +3508,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
+@@ -3363,7 +3445,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
char __user *uoptval;
int err;
@@ -96946,103 +97951,35 @@ index c226ace..561e8f7 100644
set_fs(KERNEL_DS);
if (level == SOL_SOCKET)
-diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
-index 09fb638..2e6a5c5 100644
---- a/net/sunrpc/auth_gss/svcauth_gss.c
-+++ b/net/sunrpc/auth_gss/svcauth_gss.c
-@@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
- uint64_t *handle)
- {
- struct rsc rsci, *rscp = NULL;
-- static atomic64_t ctxhctr;
-+ static atomic64_unchecked_t ctxhctr = ATOMIC64_INIT(0);
- long long ctxh;
- struct gss_api_mech *gm = NULL;
- time_t expiry;
-@@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
- status = -ENOMEM;
- /* the handle needs to be just a unique id,
- * use a static counter */
-- ctxh = atomic64_inc_return(&ctxhctr);
-+ ctxh = atomic64_inc_return_unchecked(&ctxhctr);
-
- /* make a copy for the caller */
- *handle = ctxh;
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
-index 7747960..36d1518 100644
+index b2250da..db374b7 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
-@@ -656,14 +656,16 @@ EXPORT_SYMBOL_GPL(rpc_shutdown_client);
- /*
- * Free an RPC client
- */
--static void
-+static struct rpc_clnt *
- rpc_free_client(struct rpc_clnt *clnt)
- {
-+ struct rpc_clnt *parent = NULL;
-+
- dprintk_rcu("RPC: destroying %s client for %s\n",
- clnt->cl_program->name,
- rcu_dereference(clnt->cl_xprt)->servername);
- if (clnt->cl_parent != clnt)
-- rpc_release_client(clnt->cl_parent);
-+ parent = clnt->cl_parent;
- rpc_clnt_remove_pipedir(clnt);
- rpc_unregister_client(clnt);
- rpc_free_iostats(clnt->cl_metrics);
-@@ -672,18 +674,17 @@ rpc_free_client(struct rpc_clnt *clnt)
- rpciod_down();
- rpc_free_clid(clnt);
- kfree(clnt);
-+ return parent;
- }
-
- /*
- * Free an RPC client
- */
--static void
-+static struct rpc_clnt *
- rpc_free_auth(struct rpc_clnt *clnt)
- {
-- if (clnt->cl_auth == NULL) {
-- rpc_free_client(clnt);
-- return;
-- }
-+ if (clnt->cl_auth == NULL)
-+ return rpc_free_client(clnt);
-
- /*
- * Note: RPCSEC_GSS may need to send NULL RPC calls in order to
-@@ -694,7 +695,8 @@ rpc_free_auth(struct rpc_clnt *clnt)
- rpcauth_release(clnt->cl_auth);
- clnt->cl_auth = NULL;
- if (atomic_dec_and_test(&clnt->cl_count))
-- rpc_free_client(clnt);
-+ return rpc_free_client(clnt);
-+ return NULL;
- }
-
- /*
-@@ -705,10 +707,13 @@ rpc_release_client(struct rpc_clnt *clnt)
- {
- dprintk("RPC: rpc_release_client(%p)\n", clnt);
+@@ -163,10 +163,8 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru
+ err = rpciod_up();
+ if (err)
+ goto out_no_rpciod;
+- err = -EINVAL;
+- if (!xprt)
+- goto out_no_xprt;
-- if (list_empty(&clnt->cl_tasks))
-- wake_up(&destroy_wait);
-- if (atomic_dec_and_test(&clnt->cl_count))
-- rpc_free_auth(clnt);
-+ do {
-+ if (list_empty(&clnt->cl_tasks))
-+ wake_up(&destroy_wait);
-+ if (!atomic_dec_and_test(&clnt->cl_count))
-+ break;
-+ clnt = rpc_free_auth(clnt);
-+ } while (clnt != NULL);
++ err = -EINVAL;
+ if (args->version >= program->nrvers)
+ goto out_err;
+ version = program->version[args->version];
+@@ -259,10 +257,9 @@ out_no_stats:
+ kfree(clnt->cl_server);
+ kfree(clnt);
+ out_err:
+- xprt_put(xprt);
+-out_no_xprt:
+ rpciod_down();
+ out_no_rpciod:
++ xprt_put(xprt);
+ return ERR_PTR(err);
}
- EXPORT_SYMBOL_GPL(rpc_release_client);
-@@ -1314,7 +1319,9 @@ call_start(struct rpc_task *task)
+@@ -903,7 +900,9 @@ call_start(struct rpc_task *task)
(RPC_IS_ASYNC(task) ? "async" : "sync"));
/* Increment call count */
@@ -97053,12 +97990,32 @@ index 7747960..36d1518 100644
clnt->cl_stats->rpccnt++;
task->tk_action = call_reserve;
}
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index bfddd68..567429b 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1059,6 +1059,8 @@ static struct file_system_type rpc_pipe_fs_type = {
+ .mount = rpc_mount,
+ .kill_sb = kill_litter_super,
+ };
++MODULE_ALIAS_FS("rpc_pipefs");
++MODULE_ALIAS("rpc_pipefs");
+
+ static void
+ init_once(void *foo)
+@@ -1104,6 +1106,3 @@ void unregister_rpc_pipefs(void)
+ kmem_cache_destroy(rpc_inode_cachep);
+ unregister_filesystem(&rpc_pipe_fs_type);
+ }
+-
+-/* Make 'mount -t rpc_pipefs ...' autoload this module. */
+-MODULE_ALIAS("rpc_pipefs");
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
-index ff3cc4b..7612a9e 100644
+index 206c61e..e3641fb 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
-@@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(void *word)
- #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
+@@ -240,9 +240,9 @@ static int rpc_wait_bit_killable(void *word)
+ #ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
{
- static atomic_t rpc_pid;
@@ -97070,10 +98027,19 @@ index ff3cc4b..7612a9e 100644
#else
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
-index b974571..678ed90 100644
+index c80c162..83a1e28 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
-@@ -1160,7 +1160,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
+@@ -732,7 +732,7 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs)
+
+ __module_get(serv->sv_module);
+ task = kthread_create_on_node(serv->sv_function, rqstp,
+- node, serv->sv_name);
++ node, "%s", serv->sv_name);
+ if (IS_ERR(task)) {
+ error = PTR_ERR(task);
+ module_put(serv->sv_module);
+@@ -1145,7 +1145,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
svc_putnl(resv, RPC_SUCCESS);
/* Bump per-procedure stats counter */
@@ -97085,32 +98051,44 @@ index b974571..678ed90 100644
/* Initialize storage for argp and resp */
memset(rqstp->rq_argp, 0, procp->pc_argsize);
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
-index 621ca7b..59421dd 100644
+index ce13632..144987d 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
-@@ -414,7 +414,7 @@ struct unix_gid {
- struct group_info *gi;
+@@ -602,7 +602,7 @@ struct cache_detail unix_gid_cache = {
+ .alloc = unix_gid_alloc,
};
--static int unix_gid_hash(kuid_t uid)
-+static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid)
- {
- return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
- }
-@@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd,
- (*bpp)[-1] = '\n';
- }
-
--static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
-+static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
+-static struct unix_gid *unix_gid_lookup(uid_t uid)
++static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(uid_t uid)
+ {
+ struct unix_gid ug;
+ struct cache_head *ch;
+diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
+index 296192c..5a95b93 100644
+--- a/net/sunrpc/svcsock.c
++++ b/net/sunrpc/svcsock.c
+@@ -396,7 +396,7 @@ static int svc_partial_recvfrom(struct svc_rqst *rqstp,
+ int buflen, unsigned int base)
+ {
+ size_t save_iovlen;
+- void __user *save_iovbase;
++ void *save_iovbase;
+ unsigned int i;
+ int ret;
- static int unix_gid_parse(struct cache_detail *cd,
- char *mesg, int mlen)
diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
-index c1b6270..05089c1 100644
+index 09af4fa..677025e 100644
--- a/net/sunrpc/xprtrdma/svc_rdma.c
+++ b/net/sunrpc/xprtrdma/svc_rdma.c
-@@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
+@@ -47,6 +47,7 @@
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/sched.h>
+ #include <linux/sunrpc/svc_rdma.h>
++#include "xprt_rdma.h"
+
+ #define RPCDBG_FACILITY RPCDBG_SVCXPRT
+
+@@ -61,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
static unsigned int min_max_inline = 4096;
static unsigned int max_max_inline = 65536;
@@ -97135,7 +98113,7 @@ index c1b6270..05089c1 100644
/* Temporary NFS request map and context caches */
struct kmem_cache *svc_rdma_map_cachep;
-@@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write,
+@@ -109,7 +110,7 @@ static int read_reset_stat(ctl_table *table, int write,
len -= *ppos;
if (len > *lenp)
len = *lenp;
@@ -97144,7 +98122,7 @@ index c1b6270..05089c1 100644
return -EFAULT;
*lenp = len;
*ppos += len;
-@@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = {
+@@ -150,63 +151,63 @@ static ctl_table svcrdma_parm_table[] = {
{
.procname = "rdma_stat_read",
.data = &rdma_stat_read,
@@ -97217,11 +98195,227 @@ index c1b6270..05089c1 100644
.mode = 0644,
.proc_handler = read_reset_stat,
},
+diff --git a/net/sunrpc/xprtrdma/svc_rdma_marshal.c b/net/sunrpc/xprtrdma/svc_rdma_marshal.c
+index 9530ef2..65b1462 100644
+--- a/net/sunrpc/xprtrdma/svc_rdma_marshal.c
++++ b/net/sunrpc/xprtrdma/svc_rdma_marshal.c
+@@ -60,21 +60,11 @@ static u32 *decode_read_list(u32 *va, u32 *vaend)
+ struct rpcrdma_read_chunk *ch = (struct rpcrdma_read_chunk *)va;
+
+ while (ch->rc_discrim != xdr_zero) {
+- u64 ch_offset;
+-
+ if (((unsigned long)ch + sizeof(struct rpcrdma_read_chunk)) >
+ (unsigned long)vaend) {
+ dprintk("svcrdma: vaend=%p, ch=%p\n", vaend, ch);
+ return NULL;
+ }
+-
+- ch->rc_discrim = ntohl(ch->rc_discrim);
+- ch->rc_position = ntohl(ch->rc_position);
+- ch->rc_target.rs_handle = ntohl(ch->rc_target.rs_handle);
+- ch->rc_target.rs_length = ntohl(ch->rc_target.rs_length);
+- va = (u32 *)&ch->rc_target.rs_offset;
+- xdr_decode_hyper(va, &ch_offset);
+- put_unaligned(ch_offset, (u64 *)va);
+ ch++;
+ }
+ return (u32 *)&ch->rc_position;
+@@ -91,7 +81,7 @@ void svc_rdma_rcl_chunk_counts(struct rpcrdma_read_chunk *ch,
+ *byte_count = 0;
+ *ch_count = 0;
+ for (; ch->rc_discrim != 0; ch++) {
+- *byte_count = *byte_count + ch->rc_target.rs_length;
++ *byte_count = *byte_count + ntohl(ch->rc_target.rs_length);
+ *ch_count = *ch_count + 1;
+ }
+ }
+@@ -108,7 +98,9 @@ void svc_rdma_rcl_chunk_counts(struct rpcrdma_read_chunk *ch,
+ */
+ static u32 *decode_write_list(u32 *va, u32 *vaend)
+ {
+- int ch_no;
++ unsigned long start, end;
++ int nchunks;
++
+ struct rpcrdma_write_array *ary =
+ (struct rpcrdma_write_array *)va;
+
+@@ -121,37 +113,28 @@ static u32 *decode_write_list(u32 *va, u32 *vaend)
+ dprintk("svcrdma: ary=%p, vaend=%p\n", ary, vaend);
+ return NULL;
+ }
+- ary->wc_discrim = ntohl(ary->wc_discrim);
+- ary->wc_nchunks = ntohl(ary->wc_nchunks);
+- if (((unsigned long)&ary->wc_array[0] +
+- (sizeof(struct rpcrdma_write_chunk) * ary->wc_nchunks)) >
+- (unsigned long)vaend) {
++ nchunks = ntohl(ary->wc_nchunks);
++
++ start = (unsigned long)&ary->wc_array[0];
++ end = (unsigned long)vaend;
++ if (nchunks < 0 ||
++ nchunks > (SIZE_MAX - start) / sizeof(struct rpcrdma_write_chunk) ||
++ (start + (sizeof(struct rpcrdma_write_chunk) * nchunks)) > end) {
+ dprintk("svcrdma: ary=%p, wc_nchunks=%d, vaend=%p\n",
+- ary, ary->wc_nchunks, vaend);
++ ary, nchunks, vaend);
+ return NULL;
+ }
+- for (ch_no = 0; ch_no < ary->wc_nchunks; ch_no++) {
+- u64 ch_offset;
+-
+- ary->wc_array[ch_no].wc_target.rs_handle =
+- ntohl(ary->wc_array[ch_no].wc_target.rs_handle);
+- ary->wc_array[ch_no].wc_target.rs_length =
+- ntohl(ary->wc_array[ch_no].wc_target.rs_length);
+- va = (u32 *)&ary->wc_array[ch_no].wc_target.rs_offset;
+- xdr_decode_hyper(va, &ch_offset);
+- put_unaligned(ch_offset, (u64 *)va);
+- }
+-
+ /*
+ * rs_length is the 2nd 4B field in wc_target and taking its
+ * address skips the list terminator
+ */
+- return (u32 *)&ary->wc_array[ch_no].wc_target.rs_length;
++ return (u32 *)&ary->wc_array[nchunks].wc_target.rs_length;
+ }
+
+ static u32 *decode_reply_array(u32 *va, u32 *vaend)
+ {
+- int ch_no;
++ unsigned long start, end;
++ int nchunks;
+ struct rpcrdma_write_array *ary =
+ (struct rpcrdma_write_array *)va;
+
+@@ -164,28 +147,18 @@ static u32 *decode_reply_array(u32 *va, u32 *vaend)
+ dprintk("svcrdma: ary=%p, vaend=%p\n", ary, vaend);
+ return NULL;
+ }
+- ary->wc_discrim = ntohl(ary->wc_discrim);
+- ary->wc_nchunks = ntohl(ary->wc_nchunks);
+- if (((unsigned long)&ary->wc_array[0] +
+- (sizeof(struct rpcrdma_write_chunk) * ary->wc_nchunks)) >
+- (unsigned long)vaend) {
++ nchunks = ntohl(ary->wc_nchunks);
++
++ start = (unsigned long)&ary->wc_array[0];
++ end = (unsigned long)vaend;
++ if (nchunks < 0 ||
++ nchunks > (SIZE_MAX - start) / sizeof(struct rpcrdma_write_chunk) ||
++ (start + (sizeof(struct rpcrdma_write_chunk) * nchunks)) > end) {
+ dprintk("svcrdma: ary=%p, wc_nchunks=%d, vaend=%p\n",
+- ary, ary->wc_nchunks, vaend);
++ ary, nchunks, vaend);
+ return NULL;
+ }
+- for (ch_no = 0; ch_no < ary->wc_nchunks; ch_no++) {
+- u64 ch_offset;
+-
+- ary->wc_array[ch_no].wc_target.rs_handle =
+- ntohl(ary->wc_array[ch_no].wc_target.rs_handle);
+- ary->wc_array[ch_no].wc_target.rs_length =
+- ntohl(ary->wc_array[ch_no].wc_target.rs_length);
+- va = (u32 *)&ary->wc_array[ch_no].wc_target.rs_offset;
+- xdr_decode_hyper(va, &ch_offset);
+- put_unaligned(ch_offset, (u64 *)va);
+- }
+-
+- return (u32 *)&ary->wc_array[ch_no];
++ return (u32 *)&ary->wc_array[nchunks];
+ }
+
+ int svc_rdma_xdr_decode_req(struct rpcrdma_msg **rdma_req,
+@@ -386,13 +359,14 @@ void svc_rdma_xdr_encode_reply_array(struct rpcrdma_write_array *ary,
+
+ void svc_rdma_xdr_encode_array_chunk(struct rpcrdma_write_array *ary,
+ int chunk_no,
+- u32 rs_handle, u64 rs_offset,
++ __be32 rs_handle,
++ __be64 rs_offset,
+ u32 write_len)
+ {
+ struct rpcrdma_segment *seg = &ary->wc_array[chunk_no].wc_target;
+- seg->rs_handle = htonl(rs_handle);
++ seg->rs_handle = rs_handle;
++ seg->rs_offset = rs_offset;
+ seg->rs_length = htonl(write_len);
+- xdr_encode_hyper((u32 *) &seg->rs_offset, rs_offset);
+ }
+
+ void svc_rdma_xdr_encode_reply_header(struct svcxprt_rdma *xprt,
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-index 0ce7552..d074459 100644
+index df67211..c4a1489 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-@@ -501,7 +501,7 @@ next_sge:
+@@ -147,7 +147,7 @@ static int map_read_chunks(struct svcxprt_rdma *xprt,
+ page_off = 0;
+ ch = (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0];
+ ch_no = 0;
+- ch_bytes = ch->rc_target.rs_length;
++ ch_bytes = ntohl(ch->rc_target.rs_length);
+ head->arg.head[0] = rqstp->rq_arg.head[0];
+ head->arg.tail[0] = rqstp->rq_arg.tail[0];
+ head->arg.pages = &head->pages[head->count];
+@@ -183,7 +183,7 @@ static int map_read_chunks(struct svcxprt_rdma *xprt,
+ ch_no++;
+ ch++;
+ chl_map->ch[ch_no].start = sge_no;
+- ch_bytes = ch->rc_target.rs_length;
++ ch_bytes = ntohl(ch->rc_target.rs_length);
+ /* If bytes remaining account for next chunk */
+ if (byte_count) {
+ head->arg.page_len += ch_bytes;
+@@ -281,11 +281,12 @@ static int fast_reg_read_chunks(struct svcxprt_rdma *xprt,
+ offset = 0;
+ ch = (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0];
+ for (ch_no = 0; ch_no < ch_count; ch_no++) {
++ int len = ntohl(ch->rc_target.rs_length);
+ rpl_map->sge[ch_no].iov_base = frmr->kva + offset;
+- rpl_map->sge[ch_no].iov_len = ch->rc_target.rs_length;
++ rpl_map->sge[ch_no].iov_len = len;
+ chl_map->ch[ch_no].count = 1;
+ chl_map->ch[ch_no].start = ch_no;
+- offset += ch->rc_target.rs_length;
++ offset += len;
+ ch++;
+ }
+
+@@ -316,7 +317,7 @@ static int rdma_set_ctxt_sge(struct svcxprt_rdma *xprt,
+ for (i = 0; i < count; i++) {
+ ctxt->sge[i].length = 0; /* in case map fails */
+ if (!frmr) {
+- BUG_ON(0 == virt_to_page(vec[i].iov_base));
++ BUG_ON(!virt_to_page(vec[i].iov_base));
+ off = (unsigned long)vec[i].iov_base & ~PAGE_MASK;
+ ctxt->sge[i].addr =
+ ib_dma_map_page(xprt->sc_cm_id->device,
+@@ -426,6 +427,7 @@ static int rdma_read_xdr(struct svcxprt_rdma *xprt,
+
+ for (ch = (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0];
+ ch->rc_discrim != 0; ch++, ch_no++) {
++ u64 rs_offset;
+ next_sge:
+ ctxt = svc_rdma_get_context(xprt);
+ ctxt->direction = DMA_FROM_DEVICE;
+@@ -440,10 +442,10 @@ next_sge:
+ read_wr.opcode = IB_WR_RDMA_READ;
+ ctxt->wr_op = read_wr.opcode;
+ read_wr.send_flags = IB_SEND_SIGNALED;
+- read_wr.wr.rdma.rkey = ch->rc_target.rs_handle;
+- read_wr.wr.rdma.remote_addr =
+- get_unaligned(&(ch->rc_target.rs_offset)) +
+- sgl_offset;
++ read_wr.wr.rdma.rkey = ntohl(ch->rc_target.rs_handle);
++ xdr_decode_hyper((__be32 *)&ch->rc_target.rs_offset,
++ &rs_offset);
++ read_wr.wr.rdma.remote_addr = rs_offset + sgl_offset;
+ read_wr.sg_list = ctxt->sge;
+ read_wr.num_sge =
+ rdma_read_max_sge(xprt, chl_map->ch[ch_no].count);
+@@ -499,7 +501,7 @@ next_sge:
svc_rdma_put_context(ctxt, 0);
goto out;
}
@@ -97230,7 +98424,7 @@ index 0ce7552..d074459 100644
if (read_wr.num_sge < chl_map->ch[ch_no].count) {
chl_map->ch[ch_no].count -= read_wr.num_sge;
-@@ -611,7 +611,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+@@ -609,7 +611,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
dto_q);
list_del_init(&ctxt->dto_q);
} else {
@@ -97239,7 +98433,7 @@ index 0ce7552..d074459 100644
clear_bit(XPT_DATA, &xprt->xpt_flags);
ctxt = NULL;
}
-@@ -631,7 +631,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+@@ -629,7 +631,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
ctxt, rdma_xprt, rqstp, ctxt->wc_status);
BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
@@ -97249,7 +98443,7 @@ index 0ce7552..d074459 100644
/* Build up the XDR from the receive buffers. */
rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-index c1d124d..acfc59e 100644
+index 249a835..c887c45 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
@@ -97261,11 +98455,112 @@ index c1d124d..acfc59e 100644
if (svc_rdma_send(xprt, &write_wr))
goto err;
return 0;
+@@ -409,21 +409,21 @@ static int send_write_chunks(struct svcxprt_rdma *xprt,
+ u64 rs_offset;
+
+ arg_ch = &arg_ary->wc_array[chunk_no].wc_target;
+- write_len = min(xfer_len, arg_ch->rs_length);
++ write_len = min(xfer_len, ntohl(arg_ch->rs_length));
+
+ /* Prepare the response chunk given the length actually
+ * written */
+- rs_offset = get_unaligned(&(arg_ch->rs_offset));
++ xdr_decode_hyper((__be32 *)&arg_ch->rs_offset, &rs_offset);
+ svc_rdma_xdr_encode_array_chunk(res_ary, chunk_no,
+- arg_ch->rs_handle,
+- rs_offset,
+- write_len);
++ arg_ch->rs_handle,
++ arg_ch->rs_offset,
++ write_len);
+ chunk_off = 0;
+ while (write_len) {
+ int this_write;
+ this_write = min(write_len, max_write);
+ ret = send_write(xprt, rqstp,
+- arg_ch->rs_handle,
++ ntohl(arg_ch->rs_handle),
+ rs_offset + chunk_off,
+ xdr_off,
+ this_write,
+@@ -457,6 +457,7 @@ static int send_reply_chunks(struct svcxprt_rdma *xprt,
+ u32 xdr_off;
+ int chunk_no;
+ int chunk_off;
++ int nchunks;
+ struct rpcrdma_segment *ch;
+ struct rpcrdma_write_array *arg_ary;
+ struct rpcrdma_write_array *res_ary;
+@@ -476,26 +477,27 @@ static int send_reply_chunks(struct svcxprt_rdma *xprt,
+ max_write = xprt->sc_max_sge * PAGE_SIZE;
+
+ /* xdr offset starts at RPC message */
++ nchunks = ntohl(arg_ary->wc_nchunks);
+ for (xdr_off = 0, chunk_no = 0;
+- xfer_len && chunk_no < arg_ary->wc_nchunks;
++ xfer_len && chunk_no < nchunks;
+ chunk_no++) {
+ u64 rs_offset;
+ ch = &arg_ary->wc_array[chunk_no].wc_target;
+- write_len = min(xfer_len, ch->rs_length);
++ write_len = min(xfer_len, htonl(ch->rs_length));
+
+ /* Prepare the reply chunk given the length actually
+ * written */
+- rs_offset = get_unaligned(&(ch->rs_offset));
++ xdr_decode_hyper((__be32 *)&ch->rs_offset, &rs_offset);
+ svc_rdma_xdr_encode_array_chunk(res_ary, chunk_no,
+- ch->rs_handle, rs_offset,
+- write_len);
++ ch->rs_handle, ch->rs_offset,
++ write_len);
+ chunk_off = 0;
+ while (write_len) {
+ int this_write;
+
+ this_write = min(write_len, max_write);
+ ret = send_write(xprt, rqstp,
+- ch->rs_handle,
++ ntohl(ch->rs_handle),
+ rs_offset + chunk_off,
+ xdr_off,
+ this_write,
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-index 62e4f9b..dd3f2d7 100644
+index ba1296d..515ea15 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)
+@@ -51,6 +51,7 @@
+ #include <rdma/rdma_cm.h>
+ #include <linux/sunrpc/svc_rdma.h>
+ #include <linux/export.h>
++#include "xprt_rdma.h"
+
+ #define RPCDBG_FACILITY RPCDBG_SVCXPRT
+
+@@ -90,12 +91,6 @@ struct svc_xprt_class svc_rdma_class = {
+ .xcl_max_payload = RPCSVC_MAXPAYLOAD_TCP,
+ };
+
+-/* WR context cache. Created in svc_rdma.c */
+-extern struct kmem_cache *svc_rdma_ctxt_cachep;
+-
+-/* Workqueue created in svc_rdma.c */
+-extern struct workqueue_struct *svc_rdma_wq;
+-
+ struct svc_rdma_op_ctxt *svc_rdma_get_context(struct svcxprt_rdma *xprt)
+ {
+ struct svc_rdma_op_ctxt *ctxt;
+@@ -150,9 +145,6 @@ void svc_rdma_put_context(struct svc_rdma_op_ctxt *ctxt, int free_pages)
+ atomic_dec(&xprt->sc_ctxt_used);
+ }
+
+-/* Temporary NFS request map cache. Created in svc_rdma.c */
+-extern struct kmem_cache *svc_rdma_map_cachep;
+-
+ /*
+ * Temporary NFS req mappings are shared across all transport
+ * instances. These are short lived and should be bounded by the number
+@@ -300,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
return;
ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
@@ -97274,7 +98569,7 @@ index 62e4f9b..dd3f2d7 100644
while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
-@@ -314,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -322,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
}
if (ctxt)
@@ -97283,7 +98578,7 @@ index 62e4f9b..dd3f2d7 100644
set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
/*
-@@ -386,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -394,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
return;
ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
@@ -97292,7 +98587,7 @@ index 62e4f9b..dd3f2d7 100644
while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
if (wc.status != IB_WC_SUCCESS)
/* Close the transport */
-@@ -404,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -412,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
}
if (ctxt)
@@ -97301,7 +98596,7 @@ index 62e4f9b..dd3f2d7 100644
}
static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
-@@ -1262,7 +1262,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
+@@ -1274,7 +1266,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);
@@ -97310,128 +98605,73 @@ index 62e4f9b..dd3f2d7 100644
/* See if we can opportunistically reap SQ WR to make room */
sq_cq_reap(xprt);
-diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
-index ee03d35..b752e1d 100644
---- a/net/sunrpc/xprtsock.c
-+++ b/net/sunrpc/xprtsock.c
-@@ -393,8 +393,10 @@ static int xs_send_kvec(struct socket *sock, struct sockaddr *addr, int addrlen,
- return kernel_sendmsg(sock, &msg, NULL, 0, 0);
- }
-
--static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned int base, int more)
-+static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned int base, int more, bool zerocopy)
- {
-+ ssize_t (*do_sendpage)(struct socket *sock, struct page *page,
-+ int offset, size_t size, int flags);
- struct page **ppage;
- unsigned int remainder;
- int err, sent = 0;
-@@ -403,6 +405,9 @@ static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned i
- base += xdr->page_base;
- ppage = xdr->pages + (base >> PAGE_SHIFT);
- base &= ~PAGE_MASK;
-+ do_sendpage = sock->ops->sendpage;
-+ if (!zerocopy)
-+ do_sendpage = sock_no_sendpage;
- for(;;) {
- unsigned int len = min_t(unsigned int, PAGE_SIZE - base, remainder);
- int flags = XS_SENDMSG_FLAGS;
-@@ -410,7 +415,7 @@ static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned i
- remainder -= len;
- if (remainder != 0 || more)
- flags |= MSG_MORE;
-- err = sock->ops->sendpage(sock, *ppage, base, len, flags);
-+ err = do_sendpage(sock, *ppage, base, len, flags);
- if (remainder == 0 || err != len)
- break;
- sent += err;
-@@ -431,9 +436,10 @@ static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned i
- * @addrlen: UDP only -- length of destination address
- * @xdr: buffer containing this request
- * @base: starting position in the buffer
-+ * @zerocopy: true if it is safe to use sendpage()
- *
+diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
+index 08c5d5a..9a66c95 100644
+--- a/net/sunrpc/xprtrdma/xprt_rdma.h
++++ b/net/sunrpc/xprtrdma/xprt_rdma.h
+@@ -343,4 +343,11 @@ void rpcrdma_reply_handler(struct rpcrdma_rep *);
*/
--static int xs_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen, struct xdr_buf *xdr, unsigned int base)
-+static int xs_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen, struct xdr_buf *xdr, unsigned int base, bool zerocopy)
- {
- unsigned int remainder = xdr->len - base;
- int err, sent = 0;
-@@ -461,7 +467,7 @@ static int xs_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen,
- if (base < xdr->page_len) {
- unsigned int len = xdr->page_len - base;
- remainder -= len;
-- err = xs_send_pagedata(sock, xdr, base, remainder != 0);
-+ err = xs_send_pagedata(sock, xdr, base, remainder != 0, zerocopy);
- if (remainder == 0 || err != len)
- goto out;
- sent += err;
-@@ -564,7 +570,7 @@ static int xs_local_send_request(struct rpc_task *task)
- req->rq_svec->iov_base, req->rq_svec->iov_len);
-
- status = xs_sendpages(transport->sock, NULL, 0,
-- xdr, req->rq_bytes_sent);
-+ xdr, req->rq_bytes_sent, true);
- dprintk("RPC: %s(%u) = %d\n",
- __func__, xdr->len - req->rq_bytes_sent, status);
- if (likely(status >= 0)) {
-@@ -620,7 +626,7 @@ static int xs_udp_send_request(struct rpc_task *task)
- status = xs_sendpages(transport->sock,
- xs_addr(xprt),
- xprt->addrlen, xdr,
-- req->rq_bytes_sent);
-+ req->rq_bytes_sent, true);
-
- dprintk("RPC: xs_udp_send_request(%u) = %d\n",
- xdr->len - req->rq_bytes_sent, status);
-@@ -693,6 +699,7 @@ static int xs_tcp_send_request(struct rpc_task *task)
- struct rpc_xprt *xprt = req->rq_xprt;
- struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
- struct xdr_buf *xdr = &req->rq_snd_buf;
-+ bool zerocopy = true;
- int status;
+ int rpcrdma_marshal_req(struct rpc_rqst *);
- xs_encode_stream_record_marker(&req->rq_snd_buf);
-@@ -700,13 +707,20 @@ static int xs_tcp_send_request(struct rpc_task *task)
- xs_pktdump("packet data:",
- req->rq_svec->iov_base,
- req->rq_svec->iov_len);
-+ /* Don't use zero copy if this is a resend. If the RPC call
-+ * completes while the socket holds a reference to the pages,
-+ * then we may end up resending corrupted data.
-+ */
-+ if (task->tk_flags & RPC_TASK_SENT)
-+ zerocopy = false;
-
- /* Continue transmitting the packet/record. We must be careful
- * to cope with writespace callbacks arriving _after_ we have
- * called sendmsg(). */
- while (1) {
- status = xs_sendpages(transport->sock,
-- NULL, 0, xdr, req->rq_bytes_sent);
-+ NULL, 0, xdr, req->rq_bytes_sent,
-+ zerocopy);
-
- dprintk("RPC: xs_tcp_send_request(%u) = %d\n",
- xdr->len - req->rq_bytes_sent, status);
++/* Temporary NFS request map cache. Created in svc_rdma.c */
++extern struct kmem_cache *svc_rdma_map_cachep;
++/* WR context cache. Created in svc_rdma.c */
++extern struct kmem_cache *svc_rdma_ctxt_cachep;
++/* Workqueue created in svc_rdma.c */
++extern struct workqueue_struct *svc_rdma_wq;
++
+ #endif /* _LINUX_SUNRPC_XPRT_RDMA_H */
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
-index e7000be..e3b0ba7 100644
+index e758139..d29ea47 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
-@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_header *head,
- kgid_t root_gid = make_kgid(net->user_ns, 0);
-
+@@ -47,7 +47,7 @@ static int net_ctl_permissions(struct ctl_table_root *root,
+ struct ctl_table *table)
+ {
/* Allow network administrator to have same access as root. */
-- if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
-+ if (ns_capable_nolog(net->user_ns, CAP_NET_ADMIN) ||
- uid_eq(root_uid, current_euid())) {
+- if (capable(CAP_NET_ADMIN)) {
++ if (capable_nolog(CAP_NET_ADMIN)) {
int mode = (table->mode >> 6) & 7;
return (mode << 6) | (mode << 3) | mode;
+ }
+diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
+index a224a38..c31d40a 100644
+--- a/net/tipc/eth_media.c
++++ b/net/tipc/eth_media.c
+@@ -58,7 +58,6 @@ struct eth_bearer {
+
+ static struct eth_bearer eth_bearers[MAX_ETH_BEARERS];
+ static int eth_started;
+-static struct notifier_block notifier;
+
+ /**
+ * send_msg - send a TIPC message out over an Ethernet interface
+@@ -277,6 +276,11 @@ static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size
+ * with OS for notifications about device state changes.
+ */
+
++static struct notifier_block notifier = {
++ .notifier_call = &recv_notification,
++ .priority = 0,
++};
++
+ int tipc_eth_media_start(void)
+ {
+ struct tipc_media_addr bcast_addr;
+@@ -297,8 +301,6 @@ int tipc_eth_media_start(void)
+ if (res)
+ return res;
+
+- notifier.notifier_call = &recv_notification;
+- notifier.priority = 0;
+ res = register_netdevice_notifier(¬ifier);
+ if (!res)
+ eth_started = 1;
diff --git a/net/tipc/link.c b/net/tipc/link.c
-index 0cc3d90..cc42021 100644
+index ae98a72..22f4de0 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
-@@ -1165,7 +1165,7 @@ static int link_send_sections_long(struct tipc_port *sender,
+@@ -1203,7 +1203,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;
@@ -97439,8 +98679,8 @@ index 0cc3d90..cc42021 100644
+ const unchar __user *sect_crs;
int curr_sect;
u32 fragm_no;
- int res = 0;
-@@ -1207,7 +1207,7 @@ again:
+
+@@ -1247,7 +1247,7 @@ again:
if (!sect_rest) {
sect_rest = msg_sect[++curr_sect].iov_len;
@@ -97449,26 +98689,67 @@ index 0cc3d90..cc42021 100644
}
if (sect_rest < fragm_rest)
+@@ -1266,7 +1266,7 @@ error:
+ }
+ } else
+ skb_copy_to_linear_data_offset(buf, fragm_crs,
+- sect_crs, sz);
++ (const void __force_kernel *)sect_crs, sz);
+ sect_crs += sz;
+ sect_rest -= sz;
+ fragm_crs += sz;
+@@ -2367,8 +2367,11 @@ static int link_recv_changeover_msg(struct link **l_ptr,
+ struct tipc_msg *tunnel_msg = buf_msg(tunnel_buf);
+ u32 msg_typ = msg_type(tunnel_msg);
+ u32 msg_count = msg_msgcnt(tunnel_msg);
++ u32 bearer_id = msg_bearer_id(tunnel_msg);
+
+- dest_link = (*l_ptr)->owner->links[msg_bearer_id(tunnel_msg)];
++ if (bearer_id >= MAX_BEARERS)
++ goto exit;
++ dest_link = (*l_ptr)->owner->links[bearer_id];
+ if (!dest_link)
+ goto exit;
+ if (dest_link == *l_ptr) {
+@@ -2601,14 +2604,16 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,
+ struct tipc_msg *imsg = (struct tipc_msg *)msg_data(fragm);
+ u32 msg_sz = msg_size(imsg);
+ u32 fragm_sz = msg_data_sz(fragm);
+- u32 exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz);
++ u32 exp_fragm_cnt;
+ u32 max = TIPC_MAX_USER_MSG_SIZE + NAMED_H_SIZE;
++
+ if (msg_type(imsg) == TIPC_MCAST_MSG)
+ max = TIPC_MAX_USER_MSG_SIZE + MCAST_H_SIZE;
+- if (msg_size(imsg) > max) {
++ if (fragm_sz == 0 || msg_size(imsg) > max) {
+ buf_discard(fbuf);
+ return 0;
+ }
++ exp_fragm_cnt = msg_sz / fragm_sz + !!(msg_sz % fragm_sz);
+ pbuf = tipc_buf_acquire(msg_size(imsg));
+ if (pbuf != NULL) {
+ pbuf->next = *pending;
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
-index ced60e2..54eab6c 100644
+index 83d5096..dcba497 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
-@@ -93,7 +93,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
- skb_copy_to_linear_data(*buf, hdr, hsz);
- for (res = 1, cnt = 0; res && (cnt < num_sect); cnt++) {
- skb_copy_to_linear_data_offset(*buf, pos,
-- msg_sect[cnt].iov_base,
-+ (const void __force_kernel *)msg_sect[cnt].iov_base,
- msg_sect[cnt].iov_len);
+@@ -99,7 +99,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
+ msg_sect[cnt].iov_len);
+ else
+ skb_copy_to_linear_data_offset(*buf, pos,
+- msg_sect[cnt].iov_base,
++ (const void __force_kernel *)msg_sect[cnt].iov_base,
+ msg_sect[cnt].iov_len);
pos += msg_sect[cnt].iov_len;
}
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
-index d38bb45..4fd6ac6 100644
+index 1983717..4d6102c 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
-@@ -98,7 +98,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
- struct kvec msg_sect;
- int ret;
+@@ -101,7 +101,7 @@ static void subscr_send_event(struct subscription *sub,
+ {
+ struct iovec msg_sect;
- msg_sect.iov_base = (void *)&sub->evt;
+ msg_sect.iov_base = (void __force_user *)&sub->evt;
@@ -97476,10 +98757,10 @@ index d38bb45..4fd6ac6 100644
sub->evt.event = htohl(event, sub->swap);
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index c1f403b..b246d87 100644
+index 5611563..911c6c1 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
-@@ -784,6 +784,12 @@ static struct sock *unix_find_other(struct net *net,
+@@ -766,6 +766,12 @@ static struct sock *unix_find_other(struct net *net,
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
goto put_fail;
@@ -97492,10 +98773,10 @@ index c1f403b..b246d87 100644
u = unix_find_socket_byinode(inode);
if (!u)
goto put_fail;
-@@ -804,6 +810,13 @@ static struct sock *unix_find_other(struct net *net,
+@@ -786,6 +792,13 @@ static struct sock *unix_find_other(struct net *net,
if (u) {
struct dentry *dentry;
- dentry = unix_sk(u)->path.dentry;
+ dentry = unix_sk(u)->dentry;
+
+ if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
+ err = -EPERM;
@@ -97504,28 +98785,28 @@ index c1f403b..b246d87 100644
+ }
+
if (dentry)
- touch_atime(&unix_sk(u)->path);
+ touch_atime(unix_sk(u)->mnt, dentry);
} else
-@@ -837,12 +850,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) {
+@@ -868,11 +881,18 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
+ err = security_path_mknod(&path, dentry, mode, 0);
+ if (err)
+ goto out_mknod_drop_write;
+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
+ err = -EACCES;
-+ goto out;
++ goto out_mknod_drop_write;
+ }
err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
- if (!err) {
- res->mnt = mntget(path.mnt);
- res->dentry = dget(dentry);
-+ gr_handle_create(dentry, path.mnt);
- }
- }
-+out:
- done_path_create(&path, dentry);
- return err;
- }
-@@ -2333,9 +2352,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+ out_mknod_drop_write:
+ mnt_drop_write(path.mnt);
+ if (err)
+ goto out_mknod_dput;
++
++ gr_handle_create(dentry, path.mnt);
++
+ mutex_unlock(&path.dentry->d_inode->i_mutex);
+ dput(path.dentry);
+ path.dentry = dentry;
+@@ -2260,9 +2280,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
seq_puts(seq, "Num RefCount Protocol Flags Type St "
"Inode Path\n");
else {
@@ -97540,7 +98821,7 @@ index c1f403b..b246d87 100644
seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
s,
-@@ -2362,8 +2385,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2289,8 +2313,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
}
for ( ; i < len; i++)
seq_putc(seq, u->addr->name->sun_path[i]);
@@ -97554,10 +98835,10 @@ index c1f403b..b246d87 100644
}
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
-index b3d5150..ff3a837 100644
+index 397cffe..405fdb1 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
-@@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = {
+@@ -34,7 +34,7 @@ static struct ctl_path unix_path[] = {
int __net_init unix_sysctl_register(struct net *net)
{
@@ -97567,10 +98848,10 @@ index b3d5150..ff3a837 100644
table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
if (table == NULL)
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
-index c8717c1..08539f5 100644
+index 0af7f54..c916d2f 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,
+@@ -747,8 +747,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
*/
/* Support for very large requests */
@@ -97580,7 +98861,7 @@ index c8717c1..08539f5 100644
/* Allow userspace to GET more than max so
* we can support any size GET requests.
* There is still a limit : -ENOMEM.
-@@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
+@@ -785,22 +784,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
}
}
@@ -97604,28 +98885,28 @@ index c8717c1..08539f5 100644
iwp->length += essid_compat;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 76e1873..4a12664 100644
+index 113d20e..2bb5a4e 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
-@@ -332,7 +332,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
+@@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
{
policy->walk.dead = 1;
- atomic_inc(&policy->genid);
+ atomic_inc_unchecked(&policy->genid);
- if (del_timer(&policy->polq.hold_timer))
+ if (del_timer(&policy->timer))
xfrm_pol_put(policy);
-@@ -660,7 +660,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
+@@ -583,7 +583,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]++;
- atomic_inc(&flow_cache_genid);
+ atomic_inc_unchecked(&flow_cache_genid);
-
- /* After previous checking, family can either be AF_INET or AF_INET6 */
- if (policy->family == AF_INET)
-@@ -1636,7 +1636,7 @@ free_dst:
+ if (delpol)
+ __xfrm_policy_unlink(delpol, dir);
+ policy->index = delpol ? delpol->index : xfrm_gen_index(net, dir);
+@@ -1530,7 +1530,7 @@ free_dst:
goto out;
}
@@ -97634,7 +98915,7 @@ index 76e1873..4a12664 100644
xfrm_dst_alloc_copy(void **target, const void *src, int size)
{
if (!*target) {
-@@ -1648,7 +1648,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
+@@ -1542,7 +1542,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
return 0;
}
@@ -97643,7 +98924,7 @@ index 76e1873..4a12664 100644
xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1660,7 +1660,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
+@@ -1554,7 +1554,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
#endif
}
@@ -97652,7 +98933,7 @@ index 76e1873..4a12664 100644
xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
{
#ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1754,7 +1754,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
+@@ -1648,7 +1648,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);
@@ -97661,9 +98942,9 @@ index 76e1873..4a12664 100644
return xdst;
}
-@@ -2575,11 +2575,12 @@ void xfrm_garbage_collect(struct net *net)
+@@ -2297,11 +2297,12 @@ static void xfrm_garbage_collect(struct net *net)
+ __xfrm_garbage_collect(net);
}
- EXPORT_SYMBOL(xfrm_garbage_collect);
-static void xfrm_garbage_collect_deferred(struct net *net)
+void xfrm_garbage_collect_deferred(struct net *net)
@@ -97675,7 +98956,7 @@ index 76e1873..4a12664 100644
static void xfrm_init_pmtu(struct dst_entry *dst)
{
-@@ -2629,7 +2630,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
+@@ -2348,7 +2349,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
if (xdst->xfrm_genid != dst->xfrm->genid)
return 0;
if (xdst->num_pols > 0 &&
@@ -97684,24 +98965,33 @@ index 76e1873..4a12664 100644
return 0;
mtu = dst_mtu(dst->child);
-@@ -2717,8 +2718,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
+@@ -2434,8 +2435,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
dst_ops->link_failure = xfrm_link_failure;
if (likely(dst_ops->neigh_lookup == NULL))
dst_ops->neigh_lookup = xfrm_neigh_lookup;
- if (likely(afinfo->garbage_collect == NULL))
- afinfo->garbage_collect = xfrm_garbage_collect_deferred;
- rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
- }
- spin_unlock(&xfrm_policy_afinfo_lock);
-@@ -2772,7 +2771,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
- dst_ops->check = NULL;
- dst_ops->negative_advice = NULL;
- dst_ops->link_failure = NULL;
-- afinfo->garbage_collect = NULL;
+ xfrm_policy_afinfo[afinfo->family] = afinfo;
+ }
+ write_unlock_bh(&xfrm_policy_afinfo_lock);
+@@ -2482,7 +2481,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
+ dst_ops->check = NULL;
+ dst_ops->negative_advice = NULL;
+ dst_ops->link_failure = NULL;
+- afinfo->garbage_collect = NULL;
+ }
}
- return err;
+ write_unlock_bh(&xfrm_policy_afinfo_lock);
+@@ -2692,7 +2690,7 @@ static void __net_exit xfrm_net_exit(struct net *net)
+ xfrm_statistics_fini(net);
}
-@@ -3155,7 +3153,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
+
+-static struct pernet_operations __net_initdata xfrm_net_ops = {
++static struct pernet_operations __net_initconst xfrm_net_ops = {
+ .init = xfrm_net_init,
+ .exit = xfrm_net_exit,
+ };
+@@ -2885,7 +2883,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 */
@@ -97710,17 +99000,30 @@ index 76e1873..4a12664 100644
}
}
+diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
+index 3efb07d..2576ee4 100644
+--- a/net/xfrm/xfrm_replay.c
++++ b/net/xfrm/xfrm_replay.c
+@@ -129,8 +129,7 @@ static int xfrm_replay_check(struct xfrm_state *x,
+ return 0;
+
+ diff = x->replay.seq - seq;
+- if (diff >= min_t(unsigned int, x->props.replay_window,
+- sizeof(x->replay.bitmap) * 8)) {
++ if (diff >= x->props.replay_window) {
+ x->stats.replay_window++;
+ goto err;
+ }
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
-index b9c3f9e..4767526 100644
+index 9414b9c..2477932 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
-@@ -174,12 +174,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
+@@ -194,11 +194,13 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
if (unlikely(afinfo == NULL))
return -EAFNOSUPPORT;
- typemap = afinfo->type_map;
+ typemap = (const struct xfrm_type **)afinfo->type_map;
- spin_lock_bh(&xfrm_type_lock);
- if (likely(typemap[type->proto] == NULL))
+ if (likely(typemap[type->proto] == NULL)) {
@@ -97730,15 +99033,14 @@ index b9c3f9e..4767526 100644
+ pax_close_kernel();
+ } else
err = -EEXIST;
- spin_unlock_bh(&xfrm_type_lock);
- xfrm_state_put_afinfo(afinfo);
-@@ -195,13 +197,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
+ xfrm_state_unlock_afinfo(afinfo);
+ return err;
+@@ -213,12 +215,15 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
if (unlikely(afinfo == NULL))
return -EAFNOSUPPORT;
- typemap = afinfo->type_map;
+ typemap = (const struct xfrm_type **)afinfo->type_map;
- spin_lock_bh(&xfrm_type_lock);
if (unlikely(typemap[type->proto] != type))
err = -ENOENT;
@@ -97748,10 +99050,10 @@ index b9c3f9e..4767526 100644
typemap[type->proto] = NULL;
+ pax_close_kernel();
+ }
- spin_unlock_bh(&xfrm_type_lock);
- xfrm_state_put_afinfo(afinfo);
+ xfrm_state_unlock_afinfo(afinfo);
return err;
-@@ -211,7 +216,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
+ }
+@@ -227,7 +232,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
{
struct xfrm_state_afinfo *afinfo;
@@ -97759,7 +99061,7 @@ index b9c3f9e..4767526 100644
const struct xfrm_type *type;
int modload_attempted = 0;
-@@ -219,9 +223,8 @@ retry:
+@@ -235,9 +239,8 @@ retry:
afinfo = xfrm_state_get_afinfo(family);
if (unlikely(afinfo == NULL))
return NULL;
@@ -97770,16 +99072,16 @@ index b9c3f9e..4767526 100644
if (unlikely(type && !try_module_get(type->owner)))
type = NULL;
if (!type && !modload_attempted) {
-@@ -255,7 +258,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
+@@ -270,7 +273,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
return -EAFNOSUPPORT;
err = -EEXIST;
- modemap = afinfo->mode_map;
+ modemap = (struct xfrm_mode **)afinfo->mode_map;
- spin_lock_bh(&xfrm_mode_lock);
if (modemap[mode->encap])
goto out;
-@@ -264,8 +267,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
+
+@@ -278,8 +281,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
if (!try_module_get(afinfo->owner))
goto out;
@@ -97791,13 +99093,12 @@ index b9c3f9e..4767526 100644
err = 0;
out:
-@@ -289,10 +294,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
+@@ -302,9 +307,11 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
return -EAFNOSUPPORT;
err = -ENOENT;
- modemap = afinfo->mode_map;
+ modemap = (struct xfrm_mode **)afinfo->mode_map;
- spin_lock_bh(&xfrm_mode_lock);
if (likely(modemap[mode->encap] == mode)) {
+ pax_open_kernel();
modemap[mode->encap] = NULL;
@@ -97805,7 +99106,7 @@ index b9c3f9e..4767526 100644
module_put(mode->afinfo->owner);
err = 0;
}
-@@ -1486,10 +1493,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
+@@ -1497,10 +1504,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
u32 xfrm_get_acqseq(void)
{
u32 res;
@@ -97818,8 +99119,20 @@ index b9c3f9e..4767526 100644
} while (!res);
return res;
+@@ -1985,8 +1992,10 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay)
+ goto error;
+
+ x->outer_mode = xfrm_get_mode(x->props.mode, family);
+- if (x->outer_mode == NULL)
++ if (x->outer_mode == NULL) {
++ err = -EPROTONOSUPPORT;
+ goto error;
++ }
+
+ if (init_replay) {
+ err = xfrm_init_replay(x);
diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c
-index 05a6e3d..6716ec9 100644
+index 05640bc..b67eaaa 100644
--- a/net/xfrm/xfrm_sysctl.c
+++ b/net/xfrm/xfrm_sysctl.c
@@ -42,7 +42,7 @@ static struct ctl_table xfrm_table[] = {
@@ -97831,11 +99144,34 @@ index 05a6e3d..6716ec9 100644
__xfrm_sysctl_init(net);
+diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
+index ede01a8..756e6bd 100644
+--- a/net/xfrm/xfrm_user.c
++++ b/net/xfrm/xfrm_user.c
+@@ -446,7 +446,8 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
+ memcpy(&x->sel, &p->sel, sizeof(x->sel));
+ memcpy(&x->lft, &p->lft, sizeof(x->lft));
+ x->props.mode = p->mode;
+- x->props.replay_window = p->replay_window;
++ x->props.replay_window = min_t(unsigned int, p->replay_window,
++ sizeof(x->replay.bitmap) * 8);
+ x->props.reqid = p->reqid;
+ x->props.family = p->family;
+ memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
+@@ -1816,7 +1817,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
+ if (x->km.state != XFRM_STATE_VALID)
+ goto out;
+
+- err = xfrm_replay_verify_len(x->replay_esn, rp);
++ err = xfrm_replay_verify_len(x->replay_esn, re);
+ if (err)
+ goto out;
+
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
-index d5d859c..781cbcb 100644
+index d2b366c..2d5a6f8 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
-@@ -111,7 +111,7 @@ endif
+@@ -109,7 +109,7 @@ endif
endif
# Do not include host rules unless needed
@@ -97858,6 +99194,48 @@ index 686cb0d..9d653bf 100644
__clean-files := $(filter-out $(no-clean-files), $(__clean-files))
+diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
+index a57f5bd..d3bae5e 100644
+--- a/scripts/Makefile.headersinst
++++ b/scripts/Makefile.headersinst
+@@ -4,12 +4,16 @@
+ # header-y - list files to be installed. They are preprocessed
+ # to remove __KERNEL__ section of the file
+ # objhdr-y - Same as header-y but for generated files
++# genhdr-y - Same as objhdr-y but in a generated/ directory
+ #
+ # ==========================================================================
+
+ # called may set destination dir (when installing to asm/)
+ _dst := $(if $(dst),$(dst),$(obj))
+
++# generated header directory
++gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj)))
++
+ kbuild-file := $(srctree)/$(obj)/Kbuild
+ include $(kbuild-file)
+
+@@ -33,9 +37,10 @@ wrapper-files := $(filter $(header-y), $(generic-y))
+
+ # all headers files for this dir
+ header-y := $(filter-out $(generic-y), $(header-y))
+-all-files := $(header-y) $(objhdr-y) $(wrapper-files)
++all-files := $(header-y) $(objhdr-y) $(genhdr-y) $(wrapper-files)
+ input-files := $(addprefix $(srctree)/$(obj)/,$(header-y)) \
+- $(addprefix $(objtree)/$(obj)/,$(objhdr-y))
++ $(addprefix $(objtree)/$(obj)/,$(objhdr-y)) \
++ $(addprefix $(objtree)/$(gen)/,$(genhdr-y))
+ output-files := $(addprefix $(install)/, $(all-files))
+
+ # Work out what needs to be removed
+@@ -52,6 +57,7 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
+ cmd_install = \
+ $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \
+ $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \
++ $(PERL) $< $(objtree)/$(gen) $(install) $(SRCARCH) $(genhdr-y); \
+ for F in $(wrapper-files); do \
+ echo "\#include <asm-generic/$$F>" > $(install)/$$F; \
+ done; \
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 1ac414f..38575f7 100644
--- a/scripts/Makefile.host
@@ -97930,7 +99308,7 @@ index 1ac414f..38575f7 100644
+ $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
-index 078fe1d..fbdb363 100644
+index cb1f50c..cef2a7c 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
@@ -97967,7 +99345,7 @@ index 078fe1d..fbdb363 100644
const char *p, *q;
for (; m < end; m++) {
-@@ -435,7 +435,7 @@ static void print_deps(void)
+@@ -406,7 +406,7 @@ static void print_deps(void)
static void traps(void)
{
static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
@@ -97975,7 +99353,7 @@ index 078fe1d..fbdb363 100644
+ unsigned int *p = (unsigned int *)test;
if (*p != INT_CONF) {
- fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
+ fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
new file mode 100644
index 0000000..5e0222d
@@ -97999,47 +99377,23 @@ index 0000000..5e0222d
+ [[ "$plugincc" =~ "$1" ]] && echo "$1"
+ [[ "$plugincc" =~ "$2" ]] && echo "$2"
+fi
-diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
-index 5de5660..d3deb89 100644
---- a/scripts/headers_install.sh
-+++ b/scripts/headers_install.sh
-@@ -32,6 +32,7 @@ do
- FILE="$(basename "$i")"
- sed -r \
- -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
-+ -e 's/__intentional_overflow\([- \t,0-9]*\)//g' \
- -e 's/__attribute_const__([ \t]|$)/\1/g' \
- -e 's@^#include <linux/compiler.h>@@' \
- -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
-diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 32b10f5..64eeb30 100644
---- a/scripts/link-vmlinux.sh
-+++ b/scripts/link-vmlinux.sh
-@@ -82,7 +82,9 @@ kallsyms()
- kallsymopt="${kallsymopt} --all-symbols"
- fi
-
-- kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
-+ if [ -z "${CONFIG_X86_32}" ] || [ -z "${CONFIG_PAX_KERNEXEC}" ]; then
-+ kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
-+ fi
-
- local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
- ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
-@@ -160,7 +162,7 @@ else
- fi;
-
- # final build of init/
--${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
-+${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
-
- kallsymso=""
- kallsyms_vmlinux=""
+diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
+index 48462be..3e08f94 100644
+--- a/scripts/headers_install.pl
++++ b/scripts/headers_install.pl
+@@ -33,6 +33,7 @@ foreach my $file (@files) {
+ $line =~ s/([\s(])__user\s/$1/g;
+ $line =~ s/([\s(])__force\s/$1/g;
+ $line =~ s/([\s(])__iomem\s/$1/g;
++ $line =~ s/(\s?)__intentional_overflow\([-\d\s,]*\)\s?/$1/g;
+ $line =~ s/\s__attribute_const__\s/ /g;
+ $line =~ s/\s__attribute_const__$//g;
+ $line =~ s/\b__packed\b/__attribute__((packed))/g;
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
-index 2370863..212fbca 100644
+index d1d0ae8..6b73b2a 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
-@@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
+@@ -72,7 +72,7 @@ static void device_id_check(const char *modname, const char *device_id,
unsigned long size, unsigned long id_size,
void *symval)
{
@@ -98047,66 +99401,66 @@ index 2370863..212fbca 100644
+ unsigned int i;
if (size % id_size || size < id_size) {
- fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
-@@ -170,7 +170,7 @@ static void device_id_check(const char *modname, const char *device_id,
+ if (cross_build != 0)
+@@ -102,7 +102,7 @@ static void device_id_check(const char *modname, const char *device_id,
/* USB is special because the bcdDevice can be matched against a numeric range */
- /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
- static void do_usb_entry(void *symval,
+ /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */
+ static void do_usb_entry(struct usb_device_id *id,
- unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
+ unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
unsigned char range_lo, unsigned char range_hi,
unsigned char max, struct module *mod)
{
-@@ -280,7 +280,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
+@@ -203,7 +203,7 @@ static void do_usb_entry_multi(struct usb_device_id *id, struct module *mod)
{
unsigned int devlo, devhi;
unsigned char chi, clo, max;
- int ndigits;
+ unsigned int ndigits;
- DEF_FIELD(symval, usb_device_id, match_flags);
- DEF_FIELD(symval, usb_device_id, idVendor);
-@@ -533,7 +533,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
+ id->match_flags = TO_NATIVE(id->match_flags);
+ id->idVendor = TO_NATIVE(id->idVendor);
+@@ -437,7 +437,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
for (i = 0; i < count; i++) {
- DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
- char acpi_id[sizeof(*id)];
+ const char *id = (char *)devs[i].id;
+ char acpi_id[sizeof(devs[0].id)];
- int j;
+ unsigned int j;
buf_printf(&mod->dev_table_buf,
- "MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
-@@ -562,7 +562,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
+ "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+@@ -467,7 +467,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
for (j = 0; j < PNP_MAX_DEVICES; j++) {
- const char *id = (char *)(*devs)[j].id;
+ const char *id = (char *)card->devs[j].id;
- int i2, j2;
+ unsigned int i2, j2;
int dup = 0;
if (!id[0])
-@@ -588,7 +588,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
+@@ -493,7 +493,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
/* add an individual alias for every device entry */
if (!dup) {
- char acpi_id[PNP_ID_LEN];
+ char acpi_id[sizeof(card->devs[0].id)];
- int k;
+ unsigned int k;
buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"pnp:d%s*\");\n", id);
-@@ -940,7 +940,7 @@ static void dmi_ascii_filter(char *d, const char *s)
- static int do_dmi_entry(const char *filename, void *symval,
+@@ -807,7 +807,7 @@ static void dmi_ascii_filter(char *d, const char *s)
+ static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
char *alias)
{
- int i, j;
+ unsigned int i, j;
- DEF_FIELD_ADDR(symval, dmi_system_id, matches);
+
sprintf(alias, "dmi*");
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index 8247979..815ec76 100644
+index 619228d..bf61bbb 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
-@@ -931,6 +931,7 @@ enum mismatch {
+@@ -922,6 +922,7 @@ enum mismatch {
ANY_INIT_TO_ANY_EXIT,
ANY_EXIT_TO_ANY_INIT,
EXPORT_TO_INIT_EXIT,
@@ -98114,7 +99468,7 @@ index 8247979..815ec76 100644
};
struct sectioncheck {
-@@ -1017,6 +1018,12 @@ const struct sectioncheck sectioncheck[] = {
+@@ -1030,6 +1031,12 @@ const struct sectioncheck sectioncheck[] = {
.tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
.mismatch = EXPORT_TO_INIT_EXIT,
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
@@ -98127,7 +99481,7 @@ index 8247979..815ec76 100644
}
};
-@@ -1137,10 +1144,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
+@@ -1152,10 +1159,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;
@@ -98140,7 +99494,7 @@ index 8247979..815ec76 100644
if (d < 0)
d = addr - sym->st_value;
if (d < distance) {
-@@ -1418,6 +1425,14 @@ static void report_sec_mismatch(const char *modname,
+@@ -1434,6 +1441,14 @@ static void report_sec_mismatch(const char *modname,
tosym, prl_to, prl_to, tosym);
free(prl_to);
break;
@@ -98155,7 +99509,7 @@ index 8247979..815ec76 100644
}
fprintf(stderr, "\n");
}
-@@ -1652,7 +1667,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
+@@ -1659,7 +1674,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)
{
@@ -98164,7 +99518,7 @@ index 8247979..815ec76 100644
Elf_Shdr *sechdrs = elf->sechdrs;
/* Walk through all sections */
-@@ -1771,7 +1786,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
+@@ -1757,7 +1772,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
va_end(ap);
}
@@ -98173,7 +99527,7 @@ index 8247979..815ec76 100644
{
if (buf->size - buf->pos < len) {
buf->size += len + SZ;
-@@ -1990,7 +2005,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -1975,7 +1990,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
if (fstat(fileno(file), &st) < 0)
goto close_write;
@@ -98234,22 +99588,22 @@ index 0865b3e..7235dd4 100644
__ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
__ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 90e521f..e9eaf8f 100644
+index 3c6c0b1..3e4dbf3 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
-@@ -281,6 +281,7 @@ fi
- (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
+@@ -241,6 +241,7 @@ fi
+ (cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
- (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+ (cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
mkdir -p "$destdir"
(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
-index 68bb4ef..2f419e1 100644
+index 5c11312..72742b5 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
-@@ -244,14 +244,14 @@ static void write_header(void)
+@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
fputs("#include <linux/linux_logo.h>\n\n", out);
@@ -98266,7 +99620,7 @@ index 68bb4ef..2f419e1 100644
fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
fprintf(out, "\t.width\t\t= %d,\n", logo_width);
fprintf(out, "\t.height\t\t= %d,\n", logo_height);
-@@ -381,7 +381,7 @@ static void write_logo_clut224(void)
+@@ -374,7 +374,7 @@ static void write_logo_clut224(void)
fputs("\n};\n\n", out);
/* write logo clut */
@@ -98275,28 +99629,24 @@ index 68bb4ef..2f419e1 100644
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
-diff --git a/scripts/sortextable.h b/scripts/sortextable.h
-index f5eb43d..1814de8 100644
---- a/scripts/sortextable.h
-+++ b/scripts/sortextable.h
-@@ -106,9 +106,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
- const char *secstrtab;
- const char *strtab;
- char *extab_image;
-- int extab_index = 0;
-- int i;
-- int idx;
-+ unsigned int extab_index = 0;
-+ unsigned int i;
-+ unsigned int idx;
+diff --git a/scripts/tags.sh b/scripts/tags.sh
+index 38f6617..e70b72b 100755
+--- a/scripts/tags.sh
++++ b/scripts/tags.sh
+@@ -116,7 +116,7 @@ docscope()
+
+ dogtags()
+ {
+- all_sources | gtags -f -
++ all_sources | gtags -i -f -
+ }
- shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff));
- shstrtab_sec = shdr + r2(&ehdr->e_shstrndx);
+ exuberant()
diff --git a/security/Kconfig b/security/Kconfig
-index e9c6ac7..031a726 100644
+index 51bd5a0..d0de7b0 100644
--- a/security/Kconfig
+++ b/security/Kconfig
-@@ -4,6 +4,960 @@
+@@ -4,6 +4,955 @@
menu "Security options"
@@ -98330,7 +99680,6 @@ index e9c6ac7..031a726 100644
+ select CRYPTO_SHA256
+ select PROC_FS
+ select STOP_MACHINE
-+ select TTY
+ select DEBUG_LIST
+ help
+ If you say Y here, you will be able to configure many features
@@ -98665,7 +100014,7 @@ index e9c6ac7..031a726 100644
+config PAX_NOEXEC
+ bool "Enforce non-executable pages"
+ default y if GRKERNSEC_CONFIG_AUTO
-+ depends on ALPHA || (ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
++ depends on ALPHA || (ARM && (CPU_V6 || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
+ help
+ By design some architectures do not allow for protecting memory
+ pages against execution or even if they do, Linux does not make
@@ -98876,7 +100225,7 @@ index e9c6ac7..031a726 100644
+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 (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !(ARM_LPAE && MODULES))) && !XEN
++ depends on X86 && !XEN && (!X86_32 || X86_WP_WORKS_OK)
+ select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
+ select PAX_KERNEXEC_PLUGIN if X86_64
+ help
@@ -99107,8 +100456,8 @@ index e9c6ac7..031a726 100644
+
+config PAX_MEMORY_UDEREF
+ bool "Prevent invalid userland pointer dereference"
-+ default y if GRKERNSEC_CONFIG_AUTO && !(X86_64 && GRKERNSEC_CONFIG_PRIORITY_PERF) && (GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
-+ depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !ARM_LPAE)) && !UML_X86 && !XEN
++ default y if GRKERNSEC_CONFIG_AUTO && (X86_32 || (X86_64 && GRKERNSEC_CONFIG_PRIORITY_SECURITY)) && (GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
++ depends on X86 && !UML_X86 && !XEN
+ select PAX_PER_CPU_PGD if X86_64
+ help
+ By saying Y here the kernel will be prevented from dereferencing
@@ -99125,15 +100474,10 @@ index e9c6ac7..031a726 100644
+ VMs running on CPUs without hardware virtualization support (i.e.,
+ the majority of IA-32 CPUs) will likely experience the slowdown.
+
-+ On X86_64 the kernel will make use of PCID support when available
-+ (Intel's Westmere, Sandy Bridge, etc) for better security (default)
-+ or performance impact. Pass pax_weakuderef on the kernel command
-+ line to choose the latter.
-+
+config PAX_REFCOUNT
+ bool "Prevent various kernel object reference counter overflows"
+ default y if GRKERNSEC_CONFIG_AUTO
-+ depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || SPARC64 || X86)
++ depends on GRKERNSEC && ((ARM && (CPU_32v6 || CPU_32v6K || CPU_32v7)) || SPARC64 || X86)
+ help
+ By saying Y here the kernel will detect and prevent overflowing
+ various (but not all) kinds of object reference counters. Such
@@ -99150,24 +100494,6 @@ index e9c6ac7..031a726 100644
+ Since this has a negligible performance impact, you should enable
+ this feature.
+
-+config PAX_CONSTIFY_PLUGIN
-+ bool "Automatically constify eligible structures"
-+ default y
-+ depends on !UML && PAX_KERNEXEC
-+ help
-+ By saying Y here the compiler will automatically constify a class
-+ of types that contain only function pointers. This reduces the
-+ kernel's attack surface and also produces a better memory layout.
-+
-+ Note that the implementation requires a gcc with plugin support,
-+ i.e., gcc 4.5 or newer. You may need to install the supporting
-+ headers explicitly in addition to the normal gcc package.
-+
-+ Note that if some code really has to modify constified variables
-+ then the source code will have to be patched to allow it. Examples
-+ can be found in PaX itself (the no_const attribute) and for some
-+ out-of-tree modules at http://www.grsecurity.net/~paxguy1/ .
-+
+config PAX_USERCOPY
+ bool "Harden heap object copies between kernel and userland"
+ default y if GRKERNSEC_CONFIG_AUTO
@@ -99204,6 +100530,25 @@ index e9c6ac7..031a726 100644
+ depends on X86 && PAX_USERCOPY
+ default n
+
++config PAX_CONSTIFY_PLUGIN
++ bool "Automatically constify eligible structures"
++ default y if GRKERNSEC_CONFIG_AUTO
++ depends on !UML && PAX_KERNEXEC
++ help
++ By saying Y here the compiler will automatically constify a class
++ of types that contain only function pointers. This reduces the
++ kernel's attack surface and also produces a better memory layout.
++
++ Note that the implementation requires a gcc with plugin support,
++ i.e., gcc 4.5 or newer. You may need to install the supporting
++ headers explicitly in addition to the normal gcc package
++
++ Note that if some code really has to modify constified variables
++ then the source code will have to be patched to allow it. Examples
++ can be found in PaX itself (the no_const attribute) and for some
++ out-of-tree modules at http://www.grsecurity.net/~paxguy1/ .
++
++
+config PAX_SIZE_OVERFLOW
+ bool "Prevent various integer overflows in function size parameters"
+ default y if GRKERNSEC_CONFIG_AUTO
@@ -99254,10 +100599,10 @@ index e9c6ac7..031a726 100644
+
+endmenu
+
- source security/keys/Kconfig
-
- config SECURITY_DMESG_RESTRICT
-@@ -103,7 +1057,7 @@ config INTEL_TXT
+ config KEYS
+ bool "Enable access key retention support"
+ help
+@@ -169,7 +1118,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
@@ -99266,24 +100611,1015 @@ index e9c6ac7..031a726 100644
default 65536
help
This is the portion of low virtual memory which should be protected
+diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
+index 9b9013b..51ebf96 100644
+--- a/security/apparmor/Kconfig
++++ b/security/apparmor/Kconfig
+@@ -29,3 +29,12 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE
+ boot.
+
+ If you are unsure how to answer this question, answer 1.
++
++config SECURITY_APPARMOR_COMPAT_24
++ bool "Enable AppArmor 2.4 compatability"
++ depends on SECURITY_APPARMOR
++ default y
++ help
++ This option enables compatability with AppArmor 2.4. It is
++ recommended if compatability with older versions of AppArmor
++ is desired.
+diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
+index 2dafe50..0bb604b 100644
+--- a/security/apparmor/Makefile
++++ b/security/apparmor/Makefile
+@@ -4,9 +4,10 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
+
+ apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
+ path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
+- resource.o sid.o file.o
++ resource.o sid.o file.o net.o
++apparmor-$(CONFIG_SECURITY_APPARMOR_COMPAT_24) += apparmorfs-24.o
+
+-clean-files := capability_names.h rlim_names.h
++clean-files := capability_names.h rlim_names.h af_names.h
+
+
+ # Build a lower case string table of capability names
+@@ -44,9 +45,24 @@ cmd_make-rlim = echo "static const char *rlim_names[] = {" > $@ ;\
+ sed -r -n "s/^\# ?define[ \t]+(RLIMIT_[A-Z0-9_]+).*/\1,/p" $< >> $@ ;\
+ echo "};" >> $@
+
++# Build a lower case string table of address family names.
++# Transform lines from
++# #define AF_INET 2 /* Internet IP Protocol */
++# to
++# [2] = "inet",
++quiet_cmd_make-af = GEN $@
++cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ;\
++ sed $< >> $@ -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e \
++ 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+).*/[\2] = "\L\1",/p';\
++ echo "};" >> $@
++
++
+ $(obj)/capability.o : $(obj)/capability_names.h
+ $(obj)/resource.o : $(obj)/rlim_names.h
++$(obj)/net.o : $(obj)/af_names.h
+ $(obj)/capability_names.h : $(srctree)/include/linux/capability.h
+ $(call cmd,make-caps)
+ $(obj)/rlim_names.h : $(srctree)/include/asm-generic/resource.h
+ $(call cmd,make-rlim)
++$(obj)/af_names.h : $(srctree)/include/linux/socket.h
++ $(call cmd,make-af)
+\ No newline at end of file
+diff --git a/security/apparmor/apparmorfs-24.c b/security/apparmor/apparmorfs-24.c
+new file mode 100644
+index 0000000..dc8c744
+--- /dev/null
++++ b/security/apparmor/apparmorfs-24.c
+@@ -0,0 +1,287 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor /sys/kernel/secrutiy/apparmor interface functions
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2010 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ *
++ *
++ * This file contain functions providing an interface for <= AppArmor 2.4
++ * compatibility. It is dependent on CONFIG_SECURITY_APPARMOR_COMPAT_24
++ * being set (see Makefile).
++ */
++
++#include <linux/security.h>
++#include <linux/vmalloc.h>
++#include <linux/module.h>
++#include <linux/seq_file.h>
++#include <linux/uaccess.h>
++#include <linux/namei.h>
++
++#include "include/apparmor.h"
++#include "include/audit.h"
++#include "include/context.h"
++#include "include/policy.h"
++
++
++/* apparmor/matching */
++static ssize_t aa_matching_read(struct file *file, char __user *buf,
++ size_t size, loff_t *ppos)
++{
++ const char matching[] = "pattern=aadfa audit perms=crwxamlk/ "
++ "user::other";
++
++ return simple_read_from_buffer(buf, size, ppos, matching,
++ sizeof(matching) - 1);
++}
++
++const struct file_operations aa_fs_matching_fops = {
++ .read = aa_matching_read,
++};
++
++/* apparmor/features */
++static ssize_t aa_features_read(struct file *file, char __user *buf,
++ size_t size, loff_t *ppos)
++{
++ const char features[] = "file=3.1 capability=2.0 network=1.0 "
++ "change_hat=1.5 change_profile=1.1 " "aanamespaces=1.1 rlimit=1.1";
++
++ return simple_read_from_buffer(buf, size, ppos, features,
++ sizeof(features) - 1);
++}
++
++const struct file_operations aa_fs_features_fops = {
++ .read = aa_features_read,
++};
++
++/**
++ * __next_namespace - find the next namespace to list
++ * @root: root namespace to stop search at (NOT NULL)
++ * @ns: current ns position (NOT NULL)
++ *
++ * Find the next namespace from @ns under @root and handle all locking needed
++ * while switching current namespace.
++ *
++ * Returns: next namespace or NULL if at last namespace under @root
++ * NOTE: will not unlock root->lock
++ */
++static struct aa_namespace *__next_namespace(struct aa_namespace *root,
++ struct aa_namespace *ns)
++{
++ struct aa_namespace *parent;
++
++ /* is next namespace a child */
++ if (!list_empty(&ns->sub_ns)) {
++ struct aa_namespace *next;
++ next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
++ read_lock(&next->lock);
++ return next;
++ }
++
++ /* check if the next ns is a sibling, parent, gp, .. */
++ parent = ns->parent;
++ while (parent) {
++ read_unlock(&ns->lock);
++ list_for_each_entry_continue(ns, &parent->sub_ns, base.list) {
++ read_lock(&ns->lock);
++ return ns;
++ }
++ if (parent == root)
++ return NULL;
++ ns = parent;
++ parent = parent->parent;
++ }
++
++ return NULL;
++}
++
++/**
++ * __first_profile - find the first profile in a namespace
++ * @root: namespace that is root of profiles being displayed (NOT NULL)
++ * @ns: namespace to start in (NOT NULL)
++ *
++ * Returns: unrefcounted profile or NULL if no profile
++ */
++static struct aa_profile *__first_profile(struct aa_namespace *root,
++ struct aa_namespace *ns)
++{
++ for ( ; ns; ns = __next_namespace(root, ns)) {
++ if (!list_empty(&ns->base.profiles))
++ return list_first_entry(&ns->base.profiles,
++ struct aa_profile, base.list);
++ }
++ return NULL;
++}
++
++/**
++ * __next_profile - step to the next profile in a profile tree
++ * @profile: current profile in tree (NOT NULL)
++ *
++ * Perform a depth first taversal on the profile tree in a namespace
++ *
++ * Returns: next profile or NULL if done
++ * Requires: profile->ns.lock to be held
++ */
++static struct aa_profile *__next_profile(struct aa_profile *p)
++{
++ struct aa_profile *parent;
++ struct aa_namespace *ns = p->ns;
++
++ /* is next profile a child */
++ if (!list_empty(&p->base.profiles))
++ return list_first_entry(&p->base.profiles, typeof(*p),
++ base.list);
++
++ /* is next profile a sibling, parent sibling, gp, subling, .. */
++ parent = p->parent;
++ while (parent) {
++ list_for_each_entry_continue(p, &parent->base.profiles,
++ base.list)
++ return p;
++ p = parent;
++ parent = parent->parent;
++ }
++
++ /* is next another profile in the namespace */
++ list_for_each_entry_continue(p, &ns->base.profiles, base.list)
++ return p;
++
++ return NULL;
++}
++
++/**
++ * next_profile - step to the next profile in where ever it may be
++ * @root: root namespace (NOT NULL)
++ * @profile: current profile (NOT NULL)
++ *
++ * Returns: next profile or NULL if there isn't one
++ */
++static struct aa_profile *next_profile(struct aa_namespace *root,
++ struct aa_profile *profile)
++{
++ struct aa_profile *next = __next_profile(profile);
++ if (next)
++ return next;
++
++ /* finished all profiles in namespace move to next namespace */
++ return __first_profile(root, __next_namespace(root, profile->ns));
++}
++
++/**
++ * p_start - start a depth first traversal of profile tree
++ * @f: seq_file to fill
++ * @pos: current position
++ *
++ * Returns: first profile under current namespace or NULL if none found
++ *
++ * acquires first ns->lock
++ */
++static void *p_start(struct seq_file *f, loff_t *pos)
++ __acquires(root->lock)
++{
++ struct aa_profile *profile = NULL;
++ struct aa_namespace *root = aa_current_profile()->ns;
++ loff_t l = *pos;
++ f->private = aa_get_namespace(root);
++
++
++ /* find the first profile */
++ read_lock(&root->lock);
++ profile = __first_profile(root, root);
++
++ /* skip to position */
++ for (; profile && l > 0; l--)
++ profile = next_profile(root, profile);
++
++ return profile;
++}
++
++/**
++ * p_next - read the next profile entry
++ * @f: seq_file to fill
++ * @p: profile previously returned
++ * @pos: current position
++ *
++ * Returns: next profile after @p or NULL if none
++ *
++ * may acquire/release locks in namespace tree as necessary
++ */
++static void *p_next(struct seq_file *f, void *p, loff_t *pos)
++{
++ struct aa_profile *profile = p;
++ struct aa_namespace *root = f->private;
++ (*pos)++;
++
++ return next_profile(root, profile);
++}
++
++/**
++ * p_stop - stop depth first traversal
++ * @f: seq_file we are filling
++ * @p: the last profile writen
++ *
++ * Release all locking done by p_start/p_next on namespace tree
++ */
++static void p_stop(struct seq_file *f, void *p)
++ __releases(root->lock)
++{
++ struct aa_profile *profile = p;
++ struct aa_namespace *root = f->private, *ns;
++
++ if (profile) {
++ for (ns = profile->ns; ns && ns != root; ns = ns->parent)
++ read_unlock(&ns->lock);
++ }
++ read_unlock(&root->lock);
++ aa_put_namespace(root);
++}
++
++/**
++ * seq_show_profile - show a profile entry
++ * @f: seq_file to file
++ * @p: current position (profile) (NOT NULL)
++ *
++ * Returns: error on failure
++ */
++static int seq_show_profile(struct seq_file *f, void *p)
++{
++ struct aa_profile *profile = (struct aa_profile *)p;
++ struct aa_namespace *root = f->private;
++
++ if (profile->ns != root)
++ seq_printf(f, ":%s://", aa_ns_name(root, profile->ns));
++ seq_printf(f, "%s (%s)\n", profile->base.hname,
++ COMPLAIN_MODE(profile) ? "complain" : "enforce");
++
++ return 0;
++}
++
++static const struct seq_operations aa_fs_profiles_op = {
++ .start = p_start,
++ .next = p_next,
++ .stop = p_stop,
++ .show = seq_show_profile,
++};
++
++static int profiles_open(struct inode *inode, struct file *file)
++{
++ return seq_open(file, &aa_fs_profiles_op);
++}
++
++static int profiles_release(struct inode *inode, struct file *file)
++{
++ return seq_release(inode, file);
++}
++
++const struct file_operations aa_fs_profiles_fops = {
++ .open = profiles_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = profiles_release,
++};
+diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
+index 69ddb47..be0f0f9 100644
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -187,7 +187,11 @@ void __init aa_destroy_aafs(void)
+ aafs_remove(".remove");
+ aafs_remove(".replace");
+ aafs_remove(".load");
+-
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++ aafs_remove("profiles");
++ aafs_remove("matching");
++ aafs_remove("features");
++#endif
+ securityfs_remove(aa_fs_dentry);
+ aa_fs_dentry = NULL;
+ }
+@@ -218,7 +222,17 @@ static int __init aa_create_aafs(void)
+ aa_fs_dentry = NULL;
+ goto error;
+ }
+-
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++ error = aafs_create("matching", 0444, &aa_fs_matching_fops);
++ if (error)
++ goto error;
++ error = aafs_create("features", 0444, &aa_fs_features_fops);
++ if (error)
++ goto error;
++ error = aafs_create("profiles", 0440, &aa_fs_profiles_fops);
++ if (error)
++ goto error;
++#endif
+ error = aafs_create(".load", 0640, &aa_fs_profile_load);
+ if (error)
+ goto error;
+diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
+index c1e18ba..7316d77 100644
+--- a/security/apparmor/domain.c
++++ b/security/apparmor/domain.c
+@@ -395,6 +395,11 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
+ new_profile = find_attach(ns, &ns->base.profiles, name);
+ if (!new_profile)
+ goto cleanup;
++ /*
++ * NOTE: Domain transitions from unconfined are allowed
++ * even when no_new_privs is set because this aways results
++ * in a further reduction of permissions.
++ */
+ goto apply;
+ }
+
+@@ -455,6 +460,16 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
+ /* fail exec */
+ error = -EACCES;
+
++ /*
++ * Policy has specified a domain transition, if no_new_privs then
++ * fail the exec.
++ */
++ if (bprm->unsafe & LSM_UNSAFE_NO_NEW_PRIVS) {
++ aa_put_profile(new_profile);
++ error = -EPERM;
++ goto cleanup;
++ }
++
+ if (!new_profile)
+ goto audit;
+
+@@ -609,6 +624,14 @@ int aa_change_hat(const char *hats[], int count, u64 token, bool permtest)
+ const char *target = NULL, *info = NULL;
+ int error = 0;
+
++ /*
++ * Fail explicitly requested domain transitions if no_new_privs.
++ * There is no exception for unconfined as change_hat is not
++ * available.
++ */
++ if (current->no_new_privs)
++ return -EPERM;
++
+ /* released below */
+ cred = get_current_cred();
+ cxt = cred->security;
+@@ -750,6 +773,18 @@ int aa_change_profile(const char *ns_name, const char *hname, bool onexec,
+ cxt = cred->security;
+ profile = aa_cred_profile(cred);
+
++ /*
++ * Fail explicitly requested domain transitions if no_new_privs
++ * and not unconfined.
++ * Domain transitions from unconfined are allowed even when
++ * no_new_privs is set because this aways results in a reduction
++ * of permissions.
++ */
++ if (current->no_new_privs && !unconfined(profile)) {
++ put_cred(cred);
++ return -EPERM;
++ }
++
+ if (ns_name) {
+ /* released below */
+ ns = aa_find_namespace(profile->ns, ns_name);
+diff --git a/security/apparmor/include/apparmorfs.h b/security/apparmor/include/apparmorfs.h
+index cb1e93a..14f955c 100644
+--- a/security/apparmor/include/apparmorfs.h
++++ b/security/apparmor/include/apparmorfs.h
+@@ -17,4 +17,10 @@
+
+ extern void __init aa_destroy_aafs(void);
+
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++extern const struct file_operations aa_fs_matching_fops;
++extern const struct file_operations aa_fs_features_fops;
++extern const struct file_operations aa_fs_profiles_fops;
++#endif
++
+ #endif /* __AA_APPARMORFS_H */
+diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
+new file mode 100644
+index 0000000..3c7d599
+--- /dev/null
++++ b/security/apparmor/include/net.h
+@@ -0,0 +1,40 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor network mediation definitions.
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2010 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ */
++
++#ifndef __AA_NET_H
++#define __AA_NET_H
++
++#include <net/sock.h>
++
++/* struct aa_net - network confinement data
++ * @allowed: basic network families permissions
++ * @audit_network: which network permissions to force audit
++ * @quiet_network: which network permissions to quiet rejects
++ */
++struct aa_net {
++ u16 allow[AF_MAX];
++ u16 audit[AF_MAX];
++ u16 quiet[AF_MAX];
++};
++
++extern int aa_net_perm(int op, struct aa_profile *profile, u16 family,
++ int type, int protocol, struct sock *sk);
++extern int aa_revalidate_sk(int op, struct sock *sk);
++
++static inline void aa_free_net_rules(struct aa_net *new)
++{
++ /* NOP */
++}
++
++#endif /* __AA_NET_H */
+diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
+index aeda5cf..6776929 100644
+--- a/security/apparmor/include/policy.h
++++ b/security/apparmor/include/policy.h
+@@ -27,6 +27,7 @@
+ #include "capability.h"
+ #include "domain.h"
+ #include "file.h"
++#include "net.h"
+ #include "resource.h"
+
+ extern const char *profile_mode_names[];
+@@ -145,6 +146,7 @@ struct aa_namespace {
+ * @size: the memory consumed by this profiles rules
+ * @file: The set of rules governing basic file access and domain transitions
+ * @caps: capabilities for the profile
++ * @net: network controls for the profile
+ * @rlimits: rlimits for the profile
+ *
+ * The AppArmor profile contains the basic confinement data. Each profile
+@@ -181,6 +183,7 @@ struct aa_profile {
+
+ struct aa_file_rules file;
+ struct aa_caps caps;
++ struct aa_net net;
+ struct aa_rlimit rlimits;
+ };
+
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index fb99e18..b3e0bbb 100644
+index 3783202..d70ae70 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
-@@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
+@@ -32,6 +32,7 @@
+ #include "include/context.h"
+ #include "include/file.h"
+ #include "include/ipc.h"
++#include "include/net.h"
+ #include "include/path.h"
+ #include "include/policy.h"
+ #include "include/procattr.h"
+@@ -621,7 +622,105 @@ static int apparmor_task_setrlimit(struct task_struct *task,
return error;
}
-static struct security_operations apparmor_ops = {
++static int apparmor_socket_create(int family, int type, int protocol, int kern)
++{
++ struct aa_profile *profile;
++ int error = 0;
++
++ if (kern)
++ return 0;
++
++ profile = __aa_current_profile();
++ if (!unconfined(profile))
++ error = aa_net_perm(OP_CREATE, profile, family, type, protocol,
++ NULL);
++ return error;
++}
++
++static int apparmor_socket_bind(struct socket *sock,
++ struct sockaddr *address, int addrlen)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_BIND, sk);
++}
++
++static int apparmor_socket_connect(struct socket *sock,
++ struct sockaddr *address, int addrlen)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_CONNECT, sk);
++}
++
++static int apparmor_socket_listen(struct socket *sock, int backlog)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_LISTEN, sk);
++}
++
++static int apparmor_socket_accept(struct socket *sock, struct socket *newsock)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_ACCEPT, sk);
++}
++
++static int apparmor_socket_sendmsg(struct socket *sock,
++ struct msghdr *msg, int size)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_SENDMSG, sk);
++}
++
++static int apparmor_socket_recvmsg(struct socket *sock,
++ struct msghdr *msg, int size, int flags)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_RECVMSG, sk);
++}
++
++static int apparmor_socket_getsockname(struct socket *sock)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_GETSOCKNAME, sk);
++}
++
++static int apparmor_socket_getpeername(struct socket *sock)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_GETPEERNAME, sk);
++}
++
++static int apparmor_socket_getsockopt(struct socket *sock, int level,
++ int optname)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_GETSOCKOPT, sk);
++}
++
++static int apparmor_socket_setsockopt(struct socket *sock, int level,
++ int optname)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_SETSOCKOPT, sk);
++}
++
++static int apparmor_socket_shutdown(struct socket *sock, int how)
++{
++ struct sock *sk = sock->sk;
++
++ return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk);
++}
++
+static struct security_operations apparmor_ops __read_only = {
.name = "apparmor",
.ptrace_access_check = apparmor_ptrace_access_check,
+@@ -652,6 +751,19 @@ static struct security_operations apparmor_ops = {
+ .getprocattr = apparmor_getprocattr,
+ .setprocattr = apparmor_setprocattr,
+
++ .socket_create = apparmor_socket_create,
++ .socket_bind = apparmor_socket_bind,
++ .socket_connect = apparmor_socket_connect,
++ .socket_listen = apparmor_socket_listen,
++ .socket_accept = apparmor_socket_accept,
++ .socket_sendmsg = apparmor_socket_sendmsg,
++ .socket_recvmsg = apparmor_socket_recvmsg,
++ .socket_getsockname = apparmor_socket_getsockname,
++ .socket_getpeername = apparmor_socket_getpeername,
++ .socket_getsockopt = apparmor_socket_getsockopt,
++ .socket_setsockopt = apparmor_socket_setsockopt,
++ .socket_shutdown = apparmor_socket_shutdown,
++
+ .cred_alloc_blank = apparmor_cred_alloc_blank,
+ .cred_free = apparmor_cred_free,
+ .cred_prepare = apparmor_cred_prepare,
+diff --git a/security/apparmor/match.c b/security/apparmor/match.c
+index 94de6b4..081491e 100644
+--- a/security/apparmor/match.c
++++ b/security/apparmor/match.c
+@@ -57,8 +57,17 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
+ if (bsize < tsize)
+ goto out;
+
++ /* Pad table allocation for next/check by 256 entries to remain
++ * backwards compatible with old (buggy) tools and remain safe without
++ * run time checks
++ */
++ if (th.td_id == YYTD_ID_NXT || th.td_id == YYTD_ID_CHK)
++ tsize += 256 * th.td_flags;
++
+ table = kvmalloc(tsize);
+ if (table) {
++ /* ensure the pad is clear, else there will be errors */
++ memset(table, 0, tsize);
+ *table = th;
+ if (th.td_flags == YYTD_DATA8)
+ UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
+@@ -134,11 +143,19 @@ static int verify_dfa(struct aa_dfa *dfa, int flags)
+ goto out;
+
+ if (flags & DFA_FLAG_VERIFY_STATES) {
++ int warning = 0;
+ for (i = 0; i < state_count; i++) {
+ if (DEFAULT_TABLE(dfa)[i] >= state_count)
+ goto out;
+ /* TODO: do check that DEF state recursion terminates */
+ if (BASE_TABLE(dfa)[i] + 255 >= trans_count) {
++ if (warning)
++ continue;
++ printk(KERN_WARNING "AppArmor DFA next/check "
++ "upper bounds error fixed, upgrade "
++ "user space tools \n");
++ warning = 1;
++ } else if (BASE_TABLE(dfa)[i] >= trans_count) {
+ printk(KERN_ERR "AppArmor DFA next/check upper "
+ "bounds error\n");
+ goto out;
+diff --git a/security/apparmor/net.c b/security/apparmor/net.c
+new file mode 100644
+index 0000000..1765901
+--- /dev/null
++++ b/security/apparmor/net.c
+@@ -0,0 +1,170 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor network mediation
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2010 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ */
++
++#include "include/apparmor.h"
++#include "include/audit.h"
++#include "include/context.h"
++#include "include/net.h"
++#include "include/policy.h"
++
++#include "af_names.h"
++
++static const char *sock_type_names[] = {
++ "unknown(0)",
++ "stream",
++ "dgram",
++ "raw",
++ "rdm",
++ "seqpacket",
++ "dccp",
++ "unknown(7)",
++ "unknown(8)",
++ "unknown(9)",
++ "packet",
++};
++
++/* audit callback for net specific fields */
++static void audit_cb(struct audit_buffer *ab, void *va)
++{
++ struct common_audit_data *sa = va;
++
++ audit_log_format(ab, " family=");
++ if (address_family_names[sa->u.net.family]) {
++ audit_log_string(ab, address_family_names[sa->u.net.family]);
++ } else {
++ audit_log_format(ab, " \"unknown(%d)\"", sa->u.net.family);
++ }
++
++ audit_log_format(ab, " sock_type=");
++ if (sock_type_names[sa->aad.net.type]) {
++ audit_log_string(ab, sock_type_names[sa->aad.net.type]);
++ } else {
++ audit_log_format(ab, "\"unknown(%d)\"", sa->aad.net.type);
++ }
++
++ audit_log_format(ab, " protocol=%d", sa->aad.net.protocol);
++}
++
++/**
++ * audit_net - audit network access
++ * @profile: profile being enforced (NOT NULL)
++ * @op: operation being checked
++ * @family: network family
++ * @type: network type
++ * @protocol: network protocol
++ * @sk: socket auditing is being applied to
++ * @error: error code for failure else 0
++ *
++ * Returns: %0 or sa->error else other errorcode on failure
++ */
++static int audit_net(struct aa_profile *profile, int op, u16 family, int type,
++ int protocol, struct sock *sk, int error)
++{
++ int audit_type = AUDIT_APPARMOR_AUTO;
++ struct common_audit_data sa;
++ if (sk) {
++ COMMON_AUDIT_DATA_INIT(&sa, NET);
++ } else {
++ COMMON_AUDIT_DATA_INIT(&sa, NONE);
++ }
++ /* todo fill in socket addr info */
++
++ sa.aad.op = op,
++ sa.u.net.family = family;
++ sa.u.net.sk = sk;
++ sa.aad.net.type = type;
++ sa.aad.net.protocol = protocol;
++ sa.aad.error = error;
++
++ if (likely(!sa.aad.error)) {
++ u16 audit_mask = profile->net.audit[sa.u.net.family];
++ if (likely((AUDIT_MODE(profile) != AUDIT_ALL) &&
++ !(1 << sa.aad.net.type & audit_mask)))
++ return 0;
++ audit_type = AUDIT_APPARMOR_AUDIT;
++ } else {
++ u16 quiet_mask = profile->net.quiet[sa.u.net.family];
++ u16 kill_mask = 0;
++ u16 denied = (1 << sa.aad.net.type) & ~quiet_mask;
++
++ if (denied & kill_mask)
++ audit_type = AUDIT_APPARMOR_KILL;
++
++ if ((denied & quiet_mask) &&
++ AUDIT_MODE(profile) != AUDIT_NOQUIET &&
++ AUDIT_MODE(profile) != AUDIT_ALL)
++ return COMPLAIN_MODE(profile) ? 0 : sa.aad.error;
++ }
++
++ return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb);
++}
++
++/**
++ * aa_net_perm - very course network access check
++ * @op: operation being checked
++ * @profile: profile being enforced (NOT NULL)
++ * @family: network family
++ * @type: network type
++ * @protocol: network protocol
++ *
++ * Returns: %0 else error if permission denied
++ */
++int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type,
++ int protocol, struct sock *sk)
++{
++ u16 family_mask;
++ int error;
++
++ if ((family < 0) || (family >= AF_MAX))
++ return -EINVAL;
++
++ if ((type < 0) || (type >= SOCK_MAX))
++ return -EINVAL;
++
++ /* unix domain and netlink sockets are handled by ipc */
++ if (family == AF_UNIX || family == AF_NETLINK)
++ return 0;
++
++ family_mask = profile->net.allow[family];
++
++ error = (family_mask & (1 << type)) ? 0 : -EACCES;
++
++ return audit_net(profile, op, family, type, protocol, sk, error);
++}
++
++/**
++ * aa_revalidate_sk - Revalidate access to a sock
++ * @op: operation being checked
++ * @sk: sock being revalidated (NOT NULL)
++ *
++ * Returns: %0 else error if permission denied
++ */
++int aa_revalidate_sk(int op, struct sock *sk)
++{
++ struct aa_profile *profile;
++ int error = 0;
++
++ /* aa_revalidate_sk should not be called from interrupt context
++ * don't mediate these calls as they are not task related
++ */
++ if (in_interrupt())
++ return 0;
++
++ profile = __aa_current_profile();
++ if (!unconfined(profile))
++ error = aa_net_perm(op, profile, sk->sk_family, sk->sk_type,
++ sk->sk_protocol, sk);
++
++ return error;
++}
+diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
+index 4f0eade..4d5ce13 100644
+--- a/security/apparmor/policy.c
++++ b/security/apparmor/policy.c
+@@ -745,6 +745,7 @@ static void free_profile(struct aa_profile *profile)
+
+ aa_free_file_rules(&profile->file);
+ aa_free_cap_rules(&profile->caps);
++ aa_free_net_rules(&profile->net);
+ aa_free_rlimit_rules(&profile->rlimits);
+
+ aa_free_sid(profile->sid);
+diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
+index 741dd13..ee8043e 100644
+--- a/security/apparmor/policy_unpack.c
++++ b/security/apparmor/policy_unpack.c
+@@ -190,6 +190,19 @@ fail:
+ return 0;
+ }
+
++static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name)
++{
++ if (unpack_nameX(e, AA_U16, name)) {
++ if (!inbounds(e, sizeof(u16)))
++ return 0;
++ if (data)
++ *data = le16_to_cpu(get_unaligned((u16 *) e->pos));
++ e->pos += sizeof(u16);
++ return 1;
++ }
++ return 0;
++}
++
+ static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
+ {
+ if (unpack_nameX(e, AA_U32, name)) {
+@@ -468,7 +481,8 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
+ {
+ struct aa_profile *profile = NULL;
+ const char *name = NULL;
+- int error = -EPROTO;
++ size_t size = 0;
++ int i, error = -EPROTO;
+ kernel_cap_t tmpcap;
+ u32 tmp;
+
+@@ -559,6 +573,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
+ if (!unpack_rlimits(e, profile))
+ goto fail;
+
++ size = unpack_array(e, "net_allowed_af");
++ if (size) {
++
++ for (i = 0; i < size; i++) {
++ /* discard extraneous rules that this kernel will
++ * never request
++ */
++ if (i >= AF_MAX) {
++ u16 tmp;
++ if (!unpack_u16(e, &tmp, NULL) ||
++ !unpack_u16(e, &tmp, NULL) ||
++ !unpack_u16(e, &tmp, NULL))
++ goto fail;
++ continue;
++ }
++ if (!unpack_u16(e, &profile->net.allow[i], NULL))
++ goto fail;
++ if (!unpack_u16(e, &profile->net.audit[i], NULL))
++ goto fail;
++ if (!unpack_u16(e, &profile->net.quiet[i], NULL))
++ goto fail;
++ }
++ if (!unpack_nameX(e, AA_ARRAYEND, NULL))
++ goto fail;
++ /*
++ * allow unix domain and netlink sockets they are handled
++ * by IPC
++ */
++ }
++ profile->net.allow[AF_UNIX] = 0xffff;
++ profile->net.allow[AF_NETLINK] = 0xffff;
++
+ /* get file rules */
+ profile->file.dfa = unpack_dfa(e);
+ if (IS_ERR(profile->file.dfa)) {
diff --git a/security/commoncap.c b/security/commoncap.c
-index b9d613e..f68305c 100644
+index 12440ee..2ec6d88 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
-@@ -424,6 +424,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
+@@ -29,6 +29,7 @@
+ #include <linux/securebits.h>
+ #include <linux/user_namespace.h>
+ #include <linux/personality.h>
++#include <net/sock.h>
+
+ /*
+ * If a non-root user executes a setuid-root binary in
+@@ -59,7 +60,7 @@ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
+
+ int cap_netlink_recv(struct sk_buff *skb, int cap)
+ {
+- if (!cap_raised(current_cap(), cap))
++ if (!cap_raised(current_cap(), cap) || !gr_is_capable(cap))
+ return -EPERM;
+ return 0;
+ }
+@@ -424,6 +425,45 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
return 0;
}
@@ -99313,24 +101649,57 @@ index b9d613e..f68305c 100644
+ return 0;
+}
+
++/* returns 1 for suid root privilege
++ returns 3 for fscap privilege
++*/
++int is_root_privileged_binary(const struct dentry *dentry)
++{
++ int ret = is_privileged_binary(dentry);
++ if (ret == 3)
++ return ret;
++ if (ret == 1 && dentry->d_inode->i_uid == 0)
++ return ret;
++ return 0;
++}
++
/*
* Attempt to get the on-exec apply capability sets for an executable file from
* its xattrs and, if present, apply them to the proposed credentials being
-@@ -592,6 +618,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
+@@ -521,14 +561,17 @@ skip:
+
+
+ /* Don't let someone trace a set[ug]id/setpcap binary with the revised
+- * credentials unless they have the appropriate permit
++ * credentials unless they have the appropriate permit.
++ *
++ * In addition, if NO_NEW_PRIVS, then ensure we get no new privs.
+ */
+ if ((new->euid != old->uid ||
+ new->egid != old->gid ||
+ !cap_issubset(new->cap_permitted, old->cap_permitted)) &&
+ bprm->unsafe & ~LSM_UNSAFE_PTRACE_CAP) {
+ /* downgrade; they get no more than they had, and maybe less */
+- if (!capable(CAP_SETUID)) {
++ if (!capable(CAP_SETUID) ||
++ (bprm->unsafe & LSM_UNSAFE_NO_NEW_PRIVS)) {
+ new->euid = new->uid;
+ new->egid = new->gid;
+ }
+@@ -585,6 +628,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
+ {
const struct cred *cred = current_cred();
- kuid_t root_uid = make_kuid(cred->user_ns, 0);
+ if (gr_acl_enable_at_secure())
+ return 1;
+
- if (!uid_eq(cred->uid, root_uid)) {
+ if (cred->uid != 0) {
if (bprm->cap_effective)
return 1;
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
-index b3dd616..4bb17f3 100644
+index 3ccf7ac..d73ad64 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
-@@ -83,8 +83,8 @@ int ima_init_crypto(void);
+@@ -86,8 +86,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
extern spinlock_t ima_queue_lock;
struct ima_h_table {
@@ -99342,10 +101711,10 @@ index b3dd616..4bb17f3 100644
};
extern struct ima_h_table ima_htable;
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
-index 1c03e8f1..398a941 100644
+index 88a2788..581ab92 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
-@@ -79,7 +79,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
+@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
int result;
/* can overflow, only indicator */
@@ -99354,8 +101723,27 @@ index 1c03e8f1..398a941 100644
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) {
+diff --git a/security/integrity/ima/ima_audit.c b/security/integrity/ima/ima_audit.c
+index c5c5a72..2ad942f 100644
+--- a/security/integrity/ima/ima_audit.c
++++ b/security/integrity/ima/ima_audit.c
+@@ -56,9 +56,11 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode,
+ audit_log_format(ab, " name=");
+ audit_log_untrustedstring(ab, fname);
+ }
+- if (inode)
+- audit_log_format(ab, " dev=%s ino=%lu",
+- inode->i_sb->s_id, inode->i_ino);
++ if (inode) {
++ audit_log_format(ab, " dev=");
++ audit_log_untrustedstring(ab, inode->i_sb->s_id);
++ audit_log_format(ab, " ino=%lu", inode->i_ino);
++ }
+ audit_log_format(ab, " res=%d", !result ? 0 : 1);
+ audit_log_end(ab);
+ }
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
-index 38477c9..87a60c7 100644
+index e1aa2b4..52027bf 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -28,12 +28,12 @@
@@ -99374,10 +101762,10 @@ index 38477c9..87a60c7 100644
}
diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
-index ff63fe0..809cd96 100644
+index 55a6271..ad829c3 100644
--- a/security/integrity/ima/ima_queue.c
+++ b/security/integrity/ima/ima_queue.c
-@@ -80,7 +80,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
+@@ -81,7 +81,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
INIT_LIST_HEAD(&qe->later);
list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -99387,10 +101775,10 @@ index ff63fe0..809cd96 100644
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
return 0;
diff --git a/security/keys/compat.c b/security/keys/compat.c
-index d65fa7f..cbfe366 100644
+index 1b0b7bf..9476b92 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
-@@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
+@@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov(
if (ret == 0)
goto no_payload_free;
@@ -99399,53 +101787,20 @@ index d65fa7f..cbfe366 100644
err:
if (iov != iovstack)
kfree(iov);
-diff --git a/security/keys/internal.h b/security/keys/internal.h
-index d4f1468..cc52f92 100644
---- a/security/keys/internal.h
-+++ b/security/keys/internal.h
-@@ -242,7 +242,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
- extern long keyctl_invalidate_key(key_serial_t);
-
- extern long keyctl_instantiate_key_common(key_serial_t,
-- const struct iovec *,
-+ const struct iovec __user *,
- unsigned, size_t, key_serial_t);
-
- /*
diff --git a/security/keys/key.c b/security/keys/key.c
-index 8fb7c7b..ba3610d 100644
+index 4414abd..bb89c73 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
-@@ -284,7 +284,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
-
- atomic_set(&key->usage, 1);
- init_rwsem(&key->sem);
-- lockdep_set_class(&key->sem, &type->lock_class);
-+ lockdep_set_class(&key->sem, (struct lock_class_key *)&type->lock_class);
- key->type = type;
- key->user = user;
- key->quotalen = quotalen;
-@@ -1032,7 +1032,9 @@ int register_key_type(struct key_type *ktype)
- struct key_type *p;
- int ret;
-
-- memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));
-+ pax_open_kernel();
-+ memset((void *)&ktype->lock_class, 0, sizeof(ktype->lock_class));
-+ pax_close_kernel();
-
- ret = -EEXIST;
- down_write(&key_types_sem);
-@@ -1044,7 +1046,7 @@ int register_key_type(struct key_type *ktype)
+@@ -956,7 +956,7 @@ int register_key_type(struct key_type *ktype)
}
/* store the type */
- list_add(&ktype->link, &key_types_list);
+ pax_list_add((struct list_head *)&ktype->link, &key_types_list);
-
- pr_notice("Key type %s registered\n", ktype->name);
ret = 0;
-@@ -1066,7 +1068,7 @@ EXPORT_SYMBOL(register_key_type);
+
+ out:
+@@ -976,7 +976,7 @@ EXPORT_SYMBOL(register_key_type);
void unregister_key_type(struct key_type *ktype)
{
down_write(&key_types_sem);
@@ -99453,27 +101808,25 @@ index 8fb7c7b..ba3610d 100644
+ pax_list_del_init((struct list_head *)&ktype->link);
downgrade_write(&key_types_sem);
key_gc_keytype(ktype);
- pr_notice("Key type %s unregistered\n", ktype->name);
-@@ -1084,10 +1086,10 @@ void __init key_init(void)
+ up_read(&key_types_sem);
+@@ -993,9 +993,9 @@ void __init key_init(void)
0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
/* add the special key types */
- list_add_tail(&key_type_keyring.link, &key_types_list);
- list_add_tail(&key_type_dead.link, &key_types_list);
- list_add_tail(&key_type_user.link, &key_types_list);
-- list_add_tail(&key_type_logon.link, &key_types_list);
+ pax_list_add_tail((struct list_head *)&key_type_keyring.link, &key_types_list);
+ pax_list_add_tail((struct list_head *)&key_type_dead.link, &key_types_list);
+ pax_list_add_tail((struct list_head *)&key_type_user.link, &key_types_list);
-+ pax_list_add_tail((struct list_head *)&key_type_logon.link, &key_types_list);
/* record the root user tracking */
rb_link_node(&root_key_user.node,
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
-index 33cfd27..842fc5a 100644
+index b70eaa2..35b5b71 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
-@@ -987,7 +987,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
+@@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
/*
* Copy the iovec data from userspace
*/
@@ -99482,7 +101835,7 @@ index 33cfd27..842fc5a 100644
unsigned ioc)
{
for (; ioc > 0; ioc--) {
-@@ -1009,7 +1009,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
+@@ -943,7 +943,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,
@@ -99491,7 +101844,7 @@ index 33cfd27..842fc5a 100644
unsigned ioc,
size_t plen,
key_serial_t ringid)
-@@ -1104,7 +1104,7 @@ long keyctl_instantiate_key(key_serial_t id,
+@@ -1038,7 +1038,7 @@ long keyctl_instantiate_key(key_serial_t id,
[0].iov_len = plen
};
@@ -99500,7 +101853,7 @@ index 33cfd27..842fc5a 100644
}
return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
-@@ -1137,7 +1137,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
+@@ -1071,7 +1071,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
if (ret == 0)
goto no_payload_free;
@@ -99510,16 +101863,15 @@ index 33cfd27..842fc5a 100644
if (iov != iovstack)
kfree(iov);
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
-index 6ece7f2..ecdb55c 100644
+index 37a7f3b..86dc19f 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
-@@ -227,16 +227,16 @@ static long keyring_read(const struct key *keyring,
+@@ -214,15 +214,15 @@ static long keyring_read(const struct key *keyring,
ret = -EFAULT;
for (loop = 0; loop < klist->nkeys; loop++) {
+ key_serial_t serial;
- key = rcu_deref_link_locked(klist, loop,
- keyring);
+ key = klist->keys[loop];
+ serial = key->serial;
tmp = sizeof(key_serial_t);
@@ -99533,6 +101885,54 @@ index 6ece7f2..ecdb55c 100644
goto error;
buflen -= tmp;
+diff --git a/security/lsm_audit.c b/security/lsm_audit.c
+index 893af8a..ba9237c 100644
+--- a/security/lsm_audit.c
++++ b/security/lsm_audit.c
+@@ -234,10 +234,11 @@ static void dump_common_audit_data(struct audit_buffer *ab,
+ audit_log_d_path(ab, "path=", &a->u.path);
+
+ inode = a->u.path.dentry->d_inode;
+- if (inode)
+- audit_log_format(ab, " dev=%s ino=%lu",
+- inode->i_sb->s_id,
+- inode->i_ino);
++ if (inode) {
++ audit_log_format(ab, " dev=");
++ audit_log_untrustedstring(ab, inode->i_sb->s_id);
++ audit_log_format(ab, " ino=%lu", inode->i_ino);
++ }
+ break;
+ }
+ case LSM_AUDIT_DATA_DENTRY: {
+@@ -247,10 +248,11 @@ static void dump_common_audit_data(struct audit_buffer *ab,
+ audit_log_untrustedstring(ab, a->u.dentry->d_name.name);
+
+ inode = a->u.dentry->d_inode;
+- if (inode)
+- audit_log_format(ab, " dev=%s ino=%lu",
+- inode->i_sb->s_id,
+- inode->i_ino);
++ if (inode) {
++ audit_log_format(ab, " dev=");
++ audit_log_untrustedstring(ab, inode->i_sb->s_id);
++ audit_log_format(ab, " ino=%lu", inode->i_ino);
++ }
+ break;
+ }
+ case LSM_AUDIT_DATA_INODE: {
+@@ -265,8 +267,9 @@ static void dump_common_audit_data(struct audit_buffer *ab,
+ dentry->d_name.name);
+ dput(dentry);
+ }
+- audit_log_format(ab, " dev=%s ino=%lu", inode->i_sb->s_id,
+- inode->i_ino);
++ audit_log_format(ab, " dev=");
++ audit_log_untrustedstring(ab, inode->i_sb->s_id);
++ audit_log_format(ab, " ino=%lu", inode->i_ino);
+ break;
+ }
+ case LSM_AUDIT_DATA_TASK:
diff --git a/security/min_addr.c b/security/min_addr.c
index f728728..6457a0c 100644
--- a/security/min_addr.c
@@ -99554,10 +101954,10 @@ index f728728..6457a0c 100644
/*
diff --git a/security/security.c b/security/security.c
-index 4dc31f4..eabcf41 100644
+index e2f684a..1649b69 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -33,8 +33,8 @@
+@@ -26,8 +26,8 @@
static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
CONFIG_DEFAULT_SECURITY;
@@ -99568,7 +101968,7 @@ index 4dc31f4..eabcf41 100644
.name = "default",
};
-@@ -73,11 +73,6 @@ int __init security_init(void)
+@@ -66,11 +66,6 @@ int __init security_init(void)
return 0;
}
@@ -99580,8 +101980,22 @@ index 4dc31f4..eabcf41 100644
/* Save user chosen LSM */
static int __init choose_lsm(char *str)
{
+@@ -162,6 +157,13 @@ int security_capable(struct user_namespace *ns, const struct cred *cred,
+ SECURITY_CAP_AUDIT);
+ }
+
++int security_capable_noaudit(struct user_namespace *ns, const struct cred *cred,
++ int cap)
++{
++ return security_ops->capable(current, cred, ns, cap,
++ SECURITY_CAP_NOAUDIT);
++}
++
+ int security_real_capable(struct task_struct *tsk, struct user_namespace *ns,
+ int cap)
+ {
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
-index fc3e662..7844c60 100644
+index dca1c22..4fa4591 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -59,7 +59,7 @@ struct avc_node {
@@ -99593,7 +102007,7 @@ index fc3e662..7844c60 100644
atomic_t active_nodes;
u32 latest_notif; /* latest revocation notification */
};
-@@ -167,7 +167,7 @@ void __init avc_init(void)
+@@ -173,7 +173,7 @@ void __init avc_init(void)
spin_lock_init(&avc_cache.slots_lock[i]);
}
atomic_set(&avc_cache.active_nodes, 0);
@@ -99602,7 +102016,7 @@ index fc3e662..7844c60 100644
avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
0, SLAB_PANIC, NULL);
-@@ -242,7 +242,7 @@ static inline int avc_reclaim_node(void)
+@@ -251,7 +251,7 @@ static inline int avc_reclaim_node(void)
spinlock_t *lock;
for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++) {
@@ -99612,10 +102026,43 @@ index fc3e662..7844c60 100644
lock = &avc_cache.slots_lock[hvalue];
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 5b52310..da3bf8e 100644
+index 1126c10..e2dad6b 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -5603,7 +5603,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+@@ -94,8 +94,6 @@
+
+ #define NUM_SEL_MNT_OPTS 5
+
+-extern struct security_operations *security_ops;
+-
+ /* SECMARK reference count */
+ static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
+
+@@ -2000,6 +1998,13 @@ static int selinux_bprm_set_creds(struct linux_binprm *bprm)
+ new_tsec->sid = old_tsec->exec_sid;
+ /* Reset exec SID on execve. */
+ new_tsec->exec_sid = 0;
++
++ /*
++ * Minimize confusion: if no_new_privs and a transition is
++ * explicitly requested, then fail the exec.
++ */
++ if (bprm->unsafe & LSM_UNSAFE_NO_NEW_PRIVS)
++ return -EPERM;
+ } else {
+ /* Check for a default transition on this program. */
+ rc = security_transition_sid(old_tsec->sid, isec->sid,
+@@ -2012,7 +2017,8 @@ static int selinux_bprm_set_creds(struct linux_binprm *bprm)
+ COMMON_AUDIT_DATA_INIT(&ad, PATH);
+ ad.u.path = bprm->file->f_path;
+
+- if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
++ if ((bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID) ||
++ (bprm->unsafe & LSM_UNSAFE_NO_NEW_PRIVS))
+ new_tsec->sid = old_tsec->sid;
+
+ if (new_tsec->sid == old_tsec->sid) {
+@@ -5449,7 +5455,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
#endif
@@ -99624,7 +102071,7 @@ index 5b52310..da3bf8e 100644
.name = "selinux",
.ptrace_access_check = selinux_ptrace_access_check,
-@@ -5955,6 +5955,9 @@ static void selinux_nf_ip_exit(void)
+@@ -5795,6 +5801,9 @@ static void selinux_nf_ip_exit(void)
#ifdef CONFIG_SECURITY_SELINUX_DISABLE
static int selinux_disabled;
@@ -99634,7 +102081,7 @@ index 5b52310..da3bf8e 100644
int selinux_disable(void)
{
if (ss_initialized) {
-@@ -5972,7 +5975,9 @@ int selinux_disable(void)
+@@ -5812,7 +5821,9 @@ int selinux_disable(void)
selinux_disabled = 1;
selinux_enabled = 0;
@@ -99646,23 +102093,23 @@ index 5b52310..da3bf8e 100644
/* Try to destroy the avc node cache */
avc_disable();
diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
-index 6713f04..c57ecef 100644
+index b43813c..74be837 100644
--- a/security/selinux/include/xfrm.h
+++ b/security/selinux/include/xfrm.h
-@@ -52,7 +52,7 @@ static inline void selinux_xfrm_notify_policyload(void)
- {
- struct net *net;
+@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
+ static inline void selinux_xfrm_notify_policyload(void)
+ {
- atomic_inc(&flow_cache_genid);
+ atomic_inc_unchecked(&flow_cache_genid);
- rtnl_lock();
- for_each_net(net)
- rt_genid_bump_all(net);
+ }
+ #else
+ static inline int selinux_xfrm_enabled(void)
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index 8825375..97a623b 100644
+index 7db62b4..ee4d949 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
-@@ -3726,7 +3726,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
+@@ -3481,7 +3481,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
return 0;
}
@@ -99671,26 +102118,11 @@ index 8825375..97a623b 100644
.name = "smack",
.ptrace_access_check = smack_ptrace_access_check,
-diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
-index 390c646..f2f8db3 100644
---- a/security/tomoyo/mount.c
-+++ b/security/tomoyo/mount.c
-@@ -118,6 +118,10 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r,
- type == tomoyo_mounts[TOMOYO_MOUNT_MOVE]) {
- need_dev = -1; /* dev_name is a directory */
- } else {
-+ if (!capable(CAP_SYS_ADMIN)) {
-+ error = -EPERM;
-+ goto out;
-+ }
- fstype = get_fs_type(type);
- if (!fstype) {
- error = -ENODEV;
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
-index f0b756e..b129202 100644
+index 4b327b6..646c57a2b 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
-@@ -503,7 +503,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
+@@ -504,7 +504,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.
*/
@@ -99699,70 +102131,8 @@ index f0b756e..b129202 100644
.name = "tomoyo",
.cred_alloc_blank = tomoyo_cred_alloc_blank,
.cred_prepare = tomoyo_cred_prepare,
-diff --git a/security/yama/Kconfig b/security/yama/Kconfig
-index 20ef514..4182bed 100644
---- a/security/yama/Kconfig
-+++ b/security/yama/Kconfig
-@@ -1,6 +1,6 @@
- config SECURITY_YAMA
- bool "Yama support"
-- depends on SECURITY
-+ depends on SECURITY && !GRKERNSEC
- select SECURITYFS
- select SECURITY_PATH
- default n
-diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
-index 13c88fbc..f8c115e 100644
---- a/security/yama/yama_lsm.c
-+++ b/security/yama/yama_lsm.c
-@@ -365,7 +365,7 @@ int yama_ptrace_traceme(struct task_struct *parent)
- }
-
- #ifndef CONFIG_SECURITY_YAMA_STACKED
--static struct security_operations yama_ops = {
-+static struct security_operations yama_ops __read_only = {
- .name = "yama",
-
- .ptrace_access_check = yama_ptrace_access_check,
-@@ -376,28 +376,24 @@ static struct security_operations yama_ops = {
- #endif
-
- #ifdef CONFIG_SYSCTL
-+static int zero __read_only;
-+static int max_scope __read_only = YAMA_SCOPE_NO_ATTACH;
-+
- static int yama_dointvec_minmax(struct ctl_table *table, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
- {
-- int rc;
-+ ctl_table_no_const yama_table;
-
- if (write && !capable(CAP_SYS_PTRACE))
- return -EPERM;
-
-- rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
-- if (rc)
-- return rc;
--
-+ yama_table = *table;
- /* Lock the max value if it ever gets set. */
-- if (write && *(int *)table->data == *(int *)table->extra2)
-- table->extra1 = table->extra2;
--
-- return rc;
-+ if (ptrace_scope == max_scope)
-+ yama_table.extra1 = &max_scope;
-+ return proc_dointvec_minmax(&yama_table, write, buffer, lenp, ppos);
- }
-
--static int zero;
--static int max_scope = YAMA_SCOPE_NO_ATTACH;
--
- struct ctl_path yama_sysctl_path[] = {
- { .procname = "kernel", },
- { .procname = "yama", },
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
-index 4cedc69..e59d8a3 100644
+index 762af68..7103453 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -54,7 +54,7 @@ struct onyx {
@@ -99806,7 +102176,7 @@ index ffd2025..df062c9 100644
/* PCM3052 register definitions */
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
-index 4c1cc51..16040040 100644
+index 542f69e..fe6e8c3 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
@@ -99881,7 +102251,7 @@ index 4c1cc51..16040040 100644
}
} else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
-index af49721..e85058e 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,
@@ -99894,10 +102264,10 @@ index af49721..e85058e 100644
if (err < 0)
return err;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
-index a68d4c6..72af3cf 100644
+index 638600b..2e6b1fd 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
-@@ -2809,11 +2809,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
+@@ -2788,11 +2788,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,
@@ -99912,7 +102282,7 @@ index a68d4c6..72af3cf 100644
default:
result = -EINVAL;
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
-index 040c60e..989a19a 100644
+index 5cf8d65..912a79c 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -64,7 +64,7 @@ struct ops_list {
@@ -99922,7 +102292,7 @@ index 040c60e..989a19a 100644
- struct snd_seq_dev_ops ops;
+ struct snd_seq_dev_ops *ops;
- /* registered devices */
+ /* registred devices */
struct list_head dev_list; /* list of devices */
@@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
@@ -99952,10 +102322,10 @@ index 040c60e..989a19a 100644
dev->driver_data = NULL;
ops->num_init_devices--;
diff --git a/sound/core/sound.c b/sound/core/sound.c
-index f002bd9..c462985 100644
+index 8e17b4d..6819e80 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
-@@ -86,7 +86,7 @@ static void snd_request_other(int minor)
+@@ -87,7 +87,7 @@ static void snd_request_other(int minor)
case SNDRV_MINOR_TIMER: str = "snd-timer"; break;
default: return;
}
@@ -99965,7 +102335,7 @@ index f002bd9..c462985 100644
#endif /* modular kernel */
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
-index 4e0dd22..7a1f32c 100644
+index f24bf9a..1f7b67c 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -29,6 +29,7 @@
@@ -100038,7 +102408,7 @@ index b953fb4..1999c01 100644
int timeout = 10;
while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
-index 991018d..8984740 100644
+index f664823..590c745 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -48,6 +48,7 @@
@@ -100059,10 +102429,10 @@ index 991018d..8984740 100644
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
-index ea995af..f1bfa37 100644
+index 87657dd..a8268d4 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
-@@ -389,7 +389,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
+@@ -371,7 +371,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
ptr = s->pcm_buffer_pointer + data_blocks;
if (ptr >= pcm->runtime->buffer_size)
ptr -= pcm->runtime->buffer_size;
@@ -100071,7 +102441,7 @@ index ea995af..f1bfa37 100644
s->pcm_period_pointer += data_blocks;
if (s->pcm_period_pointer >= pcm->runtime->period_size) {
-@@ -557,7 +557,7 @@ EXPORT_SYMBOL(amdtp_out_stream_pcm_pointer);
+@@ -511,7 +511,7 @@ EXPORT_SYMBOL(amdtp_out_stream_start);
*/
void amdtp_out_stream_update(struct amdtp_out_stream *s)
{
@@ -100081,10 +102451,10 @@ index ea995af..f1bfa37 100644
}
EXPORT_SYMBOL(amdtp_out_stream_update);
diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
-index f6103d6..4843fbf 100644
+index 537a9cb..8e8c8e9 100644
--- a/sound/firewire/amdtp.h
+++ b/sound/firewire/amdtp.h
-@@ -138,7 +138,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
+@@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_prepare(struct amdtp_out_stream *s)
static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
struct snd_pcm_substream *pcm)
{
@@ -100092,9 +102462,9 @@ index f6103d6..4843fbf 100644
+ ACCESS_ONCE_RW(s->pcm) = pcm;
}
- static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
+ /**
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
-index 58a5afe..af5bd64 100644
+index cd094ec..eca1277 100644
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
@@ -100137,44 +102507,11 @@ index 58a5afe..af5bd64 100644
break;
default:
return -EINVAL;
-diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
-index 505fc81..62e569e 100644
---- a/sound/firewire/scs1x.c
-+++ b/sound/firewire/scs1x.c
-@@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
- {
- struct scs *scs = stream->rmidi->private_data;
-
-- ACCESS_ONCE(scs->output) = up ? stream : NULL;
-+ ACCESS_ONCE_RW(scs->output) = up ? stream : NULL;
- if (up) {
- scs->output_idle = false;
- tasklet_schedule(&scs->tasklet);
-@@ -257,7 +257,7 @@ static void scs_input_trigger(struct snd_rawmidi_substream *stream, int up)
- {
- struct scs *scs = stream->rmidi->private_data;
-
-- ACCESS_ONCE(scs->input) = up ? stream : NULL;
-+ ACCESS_ONCE_RW(scs->input) = up ? stream : NULL;
- }
-
- static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream,
-@@ -469,8 +469,8 @@ static void scs_remove(struct fw_unit *unit)
-
- snd_card_disconnect(scs->card);
-
-- ACCESS_ONCE(scs->output) = NULL;
-- ACCESS_ONCE(scs->input) = NULL;
-+ ACCESS_ONCE_RW(scs->output) = NULL;
-+ ACCESS_ONCE_RW(scs->input) = NULL;
-
- wait_event(scs->idle_wait, scs->output_idle);
-
diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
-index 048439a..3be9f6f 100644
+index 733b014..56ce96f 100644
--- a/sound/oss/sb_audio.c
+++ b/sound/oss/sb_audio.c
-@@ -904,7 +904,7 @@ sb16_copy_from_user(int dev,
+@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
{
@@ -100184,10 +102521,10 @@ index 048439a..3be9f6f 100644
userbuf+useroffs + p,
locallen))
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
-index 7d8803a..559f8d0 100644
+index 09d4648..cf234c7 100644
--- a/sound/oss/swarm_cs4297a.c
+++ b/sound/oss/swarm_cs4297a.c
-@@ -2621,7 +2621,6 @@ static int __init cs4297a_init(void)
+@@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
{
struct cs4297a_state *s;
u32 pwr, id;
@@ -100195,7 +102532,7 @@ index 7d8803a..559f8d0 100644
int rval;
#ifndef CONFIG_BCM_CS4297A_CSWARM
u64 cfg;
-@@ -2711,22 +2710,23 @@ static int __init cs4297a_init(void)
+@@ -2696,22 +2695,23 @@ static int __init cs4297a_init(void)
if (!rval) {
char *sb1250_duart_present;
@@ -100222,10 +102559,10 @@ index 7d8803a..559f8d0 100644
list_add(&s->list, &cs4297a_devs);
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
-index 748c6a9..a27725a 100644
+index faabaa5..9888f8b 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
-@@ -976,14 +976,10 @@ find_codec_preset(struct hda_codec *codec)
+@@ -850,14 +850,10 @@ find_codec_preset(struct hda_codec *codec)
mutex_unlock(&preset_mutex);
if (mod_requested < HDA_MODREQ_MAX_COUNT) {
@@ -100242,24 +102579,11 @@ index 748c6a9..a27725a 100644
mod_requested++;
goto again;
}
-diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
-index 4631a23..001ae57 100644
---- a/sound/pci/ymfpci/ymfpci.h
-+++ b/sound/pci/ymfpci/ymfpci.h
-@@ -358,7 +358,7 @@ struct snd_ymfpci {
- spinlock_t reg_lock;
- spinlock_t voice_lock;
- wait_queue_head_t interrupt_sleep;
-- atomic_t interrupt_sleep_count;
-+ atomic_unchecked_t interrupt_sleep_count;
- struct snd_info_entry *proc_entry;
- 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 d591c15..8cb8f94 100644
+index 03ee4e3..be86b46 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
-@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
+@@ -203,8 +203,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
break;
}
@@ -100270,7 +102594,7 @@ index d591c15..8cb8f94 100644
wake_up(&chip->interrupt_sleep);
}
__end:
-@@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
+@@ -788,7 +788,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
continue;
init_waitqueue_entry(&wait, current);
add_wait_queue(&chip->interrupt_sleep, &wait);
@@ -100279,7 +102603,7 @@ index d591c15..8cb8f94 100644
schedule_timeout_uninterruptible(msecs_to_jiffies(50));
remove_wait_queue(&chip->interrupt_sleep, &wait);
}
-@@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
+@@ -826,8 +826,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
spin_unlock(&chip->reg_lock);
@@ -100290,7 +102614,7 @@ index d591c15..8cb8f94 100644
wake_up(&chip->interrupt_sleep);
}
}
-@@ -2421,7 +2421,7 @@ int snd_ymfpci_create(struct snd_card *card,
+@@ -2382,7 +2382,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);
@@ -100300,10 +102624,10 @@ index d591c15..8cb8f94 100644
chip->pci = pci;
chip->irq = -1;
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
-index 6b81d0c..031c056 100644
+index 83c4bd5..f75658c 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
-@@ -864,7 +864,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
+@@ -608,7 +608,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
{
struct fsl_ssi_private *ssi_private;
int ret = 0;
@@ -100312,23 +102636,67 @@ index 6b81d0c..031c056 100644
struct device_node *np = pdev->dev.of_node;
const char *p, *sprop;
const uint32_t *iprop;
-diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 1a38be0..66809d1 100644
---- a/sound/soc/soc-core.c
-+++ b/sound/soc/soc-core.c
-@@ -2248,8 +2248,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
- if (ret)
- return ret;
+diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
+index ee15337..ab0ec34 100644
+--- a/sound/soc/soc-pcm.c
++++ b/sound/soc/soc-pcm.c
+@@ -627,13 +627,15 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
+ rtd->pcm = pcm;
+ pcm->private_data = rtd;
+ if (platform->driver->ops) {
+- soc_pcm_ops.mmap = platform->driver->ops->mmap;
+- soc_pcm_ops.pointer = platform->driver->ops->pointer;
+- soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
+- soc_pcm_ops.copy = platform->driver->ops->copy;
+- soc_pcm_ops.silence = platform->driver->ops->silence;
+- soc_pcm_ops.ack = platform->driver->ops->ack;
+- soc_pcm_ops.page = platform->driver->ops->page;
++ pax_open_kernel();
++ *(void **)&soc_pcm_ops.mmap = platform->driver->ops->mmap;
++ *(void **)&soc_pcm_ops.pointer = platform->driver->ops->pointer;
++ *(void **)&soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
++ *(void **)&soc_pcm_ops.copy = platform->driver->ops->copy;
++ *(void **)&soc_pcm_ops.silence = platform->driver->ops->silence;
++ *(void **)&soc_pcm_ops.ack = platform->driver->ops->ack;
++ *(void **)&soc_pcm_ops.page = platform->driver->ops->page;
++ pax_close_kernel();
+ }
-- ops->warm_reset = snd_soc_ac97_warm_reset;
-- ops->reset = snd_soc_ac97_reset;
-+ pax_open_kernel();
-+ *(void **)&ops->warm_reset = snd_soc_ac97_warm_reset;
-+ *(void **)&ops->reset = snd_soc_ac97_reset;
-+ pax_close_kernel();
+ if (playback)
+diff --git a/sound/sound_core.c b/sound/sound_core.c
+index 6ce2778..f25c378 100644
+--- a/sound/sound_core.c
++++ b/sound/sound_core.c
+@@ -293,7 +293,7 @@ retry:
+ }
- snd_ac97_rst_cfg = cfg;
- return 0;
+ device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor),
+- NULL, s->name+6);
++ NULL, "%s", s->name+6);
+ return s->unit_minor;
+
+ fail:
+diff --git a/sound/usb/card.h b/sound/usb/card.h
+index 0a7ca6c..f4b948c 100644
+--- a/sound/usb/card.h
++++ b/sound/usb/card.h
+@@ -45,6 +45,7 @@ struct snd_urb_ops {
+ int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
+ int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
+ };
++typedef struct snd_urb_ops __no_const snd_urb_ops_no_const;
+
+ struct snd_usb_substream {
+ struct snd_usb_stream *stream;
+@@ -96,7 +97,7 @@ struct snd_usb_substream {
+ struct snd_pcm_hw_constraint_list rate_list; /* limited rates */
+ spinlock_t lock;
+
+- struct snd_urb_ops ops; /* callbacks (must be filled at init) */
++ snd_urb_ops_no_const ops; /* callbacks (must be filled at init) */
+ int last_frame_number; /* stored frame number */
+ int last_delay; /* stored delay */
+ };
diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
new file mode 100644
index 0000000..50f2f2f
@@ -102384,473 +104752,378 @@ index 0000000..679b9ef
+}
diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data
new file mode 100644
-index 0000000..0a9d518
+index 0000000..05e26dd
--- /dev/null
+++ b/tools/gcc/size_overflow_hash.data
-@@ -0,0 +1,7637 @@
+@@ -0,0 +1,5989 @@
+intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
+ocfs2_get_refcount_tree_3 ocfs2_get_refcount_tree 0 3 NULL
-+batadv_orig_node_del_if_4 batadv_orig_node_del_if 2 4 NULL
+storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
+compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
+carl9170_alloc_27 carl9170_alloc 1 27 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
++vis_data_count_prim_sec_64 vis_data_count_prim_sec 0 64 NULL
+__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
+crypto_authenc_setkey_80 crypto_authenc_setkey 3 80 NULL
+snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
+load_msg_95 load_msg 2 95 NULL
+device_flush_iotlb_115 device_flush_iotlb 2-3 115 NULL
-+ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL nohasharray
-+write_all_supers_117 write_all_supers 0 117 &ipath_verbs_send_117
++ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL
+init_q_132 init_q 4 132 NULL
+ocfs2_local_alloc_slide_window_134 ocfs2_local_alloc_slide_window 0 134 NULL
+memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
-+hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
-+ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
+ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray
+tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153
-+nvme_create_queue_170 nvme_create_queue 3 170 NULL
-+xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
-+iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
++pci_request_selected_regions_169 pci_request_selected_regions 0 169 NULL
++iscsi_session_setup_196 iscsi_session_setup 4-5-3 196 NULL
+device_add_bin_attributes_205 device_add_bin_attributes 0 205 NULL
-+br_port_info_size_268 br_port_info_size 0 268 NULL
++store_cpufv_215 store_cpufv 4 215 NULL
++proc_scsi_write_proc_267 proc_scsi_write_proc 3 267 NULL
+generic_file_direct_write_291 generic_file_direct_write 0 291 NULL
+read_file_war_stats_292 read_file_war_stats 3 292 NULL
-+SYSC_connect_304 SYSC_connect 3 304 NULL
-+syslog_print_307 syslog_print 2 307 NULL
-+dn_setsockopt_314 dn_setsockopt 5 314 NULL
++platform_device_add_data_310 platform_device_add_data 3 310 NULL
++iwl_dbgfs_tx_statistics_read_314 iwl_dbgfs_tx_statistics_read 3 314 NULL nohasharray
++dn_setsockopt_314 dn_setsockopt 5 314 &iwl_dbgfs_tx_statistics_read_314
+next_node_allowed_318 next_node_allowed 1-0 318 NULL
-+mlx5_core_access_reg_361 mlx5_core_access_reg 5-3 361 NULL
-+xfs_get_blocks_364 xfs_get_blocks 2 364 NULL
-+get_more_blocks_367 get_more_blocks 0 367 NULL
++ath9k_wmi_cmd_327 ath9k_wmi_cmd 4 327 NULL
++map_urb_for_dma_332 map_urb_for_dma 0 332 NULL
++cmtp_send_interopmsg_376 cmtp_send_interopmsg 7 376 NULL
+sysfs_create_dir_398 sysfs_create_dir 0 398 NULL
-+hw_device_state_409 hw_device_state 0 409 NULL
-+aio_read_events_ring_410 aio_read_events_ring 3 410 NULL
++btmrvl_txdnldready_read_413 btmrvl_txdnldready_read 3 413 NULL
+lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
++insert_vm_struct_428 insert_vm_struct 0 428 NULL
+snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL
-+cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL
-+nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
++_alloc_get_attr_desc_470 _alloc_get_attr_desc 2 470 NULL
++pidlist_resize_496 pidlist_resize 2 496 NULL
+iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
-+rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
++smp_send_cmd_512 smp_send_cmd 3 512 NULL
+_snd_pcm_hw_param_first_516 _snd_pcm_hw_param_first 0 516 NULL
+ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
-+zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
++ipv6_skip_exthdr_536 ipv6_skip_exthdr 0-2 536 NULL
+iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
-+sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL
++dle_count_543 dle_count 0 543 NULL
++devres_alloc_551 devres_alloc 2 551 NULL
+lpfc_nlp_state_name_556 lpfc_nlp_state_name 2 556 NULL
+snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
+dev_hard_header_565 dev_hard_header 0 565 NULL nohasharray
+start_isoc_chain_565 start_isoc_chain 2 565 &dev_hard_header_565
++compat_sys_preadv_583 compat_sys_preadv 3 583 NULL
+ocfs2_refcounted_xattr_delete_need_584 ocfs2_refcounted_xattr_delete_need 0 584 NULL
-+smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
-+cl_page_own0_599 cl_page_own0 0 599 NULL
-+btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
+ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
-+fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
-+ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
++sysfs_acpi_set_625 sysfs_acpi_set 3 625 NULL
+viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL
+ocfs2_num_free_extents_632 ocfs2_num_free_extents 0 632 NULL
-+clone_split_bio_633 clone_split_bio 6 633 NULL
-+ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL
-+remap_to_cache_640 remap_to_cache 3 640 NULL
-+cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL nohasharray
-+drbd_bm_find_next_643 drbd_bm_find_next 2 643 &cfs_hash_bkt_size_643
-+unlink_queued_645 unlink_queued 4 645 NULL
++drbd_bm_find_next_643 drbd_bm_find_next 2 643 NULL
++unlink_queued_645 unlink_queued 4-3 645 NULL
++iwl_legacy_dbgfs_force_reset_read_649 iwl_legacy_dbgfs_force_reset_read 3 649 NULL
+dtim_interval_read_654 dtim_interval_read 3 654 NULL
++ceph_copy_user_to_page_vector_656 ceph_copy_user_to_page_vector 3-4 656 NULL
+div_u64_rem_672 div_u64_rem 0 672 NULL
-+mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
-+persistent_ram_vmap_709 persistent_ram_vmap 1-2 709 NULL
-+ipath_resize_cq_712 ipath_resize_cq 2 712 NULL
-+disk_max_parts_719 disk_max_parts 0 719 NULL
++xfrm_aevent_msgsize_674 xfrm_aevent_msgsize 0 674 NULL
++rtl8169_try_rx_copy_705 rtl8169_try_rx_copy 3 705 NULL
+sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
++ddp_set_map_751 ddp_set_map 4 751 NULL
+dvb_video_write_754 dvb_video_write 3 754 NULL
-+cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
++iwl_read_targ_mem_772 iwl_read_targ_mem 0 772 NULL
+jbd2_journal_dirty_metadata_784 jbd2_journal_dirty_metadata 0 784 NULL
-+ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL
+snd_pcm_drain_811 snd_pcm_drain 0 811 NULL
+if_writecmd_815 if_writecmd 2 815 NULL
+aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
-+SyS_write_846 SyS_write 3 846 NULL
-+um_idi_read_850 um_idi_read 3 850 NULL
-+error_state_read_859 error_state_read 6 859 NULL
++read_fifo_826 read_fifo 3 826 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
+intel_alloc_iova_883 intel_alloc_iova 3 883 NULL
+snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
++btmrvl_hsstate_read_920 btmrvl_hsstate_read 3 920 NULL
++v4l2_ctrl_handler_init_928 v4l2_ctrl_handler_init 2 928 NULL
+readw_931 readw 0 931 NULL
+carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
+__nodes_weight_956 __nodes_weight 2-0 956 NULL
-+bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL
++sys_msgrcv_959 sys_msgrcv 3 959 NULL
+memcmp_990 memcmp 0 990 NULL
-+pte_prefetch_gfn_to_pfn_997 pte_prefetch_gfn_to_pfn 2 997 NULL
++hdlcdev_rx_997 hdlcdev_rx 3 997 NULL
+free_ind_block_999 free_ind_block 0 999 NULL
-+dm_cache_set_dirty_1016 dm_cache_set_dirty 2 1016 NULL
+readreg_1017 readreg 0-1 1017 NULL
-+_do_truncate_1019 _do_truncate 2 1019 NULL
-+smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
++pohmelfs_name_alloc_1036 pohmelfs_name_alloc 1 1036 NULL
+gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
-+mce_request_packet_1073 mce_request_packet 3 1073 NULL
++Read_hfc16_1070 Read_hfc16 0 1070 NULL
++mce_request_packet_1073 mce_request_packet 3 1073 NULL nohasharray
++mlx4_create_eq_1073 mlx4_create_eq 2 1073 &mce_request_packet_1073
+agp_create_memory_1075 agp_create_memory 1 1075 NULL
-+ext4_orphan_add_1080 ext4_orphan_add 0 1080 NULL
+_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
-+llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
+inode_ref_info_1094 inode_ref_info 0 1094 NULL nohasharray
+llc_mac_hdr_init_1094 llc_mac_hdr_init 0 1094 &inode_ref_info_1094
-+nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
-+utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL
-+__btrfs_cow_block_1125 __btrfs_cow_block 7-0 1125 NULL nohasharray
++__arch_hweight8_1105 __arch_hweight8 0 1105 NULL
++__btrfs_cow_block_1125 __btrfs_cow_block 0-7 1125 NULL nohasharray
+__ext4_journal_stop_1125 __ext4_journal_stop 0 1125 &__btrfs_cow_block_1125
-+cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
-+vmalloc_32_1135 vmalloc_32 1 1135 NULL
+i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
-+find_free_extent_1173 find_free_extent 4-0 1173 NULL
++pfkey_xfrm_policy2msg_size_1176 pfkey_xfrm_policy2msg_size 0 1176 NULL
+ipc_alloc_1192 ipc_alloc 1 1192 NULL
+ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
-+pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL
+i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL
-+dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
+i2cdev_read_1206 i2cdev_read 3 1206 NULL
-+lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
++generic_file_splice_read_1220 generic_file_splice_read 4 1220 NULL
++ipw_packet_received_skb_1230 ipw_packet_received_skb 2 1230 NULL
+acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
-+nested_get_page_1252 nested_get_page 2 1252 NULL
+ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
-+qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
+ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
-+batadv_tt_prepare_packet_buff_1280 batadv_tt_prepare_packet_buff 4 1280 NULL
-+SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
-+tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
+ocfs2_append_rec_to_path_1321 ocfs2_append_rec_to_path 0 1321 NULL
+ffs_1322 ffs 0 1322 NULL
-+qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL nohasharray
-+push_node_left_1327 push_node_left 0 1327 &qlcnic_pci_sriov_configure_1327
++push_node_left_1327 push_node_left 0 1327 NULL
++carl9170_rx_stream_1334 carl9170_rx_stream 3 1334 NULL
+btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
-+gen_pool_best_fit_1348 gen_pool_best_fit 2-3-4 1348 NULL
-+btrfs_alloc_logged_file_extent_1354 btrfs_alloc_logged_file_extent 0 1354 NULL
+snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
+ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
-+iov_num_pages_1364 iov_num_pages 0 1364 NULL
-+fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
+ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
+sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
+do_msgsnd_1387 do_msgsnd 4 1387 NULL
-+SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
+zone_page_state_1393 zone_page_state 0 1393 NULL
+file_read_actor_1401 file_read_actor 4 1401 NULL
-+vb2_vmalloc_alloc_1402 vb2_vmalloc_alloc 2 1402 NULL
-+cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
++hci_si_event_1404 hci_si_event 3 1404 NULL
+init_rs_internal_1436 init_rs_internal 1 1436 NULL
-+vb2_dc_get_user_pages_1442 vb2_dc_get_user_pages 1-3 1442 NULL
+stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
+tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
+xprt_alloc_1475 xprt_alloc 2 1475 NULL
-+SYSC_syslog_1477 SYSC_syslog 3 1477 NULL
+sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
+posix_acl_permission_1495 posix_acl_permission 0 1495 NULL
+fpregs_set_1497 fpregs_set 4 1497 NULL
+ocfs2_alloc_dinode_update_counts_1507 ocfs2_alloc_dinode_update_counts 0 1507 NULL
+tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
-+alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
-+ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL
-+extent_from_logical_1585 extent_from_logical 0 1585 NULL
++vp_request_intx_1578 vp_request_intx 0 1578 NULL
+ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
+ipath_ht_handle_hwerrors_1592 ipath_ht_handle_hwerrors 3 1592 NULL
++fc_frame_alloc_1596 fc_frame_alloc 2 1596 NULL
+packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
++i915_gem_execbuffer_wait_for_flips_1612 i915_gem_execbuffer_wait_for_flips 0 1612 NULL
+btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
+v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL
-+run_delayed_extent_op_1637 run_delayed_extent_op 0 1637 NULL
++bluetooth_proc_write_1630 bluetooth_proc_write 3 1630 NULL
++btmrvl_hsmode_read_1647 btmrvl_hsmode_read 3 1647 NULL
+ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
-+qgroup_rescan_init_1664 qgroup_rescan_init 0 1664 NULL
-+mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
-+rmap_add_1677 rmap_add 3 1677 NULL
+configfs_read_file_1683 configfs_read_file 3 1683 NULL
+pdu_write_u_1710 pdu_write_u 3 1710 NULL
-+coda_psdev_write_1711 coda_psdev_write 3 1711 NULL nohasharray
-+gfn_to_hva_prot_1711 gfn_to_hva_prot 2 1711 &coda_psdev_write_1711
-+btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
++coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
++wl1271_rx_handle_data_1714 wl1271_rx_handle_data 3 1714 NULL nohasharray
++btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 &wl1271_rx_handle_data_1714
+dma_memcpy_pg_to_iovec_1725 dma_memcpy_pg_to_iovec 6 1725 NULL
+internal_create_group_1733 internal_create_group 0 1733 NULL
-+dev_irnet_read_1741 dev_irnet_read 3 1741 NULL
-+tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
-+ebt_size_mwt_1768 ebt_size_mwt 0 1768 NULL
++ieee80211_new_mesh_header_1761 ieee80211_new_mesh_header 0 1761 NULL
+cosa_write_1774 cosa_write 3 1774 NULL
-+fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
-+__nodelist_scnprintf_1815 __nodelist_scnprintf 4-2-0 1815 NULL
-+sb_issue_zeroout_1884 sb_issue_zeroout 3-0 1884 NULL
-+rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
-+nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
-+SyS_add_key_1900 SyS_add_key 4 1900 NULL
-+uhid_char_read_1920 uhid_char_read 3 1920 NULL
-+tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
-+bdev_erase_1933 bdev_erase 3 1933 NULL
++__nodelist_scnprintf_1815 __nodelist_scnprintf 2-4-0 1815 NULL
++hidp_queue_report_1881 hidp_queue_report 3 1881 NULL
++sb_issue_zeroout_1884 sb_issue_zeroout 0 1884 NULL
++iwl_legacy_dbgfs_rxon_flags_read_1894 iwl_legacy_dbgfs_rxon_flags_read 3 1894 NULL
+ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
-+cyttsp_probe_1940 cyttsp_probe 4 1940 NULL
+ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
-+read_swap_header_1957 read_swap_header 0 1957 NULL
++__assign_irq_vector_1961 __assign_irq_vector 0 1961 NULL
+ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
++store_iwmct_log_level_fw_1974 store_iwmct_log_level_fw 4 1974 NULL
+sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
-+gpio_power_write_1991 gpio_power_write 3 1991 NULL
++xfs_trans_count_vecs_1991 xfs_trans_count_vecs 0 1991 NULL nohasharray
++gpio_power_write_1991 gpio_power_write 3 1991 &xfs_trans_count_vecs_1991
+__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
+atomic_read_unchecked_1995 atomic_read_unchecked 0 1995 NULL
-+sb_min_blocksize_2004 sb_min_blocksize 0-2 2004 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
-+rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
+ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
+write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
-+BcmCopySection_2035 BcmCopySection 5-0 2035 NULL
++BcmCopySection_2035 BcmCopySection 0-5 2035 NULL
+ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
+ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL
++subbuf_read_actor_2071 subbuf_read_actor 3 2071 NULL
+__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
+diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL nohasharray
+alloc_retstack_tasklist_2077 alloc_retstack_tasklist 0 2077 &diva_set_driver_dbg_mask_2077
+iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
+get_unaligned_le32_2092 get_unaligned_le32 0 2092 NULL
+idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
-+audit_expand_2098 audit_expand 0 2098 NULL
++audit_expand_2098 audit_expand 2-0 2098 NULL
+num_pages_spanned_2105 num_pages_spanned 0 2105 NULL
-+shrd128_2106 shrd128 0-1-3-2 2106 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
+enable_read_2117 enable_read 3 2117 NULL
-+pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
++pcf50633_write_block_2124 pcf50633_write_block 3 2124 NULL
+snd_interval_refine_last_2127 snd_interval_refine_last 0 2127 NULL
+check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
-+lp_gpio_irq_map_2149 lp_gpio_irq_map 2 2149 NULL
++mlx4_init_icm_table_2151 mlx4_init_icm_table 4-5 2151 NULL
+iov_iter_count_2152 iov_iter_count 0 2152 NULL
+__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
+ocfs2_et_sanity_check_2164 ocfs2_et_sanity_check 0 2164 NULL
+_ore_get_io_state_2166 _ore_get_io_state 5-3-4 2166 NULL
-+bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
+picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
-+mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 NULL nohasharray
-+u32_array_read_2219 u32_array_read 3 2219 &mei_dbgfs_read_meclients_2219
++page_cache_async_readahead_2219 page_cache_async_readahead 6-5 2219 NULL nohasharray
++u32_array_read_2219 u32_array_read 3 2219 &page_cache_async_readahead_2219
+vhci_write_2224 vhci_write 3 2224 NULL
+__ocfs2_journal_access_2241 __ocfs2_journal_access 0 2241 NULL
++mlx4_buddy_init_2244 mlx4_buddy_init 2 2244 NULL
+ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
+netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 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
-+ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
-+debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
+ocfs2_shift_tree_depth_2292 ocfs2_shift_tree_depth 0 2292 NULL
-+kvm_clear_guest_page_2308 kvm_clear_guest_page 2-4 2308 NULL
-+intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
-+picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL nohasharray
-+hfsplus_find_init_2318 hfsplus_find_init 0 2318 &picolcd_fb_write_2318
++kvm_clear_guest_page_2308 kvm_clear_guest_page 4 2308 NULL
++picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL
+gart_map_page_2325 gart_map_page 4-3 2325 NULL
+__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
++create_subvol_2347 create_subvol 4 2347 NULL
+zr364xx_read_2354 zr364xx_read 3 2354 NULL
+viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
-+SyS_mremap_2367 SyS_mremap 2-3-1-5 2367 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
++rose_recvmsg_2368 rose_recvmsg 4 2368 NULL
+rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
-+SYSC_mlock_2415 SYSC_mlock 1-2 2415 NULL
+isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
-+raid1_size_2419 raid1_size 0-2 2419 NULL
-+timespec_to_jiffies_timeout_2428 timespec_to_jiffies_timeout 0 2428 NULL
++hfcpci_empty_fifo_2427 hfcpci_empty_fifo 4 2427 NULL
+tty_buffer_find_2443 tty_buffer_find 2 2443 NULL
++arch_msi_check_device_2449 arch_msi_check_device 0 2449 NULL
++__sock_recvmsg_2467 __sock_recvmsg 0 2467 NULL
+b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
++xfrm_spdinfo_msgsize_2474 xfrm_spdinfo_msgsize 0 2474 NULL
++fc_fcp_send_data_2479 fc_fcp_send_data 4-3 2479 NULL
++update_pmkid_2481 update_pmkid 4 2481 NULL
+wiphy_new_2482 wiphy_new 2 2482 NULL
-+bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
-+hfsplus_user_setxattr_2485 hfsplus_user_setxattr 4 2485 NULL
-+lookup_cache_entry_2494 lookup_cache_entry 2 2494 NULL
+squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
++dm_write_2513 dm_write 3 2513 NULL
+v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
+ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL
++ata_host_start_2545 ata_host_start 0 2545 NULL
+gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
+pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
-+mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
-+slot_bytes_2609 slot_bytes 0 2609 NULL
++store_pwm1_enable_2577 store_pwm1_enable 4 2577 NULL
+smk_write_logging_2618 smk_write_logging 3 2618 NULL
-+switch_status_2629 switch_status 5 2629 NULL
-+tlv_put_string_2631 tlv_put_string 0 2631 NULL
-+kvm_gfn_to_hva_cache_init_2636 kvm_gfn_to_hva_cache_init 3 2636 NULL
-+tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
-+osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
++nlmsg_msg_size_2623 nlmsg_msg_size 0-1 2623 NULL
++iwl4965_ucode_general_stats_read_2639 iwl4965_ucode_general_stats_read 3 2639 NULL
++lro_gen_skb_2644 lro_gen_skb 6 2644 NULL
+ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
+ocfs2_rotate_subtree_right_2674 ocfs2_rotate_subtree_right 0 2674 NULL
+oti6858_write_2692 oti6858_write 4 2692 NULL
-+nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
+memcpy_fromiovecend_2707 memcpy_fromiovecend 4-3 2707 NULL
-+SyS_pwrite64_2708 SyS_pwrite64 3 2708 NULL nohasharray
-+lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 &SyS_pwrite64_2708
-+__xip_file_write_2733 __xip_file_write 3-4 2733 NULL
-+can_nocow_extent_2744 can_nocow_extent 3 2744 NULL
-+xfs_readdir_2767 xfs_readdir 3 2767 NULL
++hid_report_raw_event_2762 hid_report_raw_event 4 2762 NULL
+mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL nohasharray
+bictcp_update_2771 bictcp_update 2 2771 &mon_bin_ioctl_2771
-+__next_cpu_2782 __next_cpu 1-0 2782 NULL
-+set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
++__next_cpu_2782 __next_cpu 1 2782 NULL
++usbatm_pdu_length_2786 usbatm_pdu_length 0-1 2786 NULL
+device_add_attrs_2789 device_add_attrs 0 2789 NULL
+iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
+sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
-+vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL nohasharray
-+snd_pcm_reset_2829 snd_pcm_reset 0 2829 &vb2_dc_get_userptr_2829
-+sock_create_2838 sock_create 0 2838 NULL
++snd_pcm_reset_2829 snd_pcm_reset 0 2829 NULL
+wait_for_avail_2847 wait_for_avail 0 2847 NULL
+ufs_free_fragments_2857 ufs_free_fragments 2 2857 NULL
-+sfq_alloc_2861 sfq_alloc 1 2861 NULL
-+irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
+move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
-+mq_map_2871 mq_map 2 2871 NULL
-+__swab64p_2875 __swab64p 0 2875 NULL
+nla_padlen_2883 nla_padlen 1 2883 NULL
+cmm_write_2896 cmm_write 3 2896 NULL
-+alloc_page_cgroup_2919 alloc_page_cgroup 1 2919 NULL
-+osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL
-+xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
++count_esp_combs_2926 count_esp_combs 0 2926 NULL
+nes_read_indexed_2946 nes_read_indexed 0 2946 NULL
+tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
-+i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL
-+set_fast_connectable_2952 set_fast_connectable 4 2952 NULL
-+free_area_init_core_2962 free_area_init_core 2-3 2962 NULL
-+do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
++ppp_cp_event_2965 ppp_cp_event 6 2965 NULL
+ocfs2_find_branch_target_2989 ocfs2_find_branch_target 0 2989 NULL
+p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
-+lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
-+btrfs_add_block_group_cache_3016 btrfs_add_block_group_cache 0 3016 NULL
-+do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
++store_cardr_2997 store_cardr 4 2997 NULL
++spin_time_accum_spinning_3020 spin_time_accum_spinning 1 3020 NULL
+depth_write_3021 depth_write 3 3021 NULL
+snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL
-+kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL
+xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
+lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray
+iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038
+nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
-+il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
-+qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
++calculate_min_size_3053 calculate_min_size 0 3053 NULL
+__blk_end_bidi_request_3070 __blk_end_bidi_request 4-3 3070 NULL
+dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 NULL
-+read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
-+free_coherent_3082 free_coherent 4-2 3082 NULL
+ocfs2_get_right_path_3097 ocfs2_get_right_path 0 3097 NULL
-+clone_bio_3100 clone_bio 6 3100 NULL nohasharray
-+ttusb2_msg_3100 ttusb2_msg 4 3100 &clone_bio_3100
+rb_alloc_3102 rb_alloc 1 3102 NULL
+simple_write_to_buffer_3122 simple_write_to_buffer 2-5 3122 NULL
-+print_time_3132 print_time 0 3132 NULL
+fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
-+find_free_extent_3153 find_free_extent 5 3153 NULL
++b1_get_slice_3145 b1_get_slice 0 3145 NULL
+CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
+compat_sys_migrate_pages_3157 compat_sys_migrate_pages 2 3157 NULL
-+i915_gem_obj_ggtt_offset_3162 i915_gem_obj_ggtt_offset 0 3162 NULL
++encrypted_instantiate_3168 encrypted_instantiate 3 3168 NULL
+uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
-+uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 NULL
++find_free_extent_3178 find_free_extent 5-7 3178 NULL
+compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
-+wait_table_bits_3187 wait_table_bits 1 3187 NULL
-+mempool_create_node_3191 mempool_create_node 1 3191 NULL
+alloc_context_3194 alloc_context 1 3194 NULL
-+shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
+codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
-+SyS_sendto_3219 SyS_sendto 6 3219 NULL
-+btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL
++ath6kl_mgmt_tx_3230 ath6kl_mgmt_tx 9 3230 NULL
+btrfs_next_leaf_3232 btrfs_next_leaf 0 3232 NULL
+kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
+write_adapter_mem_3234 write_adapter_mem 3 3234 NULL
-+do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
+ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
+key_key_read_3241 key_key_read 3 3241 NULL
-+mmap_piobufs_3244 mmap_piobufs 4 3244 NULL
-+did_overwrite_first_ref_3259 did_overwrite_first_ref 0 3259 NULL
-+__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
++shrink_delalloc_3250 shrink_delalloc 0 3250 NULL
++__ilog2_u64_3284 __ilog2_u64 0-1 3284 NULL
++iwl_legacy_dbgfs_traffic_log_write_3296 iwl_legacy_dbgfs_traffic_log_write 3 3296 NULL
++arvo_sysfs_write_3311 arvo_sysfs_write 6 3311 NULL
+__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL
-+dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
++i915_gem_gtt_bind_object_3319 i915_gem_gtt_bind_object 0 3319 NULL
+compat_sys_setsockopt_3326 compat_sys_setsockopt 5 3326 NULL
++de600_read_byte_3332 de600_read_byte 0 3332 NULL
++sctp_make_init_ack_3335 sctp_make_init_ack 4 3335 NULL
+read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
+sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
-+tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
-+il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
++noack_write_3343 noack_write 3 3343 NULL
+gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
+scnprintf_3360 scnprintf 0-2 3360 NULL
+ReadByteAmd7930_3365 ReadByteAmd7930 0 3365 NULL
-+sr_read_3366 sr_read 3 3366 NULL
-+count_inode_refs_3375 count_inode_refs 0 3375 NULL
-+x86_emulate_instruction_3389 x86_emulate_instruction 2 3389 NULL
-+mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
+send_stream_3397 send_stream 4 3397 NULL
+isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
-+mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 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
-+SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
-+send_unlink_3438 send_unlink 0 3438 NULL
+pipe_iov_copy_to_user_3447 pipe_iov_copy_to_user 3 3447 NULL
-+map_single_3449 map_single 0 3449 NULL
++percpu_modalloc_3448 percpu_modalloc 2-3 3448 NULL
++s3fb_ddc_read_3451 s3fb_ddc_read 0 3451 NULL
+softsynth_write_3455 softsynth_write 3 3455 NULL
+jffs2_acl_setxattr_3464 jffs2_acl_setxattr 4 3464 NULL nohasharray
+snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 &jffs2_acl_setxattr_3464
++alloc_skb_fclone_3467 alloc_skb_fclone 1 3467 NULL
+security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
-+xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL
-+run_one_delayed_ref_3503 run_one_delayed_ref 0 3503 NULL nohasharray
-+kvm_handle_bad_page_3503 kvm_handle_bad_page 2 3503 &run_one_delayed_ref_3503
-+mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
-+SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
-+SyS_readv_3539 SyS_readv 3 3539 NULL
++xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1-0 3496 NULL
++ieee80211_wx_set_gen_ie_rsl_3521 ieee80211_wx_set_gen_ie_rsl 3 3521 NULL
+btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
-+iommu_map_3554 iommu_map 3-2 3554 NULL
-+btrfs_delayed_update_inode_3557 btrfs_delayed_update_inode 0 3557 NULL
-+i915_gem_execbuffer_reserve_3558 i915_gem_execbuffer_reserve 0 3558 NULL
++b43legacy_read16_3561 b43legacy_read16 0 3561 NULL
++get_interface_3562 get_interface 0 3562 NULL
+alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
+evtchn_read_3569 evtchn_read 3 3569 NULL
-+ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL
+vc_resize_3585 vc_resize 3-2 3585 NULL
-+kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL
++compat_sys_semtimedop_3606 compat_sys_semtimedop 3 3606 NULL
+sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
-+edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
-+tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
+aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
-+x86_swiotlb_alloc_coherent_3649 x86_swiotlb_alloc_coherent 2 3649 NULL
-+ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
++cm_copy_private_data_3649 cm_copy_private_data 2 3649 NULL
+i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
+ntfs_attr_make_non_resident_3694 ntfs_attr_make_non_resident 0 3694 NULL
-+snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL nohasharray
++btmrvl_psmode_write_3703 btmrvl_psmode_write 3 3703 NULL nohasharray
++snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 &btmrvl_psmode_write_3703 nohasharray
+create_irq_3703 create_irq 0 3703 &snd_m3_assp_read_3703
-+videobuf_pages_to_sg_3708 videobuf_pages_to_sg 2 3708 NULL
-+ci_ll_write_3740 ci_ll_write 4 3740 NULL nohasharray
-+ath6kl_mgmt_tx_3740 ath6kl_mgmt_tx 7 3740 &ci_ll_write_3740
-+uar_index2pfn_3741 uar_index2pfn 0-2 3741 NULL
++ci_ll_write_3740 ci_ll_write 4 3740 NULL
++ping_sendmsg_3782 ping_sendmsg 4 3782 NULL
+sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
+btrfs_alloc_chunk_3808 btrfs_alloc_chunk 0 3808 NULL
+ncp_file_write_3813 ncp_file_write 3 3813 NULL
+llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
-+btrfs_uuid_iter_rem_3831 btrfs_uuid_iter_rem 0 3831 NULL
-+hfsplus_direct_IO_3835 hfsplus_direct_IO 4 3835 NULL
++read_file_tx_chainmask_3829 read_file_tx_chainmask 3 3829 NULL
+stringify_nodemap_3842 stringify_nodemap 2 3842 NULL
++__buf_prepare_3846 __buf_prepare 0 3846 NULL
+ubi_eba_read_leb_3847 ubi_eba_read_leb 0 3847 NULL
-+create_one_cdev_3852 create_one_cdev 2 3852 NULL
+smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
+get_fd_set_3866 get_fd_set 1 3866 NULL
+apei_res_sub_3873 apei_res_sub 0 3873 NULL
+garp_attr_create_3883 garp_attr_create 3 3883 NULL
-+efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
++uea_send_modem_cmd_3888 uea_send_modem_cmd 3 3888 NULL
+nvram_write_3894 nvram_write 3 3894 NULL
-+pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
+comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL
+vcs_write_3910 vcs_write 3 3910 NULL
-+SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
-+hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
-+brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
-+mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
++pm860x_read_device_3958 pm860x_read_device 3 3958 NULL
++i915_gem_object_get_fence_3981 i915_gem_object_get_fence 0 3981 NULL
+do_add_counters_3992 do_add_counters 3 3992 NULL
-+obd_alloc_memmd_4002 obd_alloc_memmd 0 4002 NULL
+userspace_status_4004 userspace_status 4 4004 NULL
+mei_write_4005 mei_write 3 4005 NULL nohasharray
+xfs_check_block_4005 xfs_check_block 4 4005 &mei_write_4005
+snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
-+mm_populate_4016 mm_populate 1-2 4016 NULL nohasharray
-+i915_gem_object_unbind_4016 i915_gem_object_unbind 0 4016 &mm_populate_4016
++i915_gem_object_unbind_4016 i915_gem_object_unbind 0 4016 NULL
+blk_end_request_4024 blk_end_request 3 4024 NULL
+ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
-+mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
++b1_get_word_4035 b1_get_word 0 4035 NULL
+i915_gpu_idle_4062 i915_gpu_idle 0 4062 NULL
-+read_file_queues_4078 read_file_queues 3 4078 NULL
++get_dmabuf_4065 get_dmabuf 2 4065 NULL
++sctp_make_asconf_4078 sctp_make_asconf 3 4078 NULL
+fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
-+btrfs_inc_ref_4084 btrfs_inc_ref 0 4084 NULL
-+da9052_free_irq_4090 da9052_free_irq 2 4090 NULL
++ab8500_address_write_4099 ab8500_address_write 3 4099 NULL
+tm6000_read_4151 tm6000_read 3 4151 NULL
+mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL
+msg_bits_4158 msg_bits 0-3-4 4158 NULL
@@ -102861,2150 +105134,1713 @@ index 0000000..0a9d518
+f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL
+_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
+__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
-+ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
-+goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
-+msb_do_write_request_4286 msb_do_write_request 2 4286 NULL
-+paging32_page_fault_4288 paging32_page_fault 2 4288 NULL
-+xt_compat_add_offset_4289 xt_compat_add_offset 0 4289 NULL
-+__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
-+dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 3-2-5 4303 NULL
-+__pool_find_4308 __pool_find 3 4308 NULL
++ext4_new_inode_4247 ext4_new_inode 5 4247 NULL
++dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 2-3-5 4303 NULL
++ath6kl_wmi_tcmd_test_report_rx_4314 ath6kl_wmi_tcmd_test_report_rx 3 4314 NULL
+count_strings_4315 count_strings 0 4315 NULL
-+nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
+snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
-+kvm_apic_get_reg_4354 kvm_apic_get_reg 0 4354 NULL
+__copy_from_user_inatomic_4365 __copy_from_user_inatomic 0-3 4365 NULL nohasharray
+lookup_string_4365 lookup_string 0 4365 &__copy_from_user_inatomic_4365
-+btrfs_set_disk_extent_flags_4374 btrfs_set_disk_extent_flags 0 4374 NULL
++sys_setdomainname_4373 sys_setdomainname 2 4373 NULL
+irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
-+access_process_vm_4412 access_process_vm 0-4-2 4412 NULL nohasharray
++access_process_vm_4412 access_process_vm 0 4412 NULL nohasharray
+cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 &access_process_vm_4412
+libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
-+rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL
+do_pages_stat_4437 do_pages_stat 2 4437 NULL
+memparse_4444 memparse 0 4444 NULL
-+tcp_dma_try_early_copy_4457 tcp_dma_try_early_copy 3 4457 NULL
++dn_alloc_send_pskb_4465 dn_alloc_send_pskb 2 4465 NULL
+at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
++recv_control_msg_4476 recv_control_msg 5 4476 NULL
+snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL
-+ocfs2_grow_tree_4492 ocfs2_grow_tree 0 4492 NULL
++sys_semtimedop_4486 sys_semtimedop 3 4486 NULL
++ocfs2_grow_tree_4492 ocfs2_grow_tree 0 4492 NULL nohasharray
++udp_sendmsg_4492 udp_sendmsg 4 4492 &ocfs2_grow_tree_4492
+vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
-+set_link_security_4502 set_link_security 4 4502 NULL
-+dm_cache_remove_mapping_4513 dm_cache_remove_mapping 2 4513 NULL
-+__gfn_to_pfn_memslot_4530 __gfn_to_pfn_memslot 2-0 4530 NULL
-+ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
-+da9052_group_write_4534 da9052_group_write 2-3 4534 NULL
-+tty_register_device_4544 tty_register_device 2 4544 NULL
-+videobuf_vmalloc_to_sg_4548 videobuf_vmalloc_to_sg 2 4548 NULL
++l1oip_socket_parse_4507 l1oip_socket_parse 4 4507 NULL
++sys_llistxattr_4532 sys_llistxattr 3 4532 NULL
++Read_4560 Read 0 4560 NULL
+btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
-+xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
-+iommu_map_page_4588 iommu_map_page 5 4588 NULL
+bch_alloc_4593 bch_alloc 1 4593 NULL
+ocfs2_refcount_lock_4595 ocfs2_refcount_lock 0 4595 NULL
-+__wb_force_remove_mapping_4622 __wb_force_remove_mapping 2 4622 NULL
-+ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
++rbd_create_rw_ops_4605 rbd_create_rw_ops 2 4605 NULL
+iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
-+ext3_orphan_add_4665 ext3_orphan_add 0 4665 NULL
++virtqueue_add_buf_gfp_4662 virtqueue_add_buf_gfp 4-3 4662 NULL
++map_addr_4666 map_addr 6 4666 NULL
+skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
+cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
+short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
+kone_receive_4690 kone_receive 4 4690 NULL
-+link_to_fixup_dir_4699 link_to_fixup_dir 0 4699 NULL
++round_pipe_size_4701 round_pipe_size 1-0 4701 NULL
+cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
-+konepure_sysfs_read_4709 konepure_sysfs_read 6 4709 NULL
++trusted_instantiate_4710 trusted_instantiate 3 4710 NULL
++btmrvl_gpiogap_read_4718 btmrvl_gpiogap_read 3 4718 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
-+gfs2_bit_search_4728 gfs2_bit_search 0-2 4728 NULL
-+ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray
-+bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736
-+__find_free_cblock_4741 __find_free_cblock 2 4741 NULL
-+lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
-+find_next_best_node_4774 find_next_best_node 1-0 4774 NULL nohasharray
-+pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 &find_next_best_node_4774
-+btrfs_del_items_4791 btrfs_del_items 0 4791 NULL nohasharray
-+create_subvol_4791 create_subvol 4 4791 &btrfs_del_items_4791
++find_next_best_node_4774 find_next_best_node 1-0 4774 NULL
++ip6_ufo_append_data_4780 ip6_ufo_append_data 5-6-7 4780 NULL
+ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
-+repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
-+comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
++__iio_allocate_sw_ring_buffer_4843 __iio_allocate_sw_ring_buffer 3-2 4843 NULL
+gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
+key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
-+get_new_location_4866 get_new_location 0 4866 NULL
-+ocfs2_defrag_extent_4873 ocfs2_defrag_extent 3-2 4873 NULL
++ocfs2_defrag_extent_4873 ocfs2_defrag_extent 2-3 4873 NULL
+hid_register_field_4874 hid_register_field 2-3 4874 NULL
+vga_arb_read_4886 vga_arb_read 3 4886 NULL
-+ntfs_rl_insert_4931 ntfs_rl_insert 4-2 4931 NULL
++sys_ipc_4889 sys_ipc 3 4889 NULL
++del_ptr_4894 del_ptr 0 4894 NULL
++sys_process_vm_writev_4928 sys_process_vm_writev 5-3 4928 NULL
++ocfs2_readahead_for_cow_4932 ocfs2_readahead_for_cow 4-3 4932 NULL
+ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
-+ocfs2_should_refresh_lock_res_4958 ocfs2_should_refresh_lock_res 0 4958 NULL
++devm_kzalloc_4966 devm_kzalloc 2 4966 NULL
+compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
+skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
-+ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
-+do_sync_read_4977 do_sync_read 0 4977 NULL
-+vmw_surface_define_size_4993 vmw_surface_define_size 0 4993 NULL
-+compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
+do_mincore_5018 do_mincore 0-2-1 5018 NULL
-+btrfs_punch_hole_5041 btrfs_punch_hole 2 5041 NULL
-+cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
++mtd_device_parse_register_5024 mtd_device_parse_register 5 5024 NULL
+ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL
++__kmalloc_track_caller_5071 __kmalloc_track_caller 1 5071 NULL
+snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
+snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
+get_random_bytes_5091 get_random_bytes 2 5091 NULL nohasharray
+kfifo_copy_from_user_5091 kfifo_copy_from_user 4-3-0 5091 &get_random_bytes_5091 nohasharray
+blk_rq_sectors_5091 blk_rq_sectors 0 5091 &kfifo_copy_from_user_5091
+sound_write_5102 sound_write 3 5102 NULL
-+clear_dirty_5105 clear_dirty 3 5105 NULL
-+i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
+qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL
+ufs_add_fragments_5144 ufs_add_fragments 2 5144 NULL
+ocfs2_inode_lock_full_nested_5148 ocfs2_inode_lock_full_nested 0 5148 NULL
+__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
+iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
+acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
-+ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL nohasharray
-+r600_mip_minify_5214 r600_mip_minify 2-1-0 5214 &ppp_cp_parse_cr_5214
-+dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
-+ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
-+nouveau_fb_create__5244 nouveau_fb_create_ 5 5244 NULL
-+gfn_to_hva_memslot_5265 gfn_to_hva_memslot 2 5265 NULL
-+btrfs_alloc_reserved_file_extent_5274 btrfs_alloc_reserved_file_extent 0 5274 NULL
++ds1wm_read_5200 ds1wm_read 0 5200 NULL
++pipe_set_size_5204 pipe_set_size 2 5204 NULL
++ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
++isdn_ppp_skb_push_5236 isdn_ppp_skb_push 2 5236 NULL
+iommu_domain_identity_map_5284 iommu_domain_identity_map 2-3 5284 NULL
-+alloc_cache_blocks_with_hash_5285 alloc_cache_blocks_with_hash 2 5285 NULL
+usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL
-+__gfn_to_hva_memslot_5304 __gfn_to_hva_memslot 0-2 5304 NULL
+r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
-+sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
+pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
-+allocate_cnodes_5329 allocate_cnodes 1 5329 NULL
-+vm_insert_pfn_5341 vm_insert_pfn 3-0 5341 NULL
-+cq_free_res_5355 cq_free_res 5 5355 NULL
++ad714x_i2c_read_5345 ad714x_i2c_read 4 5345 NULL
++ata_tlink_add_5349 ata_tlink_add 0 5349 NULL
+ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
+cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 2-3 5368 NULL
-+kvm_pin_pages_5369 kvm_pin_pages 2-0 5369 NULL
+bitmap_fold_5396 bitmap_fold 4 5396 NULL
-+security_inode_init_security_5408 security_inode_init_security 0 5408 NULL
-+__resolve_indirect_refs_5409 __resolve_indirect_refs 0 5409 NULL
++perf_adjust_period_5408 perf_adjust_period 2-3 5408 NULL
+nilfs_palloc_entries_per_group_5418 nilfs_palloc_entries_per_group 0 5418 NULL
-+check_item_in_log_5440 check_item_in_log 0 5440 NULL
-+__split_bvec_across_targets_5454 __split_bvec_across_targets 3 5454 NULL
+xfs_efd_init_5463 xfs_efd_init 3 5463 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
+tty_write_5494 tty_write 3 5494 NULL
+tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
+ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498
+__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL
++spidev_message_5518 spidev_message 3 5518 NULL
++sctp_make_op_error_space_5528 sctp_make_op_error_space 3 5528 NULL
+ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL
+iommu_prepare_identity_map_5540 iommu_prepare_identity_map 2-3 5540 NULL
-+get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
++brcmu_pkt_buf_get_skb_5556 brcmu_pkt_buf_get_skb 1 5556 NULL
+le_readq_5557 le_readq 0 5557 NULL
+inw_5558 inw 0 5558 NULL
++__first_dma_cap_5560 __first_dma_cap 0 5560 NULL
++fir16_create_5574 fir16_create 3 5574 NULL
+bioset_create_5580 bioset_create 1 5580 NULL
+domain_sg_mapping_5586 domain_sg_mapping 4 5586 NULL
-+oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
++do_msgrcv_5590 do_msgrcv 4 5590 NULL
+ldm_frag_add_5611 ldm_frag_add 2 5611 NULL
-+compat_copy_entries_5617 compat_copy_entries 0 5617 NULL
-+SYSC_init_module_5626 SYSC_init_module 2 5626 NULL
-+iterate_extent_inodes_5631 iterate_extent_inodes 0 5631 NULL
-+SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
++hidp_output_raw_report_5629 hidp_output_raw_report 3 5629 NULL
++parse_arg_5657 parse_arg 2 5657 NULL
+ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
+posix_clock_register_5662 posix_clock_register 2 5662 NULL
-+kgdb_arch_pc_5673 kgdb_arch_pc 0 5673 NULL
-+wb_clear_dirty_5684 wb_clear_dirty 2 5684 NULL
+get_arg_5694 get_arg 3 5694 NULL
-+subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
+ntfs_attr_record_resize_5720 ntfs_attr_record_resize 0 5720 NULL
+vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
+rts51x_transfer_data_partial_5735 rts51x_transfer_data_partial 6 5735 NULL
-+ubi_calc_fm_size_5749 ubi_calc_fm_size 0 5749 NULL
++get_packet_5747 get_packet 3 5747 NULL
+sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
++mlx4_alloc_resize_buf_5778 mlx4_alloc_resize_buf 3 5778 NULL
++compat_sys_writev_5784 compat_sys_writev 3 5784 NULL
+__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
-+nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
++lpfc_sli_issue_mbox_5792 lpfc_sli_issue_mbox 0 5792 NULL
+skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL
-+nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
+ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 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
-+ria_page_count_5849 ria_page_count 0 5849 NULL
-+rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
++rx_q_entry_to_length_5855 rx_q_entry_to_length 0-1 5855 NULL
++compat_sys_move_pages_5861 compat_sys_move_pages 2 5861 NULL
+config_buf_5862 config_buf 0 5862 NULL
+ext4_ext_correct_indexes_5865 ext4_ext_correct_indexes 0 5865 NULL
-+paging64_walk_addr_5887 paging64_walk_addr 3 5887 NULL
-+scan_bitmap_5888 scan_bitmap 3 5888 NULL
-+lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
+port_show_regs_5904 port_show_regs 3 5904 NULL
-+rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
+uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
+lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
-+ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
+edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
-+find_parent_nodes_5948 find_parent_nodes 0 5948 NULL
-+ll_statahead_one_5962 ll_statahead_one 3 5962 NULL
++tipc_subseq_alloc_5957 tipc_subseq_alloc 1 5957 NULL
+__apu_get_register_5967 __apu_get_register 0 5967 NULL
+ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
-+native_pte_val_5978 native_pte_val 0 5978 NULL
+jbd2_journal_stop_5979 jbd2_journal_stop 0 5979 NULL
-+ntfs_rl_append_6037 ntfs_rl_append 4-2 6037 NULL
-+da9052_request_irq_6058 da9052_request_irq 2 6058 NULL nohasharray
-+device_add_attributes_6058 device_add_attributes 0 6058 &da9052_request_irq_6058
-+alloc_msg_6072 alloc_msg 1 6072 NULL
-+sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
-+rts51x_ms_rw_multi_sector_6076 rts51x_ms_rw_multi_sector 3-4 6076 NULL
-+md_trim_bio_6078 md_trim_bio 2 6078 NULL
-+finish_inode_if_needed_6098 finish_inode_if_needed 0 6098 NULL
++device_add_attributes_6058 device_add_attributes 0 6058 NULL
++send_video_command_6073 send_video_command 4 6073 NULL nohasharray
++sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 &send_video_command_6073
++logarithmic_accumulation_6094 logarithmic_accumulation 0-2-1 6094 NULL
+ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL
+dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
-+nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
-+__btrfs_commit_inode_delayed_items_6150 __btrfs_commit_inode_delayed_items 0 6150 NULL
-+ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
++netfs_trans_alloc_6136 netfs_trans_alloc 2-4 6136 NULL
+ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
-+vdma_mem_alloc_6171 vdma_mem_alloc 1 6171 NULL
+wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
-+paging64_walk_addr_generic_6180 paging64_walk_addr_generic 4 6180 NULL
-+SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
-+qp_host_get_user_memory_6189 qp_host_get_user_memory 1-2 6189 NULL
-+cl_sync_io_wait_6196 cl_sync_io_wait 0 6196 NULL
+i915_gem_execbuffer_move_to_gpu_6197 i915_gem_execbuffer_move_to_gpu 0 6197 NULL
-+mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
++nfc_alloc_skb_6216 nfc_alloc_skb 1 6216 NULL
+v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
+mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
++ata_host_register_6229 ata_host_register 0 6229 NULL
+f_hidg_read_6238 f_hidg_read 3 6238 NULL
-+changed_ref_6242 changed_ref 0 6242 NULL
+fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
+ext4_ext_split_6249 ext4_ext_split 0 6249 NULL
+pcpu_next_pop_6277 pcpu_next_pop 4 6277 NULL
-+tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
-+snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
++snd_hda_override_conn_list_6282 snd_hda_override_conn_list 0 6282 NULL nohasharray
+xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
-+posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
-+paging64_gva_to_gpa_nested_6287 paging64_gva_to_gpa_nested 2 6287 NULL
-+qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
-+exclude_super_stripes_6326 exclude_super_stripes 0 6326 NULL
-+SyS_mincore_6329 SyS_mincore 2-1 6329 NULL nohasharray
-+hfa384x_inw_6329 hfa384x_inw 0 6329 &SyS_mincore_6329
-+fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
-+ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
-+regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
-+mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
++iwl4965_rs_sta_dbgfs_stats_table_read_6289 iwl4965_rs_sta_dbgfs_stats_table_read 3 6289 NULL
++set_local_name_6310 set_local_name 4 6310 NULL
++hfa384x_inw_6329 hfa384x_inw 0 6329 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
-+msb_write_block_6379 msb_write_block 3 6379 NULL
++global_reclaimable_pages_6378 global_reclaimable_pages 0 6378 NULL nohasharray
++osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 &global_reclaimable_pages_6378
+BcmFlash2xBulkRead_6395 BcmFlash2xBulkRead 0 6395 NULL
-+posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
-+add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
++bt_skb_alloc_6404 bt_skb_alloc 1 6404 NULL
++l2up_create_6430 l2up_create 3 6430 NULL
+ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
+__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
-+add_to_list_6433 add_to_list 0 6433 NULL
-+paging32_gva_to_gpa_nested_6442 paging32_gva_to_gpa_nested 2 6442 NULL
-+i915_gem_object_wait_rendering_6446 i915_gem_object_wait_rendering 0 6446 NULL
-+mlx4_ib_reg_user_mr_6471 mlx4_ib_reg_user_mr 2-3 6471 NULL
++ceph_sync_write_6466 ceph_sync_write 3 6466 NULL
+ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
-+qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
+cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
+dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL
++ttm_get_pages_6504 ttm_get_pages 4 6504 NULL
+mei_read_6507 mei_read 3 6507 NULL
-+__start_delalloc_inodes_6528 __start_delalloc_inodes 0 6528 NULL
++read_file_disable_ani_6536 read_file_disable_ani 3 6536 NULL
+rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
+wdm_read_6549 wdm_read 3 6549 NULL
-+dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
+fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
-+SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
-+SyS_fcntl64_6582 SyS_fcntl64 3 6582 NULL
++bt_skb_send_alloc_6581 bt_skb_send_alloc 2 6581 NULL
+snd_pcm_hw_refine_old_user_6586 snd_pcm_hw_refine_old_user 0 6586 NULL
-+btrfs_start_all_delalloc_inodes_6596 btrfs_start_all_delalloc_inodes 0 6596 NULL
+snmp_mib_init_6604 snmp_mib_init 2-3 6604 NULL
+ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
-+xfs_do_div_6649 xfs_do_div 0-2 6649 NULL
-+journal_dirty_metadata_6658 journal_dirty_metadata 0 6658 NULL
++dn_alloc_skb_6631 dn_alloc_skb 2 6631 NULL
+process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
-+btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3-0 6696 NULL
++iwl_dbgfs_clear_traffic_statistics_write_6681 iwl_dbgfs_clear_traffic_statistics_write 3 6681 NULL
++ql_process_mac_rx_skb_6689 ql_process_mac_rx_skb 4 6689 NULL nohasharray
++pvscsi_allocate_rings_6689 pvscsi_allocate_rings 0 6689 &ql_process_mac_rx_skb_6689
++ieee80211_build_preq_ies_6691 ieee80211_build_preq_ies 0 6691 NULL
++btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3 6696 NULL
+ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
-+bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
+mpeg_read_6708 mpeg_read 3 6708 NULL
+ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
-+set_orig_insn_6712 set_orig_insn 3 6712 NULL
+video_proc_write_6724 video_proc_write 3 6724 NULL
+posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
++rds_rdma_pages_6735 rds_rdma_pages 0 6735 NULL
+ocfs2_insert_extent_6737 ocfs2_insert_extent 0 6737 NULL
-+btrfs_inode_delayed_dir_index_count_6759 btrfs_inode_delayed_dir_index_count 0 6759 NULL
++device_queue_depth_6771 device_queue_depth 0 6771 NULL
+kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
+iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
+ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
-+zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL
+hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
-+tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
+ocfs2_calc_refcount_meta_credits_6802 ocfs2_calc_refcount_meta_credits 0 6802 NULL
+lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
+make_8259A_irq_6828 make_8259A_irq 1 6828 NULL
+calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL
+mon_bin_read_6841 mon_bin_read 3 6841 NULL
+snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
-+ecryptfs_write_lower_6870 ecryptfs_write_lower 4 6870 NULL
-+dio_complete_6879 dio_complete 0-2-3 6879 NULL
+ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 NULL nohasharray
+raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 &ieee80211_if_fmt_path_refresh_time_6888
+dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
-+ext4_inode_bitmap_6902 ext4_inode_bitmap 0 6902 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 nohasharray
-+acm_alloc_minor_6911 acm_alloc_minor 0 6911 &proc_sessionid_read_6911
++proc_sessionid_read_6911 proc_sessionid_read 3 6911 &spi_show_regs_6911
+__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
-+do_msgrcv_6921 do_msgrcv 3 6921 NULL
-+__vxge_hw_mempool_create_6923 __vxge_hw_mempool_create 3-2-6 6923 NULL
++ieee80211_rx_mgmt_probe_resp_6918 ieee80211_rx_mgmt_probe_resp 3 6918 NULL
++ieee80211_send_probe_req_6924 ieee80211_send_probe_req 6-4 6924 NULL
+cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
+ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
+qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
-+tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
++ab3100_get_register_page_interruptible_6951 ab3100_get_register_page_interruptible 4 6951 NULL
++dn_ifaddr_nlmsg_size_6955 dn_ifaddr_nlmsg_size 0 6955 NULL nohasharray
++tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 &dn_ifaddr_nlmsg_size_6955
+pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
-+videobuf_dma_init_kernel_6963 videobuf_dma_init_kernel 3 6963 NULL
-+i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray
-+rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973
+crypto_authenc_esn_setkey_6985 crypto_authenc_esn_setkey 3 6985 NULL
+request_key_async_6990 request_key_async 4 6990 NULL
-+tpl_write_6998 tpl_write 3 6998 NULL
+r871x_set_wpa_ie_7000 r871x_set_wpa_ie 3 7000 NULL
-+log_wait_commit_7005 log_wait_commit 0 7005 NULL
+cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
+tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
+ld_usb_write_7022 ld_usb_write 3 7022 NULL
+wimax_msg_7030 wimax_msg 4 7030 NULL
+ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
+snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
++sctp_make_op_error_7057 sctp_make_op_error 6-5 7057 NULL
+hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
+event_enable_read_7074 event_enable_read 3 7074 NULL
-+ip_vs_sync_conn_7075 ip_vs_sync_conn 3 7075 NULL
+beacon_interval_read_7091 beacon_interval_read 3 7091 NULL
-+pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
+check_header_7108 check_header 0 7108 NULL
-+osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
++do_async_mmap_readahead_7123 do_async_mmap_readahead 5 7123 NULL
+qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL
-+kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
++send_mpa_reject_7135 send_mpa_reject 3 7135 NULL
+ipv6_recv_rxpmtu_7142 ipv6_recv_rxpmtu 3 7142 NULL
-+qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL
+ocfs2_get_left_path_7159 ocfs2_get_left_path 0 7159 NULL
-+core_alua_write_tpg_metadata_7168 core_alua_write_tpg_metadata 3 7168 NULL
-+ext3_xattr_ibody_list_7201 ext3_xattr_ibody_list 3-0 7201 NULL
-+__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
-+get_param_h_7247 get_param_h 0 7247 NULL
-+af_alg_make_sg_7254 af_alg_make_sg 3-0 7254 NULL
++__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL nohasharray
++utf16_strsize_7203 utf16_strsize 0 7203 &__alloc_objio_seg_7203
++sys32_ipc_7238 sys32_ipc 3 7238 NULL
+hdlc_loop_7255 hdlc_loop 0 7255 NULL
-+vm_mmap_pgoff_7259 vm_mmap_pgoff 0 7259 NULL
+snd_mask_refine_7267 snd_mask_refine 0 7267 NULL
+f_midi_start_ep_7270 f_midi_start_ep 0 7270 NULL
+dma_ops_alloc_addresses_7272 dma_ops_alloc_addresses 3-4-5-0 7272 NULL
-+rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL
+get_string_7302 get_string 0 7302 NULL
-+wb_remove_mapping_7307 wb_remove_mapping 2 7307 NULL
++ieee80211_compatible_rates_7318 ieee80211_compatible_rates 0 7318 NULL
+wait_on_sync_kiocb_7327 wait_on_sync_kiocb 0 7327 NULL
+mgmt_control_7349 mgmt_control 3 7349 NULL
-+max8998_irq_domain_map_7359 max8998_irq_domain_map 2 7359 NULL
-+i915_gem_do_execbuffer_7362 i915_gem_do_execbuffer 0 7362 NULL nohasharray
-+ext3_free_blocks_7362 ext3_free_blocks 3-4 7362 &i915_gem_do_execbuffer_7362
-+at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
++t1_get_slice_7350 t1_get_slice 0 7350 NULL
++ext3_free_blocks_7362 ext3_free_blocks 3-4 7362 NULL
+ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
+schedule_timeout_7371 schedule_timeout 0 7371 NULL
-+ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
+hweight_long_7388 hweight_long 1-0 7388 NULL
+sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
-+_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
+readb_7401 readb 0 7401 NULL
+drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
++kvm_pv_mmu_op_7436 kvm_pv_mmu_op 3-2 7436 NULL
+ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
-+SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL
+rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL
-+l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
-+ReadHSCX_7471 ReadHSCX 0 7471 NULL nohasharray
-+garp_request_join_7471 garp_request_join 4 7471 &ReadHSCX_7471
++ms_rw_multi_sector_7459 ms_rw_multi_sector 3-4 7459 NULL
++__mutex_lock_common_7469 __mutex_lock_common 0 7469 NULL
++garp_request_join_7471 garp_request_join 4 7471 NULL
++compat_sys_msgrcv_7482 compat_sys_msgrcv 2 7482 NULL
++get_stats_7483 get_stats 0 7483 NULL
+snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
-+iwl_mvm_power_dbgfs_read_7502 iwl_mvm_power_dbgfs_read 0 7502 NULL
+sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 NULL nohasharray
+ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 &sdhci_alloc_host_7509
-+array_zalloc_7519 array_zalloc 2-1 7519 NULL
-+btrfs_insert_xattr_item_7545 btrfs_insert_xattr_item 0 7545 NULL
+goal_in_my_reservation_7553 goal_in_my_reservation 3 7553 NULL
-+smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
-+cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
+ext4_ext_insert_extent_7576 ext4_ext_insert_extent 0 7576 NULL
-+btrfs_block_rsv_add_7579 btrfs_block_rsv_add 3-0 7579 NULL
-+ext3_try_to_allocate_7590 ext3_try_to_allocate 5-3-0 7590 NULL
-+ocfs2_lock_create_7612 ocfs2_lock_create 0 7612 NULL
++ext3_try_to_allocate_7590 ext3_try_to_allocate 3-5-0 7590 NULL
+create_dir_7614 create_dir 0 7614 NULL nohasharray
+groups_alloc_7614 groups_alloc 1 7614 &create_dir_7614
-+_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
-+fault_inject_write_7662 fault_inject_write 3 7662 NULL
-+acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 1-2 7685 NULL
++set_connectable_7649 set_connectable 4 7649 NULL
++skb_copy_expand_7685 skb_copy_expand 3-2 7685 NULL nohasharray
++acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 1-2 7685 &skb_copy_expand_7685
+acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
+dev_write_7708 dev_write 3 7708 NULL
-+unmap_region_7709 unmap_region 1 7709 NULL
+dbg_check_cats_7713 dbg_check_cats 0 7713 NULL
+pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL
++manip_pkt_7741 manip_pkt 3 7741 NULL
+vxge_device_register_7752 vxge_device_register 4 7752 NULL
++pohmelfs_path_length_7758 pohmelfs_path_length 0 7758 NULL
++btrfs_force_ra_7761 btrfs_force_ra 5-4 7761 NULL
++osdv2_attr_list_elem_size_7763 osdv2_attr_list_elem_size 0-1 7763 NULL
+ubi_io_read_vid_hdr_7766 ubi_io_read_vid_hdr 0 7766 NULL
+paths_from_inode_7774 paths_from_inode 0 7774 NULL
+alloc_candev_7776 alloc_candev 1-2 7776 NULL
+dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
+bnx2_nvram_write_7790 bnx2_nvram_write 2-4 7790 NULL
-+diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray
-+lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
++diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL
+ubifs_leb_read_7828 ubifs_leb_read 0 7828 NULL
-+cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
-+tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
+btrfs_find_space_for_alloc_7876 btrfs_find_space_for_alloc 2 7876 NULL
+config_desc_7878 config_desc 0 7878 NULL
+dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
+xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
++gfs2_tune_get_i_7903 gfs2_tune_get_i 0 7903 NULL
+ext3_group_extend_7911 ext3_group_extend 3 7911 NULL
+libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
++do_surface_dirty_sou_7920 do_surface_dirty_sou 7 7920 NULL
+f_hidg_write_7932 f_hidg_write 3 7932 NULL
+io_apic_setup_irq_pin_once_7934 io_apic_setup_irq_pin_once 1 7934 NULL
-+compare_refs_7938 compare_refs 0 7938 NULL
-+fsnotify_7943 fsnotify 0 7943 NULL
-+hash_netiface6_expire_7944 hash_netiface6_expire 3 7944 NULL
-+integrity_digsig_verify_7956 integrity_digsig_verify 3 7956 NULL
+smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
-+bch_btree_to_text_7960 bch_btree_to_text 2 7960 NULL
-+fixup_inode_link_count_8002 fixup_inode_link_count 0 8002 NULL
++sys_mbind_7990 sys_mbind 5 7990 NULL
++sep_lock_user_pages_8000 sep_lock_user_pages 2-3 8000 NULL
+extend_or_restart_transaction_8008 extend_or_restart_transaction 0 8008 NULL
-+tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
+vcs_read_8017 vcs_read 3 8017 NULL
++normalize_up_8037 normalize_up 0-2-1 8037 NULL
+vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
++iser_rcv_completion_8048 iser_rcv_completion 2 8048 NULL
+ms_read_multiple_pages_8052 ms_read_multiple_pages 5-4 8052 NULL
-+dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
+leb_read_lock_8070 leb_read_lock 0 8070 NULL
-+spi_write_then_read_8073 spi_write_then_read 5-3 8073 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
+ext4_ext_map_blocks_8078 ext4_ext_map_blocks 0 8078 NULL
+venus_lookup_8121 venus_lookup 4 8121 NULL
+ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
-+xfs_iomap_prealloc_size_8141 xfs_iomap_prealloc_size 3 8141 NULL
++CalcCalPLL_8136 CalcCalPLL 0 8136 NULL
++ext_sd_execute_write_data_8175 ext_sd_execute_write_data 9 8175 NULL
+dma_map_area_8178 dma_map_area 3-2-5-0 8178 NULL
-+ore_truncate_8181 ore_truncate 3 8181 NULL
+__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
+ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
-+update_cowonly_root_8200 update_cowonly_root 0 8200 NULL
++__nf_nat_mangle_tcp_packet_8190 __nf_nat_mangle_tcp_packet 5-7 8190 NULL
+recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
+__ocfs2_lock_refcount_tree_8207 __ocfs2_lock_refcount_tree 0 8207 NULL
+rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
+ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
+play_iframe_8219 play_iframe 3 8219 NULL
-+create_log_8225 create_log 2 8225 NULL nohasharray
-+kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 &create_log_8225
+sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL
-+ceph_sync_write_8233 ceph_sync_write 4 8233 NULL
-+bnx2x_iov_get_max_queue_count_8235 bnx2x_iov_get_max_queue_count 0 8235 NULL
+check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL
++add_rx_skb_8257 add_rx_skb 3 8257 NULL
+t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
+init_cdev_8274 init_cdev 1 8274 NULL
-+rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
+qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
+snd_pcm_update_state_8320 snd_pcm_update_state 0 8320 NULL
+construct_key_and_link_8321 construct_key_and_link 4 8321 NULL
+ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
++__c4iw_init_resource_fifo_8334 __c4iw_init_resource_fifo 3 8334 NULL
+tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
-+ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
-+generic_write_sync_8358 generic_write_sync 0 8358 NULL
+ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
+ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL
+ocfs2_decrease_refcount_rec_8385 ocfs2_decrease_refcount_rec 0 8385 NULL
+xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
+zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL
-+smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray
-+uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411
-+pca953x_gpio_to_irq_8424 pca953x_gpio_to_irq 2 8424 NULL
-+irq_create_mapping_8437 irq_create_mapping 2-0 8437 NULL
++uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 NULL
++snd_usb_ctl_msg_8436 snd_usb_ctl_msg 8 8436 NULL
+generic_bin_search_8440 generic_bin_search 0 8440 NULL
-+ring_wait_for_space_8457 ring_wait_for_space 0 8457 NULL
-+dir_changed_8471 dir_changed 0 8471 NULL
+afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
+fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL
-+batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
+dev_config_8506 dev_config 3 8506 NULL
+ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
-+opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
-+alloc_pg_vec_8533 alloc_pg_vec 2 8533 NULL
++utf16_strnlen_8513 utf16_strnlen 0 8513 NULL
++snd_malloc_sgbuf_pages_8532 snd_malloc_sgbuf_pages 2 8532 NULL
+ocfs2_read_virt_blocks_8538 ocfs2_read_virt_blocks 2-3 8538 NULL
-+user_on_off_8552 user_on_off 2 8552 NULL
+profile_remove_8556 profile_remove 3 8556 NULL
-+remove_extent_backref_8559 remove_extent_backref 0 8559 NULL
-+cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL
++pci_msi_check_device_8570 pci_msi_check_device 0 8570 NULL nohasharray
++cache_slow_downcall_8570 cache_slow_downcall 2 8570 &pci_msi_check_device_8570
+isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
+tower_write_8580 tower_write 3 8580 NULL
+ocfs2_reserve_local_alloc_bits_8581 ocfs2_reserve_local_alloc_bits 0 8581 NULL
-+cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
++tsi721_open_inb_mbox_8598 tsi721_open_inb_mbox 4 8598 NULL
++rtllib_MFIE_rate_len_8606 rtllib_MFIE_rate_len 0 8606 NULL
+shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
-+iommu_unmap_8624 iommu_unmap 2-0 8624 NULL
+it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
+scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
-+fuse_send_write_pages_8636 fuse_send_write_pages 0-5 8636 NULL
++fuse_send_write_pages_8636 fuse_send_write_pages 0 8636 NULL
++nf_nat_mangle_tcp_packet_8643 nf_nat_mangle_tcp_packet 5-7 8643 NULL
+generic_acl_set_8658 generic_acl_set 4 8658 NULL
-+mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
-+dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
++ath6kl_tm_rx_report_event_8660 ath6kl_tm_rx_report_event 3 8660 NULL
+lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
-+tc3589x_gpio_irq_unmap_8680 tc3589x_gpio_irq_unmap 2 8680 NULL
-+rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
+skb_frag_size_8695 skb_frag_size 0 8695 NULL
+arcfb_write_8702 arcfb_write 3 8702 NULL
+i_size_read_8703 i_size_read 0 8703 NULL nohasharray
+init_header_8703 init_header 0 8703 &i_size_read_8703
-+HDLC_irq_8709 HDLC_irq 2 8709 NULL
++cifs_writedata_alloc_8710 cifs_writedata_alloc 1 8710 NULL
+ctrl_out_8712 ctrl_out 5-3 8712 NULL
-+__create_free_space_inode_8724 __create_free_space_inode 0 8724 NULL
+tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
+jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
-+f_dupfd_8730 f_dupfd 1 8730 NULL
-+__create_irqs_8733 __create_irqs 2-1-0 8733 NULL
-+pca953x_gpio_irq_map_8737 pca953x_gpio_irq_map 2 8737 NULL
-+tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
-+compound_order_8750 compound_order 0 8750 NULL
+ocfs2_find_path_8754 ocfs2_find_path 0 8754 NULL
++em28xx_init_isoc_8755 em28xx_init_isoc 3-2-4-0 8755 NULL
+yurex_write_8761 yurex_write 3 8761 NULL
+joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
-+x32_arch_ptrace_8767 x32_arch_ptrace 3 8767 NULL
+kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
-+paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
-+ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 3-4 8785 NULL
+aligned_nrpages_8791 aligned_nrpages 0-1-2 8791 NULL
-+__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL
++__bitmap_weight_8796 __bitmap_weight 2-0 8796 NULL
+cpuset_common_file_read_8800 cpuset_common_file_read 5 8800 NULL
+intel_ring_begin_8808 intel_ring_begin 0 8808 NULL
+metronomefb_write_8823 metronomefb_write 3 8823 NULL
-+SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
+get_queue_depth_8833 get_queue_depth 0 8833 NULL
+dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
+usb_ep_queue_8839 usb_ep_queue 0 8839 NULL
-+clear_bitset_8840 clear_bitset 2 8840 NULL
-+debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
+wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
-+sk_memory_allocated_8882 sk_memory_allocated 0 8882 NULL
++iwl_dbgfs_debug_level_write_8871 iwl_dbgfs_debug_level_write 3 8871 NULL
+compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
+ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
+tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890
-+xfs_contig_bits_8904 xfs_contig_bits 3-0 8904 NULL
+sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL
+sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
+write_file_ani_8918 write_file_ani 3 8918 NULL
+layout_commit_8926 layout_commit 3 8926 NULL
+adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
+driver_stats_read_8944 driver_stats_read 3 8944 NULL
-+lookup_zone_8956 lookup_zone 2 8956 NULL
+read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
+seq_bitmap_list_8963 seq_bitmap_list 3 8963 NULL
+usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
+qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL
+venus_mkdir_8967 venus_mkdir 4 8967 NULL
-+seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
-+vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
++vol_cdev_read_8968 vol_cdev_read 3 8968 NULL nohasharray
++seq_open_net_8968 seq_open_net 4 8968 &vol_cdev_read_8968
+bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
-+btrfs_alloc_free_block_8986 btrfs_alloc_free_block 3-8 8986 NULL
-+jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
-+il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
++btrfs_alloc_free_block_8986 btrfs_alloc_free_block 8 8986 NULL
++get_pipes_9008 get_pipes 0 9008 NULL
+snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
+fd_ioctl_9028 fd_ioctl 3 9028 NULL
+nla_put_9042 nla_put 3 9042 NULL
-+offset_il_node_9059 offset_il_node 0 9059 NULL
+snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 5-3 9061 NULL
+snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
+fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
+create_queues_9088 create_queues 3-2 9088 NULL
+ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
-+adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
-+caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL nohasharray
-+gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 &caif_stream_sendmsg_9110
-+udf_direct_IO_9111 udf_direct_IO 4 9111 NULL
++caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL
+pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
-+mq_remove_mapping_9124 mq_remove_mapping 2 9124 NULL
-+mlx4_alloc_resize_umem_9132 mlx4_alloc_resize_umem 3 9132 NULL
-+ext4_list_backups_9138 ext4_list_backups 0 9138 NULL
++brcmf_sdbrcm_send_buf_9129 brcmf_sdbrcm_send_buf 6 9129 NULL
+apei_resources_merge_9149 apei_resources_merge 0 9149 NULL
-+vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
+dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
-+__btrfs_add_delayed_deletion_item_9177 __btrfs_add_delayed_deletion_item 0 9177 NULL
+isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
-+count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
-+altera_swap_ir_9194 altera_swap_ir 2 9194 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
++sep_prepare_input_output_dma_table_9200 sep_prepare_input_output_dma_table 4-3-2 9200 NULL
+snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
-+get_pfn_9207 get_pfn 1 9207 NULL
-+virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
-+tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
++l2cap_create_connless_pdu_9222 l2cap_create_connless_pdu 3 9222 NULL
+sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
+ext4_mark_iloc_dirty_9239 ext4_mark_iloc_dirty 0 9239 NULL
-+ocfs2_clear_ext_refcount_9256 ocfs2_clear_ext_refcount 4-0 9256 NULL
-+hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
++schedule_erase_9240 schedule_erase 0 9240 NULL
++cmtp_add_msgpart_9252 cmtp_add_msgpart 4 9252 NULL
++ocfs2_clear_ext_refcount_9256 ocfs2_clear_ext_refcount 0-4 9256 NULL
++tcf_csum_ipv4_icmp_9258 tcf_csum_ipv4_icmp 3 9258 NULL
+btrfs_search_slot_9264 btrfs_search_slot 0 9264 NULL
+ocfs2_merge_rec_right_9267 ocfs2_merge_rec_right 0 9267 NULL
+sparse_early_usemaps_alloc_node_9269 sparse_early_usemaps_alloc_node 4 9269 NULL
+hdpvr_read_9273 hdpvr_read 3 9273 NULL
-+flakey_status_9274 flakey_status 5 9274 NULL
+iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
+ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
-+ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
-+nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
++sk_rmem_schedule_9331 sk_rmem_schedule 2 9331 NULL
+ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
-+ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
-+sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
+get_request_type_9393 get_request_type 0 9393 NULL nohasharray
+mlx4_bitmap_init_9393 mlx4_bitmap_init 5-2 9393 &get_request_type_9393
-+virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
+read_9397 read 3 9397 NULL
-+btrfs_drop_extents_9423 btrfs_drop_extents 4-0 9423 NULL
++set_gpio_9412 set_gpio 0 9412 NULL
+bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
+ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
++kmalloc_array_9444 kmalloc_array 1-2 9444 NULL
+ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
++mcs_unwrap_mir_9455 mcs_unwrap_mir 3 9455 NULL
+ext3_xattr_set_acl_9467 ext3_xattr_set_acl 4 9467 NULL
-+agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL nohasharray
-+get_registers_9470 get_registers 4 9470 &agp_generic_alloc_user_9470
-+btrfs_csum_file_blocks_9491 btrfs_csum_file_blocks 0 9491 NULL
-+crypt_status_9492 crypt_status 5 9492 NULL
++agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL
++rbd_coll_end_req_9472 rbd_coll_end_req 3 9472 NULL
++__alloc_preds_9492 __alloc_preds 2 9492 NULL
++sock_recvmsg_9500 sock_recvmsg 0 9500 NULL
+lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
-+btrfs_add_delayed_data_ref_9508 btrfs_add_delayed_data_ref 0 9508 NULL
+lp_write_9511 lp_write 3 9511 NULL
+mext_calc_swap_extents_9517 mext_calc_swap_extents 4 9517 NULL
+scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
-+ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
+read_file_dma_9530 read_file_dma 3 9530 NULL
+ext3_alloc_branch_9534 ext3_alloc_branch 5 9534 NULL
-+iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
-+il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL
-+compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
++nlmsg_parse_9536 nlmsg_parse 2 9536 NULL
++pohmelfs_send_readpages_9537 pohmelfs_send_readpages 3 9537 NULL
++audit_log_n_untrustedstring_9548 audit_log_n_untrustedstring 3 9548 NULL
+readl_9557 readl 0 9557 NULL
+fw_node_create_9559 fw_node_create 2 9559 NULL
-+ipath_get_user_pages_9561 ipath_get_user_pages 1-2 9561 NULL
+kobj_map_9566 kobj_map 3-2 9566 NULL
-+f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
-+use_block_rsv_9597 use_block_rsv 3 9597 NULL
++biovec_create_pools_9575 biovec_create_pools 2 9575 NULL
++ieee80211_tdls_mgmt_9581 ieee80211_tdls_mgmt 8 9581 NULL
++lguest_setup_irq_9587 lguest_setup_irq 1 9587 NULL
++do_sync_9604 do_sync 1 9604 NULL
+snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
+ocfs2_claim_suballoc_bits_9615 ocfs2_claim_suballoc_bits 0 9615 NULL
-+lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
+saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
-+ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 3-4 9635 NULL
+acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
+compat_sys_keyctl_9639 compat_sys_keyctl 4 9639 NULL
-+ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
+ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
+queue_received_packet_9657 queue_received_packet 5 9657 NULL
+snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
-+dns_query_9676 dns_query 3 9676 NULL
++ks8842_read16_9676 ks8842_read16 0 9676 NULL nohasharray
++dns_query_9676 dns_query 3-0 9676 &ks8842_read16_9676
++ea_get_unstuffed_9677 ea_get_unstuffed 0 9677 NULL
+qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
+__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
++is_hole_9694 is_hole 2 9694 NULL
+vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
+fnb_9703 fnb 2-3-0 9703 NULL
-+fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
-+ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
-+cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
-+btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
-+SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
-+nla_get_u8_9736 nla_get_u8 0 9736 NULL
-+ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
-+shmem_replace_page_9740 shmem_replace_page 0 9740 NULL
++ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 NULL
+ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
-+sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 NULL
-+ni_calculate_power_boost_limit_9757 ni_calculate_power_boost_limit 3 9757 NULL
-+btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
+__alloc_percpu_9764 __alloc_percpu 2-1 9764 NULL
++do_sigpending_9766 do_sigpending 2 9766 NULL
+btrfs_write_and_wait_transaction_9768 btrfs_write_and_wait_transaction 0 9768 NULL
+__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
+snd_mem_proc_write_9786 snd_mem_proc_write 3 9786 NULL
-+kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
++qlcnic_validate_ringparam_9794 qlcnic_validate_ringparam 1-2-3 9794 NULL
+parse_uac2_sample_rate_range_9801 parse_uac2_sample_rate_range 0 9801 NULL
+tpm_data_in_9802 tpm_data_in 0 9802 NULL
+ttm_bo_fbdev_io_9805 ttm_bo_fbdev_io 4 9805 NULL
+udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 NULL nohasharray
+ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 &udpv6_recvmsg_9813
-+dvb_dvr_set_buffer_size_9840 dvb_dvr_set_buffer_size 2 9840 NULL
++cfg80211_send_deauth_9862 cfg80211_send_deauth 3 9862 NULL
++get_blk_table_len_9863 get_blk_table_len 0 9863 NULL
+pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
-+btrfs_free_reserved_extent_9867 btrfs_free_reserved_extent 2 9867 NULL
-+f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL
+mlx4_bitmap_alloc_range_9876 mlx4_bitmap_alloc_range 2-3 9876 NULL
-+wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 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
+snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 5-3 9895 NULL
-+nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
++iwm_rx_packet_alloc_9898 iwm_rx_packet_alloc 3 9898 NULL
++receive_DataRequest_9904 receive_DataRequest 3 9904 NULL
++norm_maxw_9907 norm_maxw 0 9907 NULL
+ext4_map_blocks_9916 ext4_map_blocks 0 9916 NULL
+root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL
-+tc3589x_reg_read_9940 tc3589x_reg_read 0 9940 NULL
-+pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
+read_file_misc_9948 read_file_misc 3 9948 NULL
++set_rxd_buffer_pointer_9950 set_rxd_buffer_pointer 8 9950 NULL
+ext2_new_blocks_9954 ext2_new_blocks 2-0 9954 NULL
+csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 4-3 9957 NULL
-+SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
-+get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
-+btrfs_add_link_9973 btrfs_add_link 5-0 9973 NULL
-+SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
++btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
++nfs_readdata_alloc_9990 nfs_readdata_alloc 1 9990 NULL
++kovaplus_send_10009 kovaplus_send 4 10009 NULL
+aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
-+batadv_orig_hash_add_if_10033 batadv_orig_hash_add_if 2 10033 NULL
-+iterate_inodes_from_logical_10037 iterate_inodes_from_logical 0 10037 NULL
-+vm_iomap_memory_10038 vm_iomap_memory 2 10038 NULL
-+ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
++handle_request_10024 handle_request 9 10024 NULL
++rbd_coll_end_req_index_10041 rbd_coll_end_req_index 5 10041 NULL
++userpolicy_type_attrsize_10067 userpolicy_type_attrsize 0 10067 NULL
++cifs_llseek_10091 cifs_llseek 2 10091 NULL
+ufs_bitmap_search_10105 ufs_bitmap_search 0-3 10105 NULL
-+get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
-+dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
++get_elem_size_10110 get_elem_size 0-2 10110 NULL
+gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
-+SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL nohasharray
-+offset_to_bit_10134 offset_to_bit 0-2-1-3 10134 &SyS_migrate_pages_10134
++offset_to_bit_10134 offset_to_bit 0 10134 NULL
+aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
+rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL
-+hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL nohasharray
-+ol_chunk_entries_10159 ol_chunk_entries 0 10159 &hidg_alloc_ep_req_10159
-+stmpe_irq_unmap_10164 stmpe_irq_unmap 2 10164 NULL
++ol_chunk_entries_10159 ol_chunk_entries 0 10159 NULL
+asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
+kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
+proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
++mlx4_ib_create_cq_10177 mlx4_ib_create_cq 2 10177 NULL
+jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
+register_ftrace_function_10218 register_ftrace_function 0 10218 NULL
-+hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
-+mutex_lock_killable_10244 mutex_lock_killable 0 10244 NULL
-+insert_orphan_item_10249 insert_orphan_item 0 10249 NULL
+cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
-+gpiochip_add_to_list_10262 gpiochip_add_to_list 0 10262 NULL
-+__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
++snd_pcm_lib_preallocate_pages1_10273 snd_pcm_lib_preallocate_pages1 2 10273 NULL
+snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
-+ubi_leb_change_10289 ubi_leb_change 0-4 10289 NULL
++highmem_dirtyable_memory_10301 highmem_dirtyable_memory 0-1 10301 NULL
+read_emulate_10310 read_emulate 2-4 10310 NULL
-+read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
+ttm_object_device_init_10321 ttm_object_device_init 2 10321 NULL
-+compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL
+ubi_leb_read_10328 ubi_leb_read 0 10328 NULL
+tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
-+get_dump_page_10338 get_dump_page 1 10338 NULL
++em28xx_read_reg_req_len_10340 em28xx_read_reg_req_len 0 10340 NULL
+ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
+whci_add_cap_10350 whci_add_cap 0 10350 NULL
+dbAllocAny_10354 dbAllocAny 0 10354 NULL
-+ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
+ms_write_multiple_pages_10362 ms_write_multiple_pages 6-5 10362 NULL
+sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
+ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
++led_classdev_register_10384 led_classdev_register 0 10384 NULL
+do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
-+fwtty_rx_10434 fwtty_rx 3 10434 NULL
+event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
-+ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL
+qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
-+sel_write_disable_10511 sel_write_disable 3 10511 NULL
++sel_write_disable_10511 sel_write_disable 3 10511 NULL nohasharray
++rbd_get_segment_10511 rbd_get_segment 0-3-4 10511 &sel_write_disable_10511
+osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
+rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
-+qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL nohasharray
-+hash_netiface4_expire_10519 hash_netiface4_expire 3 10519 &qlcnic_pci_sriov_enable_10519
+snd_pcm_hw_params_user_10520 snd_pcm_hw_params_user 0 10520 NULL
+ocfs2_add_refcounted_extent_10526 ocfs2_add_refcounted_extent 6 10526 NULL
+snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 NULL nohasharray
+kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 &snd_pcm_lib_read_10536
-+SYSC_read_10545 SYSC_read 3 10545 NULL
-+ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL
-+scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL
++bcm_ioctl_fw_download_10548 bcm_ioctl_fw_download 0 10548 NULL
++i915_write_fence_reg_10551 i915_write_fence_reg 0 10551 NULL
+otp_read_10594 otp_read 5-4-2 10594 NULL
+supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
+ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
-+alloc_coherent_10632 alloc_coherent 2 10632 NULL
-+ubi_io_write_vid_hdr_10660 ubi_io_write_vid_hdr 0 10660 NULL nohasharray
-+nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 &ubi_io_write_vid_hdr_10660
++cxgb3_get_cpl_reply_skb_10620 cxgb3_get_cpl_reply_skb 2 10620 NULL
++nes_alloc_resource_10624 nes_alloc_resource 3 10624 NULL
++write_file_rx_chainmask_10636 write_file_rx_chainmask 3 10636 NULL
++devm_request_irq_10640 devm_request_irq 0 10640 NULL
++__qbuf_mmap_10642 __qbuf_mmap 0 10642 NULL
++br_nlmsg_size_10645 br_nlmsg_size 0 10645 NULL
++ubi_io_write_vid_hdr_10660 ubi_io_write_vid_hdr 0 10660 NULL
+efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL
-+dtf_read_device_10663 dtf_read_device 3 10663 NULL
++ni65_alloc_mem_10664 ni65_alloc_mem 3 10664 NULL
+parport_write_10669 parport_write 0 10669 NULL
++tcp_push_10680 tcp_push 3 10680 NULL
+edge_write_10692 edge_write 4 10692 NULL
-+ubi_wl_get_peb_10699 ubi_wl_get_peb 0 10699 NULL
+inl_10708 inl 0 10708 NULL nohasharray
+selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 &inl_10708
+pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray
+shash_async_setkey_10720 shash_async_setkey 3 10720 &pvr2_ioread_read_10720
++__iscsi_complete_pdu_10726 __iscsi_complete_pdu 4 10726 NULL
+spi_sync_10731 spi_sync 0 10731 NULL
+sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
+apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
-+alloc_one_pg_vec_page_10747 alloc_one_pg_vec_page 1 10747 NULL
++compat_sys_msgsnd_10738 compat_sys_msgsnd 2 10738 NULL
+ttm_ref_object_add_10748 ttm_ref_object_add 0 10748 NULL
-+SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL
+vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
-+kvm_read_guest_atomic_10765 kvm_read_guest_atomic 2-4 10765 NULL
-+wb_set_dirty_10778 wb_set_dirty 2 10778 NULL
-+__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL
++kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4 10765 NULL
++posix_acl_to_xattr_10767 posix_acl_to_xattr 0 10767 NULL
++loopback_bytepos_update_10776 loopback_bytepos_update 2 10776 NULL
+i915_gem_wait_for_error_10791 i915_gem_wait_for_error 0 10791 NULL
+snd_mask_value_10794 snd_mask_value 0 10794 NULL
++sys_bind_10799 sys_bind 3 10799 NULL
++aun_incoming_10814 aun_incoming 3 10814 NULL
+diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
++send_command_10832 send_command 4 10832 NULL
+lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
-+ida_get_new_above_10853 ida_get_new_above 2-0 10853 NULL
++ida_get_new_above_10853 ida_get_new_above 2 10853 NULL
+fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
+ol_chunk_blocks_10864 ol_chunk_blocks 0 10864 NULL
+snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
+drm_ht_insert_item_10877 drm_ht_insert_item 0 10877 NULL
-+wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL
+get_scq_10897 get_scq 2 10897 NULL
+cgroup_write_string_10900 cgroup_write_string 5 10900 NULL
+tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
-+lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL
+__copy_from_user_10918 __copy_from_user 3-0 10918 NULL
+kobject_add_10919 kobject_add 0 10919 NULL
-+da9052_map_irq_10952 da9052_map_irq 2 10952 NULL
-+ci_port_test_write_10962 ci_port_test_write 3 10962 NULL
++iwl_calib_set_10944 iwl_calib_set 3 10944 NULL
+bm_entry_read_10976 bm_entry_read 3 10976 NULL
+sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
-+__hci_num_ctrl_10985 __hci_num_ctrl 0 10985 NULL
-+lz4_compress_10986 lz4_compress 2 10986 NULL
-+do_switch_10994 do_switch 0 10994 NULL
+xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
-+btrfs_add_delayed_extent_op_11000 btrfs_add_delayed_extent_op 0 11000 NULL
-+rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
-+SetLineNumber_11023 SetLineNumber 0 11023 NULL
-+btrfs_find_space_for_alloc_11028 btrfs_find_space_for_alloc 2 11028 NULL
+mb_find_next_bit_11037 mb_find_next_bit 0-2-3 11037 NULL
+tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
-+insert_inline_extent_backref_11063 insert_inline_extent_backref 8-0 11063 NULL
++carl9170_handle_mpdu_11056 carl9170_handle_mpdu 3 11056 NULL
+tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
+snd_pcm_delay_11081 snd_pcm_delay 0 11081 NULL
+count_argc_11083 count_argc 0 11083 NULL
+kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
-+stmpe_gpio_to_irq_11110 stmpe_gpio_to_irq 2 11110 NULL
+tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
+page_offset_11120 page_offset 0 11120 NULL
-+tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL nohasharray
-+cea_db_payload_len_11124 cea_db_payload_len 0 11124 &tracing_buffers_read_11124
++tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL
+alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL
-+eb_lookup_objects_11163 eb_lookup_objects 0 11163 NULL
-+snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 4-3 11172 NULL
-+il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
-+comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
-+mmap_region_11247 mmap_region 0-2 11247 NULL
-+ubifs_write_node_11258 ubifs_write_node 5-3 11258 NULL
-+dm_cache_discard_bitset_resize_11262 dm_cache_discard_bitset_resize 3 11262 NULL
++ioat2_alloc_ring_11172 ioat2_alloc_ring 2 11172 NULL nohasharray
++snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 4-3 11172 &ioat2_alloc_ring_11172
++__swab16p_11220 __swab16p 0 11220 NULL
+hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
-+ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
-+__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
-+btrfs_update_inode_fallback_11313 btrfs_update_inode_fallback 0 11313 NULL
+ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
-+sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
-+tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
-+shmem_radix_tree_replace_11325 shmem_radix_tree_replace 0 11325 NULL
+construct_key_11329 construct_key 3 11329 NULL nohasharray
+__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
+next_segment_11330 next_segment 0-2-1 11330 NULL
-+persistent_ram_buffer_map_11332 persistent_ram_buffer_map 2-1 11332 NULL
-+ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
-+nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 NULL nohasharray
-+sel_write_create_11353 sel_write_create 3 11353 &nl80211_send_mgmt_11353
++i915_max_freq_write_11350 i915_max_freq_write 3 11350 NULL
++sel_write_create_11353 sel_write_create 3 11353 NULL
+drm_vblank_init_11362 drm_vblank_init 2 11362 NULL
+qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
-+isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
+dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
-+__btrfs_add_delayed_insertion_item_11400 __btrfs_add_delayed_insertion_item 0 11400 NULL
-+lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 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
-+ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
-+relocate_entry_gtt_11416 relocate_entry_gtt 0 11416 NULL
-+adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL
+trace_options_read_11419 trace_options_read 3 11419 NULL
-+i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
+__irq_set_trigger_11422 __irq_set_trigger 0 11422 NULL nohasharray
+xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 &__irq_set_trigger_11422
+prepare_image_11424 prepare_image 0 11424 NULL
-+ext3_xattr_block_list_11428 ext3_xattr_block_list 3 11428 NULL
+bttv_read_11432 bttv_read 3 11432 NULL
-+create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
-+do_blockdev_direct_IO_11455 do_blockdev_direct_IO 0-6 11455 NULL
-+swp_offset_11475 swp_offset 0 11475 NULL
-+st_sensors_write_data_with_mask_11476 st_sensors_write_data_with_mask 3 11476 NULL
++__bm_find_next_11447 __bm_find_next 2 11447 NULL
+pci_set_power_state_11479 pci_set_power_state 0 11479 NULL nohasharray
+sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 &pci_set_power_state_11479
-+xfs_file_buffered_aio_write_11492 xfs_file_buffered_aio_write 4 11492 NULL
+sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
+kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
-+ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
-+twl_direction_in_11527 twl_direction_in 2 11527 NULL
+setup_IO_APIC_irq_extra_11537 setup_IO_APIC_irq_extra 1 11537 NULL
-+radix_tree_extend_11555 radix_tree_extend 0 11555 NULL
-+skb_cow_data_11565 skb_cow_data 0 11565 NULL
-+posix_acl_create_masq_11567 posix_acl_create_masq 0 11567 NULL
-+qgroup_account_ref_step2_11575 qgroup_account_ref_step2 0 11575 NULL
++skb_cow_data_11565 skb_cow_data 0-2 11565 NULL
++mlx4_init_cmpt_table_11569 mlx4_init_cmpt_table 3 11569 NULL
+lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
+oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
+snd_pcm_action_11589 snd_pcm_action 0 11589 NULL
+fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
-+btrfs_uuid_tree_add_11598 btrfs_uuid_tree_add 0 11598 NULL
-+SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
-+i915_gem_object_pin_11630 i915_gem_object_pin 0 11630 NULL
-+add_new_bitmap_11644 add_new_bitmap 3 11644 NULL
++hycapi_rx_capipkt_11602 hycapi_rx_capipkt 3 11602 NULL
+sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
+nla_total_size_11658 nla_total_size 0-1 11658 NULL
-+slab_ksize_11664 slab_ksize 0 11664 NULL
-+__btrfs_run_delayed_items_11671 __btrfs_run_delayed_items 0 11671 NULL
+ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
-+compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
+btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
-+dsp_buffer_alloc_11684 dsp_buffer_alloc 2 11684 NULL
++iwm_ntf_calib_res_11686 iwm_ntf_calib_res 3 11686 NULL
+sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
+split_11691 split 2 11691 NULL
+snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 NULL
+blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
-+dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
++i2c_master_recv_11734 i2c_master_recv 0-3 11734 NULL
++tcf_csum_ipv6_icmp_11738 tcf_csum_ipv6_icmp 4 11738 NULL
++nfsd4_get_drc_mem_11748 nfsd4_get_drc_mem 0-1-2 11748 NULL
+iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
+intel_map_page_11762 intel_map_page 4-3 11762 NULL
++rd_regl_11767 rd_regl 0 11767 NULL
+ocfs2_relink_block_group_11769 ocfs2_relink_block_group 0 11769 NULL
+ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
-+ebt_buf_add_11779 ebt_buf_add 0 11779 NULL
+btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
-+rtw_alloc_etherdev_11792 rtw_alloc_etherdev 1 11792 NULL
+pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
+umc_device_register_11824 umc_device_register 0 11824 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
++shmem_xattr_set_11843 shmem_xattr_set 4 11843 NULL
+unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
+ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
-+ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
-+mdc_rename_11899 mdc_rename 4-6 11899 NULL
++l2cap_chan_send_11878 l2cap_chan_send 3 11878 NULL
++_l2_alloc_skb_11883 _l2_alloc_skb 1 11883 NULL
+xstateregs_get_11906 xstateregs_get 4 11906 NULL
+ti_write_11916 ti_write 4 11916 NULL
++kmalloc_slab_11917 kmalloc_slab 1 11917 NULL
+fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
+bitmap_remap_11929 bitmap_remap 5 11929 NULL
+atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL
-+r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
++dccp_feat_clone_sp_val_11942 dccp_feat_clone_sp_val 3 11942 NULL
++kvm_set_msr_common_11953 kvm_set_msr_common 3 11953 NULL
+f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL
+usc_InReg_11976 usc_InReg 0 11976 NULL nohasharray
+split_node_11976 split_node 0 11976 &usc_InReg_11976
+BeceemFlashBulkRead_11979 BeceemFlashBulkRead 0 11979 NULL
-+read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
-+i40e_pci_sriov_configure_12011 i40e_pci_sriov_configure 2 12011 NULL
-+intel_init_ring_buffer_12016 intel_init_ring_buffer 0 12016 NULL
++atmel_read16_11981 atmel_read16 0 11981 NULL
+ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
-+did_overwrite_ref_12046 did_overwrite_ref 0 12046 NULL
-+ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
-+il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
++pyra_send_12061 pyra_send 4 12061 NULL
+ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
-+ubifs_recover_log_leb_12079 ubifs_recover_log_leb 3 12079 NULL
-+pse36_gfn_delta_12087 pse36_gfn_delta 0-1 12087 NULL
-+rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
-+twl6030_irq_map_12105 twl6030_irq_map 2 12105 NULL
-+i915_gem_evict_something_12118 i915_gem_evict_something 0 12118 NULL
++i915_gem_object_pin_12083 i915_gem_object_pin 0 12083 NULL
+alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
-+set_powered_12129 set_powered 4 12129 NULL
-+ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
+xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
+rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
-+vmw_fifo_reserve_12141 vmw_fifo_reserve 2 12141 NULL
++generic_file_llseek_12139 generic_file_llseek 2 12139 NULL
++iwl4965_ucode_tx_stats_read_12143 iwl4965_ucode_tx_stats_read 3 12143 NULL
+rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
+get_idx_gc_leb_12148 get_idx_gc_leb 0 12148 NULL
+btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
+ocfs2_local_alloc_new_window_12153 ocfs2_local_alloc_new_window 0 12153 NULL
+vmbus_open_12154 vmbus_open 2-3 12154 NULL
++tt_update_changes_12155 tt_update_changes 3 12155 NULL
+dma_memcpy_to_iovec_12173 dma_memcpy_to_iovec 5 12173 NULL
-+LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL
+ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
+compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
+ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
-+scaled_div_12201 scaled_div 2-1-0 12201 NULL
++pair_device_12188 pair_device 4 12188 NULL
++qt2160_read_block_12198 qt2160_read_block 4 12198 NULL
++bl_is_sector_init_12199 bl_is_sector_init 2 12199 NULL
++receive_copy_12216 receive_copy 3 12216 NULL
+snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
-+fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
-+aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
-+__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
-+kvirt_to_pa_12247 kvirt_to_pa 0 12247 NULL
++aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 NULL
+ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
++ath_descdma_setup_12257 ath_descdma_setup 5 12257 NULL
+shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
+add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
++roccat_common_send_12284 roccat_common_send 4 12284 NULL
+note_last_dentry_12285 note_last_dentry 3 12285 NULL
-+il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 NULL nohasharray
-+roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 &il_dbgfs_nvm_read_12288
++roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 NULL
++iwm_notif_send_12295 iwm_notif_send 6 12295 NULL
+wrap_min_12303 wrap_min 0-1-2 12303 NULL
++__einj_error_trigger_12304 __einj_error_trigger 0 12304 NULL
+bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
++alloc_trace_probe_12323 alloc_trace_probe 6 12323 NULL
++tipc_msg_build_12326 tipc_msg_build 4 12326 NULL
+pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
-+btrfs_lookup_file_extent_12341 btrfs_lookup_file_extent 0 12341 NULL
+mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
-+paging32_walk_addr_12359 paging32_walk_addr 3 12359 NULL
-+__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
++receive_packet_12367 receive_packet 2 12367 NULL
+xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
+btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 NULL nohasharray
+populate_dir_12391 populate_dir 0 12391 &btrfs_file_extent_ram_bytes_12391
-+ntfs_get_size_for_mapping_pairs_12413 ntfs_get_size_for_mapping_pairs 0 12413 NULL nohasharray
-+ext4_bg_num_gdb_nometa_12413 ext4_bg_num_gdb_nometa 0 12413 &ntfs_get_size_for_mapping_pairs_12413
-+hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
-+ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
-+cfs_array_alloc_12441 cfs_array_alloc 2 12441 NULL
++ntfs_get_size_for_mapping_pairs_12413 ntfs_get_size_for_mapping_pairs 0 12413 NULL
++gfs2_llseek_12464 gfs2_llseek 2 12464 NULL
+skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
+x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
-+fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
++rtllib_auth_challenge_12493 rtllib_auth_challenge 3 12493 NULL
++nfs_readdir_make_qstr_12509 nfs_readdir_make_qstr 3 12509 NULL
+qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
+xfs_get_extsz_hint_12531 xfs_get_extsz_hint 0 12531 NULL
-+kvm_setup_async_pf_12555 kvm_setup_async_pf 3 12555 NULL
-+ib_umem_get_12557 ib_umem_get 2-3 12557 NULL
++iwl_legacy_dbgfs_rx_statistics_read_12545 iwl_legacy_dbgfs_rx_statistics_read 3 12545 NULL
++WriteRegs_12569 WriteRegs 0 12569 NULL
+ceph_osdc_wait_request_12572 ceph_osdc_wait_request 0 12572 NULL
+hvc_alloc_12579 hvc_alloc 4 12579 NULL
-+snd_pcm_plugin_alloc_12580 snd_pcm_plugin_alloc 2 12580 NULL
+pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
-+tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
+vhci_put_user_12604 vhci_put_user 4 12604 NULL
-+ipath_mmap_mem_12625 ipath_mmap_mem 3 12625 NULL
-+sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
-+pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
++fc_fcp_frame_alloc_12624 fc_fcp_frame_alloc 2 12624 NULL
+pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
-+dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
+nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
-+wb_create_12651 wb_create 1 12651 NULL
-+rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
+ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
++trusted_update_12664 trusted_update 3 12664 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
-+ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL
-+ext4_bg_num_gdb_meta_12702 ext4_bg_num_gdb_meta 0 12702 NULL
-+iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
+ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
-+ivtv_write_12721 ivtv_write 3 12721 NULL
++inet6_prefix_nlmsg_size_12722 inet6_prefix_nlmsg_size 0 12722 NULL
+key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
-+__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL
-+run_delayed_data_ref_12749 run_delayed_data_ref 0 12749 NULL
+ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
+listxattr_12769 listxattr 3 12769 NULL
+sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL
-+btrfs_remove_free_space_12793 btrfs_remove_free_space 2-0 12793 NULL
++ip_ufo_append_data_12775 ip_ufo_append_data 6-7-8 12775 NULL
++platform_create_bundle_12785 platform_create_bundle 4-6 12785 NULL
+scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
+xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
-+tlv_put_uuid_12824 tlv_put_uuid 0 12824 NULL
-+readq_12825 readq 0 12825 NULL
-+SyS_add_key_12834 SyS_add_key 4 12834 NULL
++v4l_bound_align_image_12833 v4l_bound_align_image 2-3-6-7 12833 NULL
+TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
+spidev_sync_12842 spidev_sync 0 12842 NULL
++twl4030_init_irq_12843 twl4030_init_irq 2 12843 NULL
+spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
++xfs_rtallocate_extent_exact_12865 xfs_rtallocate_extent_exact 3-5-9 12865 NULL
+get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
+ocfs2_hamming_encode_block_12904 ocfs2_hamming_encode_block 2 12904 NULL
+get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
-+rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL
++cxgbi_create_session_12922 cxgbi_create_session 2 12922 NULL nohasharray
++rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 &cxgbi_create_session_12922
+free_tind_blocks_12926 free_tind_blocks 0 12926 NULL
-+ci_ll_init_12930 ci_ll_init 3 12930 NULL
-+SYSC_sendfile_12936 SYSC_sendfile 4 12936 NULL
++iwl_legacy_dbgfs_sram_write_12932 iwl_legacy_dbgfs_sram_write 3 12932 NULL
+do_inode_permission_12946 do_inode_permission 0 12946 NULL
++bcsp_prepare_pkt_12961 bcsp_prepare_pkt 3 12961 NULL
+bm_status_write_12964 bm_status_write 3 12964 NULL
-+raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL
++sctp_make_chunk_12986 sctp_make_chunk 4 12986 NULL
+TransmitTcb_12989 TransmitTcb 4 12989 NULL
-+sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
++__get_extent_inline_ref_13021 __get_extent_inline_ref 0 13021 NULL
+subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
-+btrfs_write_dirty_block_groups_13030 btrfs_write_dirty_block_groups 0 13030 NULL
-+generic_segment_checks_13041 generic_segment_checks 0 13041 NULL
-+SyS_sendfile64_13043 SyS_sendfile64 4 13043 NULL
++generic_segment_checks_13041 generic_segment_checks 0 13041 NULL nohasharray
++ubi_eba_atomic_leb_change_13041 ubi_eba_atomic_leb_change 0 13041 &generic_segment_checks_13041
+ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
-+ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 NULL nohasharray
-+__dn_setsockopt_13060 __dn_setsockopt 5 13060 &ptlrpc_lprocfs_threads_min_seq_write_13060
-+biovec_create_pool_13079 biovec_create_pool 2 13079 NULL
++ctnetlink_timestamp_size_13060 ctnetlink_timestamp_size 0 13060 NULL nohasharray
++__dn_setsockopt_13060 __dn_setsockopt 5 13060 &ctnetlink_timestamp_size_13060
++sandybridge_write_fence_reg_13080 sandybridge_write_fence_reg 0 13080 NULL
+_ocfs2_free_suballoc_bits_13085 _ocfs2_free_suballoc_bits 0 13085 NULL
+irq_set_chip_and_handler_13088 irq_set_chip_and_handler 1 13088 NULL
+xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
++blk_rq_map_sg_13092 blk_rq_map_sg 0 13092 NULL
+mb_find_next_zero_bit_13100 mb_find_next_zero_bit 2-3-0 13100 NULL
-+ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
-+SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL
+snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
++snd_pcm_lib_preallocate_pages_for_all_13112 snd_pcm_lib_preallocate_pages_for_all 4 13112 NULL
+xen_allocate_irq_dynamic_13116 xen_allocate_irq_dynamic 0 13116 NULL
+bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL
++ip_make_skb_13129 ip_make_skb 5-6 13129 NULL
+blk_update_request_13146 blk_update_request 3 13146 NULL
+caif_stream_recvmsg_13173 caif_stream_recvmsg 4 13173 NULL
+pwr_disable_ps_read_13176 pwr_disable_ps_read 3 13176 NULL
-+ucs2_strlen_13178 ucs2_strlen 0 13178 NULL
-+dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
-+create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
+__cmpxchg64_13187 __cmpxchg64 0 13187 NULL
+comedi_read_13199 comedi_read 3 13199 NULL
+mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
+__nodes_fold_13215 __nodes_fold 4 13215 NULL
-+get_unaligned_le64_13219 get_unaligned_le64 0 13219 NULL
+svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
-+fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL
++wait_events_13243 wait_events 0 13243 NULL
+asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
-+kvm_lapic_enable_pv_eoi_13249 kvm_lapic_enable_pv_eoi 2 13249 NULL
++snd_emu10k1_fx8010_tram_setup_13248 snd_emu10k1_fx8010_tram_setup 2 13248 NULL
++fw_download_code_13249 fw_download_code 3 13249 NULL
+init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
++hostap_80211_get_hdrlen_13255 hostap_80211_get_hdrlen 0 13255 NULL
+bio_integrity_trim_13259 bio_integrity_trim 3 13259 NULL
+simple_attr_write_13260 simple_attr_write 3 13260 NULL
-+c4iw_reg_user_mr_13269 c4iw_reg_user_mr 2-3 13269 NULL
++smctr_process_rx_packet_13270 smctr_process_rx_packet 2 13270 NULL
++carl9170_rx_13272 carl9170_rx 3 13272 NULL
+pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
-+il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
+lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
-+sd_major_13294 sd_major 0-1 13294 NULL
-+kempld_read16_13297 kempld_read16 0 13297 NULL
-+reexecute_instruction_13321 reexecute_instruction 2 13321 NULL
-+__clone_and_map_data_bio_13334 __clone_and_map_data_bio 4-8 13334 NULL
-+kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5-2 13337 NULL
-+get_bits_13353 get_bits 0-2 13353 NULL
-+hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
++platform_device_add_resources_13289 platform_device_add_resources 3 13289 NULL
++find_get_pages_contig_13317 find_get_pages_contig 0 13317 NULL
++nf_nat_mangle_udp_packet_13321 nf_nat_mangle_udp_packet 5-7 13321 NULL
++us122l_ctl_msg_13330 us122l_ctl_msg 8 13330 NULL
++kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5 13337 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
-+ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
-+lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray
-+dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
+BcmSetActiveSection_13389 BcmSetActiveSection 0 13389 NULL
-+ocfs2_inode_lock_update_13414 ocfs2_inode_lock_update 0 13414 NULL
-+netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
-+compat_SyS_sendfile64_13420 compat_SyS_sendfile64 4 13420 NULL
++sky2_receive_13407 sky2_receive 2 13407 NULL
++encrypted_update_13414 encrypted_update 3 13414 NULL nohasharray
++ocfs2_inode_lock_update_13414 ocfs2_inode_lock_update 0 13414 &encrypted_update_13414
++netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL nohasharray
++i915_gem_execbuffer_sync_rings_13417 i915_gem_execbuffer_sync_rings 0 13417 &netxen_alloc_sds_rings_13417
+keyring_read_13438 keyring_read 3 13438 NULL
+sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
-+ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 8-9-7 13443 NULL
-+sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
-+data_read_13494 data_read 3 13494 NULL
-+i915_switch_context_13498 i915_switch_context 0 13498 NULL
-+ioat_chansts_32_13506 ioat_chansts_32 0 13506 NULL
-+ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 2-0 13512 NULL
++ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 7-8-9 13443 NULL
++ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 2 13512 NULL
+core_status_13515 core_status 4 13515 NULL
-+smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
++sctp_tsnmap_mark_13527 sctp_tsnmap_mark 2 13527 NULL
+bm_init_13529 bm_init 2 13529 NULL
-+kvm_get_cr8_13538 kvm_get_cr8 0 13538 NULL
-+SYSC_remap_file_pages_13540 SYSC_remap_file_pages 1-2 13540 NULL nohasharray
-+non_atomic_pte_lookup_13540 non_atomic_pte_lookup 2 13540 &SYSC_remap_file_pages_13540
-+__btrfs_alloc_chunk_13554 __btrfs_alloc_chunk 0 13554 NULL
-+llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
-+ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL
++request_any_context_irq_13530 request_any_context_irq 0 13530 NULL
++usb_hcd_link_urb_to_ep_13560 usb_hcd_link_urb_to_ep 0 13560 NULL
+ubifs_get_idx_gc_leb_13566 ubifs_get_idx_gc_leb 0 13566 NULL
+read_file_antenna_13574 read_file_antenna 3 13574 NULL
+cache_write_13589 cache_write 3 13589 NULL
++mpt_lan_receive_post_turbo_13592 mpt_lan_receive_post_turbo 2 13592 NULL
++irias_new_octseq_value_13596 irias_new_octseq_value 2 13596 NULL
+Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
-+swap_cgroup_swapon_13614 swap_cgroup_swapon 2 13614 NULL
-+wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
++wm8994_bulk_write_13615 wm8994_bulk_write 3 13615 NULL
+pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
++iio_device_add_event_sysfs_13627 iio_device_add_event_sysfs 0 13627 NULL
+packet_snd_13634 packet_snd 3 13634 NULL
++__qbuf_userptr_13636 __qbuf_userptr 0 13636 NULL
+blk_msg_write_13655 blk_msg_write 3 13655 NULL
++nfs_idmap_lookup_id_13665 nfs_idmap_lookup_id 2 13665 NULL
+cache_downcall_13666 cache_downcall 3 13666 NULL
-+ext3_xattr_list_entries_13682 ext3_xattr_list_entries 0-4 13682 NULL
-+nv94_aux_13689 nv94_aux 2-5 13689 NULL
++ext3_xattr_list_entries_13682 ext3_xattr_list_entries 0 13682 NULL
+usb_get_string_13693 usb_get_string 0 13693 NULL
+atomic_cmpxchg_13700 atomic_cmpxchg 0 13700 NULL
-+fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
+ocfs2_cache_block_dealloc_13731 ocfs2_cache_block_dealloc 0 13731 NULL
++cfg80211_testmode_alloc_event_skb_13739 cfg80211_testmode_alloc_event_skb 2 13739 NULL
+audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
+ufs_dtog_13750 ufs_dtog 0-2 13750 NULL
-+ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
+fb_sys_read_13778 fb_sys_read 3 13778 NULL
-+ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
++CalcMainPLL_13811 CalcMainPLL 0 13811 NULL
++bat_ogm_aggregate_new_13813 bat_ogm_aggregate_new 2 13813 NULL
+random_read_13815 random_read 3 13815 NULL
+mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
-+hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
-+___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
-+enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
++mtd_do_readoob_13850 mtd_do_readoob 4 13850 NULL
+evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
+compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
-+btrfs_insert_empty_item_13885 btrfs_insert_empty_item 0 13885 NULL
-+qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL nohasharray
-+__fsnotify_parent_13886 __fsnotify_parent 0 13886 &qp_memcpy_to_queue_13886
-+window_alignment_13895 window_alignment 0 13895 NULL
+snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
-+is_inode_existent_13913 is_inode_existent 0 13913 NULL
-+cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL
++qla2x00_get_ctx_sp_13912 qla2x00_get_ctx_sp 3 13912 NULL
+ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL
-+ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray
-+ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
++ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 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
-+qib_mmap_mem_13947 qib_mmap_mem 3 13947 NULL
+lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL
-+osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
-+ocfs2_refresh_slot_info_13957 ocfs2_refresh_slot_info 0 13957 NULL
+snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
++ext4_ind_calc_metadata_amount_13975 ext4_ind_calc_metadata_amount 2 13975 NULL
+qcam_read_13977 qcam_read 3 13977 NULL
+dsp_read_13980 dsp_read 2 13980 NULL
+bm_block_bits_13981 bm_block_bits 0 13981 NULL nohasharray
+dvb_demux_read_13981 dvb_demux_read 3 13981 &bm_block_bits_13981
++ieee80211_bss_info_update_13991 ieee80211_bss_info_update 4 13991 NULL
+create_files_14003 create_files 0 14003 NULL
+sddr09_write_data_14014 sddr09_write_data 3 14014 NULL
+btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL
-+dmi_format_ids_14018 dmi_format_ids 2 14018 NULL
-+iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
++_rtl92s_firmware_downloadcode_14021 _rtl92s_firmware_downloadcode 3 14021 NULL
+dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
+read_def_modal_eeprom_14041 read_def_modal_eeprom 3 14041 NULL
+ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
++utf8_to_utf16le_14057 utf8_to_utf16le 0 14057 NULL
+sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
-+ovs_flow_actions_alloc_14072 ovs_flow_actions_alloc 1 14072 NULL
-+lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
++do_tcp_sendpages_14083 do_tcp_sendpages 4-3 14083 NULL
+do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
+compat_sys_pselect6_14105 compat_sys_pselect6 1 14105 NULL
-+intel_ring_wait_seqno_14107 intel_ring_wait_seqno 0 14107 NULL
-+ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
-+ntfs_rl_replace_14136 ntfs_rl_replace 4-2 14136 NULL
-+qfq_ffs_14139 qfq_ffs 2 14139 NULL
-+isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
-+em_canid_change_14150 em_canid_change 3 14150 NULL
++nlmsg_len_14115 nlmsg_len 0 14115 NULL
+gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
+print_input_mask_14168 print_input_mask 3-0 14168 NULL
+ocfs2_split_and_insert_14171 ocfs2_split_and_insert 0 14171 NULL
+ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL
+datafab_read_data_14186 datafab_read_data 4 14186 NULL
-+do_splice_14196 do_splice 5 14196 NULL
-+hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL
++tcp_manip_pkt_14202 tcp_manip_pkt 2 14202 NULL
+alloc_async_14208 alloc_async 1 14208 NULL
+ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL
-+ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
++sys_kexec_load_14222 sys_kexec_load 2 14222 NULL
+dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL
-+snd_soc_hw_bulk_write_raw_14245 snd_soc_hw_bulk_write_raw 2-4 14245 NULL
++snd_soc_hw_bulk_write_raw_14245 snd_soc_hw_bulk_write_raw 4 14245 NULL
+ext4_journal_restart_14251 ext4_journal_restart 0 14251 NULL
-+will_overwrite_ref_14252 will_overwrite_ref 0 14252 NULL
++radix_tree_prev_hole_14252 radix_tree_prev_hole 0-2 14252 NULL
+ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
++add_numbered_child_14273 add_numbered_child 5 14273 NULL
++OS_mem_token_alloc_14276 OS_mem_token_alloc 1 14276 NULL
++em28xx_i2c_eeprom_14280 em28xx_i2c_eeprom 3 14280 NULL
++snd_seq_oss_readq_new_14283 snd_seq_oss_readq_new 2 14283 NULL
++audit_send_reply_14292 audit_send_reply 7 14292 NULL
+rr_status_14293 rr_status 5 14293 NULL
+read_default_ldt_14302 read_default_ldt 2 14302 NULL
-+__readl_14308 __readl 0 14308 NULL
-+send_chown_14309 send_chown 0 14309 NULL
++xfs_qm_qino_alloc_14309 xfs_qm_qino_alloc 3 14309 NULL
+i915_gem_object_finish_gpu_14312 i915_gem_object_finish_gpu 0 14312 NULL
+oo_objects_14319 oo_objects 0 14319 NULL
-+ww_mutex_deadlock_injection_14321 ww_mutex_deadlock_injection 0 14321 NULL
-+ll_get_user_pages_14328 ll_get_user_pages 2-3-0 14328 NULL
-+down_write_failed_14331 down_write_failed 2 14331 NULL
++iwl_legacy_dbgfs_interrupt_read_14324 iwl_legacy_dbgfs_interrupt_read 3 14324 NULL
+p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
-+alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
+snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL
-+btrfs_set_inode_index_14379 btrfs_set_inode_index 0 14379 NULL
+acpi_get_override_irq_14381 acpi_get_override_irq 1 14381 NULL
+ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
+smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
+first_logical_byte_14403 first_logical_byte 0 14403 NULL
+mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
+get_kcore_size_14425 get_kcore_size 0 14425 NULL
-+qib_user_sdma_page_length_14432 qib_user_sdma_page_length 0-2-1 14432 NULL
++gart_alloc_coherent_14437 gart_alloc_coherent 2 14437 NULL
+check_lpt_crc_14442 check_lpt_crc 0 14442 NULL
+block_size_14443 block_size 0 14443 NULL
-+lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
+snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
-+lustre_msg_size_v2_14470 lustre_msg_size_v2 0 14470 NULL
-+dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
+udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
-+efx_mdio_check_mmds_14486 efx_mdio_check_mmds 2 14486 NULL nohasharray
-+ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 &efx_mdio_check_mmds_14486
++ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
++cmd_complete_14502 cmd_complete 5 14502 NULL
+ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
-+ep0_write_14536 ep0_write 3 14536 NULL nohasharray
++prepare_data_14536 prepare_data 3 14536 NULL nohasharray
++ep0_write_14536 ep0_write 3 14536 &prepare_data_14536 nohasharray
+dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 &ep0_write_14536
+register_trace_sched_switch_14545 register_trace_sched_switch 0 14545 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
-+qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
-+SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
-+remap_to_origin_then_cache_14583 remap_to_origin_then_cache 3 14583 NULL
++nfqnl_mangle_14583 nfqnl_mangle 2 14583 NULL
+idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
-+ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
+ocfs2_steal_meta_14602 ocfs2_steal_meta 0 14602 NULL
+ocfs2_trim_group_14641 ocfs2_trim_group 4-3 14641 NULL
+dbJoin_14644 dbJoin 0 14644 NULL
+profile_replace_14652 profile_replace 3 14652 NULL
-+add_to_page_cache_locked_14668 add_to_page_cache_locked 0 14668 NULL
+min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
-+nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
-+pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
+ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL
-+SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL
-+persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
+u_audio_playback_14709 u_audio_playback 3 14709 NULL
-+rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
-+cgroup_path_14713 cgroup_path 3 14713 NULL
-+get_bio_block_14714 get_bio_block 0 14714 NULL
+vfd_write_14717 vfd_write 3 14717 NULL
-+SyS_sendfile_14718 SyS_sendfile 4 14718 NULL
-+__blk_end_request_14729 __blk_end_request 3 14729 NULL
-+raid1_resize_14740 raid1_resize 2 14740 NULL
-+i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL
-+btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL
-+rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
-+regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL
++ext4_da_map_blocks_14723 ext4_da_map_blocks 2 14723 NULL nohasharray
++inet_listen_14723 inet_listen 2 14723 &ext4_da_map_blocks_14723
++__blk_end_request_14729 __blk_end_request 3 14729 NULL nohasharray
++do_mmap_14729 do_mmap 0 14729 &__blk_end_request_14729
++rh_urb_enqueue_14733 rh_urb_enqueue 0 14733 NULL
++store_camera_14751 store_camera 4 14751 NULL
+sta_dev_read_14782 sta_dev_read 3 14782 NULL
-+keys_proc_write_14792 keys_proc_write 3 14792 NULL
++keys_proc_write_14792 keys_proc_write 3 14792 NULL nohasharray
++cp_tm1217_read_14792 cp_tm1217_read 3 14792 &keys_proc_write_14792
+ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
+__kfifo_in_14797 __kfifo_in 3-0 14797 NULL
-+hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
-+snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
-+changed_cb_14819 changed_cb 0 14819 NULL
++snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 NULL nohasharray
++hpet_readl_14801 hpet_readl 0 14801 &snd_als300_gcr_read_14801
++__i2400ms_rx_get_size_14826 __i2400ms_rx_get_size 0 14826 NULL
+do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
-+mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
-+lcd_write_14857 lcd_write 3 14857 NULL
++__mutex_fastpath_lock_retval_14844 __mutex_fastpath_lock_retval 0 14844 NULL
++lcd_write_14857 lcd_write 3 14857 NULL nohasharray
++__krealloc_14857 __krealloc 2 14857 &lcd_write_14857
+get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
-+gmux_index_read8_14890 gmux_index_read8 0 14890 NULL
+acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
-+SYSC_readv_14901 SYSC_readv 3 14901 NULL
-+regmap_irq_get_virq_14910 regmap_irq_get_virq 2-0 14910 NULL
-+__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
-+qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923
++ubi_leb_change_14899 ubi_leb_change 0 14899 NULL
++krealloc_14908 krealloc 2 14908 NULL
++__arch_hweight64_14923 __arch_hweight64 0 14923 NULL
++store_sys_wmi_14934 store_sys_wmi 4 14934 NULL
+ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
-+range_to_mtrr_14940 range_to_mtrr 2 14940 NULL
+queue_cnt_14951 queue_cnt 0 14951 NULL
+unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
-+i915_vma_unbind_14954 i915_vma_unbind 0 14954 NULL
+videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
++help_14971 help 4 14971 NULL
+mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
-+setkey_14987 setkey 3 14987 NULL nohasharray
-+gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
-+xfs_dinode_size_14996 xfs_dinode_size 0 14996 NULL
++setkey_14987 setkey 3 14987 NULL
++store_touchpad_15003 store_touchpad 4 15003 NULL
+blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
+irq_get_next_irq_15053 irq_get_next_irq 1-0 15053 NULL
-+cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
-+ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
++store_lslvl_15059 store_lslvl 4 15059 NULL
+nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
+ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL
+pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
-+ceph_calc_ceph_pg_15075 ceph_calc_ceph_pg 0 15075 NULL
-+perf_trace_sched_stat_runtime_15115 perf_trace_sched_stat_runtime 3 15115 NULL
+hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
+start_port_15124 start_port 0 15124 NULL
++perf_ctx_adjust_freq_15133 perf_ctx_adjust_freq 2 15133 NULL
+ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL
-+iwl_dbgfs_sta_drain_write_15167 iwl_dbgfs_sta_drain_write 3 15167 NULL
-+self_check_not_bad_15175 self_check_not_bad 0 15175 NULL
-+SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL
+iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
+reserve_resources_15194 reserve_resources 3 15194 NULL
-+mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL
+bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
++udf_bitmap_new_block_15230 udf_bitmap_new_block 5 15230 NULL nohasharray
++nlmsg_total_size_15230 nlmsg_total_size 0-1 15230 &udf_bitmap_new_block_15230
++variax_alloc_sysex_buffer_15237 variax_alloc_sysex_buffer 3 15237 NULL
+iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
-+il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
-+div64_u64_15263 div64_u64 0-1-2 15263 NULL
+simple_strtol_15273 simple_strtol 0 15273 NULL
+fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
++sys_connect_15291 sys_connect 3 15291 NULL
+arch_enable_uv_irq_15294 arch_enable_uv_irq 2 15294 NULL
+acpi_ev_create_gpe_block_15297 acpi_ev_create_gpe_block 5 15297 NULL
+ocfs2_read_refcount_block_15305 ocfs2_read_refcount_block 0 15305 NULL
++fcoe_ctlr_send_keep_alive_15308 fcoe_ctlr_send_keep_alive 3 15308 NULL
+__ocfs2_remove_xattr_range_15330 __ocfs2_remove_xattr_range 4-3-5 15330 NULL
-+bfloat_mantissa_15334 bfloat_mantissa 0 15334 NULL
-+xlog_ticket_alloc_15335 xlog_ticket_alloc 2 15335 NULL
-+kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
+ioread16_15342 ioread16 0 15342 NULL
-+ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
++alloc_ring_15345 alloc_ring 4-2 15345 NULL
+acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
-+count_inode_extrefs_15366 count_inode_extrefs 0 15366 NULL
-+ext4_direct_IO_15369 ext4_direct_IO 4 15369 NULL
-+graph_depth_read_15371 graph_depth_read 3 15371 NULL
+compat_sys_process_vm_readv_15374 compat_sys_process_vm_readv 3-5 15374 NULL
-+fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
+domain_flush_pages_15379 domain_flush_pages 2-3 15379 NULL
+alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
-+btrfs_level_size_15392 btrfs_level_size 0 15392 NULL
-+pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
+get_modalias_15406 get_modalias 2 15406 NULL
-+blockdev_direct_IO_15408 blockdev_direct_IO 0-5 15408 NULL
-+dm_cache_resize_15422 dm_cache_resize 2 15422 NULL
+__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
-+tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
++tcp_mtu_to_mss_15438 tcp_mtu_to_mss 0-2 15438 NULL
+hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
-+memweight_15450 memweight 2 15450 NULL
-+vmalloc_15464 vmalloc 1 15464 NULL
+__mutex_lock_killable_slowpath_15472 __mutex_lock_killable_slowpath 0 15472 NULL
++iwl_legacy_dbgfs_wd_timeout_write_15478 iwl_legacy_dbgfs_wd_timeout_write 3 15478 NULL
+insert_old_idx_znode_15500 insert_old_idx_znode 0 15500 NULL
+zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
+ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
-+da9052_bat_irq_15533 da9052_bat_irq 1 15533 NULL
+p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
++ql_process_mac_rx_page_15543 ql_process_mac_rx_page 4 15543 NULL
+xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL
-+snd_pcm_channel_info_15572 snd_pcm_channel_info 0 15572 NULL
++ieee80211_amsdu_to_8023s_15561 ieee80211_amsdu_to_8023s 5 15561 NULL
++mlx4_buf_alloc_15572 mlx4_buf_alloc 2 15572 NULL nohasharray
++snd_pcm_channel_info_15572 snd_pcm_channel_info 0 15572 &mlx4_buf_alloc_15572
+persistent_status_15574 persistent_status 4 15574 NULL
+bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
-+cl_io_submit_sync_15579 cl_io_submit_sync 0 15579 NULL
+vme_user_write_15587 vme_user_write 3 15587 NULL
-+ocfs2_truncate_rec_15595 ocfs2_truncate_rec 7-0 15595 NULL
++ocfs2_truncate_rec_15595 ocfs2_truncate_rec 0-7 15595 NULL
++get_event_length_15598 get_event_length 0 15598 NULL
+sx150x_install_irq_chip_15609 sx150x_install_irq_chip 3 15609 NULL
+iommu_device_max_index_15620 iommu_device_max_index 0-3-2-1 15620 NULL nohasharray
+compat_fillonedir_15620 compat_fillonedir 3 15620 &iommu_device_max_index_15620
++dsp_cmx_send_member_15625 dsp_cmx_send_member 2 15625 NULL
+proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
-+tomoyo_scan_bprm_15642 tomoyo_scan_bprm 4-2 15642 NULL nohasharray
-+sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &tomoyo_scan_bprm_15642 nohasharray
-+pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &sk_memory_allocated_add_15642
++tomoyo_scan_bprm_15642 tomoyo_scan_bprm 4-2 15642 NULL
+joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
-+fs_path_add_15648 fs_path_add 3-0 15648 NULL
+xsd_read_15653 xsd_read 3 15653 NULL
++compat_sys_fcntl_15654 compat_sys_fcntl 3 15654 NULL
+unix_bind_15668 unix_bind 3 15668 NULL
-+SyS_connect_15674 SyS_connect 3 15674 NULL nohasharray
-+dm_read_15674 dm_read 3 15674 &SyS_connect_15674
-+pstore_mkfile_15675 pstore_mkfile 6 15675 NULL
++dm_read_15674 dm_read 3 15674 NULL
+i915_gem_object_set_to_cpu_domain_15705 i915_gem_object_set_to_cpu_domain 0 15705 NULL
-+ocfs2_split_tree_15716 ocfs2_split_tree 5-0 15716 NULL
-+tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
++inet6_if_nlmsg_size_15711 inet6_if_nlmsg_size 0 15711 NULL
++ocfs2_split_tree_15716 ocfs2_split_tree 0-5 15716 NULL
+HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
++sk_wmem_schedule_15759 sk_wmem_schedule 2 15759 NULL
+ftrace_profile_init_cpu_15761 ftrace_profile_init_cpu 0 15761 NULL
+bitmap_search_next_usable_block_15762 bitmap_search_next_usable_block 3-1-0 15762 NULL
-+i915_gem_init_seqno_15793 i915_gem_init_seqno 0 15793 NULL
++msi_alloc_irte_15798 msi_alloc_irte 3 15798 NULL
+smk_read_direct_15803 smk_read_direct 3 15803 NULL
-+nameseq_list_15817 nameseq_list 3-0 15817 NULL nohasharray
-+gnttab_expand_15817 gnttab_expand 1 15817 &nameseq_list_15817
++gnttab_expand_15817 gnttab_expand 1 15817 NULL
+afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
-+brcmf_sdbrcm_died_dump_15841 brcmf_sdbrcm_died_dump 3 15841 NULL
+table_size_15851 table_size 0-1-2 15851 NULL
-+ubi_io_write_15870 ubi_io_write 0-5-4 15870 NULL nohasharray
++ubi_io_write_15870 ubi_io_write 0 15870 NULL nohasharray
+media_entity_init_15870 media_entity_init 2-4 15870 &ubi_io_write_15870
++ddr_init_15874 ddr_init 0 15874 NULL
+__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
-+profile_pc_15887 profile_pc 0 15887 NULL
+nfs_map_group_to_gid_15892 nfs_map_group_to_gid 3 15892 NULL
+native_read_msr_15905 native_read_msr 0 15905 NULL
+parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
+power_read_15939 power_read 3 15939 NULL
-+lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
++lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL nohasharray
++i2c_write_15948 i2c_write 0 15948 &lpfc_idiag_drbacc_read_15948
+snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
-+tfrc_calc_x_15975 tfrc_calc_x 2-1 15975 NULL
-+frame_alloc_15981 frame_alloc 4 15981 NULL
++calculate_max_size_15977 calculate_max_size 0 15977 NULL
++get_entry_16003 get_entry 4 16003 NULL
+hdpvr_register_videodev_16010 hdpvr_register_videodev 3 16010 NULL
+viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
-+i915_gem_object_pin_16032 i915_gem_object_pin 0 16032 NULL
++got_frame_16028 got_frame 2 16028 NULL
+dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
-+read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
-+si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
++snd_sgbuf_aligned_pages_16063 snd_sgbuf_aligned_pages 0-1 16063 NULL
+ocfs2_sync_local_to_main_16076 ocfs2_sync_local_to_main 0 16076 NULL
+isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 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
+irq_set_chip_and_handler_name_16111 irq_set_chip_and_handler_name 1 16111 NULL
++rd_mem_16117 rd_mem 0 16117 NULL
+snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
+compat_sys_select_16131 compat_sys_select 1 16131 NULL
+fsm_init_16134 fsm_init 2 16134 NULL
++hysdn_rx_netpkt_16136 hysdn_rx_netpkt 3 16136 NULL
+ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
-+update_block_group_16155 update_block_group 0 16155 NULL
-+optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
-+mapping_level_16188 mapping_level 2 16188 NULL
-+i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL
-+tcp_syn_options_16197 tcp_syn_options 0 16197 NULL
-+ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL
+cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL
-+SyS_pselect6_16210 SyS_pselect6 1 16210 NULL
+create_table_16213 create_table 2 16213 NULL
+atomic_read_file_16227 atomic_read_file 3 16227 NULL
+BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
-+lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
-+i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL nohasharray
-+btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 &i40e_dbg_dump_read_16247
-+il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
-+SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
++btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 NULL
++mark_written_sectors_16262 mark_written_sectors 2 16262 NULL
+reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
-+mq_force_mapping_16277 mq_force_mapping 2 16277 NULL
+ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL
+drbd_setsockopt_16280 drbd_setsockopt 5 16280 NULL nohasharray
+nand_bch_init_16280 nand_bch_init 2-3 16280 &drbd_setsockopt_16280
-+account_16283 account 0-4-2 16283 NULL nohasharray
-+mirror_status_16283 mirror_status 5 16283 &account_16283
-+retry_instruction_16285 retry_instruction 2 16285 NULL
++account_16283 account 0-4-2 16283 NULL
+jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL
-+mo_xattr_get_16288 mo_xattr_get 0 16288 NULL
+stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
-+rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL
-+tfrc_invert_loss_event_rate_16295 tfrc_invert_loss_event_rate 1 16295 NULL
+rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
-+wb_map_16301 wb_map 2 16301 NULL
-+kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
-+ext4_blocks_count_16320 ext4_blocks_count 0 16320 NULL
-+vmw_cursor_update_image_16332 vmw_cursor_update_image 3-4 16332 NULL
-+btrfs_insert_item_16357 btrfs_insert_item 0 16357 NULL
-+sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
++sst_allocate_decode_buf_16349 sst_allocate_decode_buf 3 16349 NULL
+total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
+iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
-+diva_os_malloc_16406 diva_os_malloc 2 16406 NULL
++nl80211_send_unprot_deauth_16378 nl80211_send_unprot_deauth 4 16378 NULL
++i8042_create_kbd_port_16379 i8042_create_kbd_port 0 16379 NULL
++scsi_nl_send_vendor_msg_16394 scsi_nl_send_vendor_msg 5 16394 NULL
++alloc_trdev_16399 alloc_trdev 1 16399 NULL
+ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
+rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
-+__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
-+btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 0 16452 NULL
++calculate_inocache_hashsize_16449 calculate_inocache_hashsize 0-1 16449 NULL
+ocfs2_expand_refcount_tree_16455 ocfs2_expand_refcount_tree 0 16455 NULL
+netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
-+req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
++sock_wmalloc_16472 sock_wmalloc 2 16472 NULL
++ab8500_val_write_16473 ab8500_val_write 3 16473 NULL
+ocfs2_block_group_set_bits_16488 ocfs2_block_group_set_bits 0 16488 NULL
-+add_qgroup_item_16492 add_qgroup_item 0 16492 NULL
+tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
+filemap_write_and_wait_16506 filemap_write_and_wait 0 16506 NULL
+start_this_handle_16519 start_this_handle 0 16519 NULL
+snd_interval_max_16529 snd_interval_max 0 16529 NULL
-+raid10_resize_16537 raid10_resize 2 16537 NULL
+lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
-+perf_event_set_period_16574 perf_event_set_period 2-3 16574 NULL
+agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
-+lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0 16589 NULL
-+btrfs_insert_orphan_item_16602 btrfs_insert_orphan_item 0 16602 NULL
-+gmux_index_read32_16604 gmux_index_read32 0 16604 NULL
-+btrfs_end_transaction_16610 btrfs_end_transaction 0 16610 NULL
-+palmas_irq_get_virq_16613 palmas_irq_get_virq 2 16613 NULL
++__cfg80211_testmode_alloc_skb_16611 __cfg80211_testmode_alloc_skb 2 16611 NULL
+btrfs_wait_marked_extents_16615 btrfs_wait_marked_extents 0 16615 NULL
-+rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
-+btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
++bnx2i_session_create_16624 bnx2i_session_create 2 16624 NULL
+packet_recv_error_16669 packet_recv_error 3 16669 NULL
-+__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
-+__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
++dlm_new_lockspace_16688 dlm_new_lockspace 2 16688 NULL
++calc_layout_16690 calc_layout 4 16690 NULL
++em28xx_v4l2_read_16701 em28xx_v4l2_read 3 16701 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
+blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
+i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL
+get_server_iovec_16804 get_server_iovec 2 16804 NULL
+tipc_send2name_16809 tipc_send2name 6 16809 NULL
-+dm_vcalloc_16814 dm_vcalloc 1-2 16814 NULL
-+drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
++mled_proc_write_16831 mled_proc_write 3 16831 NULL nohasharray
++drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 &mled_proc_write_16831
+scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
+hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
+alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL
+carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
+st_write_16874 st_write 3 16874 NULL
+__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
-+transport_init_session_tags_16878 transport_init_session_tags 1-2 16878 NULL
+ext4_ext_zeroout_16895 ext4_ext_zeroout 0 16895 NULL
++mwifiex_update_curr_bss_params_16908 mwifiex_update_curr_bss_params 5 16908 NULL
++ivtv_v4l2_ioctl_16915 ivtv_v4l2_ioctl 2 16915 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
++paranoid_check_vid_hdr_16932 paranoid_check_vid_hdr 0 16932 NULL
++random32_16937 random32 0 16937 NULL
++ip_append_data_16942 ip_append_data 5-6 16942 NULL
+_sp2d_alloc_16944 _sp2d_alloc 3-2-1 16944 NULL
+squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
++cfg80211_send_unprot_disassoc_16951 cfg80211_send_unprot_disassoc 3 16951 NULL
+wrm_16966 wrm 0 16966 NULL
+keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
-+ocfs2_read_quota_phys_block_16990 ocfs2_read_quota_phys_block 0 16990 NULL
+ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
+snd_mask_refine_first_17026 snd_mask_refine_first 0 17026 NULL
-+copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
-+btrfs_unlink_inode_17043 btrfs_unlink_inode 0 17043 NULL
++copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL nohasharray
++iwm_if_alloc_17027 iwm_if_alloc 1 17027 ©_counters_to_user_17027
+jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
+__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
-+__copy_user_nocache_17065 __copy_user_nocache 0 17065 NULL
+sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
+dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
+simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
++expand_files_17080 expand_files 2 17080 NULL
+carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
+entry_length_17093 entry_length 0 17093 NULL
++sys_preadv_17100 sys_preadv 3 17100 NULL
+ocfs2_get_refcount_cpos_end_17113 ocfs2_get_refcount_cpos_end 0 17113 NULL
+write_mem_17114 write_mem 3 17114 NULL
+pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
++mwifiex_get_common_rates_17131 mwifiex_get_common_rates 3 17131 NULL
+wrmaltWithLock_17139 wrmaltWithLock 0 17139 NULL
-+nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
+jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
-+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
-+UniStrnlen_17169 UniStrnlen 0 17169 NULL
-+ocfs2_flock_handle_signal_17189 ocfs2_flock_handle_signal 0 17189 NULL nohasharray
-+access_remote_vm_17189 access_remote_vm 0-4-2 17189 &ocfs2_flock_handle_signal_17189 nohasharray
++pm860x_page_bulk_read_17174 pm860x_page_bulk_read 3 17174 NULL
++access_remote_vm_17189 access_remote_vm 0 17189 NULL nohasharray
+iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189
+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
-+sync_request_17208 sync_request 2 17208 NULL
+dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
-+send_write_or_clone_17241 send_write_or_clone 0 17241 NULL
-+to_oblock_17254 to_oblock 0-1 17254 NULL
-+unpack_value_17259 unpack_value 1 17259 NULL
-+lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
-+error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
-+alloc_reserved_file_extent_17267 alloc_reserved_file_extent 0 17267 NULL
++ms_rw_17220 ms_rw 3-4 17220 NULL
++__be16_to_cpup_17261 __be16_to_cpup 0 17261 NULL
+alloc_ep_17269 alloc_ep 1 17269 NULL
-+hw_test_and_write_17271 hw_test_and_write 3 17271 NULL
+pg_read_17276 pg_read 3 17276 NULL
+raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
-+hmac_sha256_17278 hmac_sha256 2 17278 NULL
+neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
+minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
-+install_breakpoint_17292 install_breakpoint 4 17292 NULL
-+ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
++skb_pad_17302 skb_pad 2 17302 NULL
+mb_cache_create_17307 mb_cache_create 2 17307 NULL
-+gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
-+SYSC_pread64_17337 SYSC_pread64 3 17337 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
-+mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
++iwm_umac_set_config_var_17320 iwm_umac_set_config_var 4 17320 NULL
++ata_host_alloc_pinfo_17325 ata_host_alloc_pinfo 3 17325 NULL
++alloc_fdtable_17389 alloc_fdtable 1 17389 NULL
+lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
+compat_sys_ppoll_17430 compat_sys_ppoll 2 17430 NULL
+sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
-+SYSC_fcntl_17441 SYSC_fcntl 3 17441 NULL
-+libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
++snd_hammerfall_get_buffer_17441 snd_hammerfall_get_buffer 3 17441 NULL
+nla_get_u32_17455 nla_get_u32 0 17455 NULL
-+__ref_totlen_17461 __ref_totlen 0 17461 NULL
++__send_request_17461 __send_request 0 17461 NULL nohasharray
++__ref_totlen_17461 __ref_totlen 0 17461 &__send_request_17461
+probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
+TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
-+lookup_tree_block_ref_17494 lookup_tree_block_ref 0 17494 NULL
+bitmap_pos_to_ord_17503 bitmap_pos_to_ord 3 17503 NULL
+lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
-+qp_free_res_17541 qp_free_res 5 17541 NULL
++restore_i387_fxsave_17528 restore_i387_fxsave 2 17528 NULL
++__cfg80211_roamed_17529 __cfg80211_roamed 5-7 17529 NULL
+xlog_do_log_recovery_17550 xlog_do_log_recovery 3 17550 NULL
+__copy_to_user_17551 __copy_to_user 3-0 17551 NULL
+copy_from_user_17559 copy_from_user 3-0 17559 NULL
+snd_pcm_action_lock_irq_17569 snd_pcm_action_lock_irq 0 17569 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
++brcmf_process_nvram_vars_17601 brcmf_process_nvram_vars 0 17601 NULL nohasharray
++iwl_dump_nic_event_log_17601 iwl_dump_nic_event_log 0 17601 &brcmf_process_nvram_vars_17601
+__inode_info_17603 __inode_info 0 17603 NULL
-+wm8994_gpio_to_irq_17604 wm8994_gpio_to_irq 2 17604 NULL
+osst_execute_17607 osst_execute 7-6 17607 NULL
+ocfs2_mark_extent_written_17615 ocfs2_mark_extent_written 6 17615 NULL
-+ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
+dma_map_page_17628 dma_map_page 0 17628 NULL
+ocfs2_rotate_subtree_left_17634 ocfs2_rotate_subtree_left 0 17634 NULL
-+twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL
-+SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
+packet_setsockopt_17662 packet_setsockopt 5 17662 NULL nohasharray
+ubi_io_read_data_17662 ubi_io_read_data 0 17662 &packet_setsockopt_17662
-+kernel_write_17665 kernel_write 3 17665 NULL
++dsp_tone_hw_message_17678 dsp_tone_hw_message 3 17678 NULL
+pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
+filemap_fdatawait_17688 filemap_fdatawait 0 17688 NULL
-+gfn_to_pfn_memslot_17693 gfn_to_pfn_memslot 2-0 17693 NULL
-+__einj_error_trigger_17707 __einj_error_trigger 0 17707 NULL nohasharray
-+venus_rename_17707 venus_rename 4-5 17707 &__einj_error_trigger_17707
++venus_rename_17707 venus_rename 4-5 17707 NULL
++intel_wait_ring_buffer_17727 intel_wait_ring_buffer 0 17727 NULL
+exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
+sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
+mark_unsafe_pages_17759 mark_unsafe_pages 0 17759 NULL
-+dgap_do_fep_load_17765 dgap_do_fep_load 3 17765 NULL
-+dtf_read_run_17768 dtf_read_run 3 17768 NULL
-+brcmf_sdio_chip_verifynvram_17776 brcmf_sdio_chip_verifynvram 4 17776 NULL
-+hash_ipport6_expire_17784 hash_ipport6_expire 3 17784 NULL
+perf_clock_17787 perf_clock 0 17787 NULL
-+ubifs_leb_change_17789 ubifs_leb_change 0-4 17789 NULL
-+get_unaligned_be64_17794 get_unaligned_be64 0 17794 NULL nohasharray
-+shrink_slab_node_17794 shrink_slab_node 3-4 17794 &get_unaligned_be64_17794
-+bkey_to_cacheline_17811 bkey_to_cacheline 0 17811 NULL
-+_snd_pcm_lib_alloc_vmalloc_buffer_17820 _snd_pcm_lib_alloc_vmalloc_buffer 2 17820 NULL
++get_unaligned_be64_17794 get_unaligned_be64 0 17794 NULL
+gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
+cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
-+dm_stats_message_17863 dm_stats_message 5 17863 NULL
++count_leafs_17842 count_leafs 0 17842 NULL
++tcp_left_out_17860 tcp_left_out 0 17860 NULL
+sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
+alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
+ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
-+orinoco_set_key_17878 orinoco_set_key 7-5 17878 NULL nohasharray
-+i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878
++orinoco_set_key_17878 orinoco_set_key 7-5 17878 NULL
+init_per_cpu_17880 init_per_cpu 1 17880 NULL
+ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
++compat_sys_pwritev_17886 compat_sys_pwritev 3 17886 NULL
+ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
+ocfs2_clusters_to_blocks_17896 ocfs2_clusters_to_blocks 0-2 17896 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
++xfs_rtallocate_extent_near_17916 xfs_rtallocate_extent_near 3-5-9 17916 NULL
++srp_iu_pool_alloc_17920 srp_iu_pool_alloc 2 17920 NULL
+scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
-+__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
+beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
-+ufs_free_blocks_17963 ufs_free_blocks 3-2 17963 NULL nohasharray
-+tlv_put_u64_17963 tlv_put_u64 0 17963 &ufs_free_blocks_17963
++ufs_free_blocks_17963 ufs_free_blocks 3-2 17963 NULL
+calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL
-+ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL
+smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
-+gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
+ext4_num_overhead_clusters_18001 ext4_num_overhead_clusters 2 18001 NULL
+pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
++prandom32_18007 prandom32 0 18007 NULL
+alloc_rx_desc_ring_18016 alloc_rx_desc_ring 2 18016 NULL
+fill_read_18019 fill_read 0 18019 NULL
-+o2hb_highest_node_18034 o2hb_highest_node 2-0 18034 NULL
-+__posix_lock_file_18035 __posix_lock_file 0 18035 NULL
++o2hb_highest_node_18034 o2hb_highest_node 2 18034 NULL
+ocfs2_cache_cluster_dealloc_18043 ocfs2_cache_cluster_dealloc 0 18043 NULL
+cryptd_alloc_instance_18048 cryptd_alloc_instance 3-2 18048 NULL
-+find_next_inuse_18051 find_next_inuse 2-3-0 18051 NULL
+ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
-+lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL
+fpregs_get_18066 fpregs_get 4 18066 NULL
-+kvm_read_guest_page_18074 kvm_read_guest_page 5-2 18074 NULL
-+SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
-+SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
-+mpi_alloc_18094 mpi_alloc 1 18094 NULL
-+hfs_direct_IO_18104 hfs_direct_IO 4 18104 NULL
++packet_came_18072 packet_came 3 18072 NULL
++kvm_read_guest_page_18074 kvm_read_guest_page 5 18074 NULL
++pvclock_get_nsec_offset_18104 pvclock_get_nsec_offset 0 18104 NULL
++netlink_kernel_create_18110 netlink_kernel_create 3 18110 NULL
++iwch_create_cq_18115 iwch_create_cq 2 18115 NULL
+dfs_file_read_18116 dfs_file_read 3 18116 NULL
+svc_getnl_18120 svc_getnl 0 18120 NULL
-+paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
-+vmw_surface_dma_size_18132 vmw_surface_dma_size 0 18132 NULL
+selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
+is_idx_node_in_use_18165 is_idx_node_in_use 0 18165 NULL
++_has_tag_18169 _has_tag 2 18169 NULL
+pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
++cfpkt_create_18197 cfpkt_create 1 18197 NULL
+snd_pcm_hw_refine_user_18204 snd_pcm_hw_refine_user 0 18204 NULL
+orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
+gsm_control_message_18209 gsm_control_message 4 18209 NULL
+ocfs2_divide_leaf_refcount_block_18214 ocfs2_divide_leaf_refcount_block 0 18214 NULL
+do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
++koneplus_send_18226 koneplus_send 4 18226 NULL
+gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
-+alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
+rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
+__sysfs_add_one_18258 __sysfs_add_one 0 18258 NULL
+qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
++call_usermodehelper_18268 call_usermodehelper 0 18268 NULL
+gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
+alloc_ring_18278 alloc_ring 4-2 18278 NULL
+find_dirty_idx_leb_18280 find_dirty_idx_leb 0 18280 NULL
-+nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 NULL nohasharray
-+bio_phys_segments_18281 bio_phys_segments 0 18281 &nouveau_subdev_create__18281
-+ext4_readpages_18283 ext4_readpages 4 18283 NULL
+mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
+um_idi_write_18293 um_idi_write 3 18293 NULL
-+nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
++ip6ip6_err_18308 ip6ip6_err 5 18308 NULL
+vga_r_18310 vga_r 0 18310 NULL
-+class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
-+csio_mem_read_18319 csio_mem_read 3 18319 NULL
+alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
+ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
+bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
-+__inorder_to_tree_18329 __inorder_to_tree 0-3-1 18329 NULL
+lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
+pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
+xlbd_reserve_minors_18365 xlbd_reserve_minors 1-2 18365 NULL
-+SyS_process_vm_readv_18366 SyS_process_vm_readv 5-3 18366 NULL
+ep_io_18367 ep_io 0 18367 NULL
-+qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL
-+ci_role_write_18388 ci_role_write 3 18388 NULL nohasharray
-+irq_find_mapping_18388 irq_find_mapping 0-2 18388 &ci_role_write_18388
-+btrfs_update_inode_18394 btrfs_update_inode 0 18394 NULL
-+hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
+__video_register_device_18399 __video_register_device 3 18399 NULL
-+hash_ip4_expire_18402 hash_ip4_expire 3 18402 NULL nohasharray
-+adis16136_show_serial_18402 adis16136_show_serial 3 18402 &hash_ip4_expire_18402
-+btrfs_rmap_block_18403 btrfs_rmap_block 0 18403 NULL
+crystalhd_user_data_18407 crystalhd_user_data 3 18407 NULL
-+batadv_orig_node_add_if_18433 batadv_orig_node_add_if 2 18433 NULL nohasharray
-+iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 &batadv_orig_node_add_if_18433
+snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
-+btrfs_uuid_tree_lookup_18451 btrfs_uuid_tree_lookup 0 18451 NULL
-+flash_dev_cache_miss_18454 flash_dev_cache_miss 4 18454 NULL
+fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
+regset_tls_set_18459 regset_tls_set 4 18459 NULL
-+pcibios_window_alignment_18460 pcibios_window_alignment 0 18460 NULL
-+dma_alloc_from_contiguous_18466 dma_alloc_from_contiguous 3-2 18466 NULL
-+pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
-+mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479
-+r600_texture_size_18487 r600_texture_size 4-5-6 18487 NULL nohasharray
-+udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 &r600_texture_size_18487
-+btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL nohasharray
-+remap_pmd_range_18501 remap_pmd_range 3-4-5 18501 &btrfs_fiemap_18501
-+i915_gem_object_wait_fence_18508 i915_gem_object_wait_fence 0 18508 NULL
++write_file_tx_chainmask_18487 write_file_tx_chainmask 3 18487 NULL nohasharray
++udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 &write_file_tx_chainmask_18487
+__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
+snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
+snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
-+nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
+seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
+acpi_register_gsi_ioapic_18550 acpi_register_gsi_ioapic 2 18550 NULL
+sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
+vb2_streamon_18562 vb2_streamon 0 18562 NULL
-+smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
+debug_output_18575 debug_output 3 18575 NULL
-+is_extent_unchanged_18576 is_extent_unchanged 0 18576 NULL
+check_lpt_type_18577 check_lpt_type 0 18577 NULL
-+numa_node_id_18596 numa_node_id 0 18596 NULL
++__netdev_alloc_skb_18595 __netdev_alloc_skb 2 18595 NULL
+filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray
+slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600
+iowarrior_write_18604 iowarrior_write 3 18604 NULL
-+audio_get_endpoint_req_18624 audio_get_endpoint_req 0 18624 NULL
+from_buffer_18625 from_buffer 3 18625 NULL
++f1x_map_sysaddr_to_csrow_18628 f1x_map_sysaddr_to_csrow 2 18628 NULL
++cfg80211_send_rx_assoc_18638 cfg80211_send_rx_assoc 3 18638 NULL
+snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
-+ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
+unmap_page_18665 unmap_page 2-3 18665 NULL
-+xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
-+echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL
-+replay_log_leb_18704 replay_log_leb 3 18704 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
+iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
+ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
+ocfs2_trim_extent_18711 ocfs2_trim_extent 3-4 18711 NULL
+blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
-+byt_gpio_to_irq_18721 byt_gpio_to_irq 2 18721 NULL
-+ext4_es_insert_extent_18729 ext4_es_insert_extent 0 18729 NULL
+snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
+o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
+__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
+wep_packets_read_18751 wep_packets_read 3 18751 NULL
+read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
+ffs_epfile_read_18775 ffs_epfile_read 3 18775 NULL
-+SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
+alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
-+prealloc_18800 prealloc 0 18800 NULL
-+madvise_hwpoison_18812 madvise_hwpoison 2 18812 NULL
++ieee80211_auth_challenge_18810 ieee80211_auth_challenge 3 18810 NULL
+setup_ioapic_irq_18813 setup_ioapic_irq 1 18813 NULL
-+dm_stats_print_18815 dm_stats_print 7 18815 NULL
++iio_allocate_device_18821 iio_allocate_device 1 18821 NULL
+sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
+mtf_test_write_18844 mtf_test_write 3 18844 NULL
-+iterate_inode_refs_18846 iterate_inode_refs 0 18846 NULL
+drm_ht_create_18853 drm_ht_create 2 18853 NULL
+sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
-+ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL nohasharray
-+heads_to_leaves_18869 heads_to_leaves 2-0 18869 &ieee80211_if_read_element_ttl_18869
++ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
+xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
+width_to_agaw_18883 width_to_agaw 0-1 18883 NULL
-+overwrite_item_18896 overwrite_item 0 18896 NULL
+ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
-+ext4_block_in_group_18922 ext4_block_in_group 2 18922 NULL
-+ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
-+create_pending_snapshot_18936 create_pending_snapshot 0 18936 NULL
+snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
-+regcache_sync_block_18963 regcache_sync_block 4-3 18963 NULL
++sctp_tsnmap_num_gabs_18952 sctp_tsnmap_num_gabs 0 18952 NULL
++fdb_nlmsg_size_18957 fdb_nlmsg_size 0 18957 NULL
+__nla_reserve_18974 __nla_reserve 3 18974 NULL
-+__blockdev_direct_IO_18977 __blockdev_direct_IO 0-6 18977 NULL
-+gfn_to_pfn_atomic_18981 gfn_to_pfn_atomic 2 18981 NULL
-+get_inode_path_18988 get_inode_path 0 18988 NULL
-+find_dirtiest_idx_leb_19001 find_dirtiest_idx_leb 0 19001 NULL nohasharray
-+test_check_exists_19001 test_check_exists 2 19001 &find_dirtiest_idx_leb_19001
++alc_auto_create_extra_outs_18975 alc_auto_create_extra_outs 2 18975 NULL
++find_dirtiest_idx_leb_19001 find_dirtiest_idx_leb 0 19001 NULL
+layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
+huge_page_size_19008 huge_page_size 0 19008 NULL
+push_leaf_right_19017 push_leaf_right 0 19017 NULL
+prepare_highmem_image_19028 prepare_highmem_image 0 19028 NULL
+ocfs2_steal_resource_19036 ocfs2_steal_resource 0 19036 NULL
+revalidate_19043 revalidate 2 19043 NULL
++drm_fb_helper_init_19044 drm_fb_helper_init 4-3 19044 NULL
+afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
-+osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL
++do_vm86_irq_handling_19056 do_vm86_irq_handling 2 19056 NULL
+create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
+ieee80211_key_alloc_19065 ieee80211_key_alloc 3 19065 NULL
-+ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
++alloc_pbl_19075 alloc_pbl 2 19075 NULL
++copy_and_check_19089 copy_and_check 3 19089 NULL
++sys_process_vm_readv_19090 sys_process_vm_readv 5-3 19090 NULL
+sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
+cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
-+ATOMIC_SUB_RETURN_19115 ATOMIC_SUB_RETURN 2 19115 NULL
++skb_gro_offset_19123 skb_gro_offset 0 19123 NULL
+ext4_inode_table_19125 ext4_inode_table 0 19125 NULL
+snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
-+btrfs_run_delayed_refs_19137 btrfs_run_delayed_refs 0 19137 NULL
+alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
-+sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
-+ext3_reserve_inode_write_19163 ext3_reserve_inode_write 0 19163 NULL
-+smk_write_access2_19170 smk_write_access2 3 19170 NULL
++count_history_pages_19171 count_history_pages 0-3 19171 NULL
+iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
+vmw_unlocked_ioctl_19212 vmw_unlocked_ioctl 2 19212 NULL
+__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3-0 19214 NULL
+dev_counters_read_19216 dev_counters_read 3 19216 NULL
-+wbcir_tx_19219 wbcir_tx 3 19219 NULL
+gsi_to_irq_19220 gsi_to_irq 0-1 19220 NULL
+snd_mask_max_19224 snd_mask_max 0 19224 NULL
+snd_pcm_capture_rewind_19229 snd_pcm_capture_rewind 0-2 19229 NULL
-+bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
-+ucma_query_19260 ucma_query 4 19260 NULL
-+write_one_cache_group_19261 write_one_cache_group 0 19261 NULL
-+il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
-+cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 NULL
++sys_fcntl_19267 sys_fcntl 3 19267 NULL
++setup_shmem_window_19292 setup_shmem_window 2-3 19292 NULL
+qc_capture_19298 qc_capture 3 19298 NULL
+ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 4-3 19303 NULL
+event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
-+gfn_to_gpa_19320 gfn_to_gpa 0-1 19320 NULL
+debug_read_19322 debug_read 3 19322 NULL
-+SYSC_sendfile64_19327 SYSC_sendfile64 4 19327 NULL
+cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 NULL nohasharray
+lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 &cfg80211_inform_bss_19332
-+closure_sub_19359 closure_sub 2 19359 NULL
+firmware_data_write_19360 firmware_data_write 6-5 19360 NULL
+read_zero_19366 read_zero 3 19366 NULL
+interpret_user_input_19393 interpret_user_input 2 19393 NULL
-+sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
+get_unaligned_be16_19400 get_unaligned_be16 0 19400 NULL
+get_n_events_by_type_19401 get_n_events_by_type 0 19401 NULL
+pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
+dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
+__phys_addr_19434 __phys_addr 0 19434 NULL
-+SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
+xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
+gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL
+sky2_read16_19475 sky2_read16 0 19475 NULL
++refill_pool_19477 refill_pool 2 19477 NULL
++efivar_create_sysfs_entry_19485 efivar_create_sysfs_entry 2 19485 NULL
+__read_status_pciv2_19492 __read_status_pciv2 0 19492 NULL
+kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL
-+ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
-+cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL nohasharray
-+apei_exec_pre_map_gars_19529 apei_exec_pre_map_gars 0 19529 &cfc_write_array_to_buffer_19529
-+nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
-+howmany_64_19548 howmany_64 2 19548 NULL
-+btrfs_xattr_security_init_19553 btrfs_xattr_security_init 0 19553 NULL
-+gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
-+kernel_read_19559 kernel_read 4-0 19559 NULL
++v4l2_event_subscribe_19510 v4l2_event_subscribe 3 19510 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
++apei_exec_pre_map_gars_19529 apei_exec_pre_map_gars 0 19529 NULL
+ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
+ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 NULL
+nfsd_read_19568 nfsd_read 5 19568 NULL
+cgroup_read_s64_19570 cgroup_read_s64 5 19570 NULL
+bm_status_read_19583 bm_status_read 3 19583 NULL
-+batadv_tt_update_orig_19586 batadv_tt_update_orig 4 19586 NULL
+load_xattr_datum_19594 load_xattr_datum 0 19594 NULL
-+__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
-+usbvision_rvmalloc_19655 usbvision_rvmalloc 1 19655 NULL
++buffRdbkVerify_19644 buffRdbkVerify 0 19644 NULL
++alloc_coherent_19649 alloc_coherent 2 19649 NULL
+LoadBitmap_19658 LoadBitmap 2 19658 NULL
-+i915_gem_object_bind_to_gtt_19682 i915_gem_object_bind_to_gtt 0 19682 NULL
-+bio_detain_19690 bio_detain 2 19690 NULL
-+btrfs_del_inode_extref_19692 btrfs_del_inode_extref 0 19692 NULL
-+mem_cgroup_swappiness_19718 mem_cgroup_swappiness 0 19718 NULL
++rbd_snap_add_19678 rbd_snap_add 4 19678 NULL
++delay_status_19685 delay_status 4 19685 NULL
+btrfs_write_marked_extents_19720 btrfs_write_marked_extents 0 19720 NULL
+read_reg_19723 read_reg 0 19723 NULL
-+wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
-+memcpy_toiovecend_19736 memcpy_toiovecend 3-4-0 19736 NULL
++memcpy_toiovecend_19736 memcpy_toiovecend 3-4 19736 NULL
+snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL
+p9_client_read_19750 p9_client_read 0-5 19750 NULL
+pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
-+ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
+jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
-+readhscx_19769 readhscx 0 19769 NULL
+ocfs2_read_group_descriptor_19771 ocfs2_read_group_descriptor 0 19771 NULL
+__set_print_fmt_19776 __set_print_fmt 0 19776 NULL
+saa7146_vmalloc_build_pgtable_19780 saa7146_vmalloc_build_pgtable 2 19780 NULL
++madgemc_sifreadw_19811 madgemc_sifreadw 0 19811 NULL
+irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
++ubi_eba_write_leb_19826 ubi_eba_write_leb 0 19826 NULL
+pcpu_next_unpop_19831 pcpu_next_unpop 4 19831 NULL
+vfs_getxattr_19832 vfs_getxattr 0 19832 NULL
++key_validate_19834 key_validate 0 19834 NULL
+security_context_to_sid_19839 security_context_to_sid 2 19839 NULL
-+crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
+cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
+__nla_put_19857 __nla_put 3 19857 NULL
-+mrp_request_join_19882 mrp_request_join 4 19882 NULL
+aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
+ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
-+mangle_name_19923 mangle_name 0 19923 NULL
+cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
-+guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
+iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
-+cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
-+alloc_elfnotes_buf_19974 alloc_elfnotes_buf 1 19974 NULL
-+get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL
++ax25_send_frame_19964 ax25_send_frame 2 19964 NULL
++dbg_leb_change_19969 dbg_leb_change 0 19969 NULL
+attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
-+rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL
++ip_send_reply_19987 ip_send_reply 5 19987 NULL
+diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
-+lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL
-+SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
-+split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
-+mlx5_ib_db_map_user_20037 mlx5_ib_db_map_user 2 20037 NULL
-+btrfs_block_rsv_migrate_20050 btrfs_block_rsv_migrate 0 20050 NULL
++jbd2_journal_create_slab_20043 jbd2_journal_create_slab 1 20043 NULL
+__be32_to_cpup_20056 __be32_to_cpup 0 20056 NULL
+alloc_ieee80211_20063 alloc_ieee80211 1 20063 NULL
-+iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 4 20067 NULL
-+btrfs_pin_extent_for_log_replay_20069 btrfs_pin_extent_for_log_replay 2 20069 NULL
-+target_message_20072 target_message 2 20072 NULL
+rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
+fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
+aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
-+team_options_register_20091 team_options_register 3 20091 NULL
+qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
-+read_int_20098 read_int 0 20098 NULL
+root_nfs_copy_20111 root_nfs_copy 3 20111 NULL
+hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
-+self_check_vid_hdr_20131 self_check_vid_hdr 0 20131 NULL
+tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
+read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
+wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
+create_trace_probe_20175 create_trace_probe 1 20175 NULL
+crystalhd_map_dio_20181 crystalhd_map_dio 3 20181 NULL
-+udf_bitmap_new_block_20214 udf_bitmap_new_block 4 20214 NULL
++ext4_llseek_20183 ext4_llseek 2 20183 NULL
+pvr2_ctrl_value_to_sym_20229 pvr2_ctrl_value_to_sym 5 20229 NULL
+rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
+tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
+pcpu_alloc_20255 pcpu_alloc 1-2 20255 NULL
+resource_size_20256 resource_size 0 20256 NULL
-+r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL
-+dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL
-+tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
++_rtl92s_get_h2c_cmdlen_20312 _rtl92s_get_h2c_cmdlen 0 20312 NULL
+vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL
+snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
+ocfs2_et_insert_check_20341 ocfs2_et_insert_check 0 20341 NULL
+gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
-+handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
+snd_pcm_stop_20376 snd_pcm_stop 0 20376 NULL
-+smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
+block_read_full_page_20380 block_read_full_page 0 20380 NULL
-+snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL nohasharray
-+read_7220_creg32_20394 read_7220_creg32 0 20394 &snd_nm256_readl_20394
-+__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL nohasharray
-+SyS_get_mempolicy_20399 SyS_get_mempolicy 3-4 20399 &__kfifo_from_user_20399
-+btrfs_set_acl_20440 btrfs_set_acl 0 20440 NULL
++snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL
++__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL
++interface_rx_20404 interface_rx 4 20404 NULL
++find_skb_20431 find_skb 2 20431 NULL
++fmc_send_cmd_20435 fmc_send_cmd 5 20435 NULL
++tcp_fragment_20436 tcp_fragment 3 20436 NULL
+nfs3_setxattr_20458 nfs3_setxattr 4 20458 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
-+btrfs_get_32_20476 btrfs_get_32 0 20476 NULL
-+fast_user_write_20494 fast_user_write 5 20494 NULL
-+ocfs2_db_frozen_trigger_20503 ocfs2_db_frozen_trigger 4 20503 NULL
++ocfs2_db_frozen_trigger_20503 ocfs2_db_frozen_trigger 4 20503 NULL nohasharray
++hidraw_report_event_20503 hidraw_report_event 3 20503 &ocfs2_db_frozen_trigger_20503
+pcpu_alloc_area_20511 pcpu_alloc_area 0-3 20511 NULL
-+link_free_space_20512 link_free_space 0 20512 NULL
+pcpu_depopulate_chunk_20517 pcpu_depopulate_chunk 3-2 20517 NULL
+xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
+drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
+amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
-+scsi_report_opcode_20551 scsi_report_opcode 3 20551 NULL
+venus_create_20555 venus_create 4 20555 NULL
-+btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
+crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
-+batadv_tt_append_diff_20588 batadv_tt_append_diff 4 20588 NULL nohasharray
-+ocfs2_cluster_lock_20588 ocfs2_cluster_lock 0 20588 &batadv_tt_append_diff_20588
-+kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
-+sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
++i915_max_freq_read_20581 i915_max_freq_read 3 20581 NULL
++ocfs2_cluster_lock_20588 ocfs2_cluster_lock 0 20588 NULL
+lirc_write_20604 lirc_write 3 20604 NULL
+qib_qsfp_write_20614 qib_qsfp_write 0-2-4 20614 NULL
++regcache_lzo_block_count_20628 regcache_lzo_block_count 0 20628 NULL
+snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
-+get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
+kfifo_copy_to_user_20646 kfifo_copy_to_user 4-3 20646 NULL
+cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
-+oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
-+oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
-+snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL nohasharray
-+btrfs_qgroup_reserve_20676 btrfs_qgroup_reserve 0 20676 &snd_hdsp_playback_copy_20676
-+get_user_page_nowait_20682 get_user_page_nowait 3 20682 NULL nohasharray
-+dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 &get_user_page_nowait_20682
++ceph_osdc_new_request_20654 ceph_osdc_new_request 15-4 20654 NULL
++snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL
++dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 NULL
+cpumask_size_20683 cpumask_size 0 20683 NULL
+btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
-+gru_vtop_20689 gru_vtop 2 20689 NULL
+read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
-+i915_gem_obj_ggtt_pin_20698 i915_gem_obj_ggtt_pin 0 20698 NULL
+__maestro_read_20700 __maestro_read 0 20700 NULL
+cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
++page_cache_sync_readahead_20706 page_cache_sync_readahead 5-4 20706 NULL
+pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
+ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
+security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
++vring_add_indirect_20737 vring_add_indirect 4-3 20737 NULL
+io_apic_set_pci_routing_20740 io_apic_set_pci_routing 2 20740 NULL
+fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
+vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
+ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
-+brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL
+ubi_io_read_20767 ubi_io_read 0 20767 NULL
-+ext4_r_blocks_count_20768 ext4_r_blocks_count 0 20768 NULL
+fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
+iommu_range_alloc_20794 iommu_range_alloc 3 20794 NULL
+iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
++sys_sendto_20809 sys_sendto 6 20809 NULL
+ext4_convert_unwritten_extents_endio_20812 ext4_convert_unwritten_extents_endio 0 20812 NULL
+strndup_user_20819 strndup_user 2 20819 NULL
-+dtf_read_channel_20831 dtf_read_channel 3 20831 NULL
++iwl_legacy_dbgfs_qos_read_20825 iwl_legacy_dbgfs_qos_read 3 20825 NULL
+wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
+uvc_alloc_entity_20836 uvc_alloc_entity 3-4 20836 NULL
-+btrfs_orphan_add_20840 btrfs_orphan_add 0 20840 NULL
+p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL
-+nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL
-+get_name_20855 get_name 4 20855 NULL
-+iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL
+snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
-+srq_free_res_20868 srq_free_res 5 20868 NULL
+ocfs2_bmap_20874 ocfs2_bmap 2 20874 NULL
-+cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
++iwl3945_ucode_tx_stats_read_20879 iwl3945_ucode_tx_stats_read 3 20879 NULL
+rb_simple_write_20890 rb_simple_write 3 20890 NULL
+sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
+key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
-+vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
++ext4_calc_metadata_amount_20905 ext4_calc_metadata_amount 2 20905 NULL
++compat_sys_readv_20911 compat_sys_readv 3 20911 NULL
++ixj_write_20912 ixj_write 3 20912 NULL
+lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
+htable_bits_20933 htable_bits 0 20933 NULL
+check_eofblocks_fl_20942 check_eofblocks_fl 0 20942 NULL
+altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
-+rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
-+rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
-+nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL
++get_init_ra_size_20955 get_init_ra_size 1 20955 NULL
++insert_ptr_20961 insert_ptr 0 20961 NULL
+snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
++brcmf_tx_frame_20978 brcmf_tx_frame 3 20978 NULL
+alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
+qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
-+ocfs2_free_clusters_21001 ocfs2_free_clusters 4-0 21001 NULL
++ocfs2_free_clusters_21001 ocfs2_free_clusters 4 21001 NULL
+btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
-+rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
++snd_pcm_lib_preallocate_pages_21031 snd_pcm_lib_preallocate_pages 4 21031 NULL
+lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
-+reiserfs_direct_IO_21051 reiserfs_direct_IO 4 21051 NULL
+proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
-+btrfs_insert_root_21061 btrfs_insert_root 0 21061 NULL
-+qdisc_get_default_21072 qdisc_get_default 2 21072 NULL
++rose_create_facilities_21067 rose_create_facilities 0 21067 NULL
+event_calibration_read_21083 event_calibration_read 3 21083 NULL
-+bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray
-+multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094
++__cfg80211_send_disassoc_21096 __cfg80211_send_disassoc 3 21096 NULL
+ext2_valid_block_bitmap_21101 ext2_valid_block_bitmap 3 21101 NULL
+ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
-+bitset_size_in_bytes_21124 bitset_size_in_bytes 0-1 21124 NULL
+i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
-+tps6586x_irq_init_21144 tps6586x_irq_init 3 21144 NULL
-+chunk_size_21146 chunk_size 0 21146 NULL
++new_skb_21148 new_skb 1 21148 NULL
+ocfs2_block_check_validate_21149 ocfs2_block_check_validate 2 21149 NULL
-+alloc_pg_vec_21159 alloc_pg_vec 3 21159 NULL
-+btrfs_add_root_ref_21186 btrfs_add_root_ref 0 21186 NULL
++setup_msi_irq_21169 setup_msi_irq 3 21169 NULL
+cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
+ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
-+scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
-+_ocfs2_free_clusters_21220 _ocfs2_free_clusters 4-0 21220 NULL
++_ocfs2_free_clusters_21220 _ocfs2_free_clusters 0-4 21220 NULL
+get_numpages_21227 get_numpages 0-1-2 21227 NULL
-+SyS_mlock_21238 SyS_mlock 1-2 21238 NULL
+input_ff_create_21240 input_ff_create 2 21240 NULL
+cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
-+fru_length_21257 fru_length 0 21257 NULL
-+rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
++sock_alloc_send_pskb_21246 sock_alloc_send_pskb 2 21246 NULL
+ocfs2_blocks_for_bytes_21268 ocfs2_blocks_for_bytes 0-2 21268 NULL
-+vmw_gmr2_bind_21305 vmw_gmr2_bind 3 21305 NULL
-+do_msg_fill_21307 do_msg_fill 3 21307 NULL
-+add_res_range_21310 add_res_range 4 21310 NULL
++store_bluetooth_21320 store_bluetooth 4 21320 NULL
+get_zeroed_page_21322 get_zeroed_page 0 21322 NULL
+ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
++iwl_legacy_tx_queue_init_21332 iwl_legacy_tx_queue_init 3 21332 NULL
+gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
-+max77693_irq_domain_map_21357 max77693_irq_domain_map 2 21357 NULL
+alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
+split_leaf_21378 split_leaf 0 21378 NULL
-+SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
+video_ioctl2_21380 video_ioctl2 2 21380 NULL
+diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
+snd_m3_inw_21406 snd_m3_inw 0 21406 NULL
+snapshot_read_next_21426 snapshot_read_next 0 21426 NULL
+tcp_bound_to_half_wnd_21429 tcp_bound_to_half_wnd 0-2 21429 NULL
+tracing_saved_cmdlines_read_21434 tracing_saved_cmdlines_read 3 21434 NULL
-+aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
-+__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
++concat_writev_21451 concat_writev 3 21451 NULL
+ReadISAR_21453 ReadISAR 0 21453 NULL
-+mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
+read_file_xmit_21487 read_file_xmit 3 21487 NULL
+mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
+dma_skb_copy_datagram_iovec_21516 dma_skb_copy_datagram_iovec 3-5 21516 NULL
+btrfs_file_aio_write_21520 btrfs_file_aio_write 4 21520 NULL
-+il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
+cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
+rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
-+rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
-+xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL
+snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
+ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
-+filemap_get_page_21606 filemap_get_page 2 21606 NULL
+xlog_do_recovery_pass_21618 xlog_do_recovery_pass 3 21618 NULL
-+pci_cardbus_resource_alignment_21625 pci_cardbus_resource_alignment 0 21625 NULL
-+ocfs2_refcount_cow_hunk_21630 ocfs2_refcount_cow_hunk 3-4 21630 NULL
++ndisc_addr_option_pad_21630 ndisc_addr_option_pad 0 21630 NULL
+__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
+validate_nnode_21638 validate_nnode 0 21638 NULL
-+__irq_alloc_descs_21639 __irq_alloc_descs 2-1-0-3 21639 NULL
++__irq_alloc_descs_21639 __irq_alloc_descs 2-1-3-0 21639 NULL
+ocfs2_lock_refcount_allocators_21646 ocfs2_lock_refcount_allocators 0 21646 NULL
++carl9170_rx_copy_data_21656 carl9170_rx_copy_data 2 21656 NULL
++hpet_setup_msi_irq_21662 hpet_setup_msi_irq 1 21662 NULL
+atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
+ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
-+rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL
++rtllib_alloc_txb_21687 rtllib_alloc_txb 1-2 21687 NULL
++kobject_uevent_env_21703 kobject_uevent_env 0 21703 NULL
+evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
-+btrfs_find_all_leafs_21712 btrfs_find_all_leafs 0 21712 NULL
-+unix_skb_len_21722 unix_skb_len 0 21722 NULL
-+lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
++drm_sman_init_21710 drm_sman_init 2-4-3 21710 NULL
+ocfs2_remove_rightmost_path_21729 ocfs2_remove_rightmost_path 0 21729 NULL
-+reiserfs_allocate_list_bitmaps_21732 reiserfs_allocate_list_bitmaps 3 21732 NULL nohasharray
-+ext4_split_extent_at_21732 ext4_split_extent_at 0 21732 &reiserfs_allocate_list_bitmaps_21732
-+vm_brk_21739 vm_brk 1-2 21739 NULL
++ext4_split_extent_at_21732 ext4_split_extent_at 0 21732 NULL
+mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
++l2down_create_21755 l2down_create 4 21755 NULL
+usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL
+gen_pool_add_21776 gen_pool_add 3 21776 NULL
-+SyS_sendfile_21777 SyS_sendfile 4 21777 NULL
+atomic64_cmpxchg_21782 atomic64_cmpxchg 0 21782 NULL
+xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
++kmalloc_order_trace_21788 kmalloc_order_trace 1 21788 NULL
++libipw_get_hdrlen_21792 libipw_get_hdrlen 0 21792 NULL
+dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
+__ocfs2_cluster_lock_21812 __ocfs2_cluster_lock 0 21812 NULL
-+wm8994_request_irq_21822 wm8994_request_irq 2 21822 NULL
-+oom_adj_read_21847 oom_adj_read 3 21847 NULL
-+gen_unique_name_21852 gen_unique_name 0 21852 NULL
+lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
-+brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
-+sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
-+ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
++msix_capability_init_21870 msix_capability_init 0 21870 NULL
++sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL nohasharray
++tcp_cookie_size_check_21873 tcp_cookie_size_check 0-1 21873 &sisusbcon_bmove_21873
+__alloc_reserved_percpu_21895 __alloc_reserved_percpu 2-1 21895 NULL
-+rio_destid_first_21900 rio_destid_first 0 21900 NULL
+dbAllocCtl_21911 dbAllocCtl 0 21911 NULL
+qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
-+ast_ttm_tt_create_21917 ast_ttm_tt_create 2 21917 NULL
+__ocfs2_claim_clusters_21936 __ocfs2_claim_clusters 0 21936 NULL
-+alloc_ldt_21972 alloc_ldt 2 21972 NULL
-+SYSC_prctl_21980 SYSC_prctl 4 21980 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-0 22001 &rxpipe_descr_host_int_trig_rx_data_read_22001
++rbd_req_read_21952 rbd_req_read 4-5 21952 NULL
++rxpipe_descr_host_int_trig_rx_data_read_22001 rxpipe_descr_host_int_trig_rx_data_read 3 22001 NULL
+ocfs2_reserve_cluster_bitmap_bits_22016 ocfs2_reserve_cluster_bitmap_bits 0 22016 NULL
-+regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
-+btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
-+i915_gem_evict_something_22028 i915_gem_evict_something 0 22028 NULL
-+_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
++ti_recv_22027 ti_recv 4 22027 NULL
+zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
+atalk_recvmsg_22053 atalk_recvmsg 4 22053 NULL
+ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
++iwl_legacy_dbgfs_clear_ucode_statistics_write_22072 iwl_legacy_dbgfs_clear_ucode_statistics_write 3 22072 NULL
+btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
-+write_opcode_22082 write_opcode 2 22082 NULL
+mem_rw_22085 mem_rw 3 22085 NULL
+snd_pcm_xrun_22088 snd_pcm_xrun 0 22088 NULL
+sched_clock_cpu_22098 sched_clock_cpu 0 22098 NULL
+rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
-+shmem_add_to_page_cache_22121 shmem_add_to_page_cache 0 22121 NULL
++sys_remap_file_pages_22124 sys_remap_file_pages 1 22124 NULL
+snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
-+SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
-+do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
-+remap_pud_range_22164 remap_pud_range 3-4-5 22164 NULL
-+__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL nohasharray
-+vmci_qp_broker_map_22173 vmci_qp_broker_map 3 22173 &__kfifo_alloc_22173
-+fls_22210 fls 0 22210 NULL
-+rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL nohasharray
++__kfifo_alloc_22173 __kfifo_alloc 3-2 22173 NULL
++fls_22210 fls 0 22210 NULL nohasharray
++snd_soc_lzo_block_count_22210 snd_soc_lzo_block_count 0 22210 &fls_22210
++bio_chain_clone_22227 bio_chain_clone 4 22227 NULL nohasharray
++do_sync_mmap_readahead_22227 do_sync_mmap_readahead 4 22227 &bio_chain_clone_22227 nohasharray
++rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 &do_sync_mmap_readahead_22227 nohasharray
+bitmap_clear_bits_22227 bitmap_clear_bits 3 22227 &rfcomm_sock_recvmsg_22227
+mem_write_22232 mem_write 3 22232 NULL
+p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL
-+fsnotify_parent_22243 fsnotify_parent 0 22243 NULL
+atomic64_xchg_22246 atomic64_xchg 0 22246 NULL
+compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
-+ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
-+add_res_tree_22263 add_res_tree 7 22263 NULL
+__btrfs_direct_write_22273 __btrfs_direct_write 4 22273 NULL
-+queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
-+i915_gem_execbuffer_relocate_22294 i915_gem_execbuffer_relocate 0 22294 NULL
-+pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 NULL nohasharray
-+__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 &pci_vpd_srdt_size_22300
++__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 NULL
+mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
-+lov_setstripe_22307 lov_setstripe 2 22307 NULL
+udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
-+C_SYSC_msgrcv_22320 C_SYSC_msgrcv 3 22320 NULL
-+radix_tree_find_next_bit_22334 radix_tree_find_next_bit 3-2-0 22334 NULL
+atomic_read_22342 atomic_read 0 22342 NULL
-+ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL
+mlx4_db_alloc_22358 mlx4_db_alloc 3 22358 NULL
-+irq_reserve_irq_22360 irq_reserve_irq 1 22360 NULL nohasharray
-+memcg_size_22360 memcg_size 0 22360 &irq_reserve_irq_22360
++irq_reserve_irq_22360 irq_reserve_irq 1 22360 NULL
+snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL
-+tps6586x_gpio_to_irq_22365 tps6586x_gpio_to_irq 2 22365 NULL
++iwch_alloc_fast_reg_mr_22368 iwch_alloc_fast_reg_mr 2 22368 NULL
+evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
-+alloc_large_system_hash_22391 alloc_large_system_hash 2-8-9 22391 NULL
+ocfs2_assign_bh_22392 ocfs2_assign_bh 0 22392 NULL
++btmrvl_psmode_read_22395 btmrvl_psmode_read 3 22395 NULL
++ubifs_leb_change_22399 ubifs_leb_change 0 22399 NULL nohasharray
++alloc_private_22399 alloc_private 2 22399 &ubifs_leb_change_22399
+zoran_write_22404 zoran_write 3 22404 NULL
-+ATOMIC_ADD_RETURN_22413 ATOMIC_ADD_RETURN 2 22413 NULL
+queue_reply_22416 queue_reply 3 22416 NULL
+__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
+queue_max_segments_22441 queue_max_segments 0 22441 NULL
-+_rtw_vmalloc_22444 _rtw_vmalloc 1 22444 NULL
+handle_received_packet_22457 handle_received_packet 3 22457 NULL
-+mem_cgroup_read_22461 mem_cgroup_read 5 22461 NULL
-+btrfs_write_out_cache_22471 btrfs_write_out_cache 0 22471 NULL nohasharray
-+dtf_write_device_22471 dtf_write_device 3 22471 &btrfs_write_out_cache_22471
-+source_sink_start_ep_22472 source_sink_start_ep 0 22472 NULL
++rt6_nlmsg_size_22473 rt6_nlmsg_size 0 22473 NULL
+ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
-+qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL
+cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
+mp_find_ioapic_pin_22499 mp_find_ioapic_pin 0-2 22499 NULL
+mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL
-+__btrfs_add_delayed_item_22511 __btrfs_add_delayed_item 0 22511 NULL
-+trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
++pskb_may_pull_22546 pskb_may_pull 2 22546 NULL
+ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
+atomic_long_read_unchecked_22551 atomic_long_read_unchecked 0 22551 NULL
+agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
@@ -105012,808 +106848,627 @@ index 0000000..0a9d518
+dbFindCtl_22587 dbFindCtl 0 22587 NULL
+snapshot_read_22601 snapshot_read 3 22601 NULL
+ocfs2_get_refcount_block_22610 ocfs2_get_refcount_block 0 22610 NULL
-+remove_breakpoint_22628 remove_breakpoint 3 22628 NULL
++btrfs_delalloc_reserve_space_22617 btrfs_delalloc_reserve_space 0 22617 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
-+wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL
+pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
+sysfs_attr_ns_22645 sysfs_attr_ns 0 22645 NULL
-+iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
-+compat_SyS_msgrcv_22661 compat_SyS_msgrcv 3 22661 NULL
-+ubifs_leb_write_22679 ubifs_leb_write 4-5 22679 NULL nohasharray
-+ext4_ext_direct_IO_22679 ext4_ext_direct_IO 4 22679 &ubifs_leb_write_22679
+fill_gap_22681 fill_gap 0 22681 NULL nohasharray
+l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 &fill_gap_22681
-+bch_dump_read_22685 bch_dump_read 3 22685 NULL
-+reg_umr_22686 reg_umr 5 22686 NULL
+ocfs2_get_block_22687 ocfs2_get_block 2 22687 NULL
-+map_22700 map 2 22700 NULL nohasharray
-+btrfs_del_inode_ref_in_log_22700 btrfs_del_inode_ref_in_log 0 22700 &map_22700
++sys_ppoll_22688 sys_ppoll 2 22688 NULL
+alloc_libipw_22708 alloc_libipw 1 22708 NULL
-+ecryptfs_write_metadata_to_contents_22721 ecryptfs_write_metadata_to_contents 3 22721 NULL
++brcmf_sdbrcm_read_control_22721 brcmf_sdbrcm_read_control 3 22721 NULL
++aa_features_read_22730 aa_features_read 3 22730 NULL
+cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
-+ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
-+__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
-+iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
-+qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
++ax25_output_22736 ax25_output 2 22736 NULL
++ceph_decode_32_22738 ceph_decode_32 0 22738 NULL
+print_frame_22769 print_frame 0 22769 NULL
+ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
+ocfs2_block_group_alloc_22774 ocfs2_block_group_alloc 0 22774 NULL
-+pla_ocp_write_22802 pla_ocp_write 4 22802 NULL
+__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
-+clone_bio_integrity_22842 clone_bio_integrity 4 22842 NULL
-+read_file_rcstat_22854 read_file_rcstat 3 22854 NULL
++can_nocow_odirect_22854 can_nocow_odirect 3-4 22854 NULL nohasharray
++read_file_rcstat_22854 read_file_rcstat 3 22854 &can_nocow_odirect_22854
+create_attr_set_22861 create_attr_set 1 22861 NULL
-+vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
+usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
+mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
-+policy_emit_config_values_22900 policy_emit_config_values 3 22900 NULL
-+__btrfs_add_free_space_22917 __btrfs_add_free_space 0 22917 NULL
++virtqueue_add_buf_22924 virtqueue_add_buf 3-4 22924 NULL
+xstateregs_set_22932 xstateregs_set 4 22932 NULL
+pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
-+alloc_sglist_22960 alloc_sglist 3-2 22960 NULL
++alloc_sglist_22960 alloc_sglist 1-3-2 22960 NULL
+caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
+vme_get_size_22964 vme_get_size 0 22964 NULL
-+tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
-+cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL
+usb_get_langid_22983 usb_get_langid 0 22983 NULL
-+set_msr_hyperv_22985 set_msr_hyperv 3 22985 NULL
+remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
-+brcmf_sdio_chip_exit_download_23001 brcmf_sdio_chip_exit_download 4 23001 NULL
+viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
-+cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
-+ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 0-6-7 23029 NULL
++ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 0 23029 NULL
+st_status_23032 st_status 5 23032 NULL
-+nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
-+comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
++xfs_qm_write_sb_changes_23039 xfs_qm_write_sb_changes 2 23039 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
-+mei_cl_send_23068 mei_cl_send 3 23068 NULL
-+filp_close_23071 filp_close 0 23071 NULL
++vivi_read_23073 vivi_read 3 23073 NULL
+kvm_mmu_gva_to_gpa_write_23075 kvm_mmu_gva_to_gpa_write 0 23075 NULL
+raw_sendmsg_23078 raw_sendmsg 4 23078 NULL
-+get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL
+isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
-+lnw_gpio_irq_map_23087 lnw_gpio_irq_map 2 23087 NULL
+rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
-+__add_prelim_ref_23095 __add_prelim_ref 0 23095 NULL
-+fls_long_23096 fls_long 0 23096 NULL
++fls_long_23096 fls_long 0-1 23096 NULL
+ntfs_ucstonls_23097 ntfs_ucstonls 5-3 23097 NULL
+pipe_iov_copy_from_user_23102 pipe_iov_copy_from_user 3 23102 NULL
+dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
+ip_recv_error_23109 ip_recv_error 3 23109 NULL
-+mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
++msix_setup_entries_23110 msix_setup_entries 0 23110 NULL nohasharray
++mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 &msix_setup_entries_23110
+nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 NULL
+__clear_user_23118 __clear_user 0-2 23118 NULL
-+drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
++iwl_legacy_dbgfs_interrupt_write_23122 iwl_legacy_dbgfs_interrupt_write 3 23122 NULL nohasharray
++drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 &iwl_legacy_dbgfs_interrupt_write_23122
+ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
-+ext3_listxattr_23137 ext3_listxattr 3 23137 NULL
++cfg80211_rx_mgmt_23138 cfg80211_rx_mgmt 4 23138 NULL nohasharray
++em28xx_write_regs_req_23138 em28xx_write_regs_req 0 23138 &cfg80211_rx_mgmt_23138
+read_file_ani_23161 read_file_ani 3 23161 NULL
-+tg_get_cfs_quota_23176 tg_get_cfs_quota 0 23176 NULL
+usblp_write_23178 usblp_write 3 23178 NULL
-+msnd_fifo_alloc_23179 msnd_fifo_alloc 2 23179 NULL
+gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
-+fix_unclean_leb_23188 fix_unclean_leb 3 23188 NULL
-+mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
-+convert_ip_to_linear_23198 convert_ip_to_linear 0 23198 NULL
-+pm80x_free_irq_23210 pm80x_free_irq 2 23210 NULL
++ieee80211_get_mesh_hdrlen_23183 ieee80211_get_mesh_hdrlen 0 23183 NULL
++__next_dma_cap_23195 __next_dma_cap 1-0 23195 NULL
+tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
+__read_status_pci_23229 __read_status_pci 0 23229 NULL nohasharray
+xlog_get_bp_23229 xlog_get_bp 2 23229 &__read_status_pci_23229
++__kmalloc_23231 __kmalloc 1 23231 NULL
+ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
+rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
-+__gfn_to_rmap_23240 __gfn_to_rmap 2-1 23240 NULL
-+sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
++sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL nohasharray
++ad799x_single_channel_from_ring_23265 ad799x_single_channel_from_ring 2 23265 &sctp_recvmsg_23265
+uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
+diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
-+gru_preload_tlb_23305 gru_preload_tlb 7-4 23305 NULL
+i2cdev_write_23310 i2cdev_write 3 23310 NULL
-+__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
-+__es_remove_extent_23323 __es_remove_extent 0 23323 NULL
++nl_pid_hash_zalloc_23314 nl_pid_hash_zalloc 1 23314 NULL
++try_context_readahead_23342 try_context_readahead 4-3 23342 NULL
+page_readlink_23346 page_readlink 3 23346 NULL
-+kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
+get_dst_timing_23358 get_dst_timing 0 23358 NULL
-+fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
++ip_nat_sdp_media_23386 ip_nat_sdp_media 8 23386 NULL
+iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
+vga_mm_r_23419 vga_mm_r 0 23419 NULL
-+vzalloc_node_23424 vzalloc_node 1 23424 NULL
-+__ctzsi2_23444 __ctzsi2 1 23444 NULL
-+ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
++ulog_alloc_skb_23427 ulog_alloc_skb 1 23427 NULL
++__cxio_init_resource_fifo_23447 __cxio_init_resource_fifo 3 23447 NULL nohasharray
++ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 &__cxio_init_resource_fifo_23447
+hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
+__ata_change_queue_depth_23484 __ata_change_queue_depth 3-0 23484 NULL
+linear_conf_23485 linear_conf 2 23485 NULL
-+copy_module_from_user_23492 copy_module_from_user 2 23492 NULL
++si4713_send_command_23493 si4713_send_command 6 23493 NULL
+event_filter_read_23494 event_filter_read 3 23494 NULL
+ext4_remove_blocks_23497 ext4_remove_blocks 0 23497 NULL
-+lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
-+__gfn_to_hva_many_23508 __gfn_to_hva_many 0-2 23508 NULL
-+devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
-+__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
++write_led_23517 write_led 2 23517 NULL
++__fill_vb2_buffer_23521 __fill_vb2_buffer 0 23521 NULL
+ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
-+__es_insert_extent_23543 __es_insert_extent 0 23543 NULL
+xen_allocate_irq_gsi_23546 xen_allocate_irq_gsi 1-0 23546 NULL
+tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
-+dbg_leb_change_23555 dbg_leb_change 0-4 23555 NULL
-+btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
++tcp_match_skb_to_sack_23568 tcp_match_skb_to_sack 4-3 23568 NULL
+venus_symlink_23570 venus_symlink 6-4 23570 NULL
+iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
++l2cap_parse_conf_req_23575 l2cap_parse_conf_req 0 23575 NULL
+xfpregs_get_23586 xfpregs_get 4 23586 NULL
++cifs_spnego_key_instantiate_23588 cifs_spnego_key_instantiate 3 23588 NULL
+snd_interval_min_23590 snd_interval_min 0 23590 NULL
-+do_mmap_pgoff_23600 do_mmap_pgoff 0 23600 NULL
++cfpkt_create_pfx_23594 cfpkt_create_pfx 2-1 23594 NULL
++_alloc_cdb_cont_23609 _alloc_cdb_cont 2 23609 NULL
+islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
+ocfs2_journal_access_23616 ocfs2_journal_access 0 23616 NULL
-+alloc_pte_23642 alloc_pte 3 23642 NULL
+__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
+sInW_23663 sInW 0 23663 NULL
-+SyS_connect_23669 SyS_connect 3 23669 NULL
++nftl_partscan_23688 nftl_partscan 0 23688 NULL
+cx18_read_23699 cx18_read 3 23699 NULL
-+btrfs_insert_delayed_item_23705 btrfs_insert_delayed_item 0 23705 NULL
-+at_get_23708 at_get 0 23708 NULL
++sock_alloc_send_skb_23720 sock_alloc_send_skb 2 23720 NULL
+snd_pcm_hw_refine_23721 snd_pcm_hw_refine 0 23721 NULL
+mp_config_acpi_gsi_23728 mp_config_acpi_gsi 2 23728 NULL
-+rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
++pack_sg_list_p_23739 pack_sg_list_p 0-2 23739 NULL
+__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
-+__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
++tt_save_orig_buffer_23779 tt_save_orig_buffer 4 23779 NULL
+security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL
-+cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL
-+mpt_free_res_23793 mpt_free_res 5 23793 NULL
-+map_write_23795 map_write 3 23795 NULL
-+diva_alloc_dma_map_23798 diva_alloc_dma_map 2 23798 NULL
+rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
+ocfs2_replace_cow_23803 ocfs2_replace_cow 0 23803 NULL
+__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
-+lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
-+ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 0-4-3 23829 NULL
-+tfrc_binsearch_23833 tfrc_binsearch 0 23833 NULL
-+pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
++xfs_dir2_leaf_getdents_23841 xfs_dir2_leaf_getdents 3 23841 NULL
+iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
+p54_init_common_23850 p54_init_common 1 23850 NULL
-+gart_alloc_coherent_23852 gart_alloc_coherent 2 23852 NULL
-+bin_to_hex_dup_23853 bin_to_hex_dup 2 23853 NULL
+ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
+ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
-+nes_alloc_resource_23891 nes_alloc_resource 3 23891 NULL
-+_rtw_zvmalloc_23892 _rtw_zvmalloc 1 23892 NULL
-+tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
-+usbg_prepare_w_request_23895 usbg_prepare_w_request 0 23895 NULL
-+add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
-+ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
++ieee80211_if_read_channel_type_23884 ieee80211_if_read_channel_type 3 23884 NULL
++iwch_reject_cr_23901 iwch_reject_cr 3 23901 NULL
+device_create_bin_file_23914 device_create_bin_file 0 23914 NULL
-+f2fs_getxattr_23917 f2fs_getxattr 0 23917 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
-+kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL nohasharray
-+intel_ring_alloc_seqno_23928 intel_ring_alloc_seqno 0 23928 &kvm_read_guest_23928
-+uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
++ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL
++i915_gem_object_bind_to_gtt_23921 i915_gem_object_bind_to_gtt 0 23921 NULL
++kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL
++__alloc_skb_23940 __alloc_skb 1 23940 NULL
+cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
-+size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
-+vfs_write_23971 vfs_write 0-3 23971 NULL
++ixj_enhanced_write_23973 ixj_enhanced_write 3 23973 NULL
+sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
+zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
++brcmf_sdcard_recv_buf_24006 brcmf_sdcard_recv_buf 6 24006 NULL
+cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
-+intel_ring_idle_24014 intel_ring_idle 0 24014 NULL
-+give_pages_24021 give_pages 3 24021 NULL
+ocfs2_mark_extent_refcounted_24035 ocfs2_mark_extent_refcounted 6 24035 NULL
-+adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
-+hmac_setkey_24043 hmac_setkey 3 24043 NULL
+afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
+blkcipher_copy_iv_24075 blkcipher_copy_iv 3 24075 NULL
-+vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
-+ocfs2_cannibalize_resv_24090 ocfs2_cannibalize_resv 3 24090 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
-+lov_brw_24122 lov_brw 4 24122 NULL
++iwl_legacy_dbgfs_stations_read_24121 iwl_legacy_dbgfs_stations_read 3 24121 NULL
+mpu401_read_24126 mpu401_read 3-0 24126 NULL
+_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
+irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
-+SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
-+trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
-+set_discard_24162 set_discard 2 24162 NULL
-+__copy_user_zeroing_intel_nocache_24163 __copy_user_zeroing_intel_nocache 0-3 24163 NULL
++UpdateReg_24148 UpdateReg 0 24148 NULL
+adu_read_24177 adu_read 3 24177 NULL
+safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
+shrink_tnc_24190 shrink_tnc 0 24190 NULL
-+irq_remapping_setup_msi_irqs_24194 irq_remapping_setup_msi_irqs 2 24194 NULL
++get_order_24203 get_order 0 24203 NULL
+ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
-+efx_vf_size_24213 efx_vf_size 0 24213 NULL
-+SyS_sendfile64_24220 SyS_sendfile64 4 24220 NULL
+tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
-+pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray
-+mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224
++pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL
+pci_num_vf_24235 pci_num_vf 0 24235 NULL
+sel_read_bool_24236 sel_read_bool 3 24236 NULL
-+dm_cache_save_hint_24257 dm_cache_save_hint 2 24257 NULL
-+em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
++esp6_get_mtu_24264 esp6_get_mtu 0-2 24264 NULL
+calculate_sizes_24273 calculate_sizes 2 24273 NULL
-+thin_status_24278 thin_status 5 24278 NULL
+msg_size_24288 msg_size 0 24288 NULL
+ext2_free_blocks_24292 ext2_free_blocks 3-2 24292 NULL
-+i2c_smbus_check_pec_24297 i2c_smbus_check_pec 0 24297 NULL
+map_page_24298 map_page 3-4 24298 NULL
+gserial_connect_24302 gserial_connect 0 24302 NULL
+btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
-+reserve_metadata_bytes_24313 reserve_metadata_bytes 3-0 24313 NULL
-+ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
+ocfs2_direct_IO_get_blocks_24333 ocfs2_direct_IO_get_blocks 2 24333 NULL
-+si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
+kzalloc_node_24352 kzalloc_node 1 24352 NULL
+qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
+cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
+btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
+igetword_24373 igetword 0 24373 NULL
+max_io_len_24384 max_io_len 0-1 24384 NULL
-+mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
-+osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
+pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 NULL nohasharray
-+getxattr_24398 getxattr 4 24398 &pvr2_v4l2_ioctl_24398 nohasharray
-+__btrfs_write_out_cache_24398 __btrfs_write_out_cache 0 24398 &getxattr_24398
++getxattr_24398 getxattr 4 24398 &pvr2_v4l2_ioctl_24398
+blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
-+nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
+b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
+xenbus_file_read_24427 xenbus_file_read 3 24427 NULL
+ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
-+copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL
-+ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 6-4 24439 NULL
-+smk_user_access_24440 smk_user_access 3 24440 NULL nohasharray
-+rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 &smk_user_access_24440
+__push_leaf_left_24456 __push_leaf_left 0 24456 NULL
+evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
+lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL
+skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL nohasharray
+ocfs2_write_cluster_by_desc_24466 ocfs2_write_cluster_by_desc 6-5 24466 &skb_copy_and_csum_datagram_iovec_24466
+snd_pcm_hw_param_first_24487 snd_pcm_hw_param_first 0 24487 NULL
-+read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL
-+i915_gem_obj_offset_24494 i915_gem_obj_offset 0 24494 NULL
+push_nodes_for_insert_24496 push_nodes_for_insert 0 24496 NULL
+pd_video_read_24510 pd_video_read 3 24510 NULL
+request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
-+xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
-+do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
++named_prepare_buf_24532 named_prepare_buf 2 24532 NULL
++rtnl_port_size_24537 rtnl_port_size 0 24537 NULL
+write_cache_pages_24562 write_cache_pages 0 24562 NULL
-+SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
++printer_set_config_24568 printer_set_config 0 24568 NULL
++netlbl_domhsh_init_24576 netlbl_domhsh_init 1 24576 NULL
++ath6kl_wmi_startscan_cmd_24580 ath6kl_wmi_startscan_cmd 7 24580 NULL
+udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
-+sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
-+lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605
-+SyS_poll_24620 SyS_poll 2 24620 NULL
-+kvm_pv_enable_async_pf_24637 kvm_pv_enable_async_pf 2 24637 NULL
++ip6addrlbl_msgsize_24595 ip6addrlbl_msgsize 0 24595 NULL
++count_preds_24600 count_preds 0 24600 NULL
++alloc_wr_24635 alloc_wr 2-1 24635 NULL
+context_alloc_24645 context_alloc 3 24645 NULL
+blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
+btrfs_check_data_free_space_24692 btrfs_check_data_free_space 0 24692 NULL
+datafab_write_data_24696 datafab_write_data 4 24696 NULL
-+intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
++ext4_da_reserve_space_24702 ext4_da_reserve_space 2 24702 NULL
+simple_attr_read_24738 simple_attr_read 3 24738 NULL
+qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
++ath_rxbuf_alloc_24745 ath_rxbuf_alloc 2 24745 NULL
+get_dma_residue_24749 get_dma_residue 0 24749 NULL
-+ocfs2_cow_file_pos_24751 ocfs2_cow_file_pos 3 24751 NULL
+kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
-+kempld_read8_24756 kempld_read8 0 24756 NULL
++nfsd4_sanitize_slot_size_24756 nfsd4_sanitize_slot_size 0-1 24756 NULL
++mI_alloc_skb_24770 mI_alloc_skb 1 24770 NULL
++i915_cache_sharing_read_24775 i915_cache_sharing_read 3 24775 NULL
+ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL
++skb_make_writable_24783 skb_make_writable 2 24783 NULL
+datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
+cache_read_24790 cache_read 3 24790 NULL
-+__xfs_get_blocks_24791 __xfs_get_blocks 2 24791 NULL
-+i915_gem_check_wedge_24793 i915_gem_check_wedge 0 24793 NULL
+user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
++unpack_str_24798 unpack_str 0 24798 NULL
+kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
+__next_cpu_nr_24805 __next_cpu_nr 1 24805 NULL
-+sb_set_blocksize_24807 sb_set_blocksize 0-2 24807 NULL
+ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
-+comedi_buf_alloc_24822 comedi_buf_alloc 3 24822 NULL
+net2272_read_24825 net2272_read 0 24825 NULL
++copy_for_split_24826 copy_for_split 0 24826 NULL
++c4iw_alloc_fast_reg_mr_24838 c4iw_alloc_fast_reg_mr 2 24838 NULL nohasharray
++free_coherent_24838 free_coherent 4-2 24838 &c4iw_alloc_fast_reg_mr_24838
+snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
-+btrfs_next_old_item_24843 btrfs_next_old_item 0 24843 NULL
-+xfs_free_file_space_24853 xfs_free_file_space 2-3 24853 NULL
+snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
+pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
-+l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
-+setup_buffering_24872 setup_buffering 3 24872 NULL
++put_data_to_circ_buf_24869 put_data_to_circ_buf 3 24869 &pnp_alloc_24869
++bnx2fc_cmd_mgr_alloc_24873 bnx2fc_cmd_mgr_alloc 2-3 24873 NULL
+queues_read_24877 queues_read 3 24877 NULL
-+__vxge_hw_vp_initialize_24885 __vxge_hw_vp_initialize 2 24885 NULL
++iwm_rx_handle_24899 iwm_rx_handle 3 24899 NULL
+codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
-+__btrfs_free_extent_24927 __btrfs_free_extent 7-0 24927 NULL nohasharray
-+v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 &__btrfs_free_extent_24927
+ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL
+packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
-+ensure_wear_leveling_24971 ensure_wear_leveling 0 24971 NULL
-+twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
++sys_rt_sigpending_24961 sys_rt_sigpending 2 24961 NULL
+llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL
-+btrfs_update_delayed_inode_24988 btrfs_update_delayed_inode 0 24988 NULL
+key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
-+il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
-+twl6030_irq_unmap_25014 twl6030_irq_unmap 2 25014 NULL
++iwl3945_ucode_general_stats_read_25009 iwl3945_ucode_general_stats_read 3 25009 NULL
+ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
-+nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
-+load_unaligned_zeropad_25050 load_unaligned_zeropad 0 25050 NULL
-+btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
+gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
-+ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
-+SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
-+iwl_dbgfs_tx_flush_write_25091 iwl_dbgfs_tx_flush_write 3 25091 NULL
-+gfs2_iter_unstuffed_25099 gfs2_iter_unstuffed 0 25099 NULL nohasharray
-+blkg_path_25099 blkg_path 3 25099 &gfs2_iter_unstuffed_25099
-+snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
++cxio_hal_init_rhdl_resource_25104 cxio_hal_init_rhdl_resource 1 25104 NULL
++ubifs_dir_llseek_25106 ubifs_dir_llseek 2 25106 NULL nohasharray
++snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 &ubifs_dir_llseek_25106
++oom_adjust_read_25127 oom_adjust_read 3 25127 NULL
+fs32_to_cpu_25143 fs32_to_cpu 0 25143 NULL
-+record_new_ref_25154 record_new_ref 0 25154 NULL
++sys_fgetxattr_25166 sys_fgetxattr 4 25166 NULL
+ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL nohasharray
-+btrfs_delete_delayed_items_25167 btrfs_delete_delayed_items 0 25167 &ipath_init_qp_table_25167
-+kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL
++sethdraddr_25167 sethdraddr 0 25167 &ipath_init_qp_table_25167
+sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
-+res_counter_read_u64_25180 res_counter_read_u64 0 25180 NULL
-+send_create_inode_if_needed_25211 send_create_inode_if_needed 0 25211 NULL
-+security_socket_post_create_25221 security_socket_post_create 0 25221 NULL
++ks8851_rdreg32_25187 ks8851_rdreg32 0 25187 NULL
+ocfs2_block_check_compute_25223 ocfs2_block_check_compute 2 25223 NULL
-+dtf_write_string_25232 dtf_write_string 5 25232 NULL
+mon_stat_read_25238 mon_stat_read 3 25238 NULL
++tcf_csum_ipv6_udp_25241 tcf_csum_ipv6_udp 4 25241 NULL
++compat_rw_copy_check_uvector_25242 compat_rw_copy_check_uvector 0-3 25242 NULL
+nilfs_palloc_find_available_slot_25245 nilfs_palloc_find_available_slot 5-3 25245 NULL
-+stripe_status_25259 stripe_status 5 25259 NULL
+snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
+crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
+vfs_writev_25278 vfs_writev 3 25278 NULL
++sys_dup2_25284 sys_dup2 2 25284 NULL
+l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
++ceph_calc_object_layout_25305 ceph_calc_object_layout 0 25305 NULL
+ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
+rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
-+SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
-+rio_destid_next_25368 rio_destid_next 2-0 25368 NULL nohasharray
-+unix_mkname_25368 unix_mkname 0-2 25368 &rio_destid_next_25368
++wait_for_completion_killable_25352 wait_for_completion_killable 0 25352 NULL
++i915_gem_execbuffer_relocate_slow_25355 i915_gem_execbuffer_relocate_slow 7-0 25355 NULL
++unix_mkname_25368 unix_mkname 0-2 25368 NULL
+sel_read_mls_25369 sel_read_mls 3 25369 NULL
-+tc3589x_gpio_to_irq_25371 tc3589x_gpio_to_irq 2 25371 NULL
-+orphanize_inode_25382 orphanize_inode 0 25382 NULL
-+SyS_splice_25390 SyS_splice 5 25390 NULL
-+btrfs_update_reserved_bytes_25393 btrfs_update_reserved_bytes 0 25393 NULL
-+vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
-+ebt_buf_add_pad_25413 ebt_buf_add_pad 0 25413 NULL
++rh_queue_status_25378 rh_queue_status 0 25378 NULL
++ThermometerRead_25393 ThermometerRead 0 25393 NULL
++et61x251_read_25420 et61x251_read 3 25420 NULL
+dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
+generic_file_buffered_write_25464 generic_file_buffered_write 4 25464 NULL
+ipath_decode_err_25468 ipath_decode_err 3 25468 NULL
+crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
+ocfs2_hamming_encode_25501 ocfs2_hamming_encode 3 25501 NULL
+ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
-+evm_init_hmac_25504 evm_init_hmac 0 25504 NULL
+snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
-+sb_permission_25523 sb_permission 0 25523 NULL
-+down_read_failed_25532 down_read_failed 2 25532 NULL
+ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
+ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
++c4iw_init_resource_fifo_random_25547 c4iw_init_resource_fifo_random 3 25547 NULL
+wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL
-+mgag200_ttm_tt_create_25550 mgag200_ttm_tt_create 2 25550 NULL
++taskstats_packet_size_25553 taskstats_packet_size 0 25553 NULL
+ht_print_chan_25556 ht_print_chan 0 25556 NULL
+skb_tailroom_25567 skb_tailroom 0 25567 NULL
-+ping_recvmsg_25597 ping_recvmsg 4 25597 NULL nohasharray
-+find_extend_vma_25597 find_extend_vma 2 25597 &ping_recvmsg_25597
++realloc_packet_buffer_25569 realloc_packet_buffer 2 25569 NULL
++ping_recvmsg_25597 ping_recvmsg 4 25597 NULL
++__devres_alloc_25598 __devres_alloc 2 25598 NULL
++ddp_ppod_write_idata_25610 ddp_ppod_write_idata 5 25610 NULL
+copy_user_generic_25611 copy_user_generic 0 25611 NULL
+proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
-+__get_user_pages_25628 __get_user_pages 0-3-4 25628 NULL nohasharray
++__get_user_pages_25628 __get_user_pages 0 25628 NULL nohasharray
+befs_utf2nls_25628 befs_utf2nls 3 25628 &__get_user_pages_25628
-+__direct_map_25647 __direct_map 6-5 25647 NULL
-+ext2_try_to_allocate_25667 ext2_try_to_allocate 4-2-0 25667 NULL
++ext2_try_to_allocate_25667 ext2_try_to_allocate 2-4-0 25667 NULL
+aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
+lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
+sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
+ebitmap_start_positive_25703 ebitmap_start_positive 0 25703 NULL
-+wl1271_tx_enabled_rates_get_25712 wl1271_tx_enabled_rates_get 0 25712 NULL nohasharray
-+rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 &wl1271_tx_enabled_rates_get_25712
+ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
-+ttm_tt_init_25717 ttm_tt_init 3 25717 NULL
++rx_queue_entry_next_25715 rx_queue_entry_next 0 25715 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
++mcs_unwrap_fir_25733 mcs_unwrap_fir 3 25733 NULL
+ext2_find_near_25734 ext2_find_near 0 25734 NULL
-+__set_clear_dirty_25744 __set_clear_dirty 2 25744 NULL
+cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
-+dtf_write_channel_25748 dtf_write_channel 3 25748 NULL
++iommu_flush_iotlb_psi_25780 iommu_flush_iotlb_psi 4 25780 NULL
+event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
+sg_read_25799 sg_read 3 25799 NULL
++sys32_rt_sigpending_25814 sys32_rt_sigpending 2 25814 NULL
+system_enable_read_25815 system_enable_read 3 25815 NULL
+realloc_buffer_25816 realloc_buffer 2 25816 NULL
+ftrace_profile_init_25821 ftrace_profile_init 0 25821 NULL
-+mthca_map_user_db_25823 mthca_map_user_db 5 25823 NULL
+pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
+parport_read_25855 parport_read 0 25855 NULL
+xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL
-+key_attr_size_25865 key_attr_size 0 25865 NULL
+ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
+run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL
+sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
+lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
-+nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL
+do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
+rcname_read_25919 rcname_read 3 25919 NULL
++_get_word_25929 _get_word 0 25929 NULL
+snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
+key_flags_read_25931 key_flags_read 3 25931 NULL
+copy_play_buf_25932 copy_play_buf 3 25932 NULL
-+flush_25957 flush 2 25957 NULL
+video_register_device_25971 video_register_device 3 25971 NULL
+udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
-+lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
-+ebt_compat_entry_padsize_26001 ebt_compat_entry_padsize 0 26001 NULL
-+SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
-+irq_create_strict_mappings_26025 irq_create_strict_mappings 2-4 26025 NULL
++cap_file_mmap_26018 cap_file_mmap 0 26018 NULL
+xfs_xattr_acl_set_26028 xfs_xattr_acl_set 4 26028 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
-+tun_do_read_26047 tun_do_read 5 26047 NULL
-+make_bfloat_26056 make_bfloat 2 26056 NULL
++security_file_mmap_26056 security_file_mmap 0 26056 NULL
+keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
-+rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
-+__add_inline_refs_26096 __add_inline_refs 0 26096 NULL
-+dup_ref_26100 dup_ref 0 26100 NULL
-+intel_wrap_ring_buffer_26117 intel_wrap_ring_buffer 0 26117 NULL
-+read_sb_page_26119 read_sb_page 5 26119 NULL
++intel_wrap_ring_buffer_26117 intel_wrap_ring_buffer 0 26117 NULL nohasharray
++__strnlen_user_26117 __strnlen_user 0-2 26117 &intel_wrap_ring_buffer_26117
++user_instantiate_26131 user_instantiate 3 26131 NULL
++skb_cow_26138 skb_cow 2 26138 NULL
+__fswab64_26155 __fswab64 0 26155 NULL
+copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL
-+gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
-+ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
-+perf_adjust_period_26168 perf_adjust_period 2-3 26168 NULL
++gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL
+disk_devt_26180 disk_devt 0 26180 NULL
-+cgroup_setxattr_26188 cgroup_setxattr 4 26188 NULL
++get_registers_26187 get_registers 3 26187 NULL
+ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
+xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
+mce_write_26201 mce_write 3 26201 NULL
-+SyS_splice_26206 SyS_splice 5 26206 NULL
-+mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
++mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL nohasharray
++store_sys_hwmon_26225 store_sys_hwmon 3 26225 &mwifiex_regrdwr_write_26225
+_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
-+rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
++cxio_num_stags_26233 cxio_num_stags 0 26233 NULL nohasharray
++rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 &cxio_num_stags_26233
+bio_split_26235 bio_split 2 26235 NULL
-+btrfs_delayed_inode_reserve_metadata_26236 btrfs_delayed_inode_reserve_metadata 0 26236 NULL
-+ecryptfs_read_lower_page_segment_26244 ecryptfs_read_lower_page_segment 4 26244 NULL
-+do_setxattr_26264 do_setxattr 0 26264 NULL
+crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
+apei_resources_request_26279 apei_resources_request 0 26279 NULL
-+wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
+ext2_find_goal_26306 ext2_find_goal 0 26306 NULL
+snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL nohasharray
+pax_get_random_long_26309 pax_get_random_long 0 26309 &snd_pcm_plug_client_channels_buf_26309
++tled_proc_write_26315 tled_proc_write 3 26315 NULL
+pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
-+check_can_nocow_26336 check_can_nocow 2 26336 NULL
++tcp_sacktag_walk_26339 tcp_sacktag_walk 5-6 26339 NULL
+snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL
-+ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 5-0-6-3 26357 NULL
-+cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
++ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 0-6-3-5 26357 NULL
++dup_to_netobj_26363 dup_to_netobj 3 26363 NULL
+invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL
+ntty_write_26404 ntty_write 3 26404 NULL
++tcp_shift_skb_data_26405 tcp_shift_skb_data 5 26405 NULL
++iwl_legacy_dbgfs_sram_read_26419 iwl_legacy_dbgfs_sram_read 3 26419 NULL
++__vb2_get_done_vb_26426 __vb2_get_done_vb 0 26426 NULL
+pagemap_read_26441 pagemap_read 3 26441 NULL
-+tower_read_26461 tower_read 3 26461 NULL nohasharray
-+enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461 nohasharray
-+numa_cpu_node_26461 numa_cpu_node 0 26461 &enc_pools_add_pages_26461
++tower_read_26461 tower_read 3 26461 NULL
+ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
+ulong_write_file_26485 ulong_write_file 3 26485 NULL
+dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL
-+vfio_pin_pages_26494 vfio_pin_pages 1 26494 NULL
+read_vmcore_26501 read_vmcore 3 26501 NULL
-+uhid_char_write_26502 uhid_char_write 3 26502 NULL
-+vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
-+iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
-+SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL
++l2cap_build_conf_req_26513 l2cap_build_conf_req 0 26513 NULL
+rds_message_inc_copy_to_user_26540 rds_message_inc_copy_to_user 3 26540 NULL
+__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
-+qgroup_account_ref_step3_26558 qgroup_account_ref_step3 0 26558 NULL
-+dio_new_bio_26562 dio_new_bio 0 26562 NULL
-+kvm_iommu_put_pages_26571 kvm_iommu_put_pages 2 26571 NULL
+rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
-+regcache_set_reg_present_26598 regcache_set_reg_present 2 26598 NULL
+__unmap_single_26604 __unmap_single 2-3 26604 NULL
+iommu_alloc_26621 iommu_alloc 4 26621 NULL
-+pack_value_26625 pack_value 1 26625 NULL
+pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
+drm_ht_find_item_26637 drm_ht_find_item 0 26637 NULL
-+process_extent_26646 process_extent 0 26646 NULL nohasharray
-+btrfs_lookup_inode_26646 btrfs_lookup_inode 0 26646 &process_extent_26646
++mmap_region_26649 mmap_region 0-2 26649 NULL
+irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL nohasharray
+inb_p_26650 inb_p 0 26650 &irq_alloc_generic_chip_26650
+usb_reset_device_26661 usb_reset_device 0 26661 NULL
+cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
-+nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
-+SyS_fcntl_26737 SyS_fcntl 3 26737 NULL
-+pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
++__alloc_pred_stack_26687 __alloc_pred_stack 2 26687 NULL
++rtllib_authentication_req_26713 rtllib_authentication_req 3 26713 NULL
+bos_desc_26752 bos_desc 0 26752 NULL
++srp_ring_alloc_26760 srp_ring_alloc 2 26760 NULL
+snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL
+dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL
-+cache_save_setup_26783 cache_save_setup 0 26783 NULL
+qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
+cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
-+iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
+smk_write_load_26829 smk_write_load 3 26829 NULL
-+ept_get_level1_sp_gpa_26831 ept_get_level1_sp_gpa 0 26831 NULL
+__nodes_onto_26838 __nodes_onto 4 26838 NULL
+scnprint_id_26842 scnprint_id 3-0 26842 NULL
+ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
-+tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
-+ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL
+svc_print_xprts_26881 svc_print_xprts 0 26881 NULL
-+cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
++ctnetlink_counters_size_26898 ctnetlink_counters_size 0 26898 NULL
++slhc_uncompress_26905 slhc_uncompress 0-3 26905 NULL
+x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
-+compat_mtw_from_user_26932 compat_mtw_from_user 0 26932 NULL
+scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 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
-+remove_from_bitmap_26939 remove_from_bitmap 0 26939 NULL
+create_bm_block_list_26940 create_bm_block_list 0 26940 NULL
+hecubafb_write_26942 hecubafb_write 3 26942 NULL
-+extract_entropy_user_26952 extract_entropy_user 3 26952 NULL nohasharray
-+do_trimming_26952 do_trimming 3 26952 &extract_entropy_user_26952
-+xlog_grant_push_ail_26972 xlog_grant_push_ail 2 26972 NULL
-+do_direct_IO_26979 do_direct_IO 0 26979 NULL
-+pcf857x_irq_domain_map_26998 pcf857x_irq_domain_map 2 26998 NULL
-+i2c_smbus_xfer_27006 i2c_smbus_xfer 0 27006 NULL
++extract_entropy_user_26952 extract_entropy_user 3 26952 NULL
+omfs_allocate_range_27034 omfs_allocate_range 3 27034 NULL
+ufs_alloc_fragments_27059 ufs_alloc_fragments 3-0-2 27059 NULL
+__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
-+ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3-0 27064 NULL
+snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
+paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
-+snd_mixer_oss_set_recsrc_27080 snd_mixer_oss_set_recsrc 2 27080 NULL
+alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
+find_first_bit_27088 find_first_bit 0-2 27088 NULL
+btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL
-+nes_reg_user_mr_27106 nes_reg_user_mr 2-3 27106 NULL
+__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
-+i915_gem_execbuffer_relocate_slow_27116 i915_gem_execbuffer_relocate_slow 0 27116 NULL
-+get_kernel_page_27133 get_kernel_page 0 27133 NULL
++spin_time_accum_total_27131 spin_time_accum_total 1 27131 NULL
+__ext4_handle_dirty_metadata_27137 __ext4_handle_dirty_metadata 0 27137 NULL
+drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
+pms_capture_27142 pms_capture 4 27142 NULL
+btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
-+snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
++i2400m_net_rx_27170 i2400m_net_rx 5 27170 NULL
+ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
+get_unaligned_be32_27184 get_unaligned_be32 0 27184 NULL
-+__intel_ring_begin_27197 __intel_ring_begin 0 27197 NULL
-+__sg_alloc_table_27198 __sg_alloc_table 0 27198 NULL
+ocfs2_read_blocks_sync_27210 ocfs2_read_blocks_sync 0 27210 NULL
+write_kmem_27225 write_kmem 3 27225 NULL
+dbAllocAG_27228 dbAllocAG 0 27228 NULL
+rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
+ocfs2_journal_access_path_27243 ocfs2_journal_access_path 0 27243 NULL
-+ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
-+qfq_unblock_groups_27269 qfq_unblock_groups 2 27269 NULL
-+comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
++cfpkt_add_trail_27260 cfpkt_add_trail 3 27260 NULL
++nlmsg_new_27263 nlmsg_new 1 27263 NULL
++usb_submit_urb_27278 usb_submit_urb 0 27278 NULL
+__dma_map_cont_27289 __dma_map_cont 5 27289 NULL
++hpi_read_reg_27302 hpi_read_reg 0 27302 NULL
+copy_from_buf_27308 copy_from_buf 2-4 27308 NULL
-+virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
-+write_buf_27316 write_buf 0-3 27316 NULL
++ath6kl_wmi_test_cmd_27312 ath6kl_wmi_test_cmd 3 27312 NULL
+ocfs2_blocks_to_clusters_27327 ocfs2_blocks_to_clusters 0-2 27327 NULL
+snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
+afs_cell_create_27346 afs_cell_create 2 27346 NULL
+iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL
+pcbit_stat_27364 pcbit_stat 2 27364 NULL
-+lz4_compress_crypto_27387 lz4_compress_crypto 3 27387 NULL
++if_nlmsg_size_27404 if_nlmsg_size 0 27404 NULL
+seq_read_27411 seq_read 3 27411 NULL
-+ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL
+ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
-+ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 0-3-4 27422 NULL nohasharray
-+evm_inode_init_security_27422 evm_inode_init_security 0 27422 &ocfs2_refcount_cal_cow_clusters_27422
++ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 0 27422 NULL
+cypress_write_27423 cypress_write 4 27423 NULL
++pack_sg_list_27425 pack_sg_list 0-2 27425 NULL
+sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
-+ktime_to_us_27455 ktime_to_us 0 27455 NULL
-+sk_extract_addr_27474 sk_extract_addr 0 27474 NULL
-+v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
+hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
-+qib_create_cq_27497 qib_create_cq 2 27497 NULL
+ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
-+btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
-+ept_walk_addr_generic_27501 ept_walk_addr_generic 4 27501 NULL
+garmin_read_process_27509 garmin_read_process 3 27509 NULL
-+oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
++xfs_buf_read_uncached_27519 xfs_buf_read_uncached 4 27519 NULL
+ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
++intel_gtt_map_memory_27539 intel_gtt_map_memory 0 27539 NULL
+snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
-+SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
-+sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
-+libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
++libipw_alloc_txb_27579 libipw_alloc_txb 1-3-2 27579 NULL
++tipc_cfg_reply_alloc_27606 tipc_cfg_reply_alloc 1 27606 NULL
++iwl4965_rs_sta_dbgfs_rate_scale_data_read_27619 iwl4965_rs_sta_dbgfs_rate_scale_data_read 3 27619 NULL
+read_flush_procfs_27642 read_flush_procfs 3 27642 NULL nohasharray
+nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642 nohasharray
-+ocfs2_direct_IO_27642 ocfs2_direct_IO 4 27642 &nl80211_send_connect_result_27642 nohasharray
-+ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 &ocfs2_direct_IO_27642
++ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 &nl80211_send_connect_result_27642
+add_new_gdb_27643 add_new_gdb 3 27643 NULL
-+btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
-+qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
++ieee80211_build_probe_req_27660 ieee80211_build_probe_req 7-5 27660 NULL
+cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
-+record_changed_ref_27665 record_changed_ref 0 27665 NULL
-+iommu_pgsize_27677 iommu_pgsize 2-0 27677 NULL
++qword_get_27670 qword_get 0 27670 NULL
+ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL
-+fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4-0 27702 NULL
++l2cap_sar_segment_sdu_27701 l2cap_sar_segment_sdu 3 27701 NULL
++cxio_hal_pblpool_alloc_27714 cxio_hal_pblpool_alloc 2 27714 NULL
+evm_write_key_27715 evm_write_key 3 27715 NULL
+ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
++pstore_write_27724 pstore_write 3 27724 NULL nohasharray
++iwl_dbgfs_traffic_log_write_27724 iwl_dbgfs_traffic_log_write 3 27724 &pstore_write_27724 nohasharray
++reg_w_buf_27724 reg_w_buf 3 27724 &iwl_dbgfs_traffic_log_write_27724
+xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
-+macvtap_skb_to_vnet_hdr_27747 macvtap_skb_to_vnet_hdr 0 27747 NULL
-+SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
-+gpiochip_export_27776 gpiochip_export 0 27776 NULL
-+__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
-+twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
-+DivaSTraceGetMemotyRequirement_27797 DivaSTraceGetMemotyRequirement 0-1 27797 NULL
-+ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL nohasharray
-+SyS_readv_27804 SyS_readv 3 27804 &ttm_object_file_init_27804
-+mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
-+fwtty_buffer_rx_27821 fwtty_buffer_rx 3 27821 NULL
++kcalloc_27770 kcalloc 2-1 27770 NULL
++ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL
+hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL
-+init_header_complete_27833 init_header_complete 0 27833 NULL
++init_header_complete_27833 init_header_complete 0 27833 NULL nohasharray
++sys_listxattr_27833 sys_listxattr 3 27833 &init_header_complete_27833
+read_profile_27859 read_profile 3 27859 NULL
+sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
-+ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
-+process_all_extents_27879 process_all_extents 0 27879 NULL
++mangle_packet_27864 mangle_packet 6-8 27864 NULL
++ocfs2_file_splice_read_27870 ocfs2_file_splice_read 4 27870 NULL
++paranoid_check_ec_hdr_27872 paranoid_check_ec_hdr 0 27872 NULL
+unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
-+gluebi_write_27905 gluebi_write 3-2 27905 NULL
-+SyS_ptrace_27924 SyS_ptrace 3 27924 NULL
++ubi_eba_write_leb_st_27896 ubi_eba_write_leb_st 0 27896 NULL
+bm_find_next_27929 bm_find_next 2 27929 NULL
+check_mapped_name_27943 check_mapped_name 3 27943 NULL
-+i915_gem_execbuffer_reserve_object_27956 i915_gem_execbuffer_reserve_object 0 27956 NULL
++sctp_make_abort_violation_27959 sctp_make_abort_violation 4 27959 NULL
+tracing_clock_write_27961 tracing_clock_write 3 27961 NULL
-+tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
+device_register_27972 device_register 0 27972 NULL nohasharray
+mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 &device_register_27972
-+pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL
-+f2fs_bio_alloc_27983 f2fs_bio_alloc 2 27983 NULL
-+edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
+snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
-+remove_extent_data_ref_28023 remove_extent_data_ref 0 28023 NULL
-+alloc_one_pg_vec_page_28031 alloc_one_pg_vec_page 1 28031 NULL
-+record_deleted_ref_28039 record_deleted_ref 0 28039 NULL
++get_packet_pg_28023 get_packet_pg 4 28023 NULL
++raid_status_28025 raid_status 4 28025 NULL
+sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
-+rts51x_xd_rw_28046 rts51x_xd_rw 3-4 28046 NULL
-+p9_fd_write_28050 p9_fd_write 3 28050 NULL
+cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
-+pool_status_28055 pool_status 5 28055 NULL
+init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
+lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
-+tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
-+ext4_read_block_bitmap_nowait_28078 ext4_read_block_bitmap_nowait 2 28078 NULL
-+platform_get_irq_28088 platform_get_irq 0 28088 NULL
-+SyS_brk_28096 SyS_brk 1 28096 NULL
++GetRecvByte_28082 GetRecvByte 0 28082 NULL
+mmc_test_alloc_mem_28102 mmc_test_alloc_mem 2-3 28102 NULL
-+rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
+vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
+tipc_msg_init_28128 tipc_msg_init 4-2 28128 NULL
+video_read_28148 video_read 3 28148 NULL
+snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
+stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
-+__add_reloc_root_28155 __add_reloc_root 0 28155 NULL
+vread_28173 vread 0-3 28173 NULL
++c4iw_reject_cr_28174 c4iw_reject_cr 3 28174 NULL
++pipe_fcntl_28181 pipe_fcntl 3 28181 NULL
+macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
-+counter_free_res_28187 counter_free_res 5 28187 NULL
-+read_disk_sb_28188 read_disk_sb 2 28188 NULL
-+nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
-+__exclude_logged_extent_28212 __exclude_logged_extent 2-0 28212 NULL
-+__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
+ocfs2_cow_sync_writeback_28221 ocfs2_cow_sync_writeback 0 28221 NULL
+line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
+amd_nb_num_28228 amd_nb_num 0 28228 NULL
-+ext4_validate_block_bitmap_28243 ext4_validate_block_bitmap 3 28243 NULL
-+fuse_direct_IO_28275 fuse_direct_IO 4 28275 NULL
++c4iw_rqtpool_alloc_28271 c4iw_rqtpool_alloc 2 28271 NULL
+usemap_size_28281 usemap_size 0 28281 NULL
-+inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
+dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
-+SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
+kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
++__hidp_send_ctrl_message_28303 __hidp_send_ctrl_message 4 28303 NULL
+acpi_register_gsi_xen_28305 acpi_register_gsi_xen 2 28305 NULL nohasharray
+nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 &acpi_register_gsi_xen_28305
-+__mlock_vma_pages_range_28315 __mlock_vma_pages_range 2-3-0 28315 NULL
+snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
+bm_entry_write_28338 bm_entry_write 3 28338 NULL
+tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
-+cpuset_spread_node_28351 cpuset_spread_node 0 28351 NULL nohasharray
-+snapshot_write_28351 snapshot_write 3 28351 &cpuset_spread_node_28351
-+xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL
++snapshot_write_28351 snapshot_write 3 28351 NULL
++orig_node_del_if_28371 orig_node_del_if 2 28371 NULL
++sys_writev_28384 sys_writev 3 28384 NULL
+dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
-+tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
-+bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
+subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
+get_extent_allocation_hint_28423 get_extent_allocation_hint 0 28423 NULL
-+ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
-+mpage_readpages_28436 mpage_readpages 3 28436 NULL
+snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
-+key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
+alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
-+vmw_du_crtc_cursor_set_28479 vmw_du_crtc_cursor_set 4-5 28479 NULL
+ocfs2_backup_super_blkno_28484 ocfs2_backup_super_blkno 0-2 28484 NULL
+__filemap_fdatawrite_28485 __filemap_fdatawrite 0 28485 NULL
-+clear_discard_28494 clear_discard 2 28494 NULL
-+ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
++max_response_pages_28492 max_response_pages 0 28492 NULL
+__next_node_28521 __next_node 1-0 28521 NULL
+i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 NULL
++capinc_tty_write_28539 capinc_tty_write 3 28539 NULL
+sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
+run_delalloc_range_28545 run_delalloc_range 3-4 28545 NULL nohasharray
-+mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &run_delalloc_range_28545 nohasharray
-+aio_read_events_28545 aio_read_events 3 28545 &mptctl_getiocinfo_28545
++mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &run_delalloc_range_28545
+sysfs_create_bin_file_28551 sysfs_create_bin_file 0 28551 NULL
+b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
+i2o_msg_post_wait_mem_28558 i2o_msg_post_wait_mem 0 28558 NULL
-+asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
++inet_dccp_listen_28565 inet_dccp_listen 2 28565 NULL
++cfg80211_send_rx_auth_28580 cfg80211_send_rx_auth 3 28580 NULL
+oxygen_read32_28582 oxygen_read32 0 28582 NULL
+ocfs2_read_dir_block_28587 ocfs2_read_dir_block 2 28587 NULL
+extract_entropy_28604 extract_entropy 5-3 28604 NULL
+kfifo_unused_28612 kfifo_unused 0 28612 NULL
+mp_override_legacy_irq_28618 mp_override_legacy_irq 4 28618 NULL
+snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL
++_set_range_28627 _set_range 3 28627 NULL
+setup_usemap_28636 setup_usemap 3-4 28636 NULL
+qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL
-+p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
-+read_nic_io_byte_28654 read_nic_io_byte 0 28654 NULL
+btrfs_previous_item_28667 btrfs_previous_item 0 28667 NULL
+blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
-+__perf_sw_event_28684 __perf_sw_event 2 28684 NULL
-+SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
-+kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
++posix_acl_from_xattr_28675 posix_acl_from_xattr 2 28675 NULL
++__dev_alloc_skb_28681 __dev_alloc_skb 1 28681 NULL
++nl80211_send_new_peer_candidate_28692 nl80211_send_new_peer_candidate 5 28692 NULL
+balance_level_28707 balance_level 0 28707 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
-+read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
-+max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
++cxio_init_resource_fifo_28764 cxio_init_resource_fifo 3 28764 NULL
+rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
+atomic_inc_return_unchecked_28778 atomic_inc_return_unchecked 0 28778 NULL
+ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
-+btrfs_block_rsv_refill_28800 btrfs_block_rsv_refill 3 28800 NULL nohasharray
-+sel_write_member_28800 sel_write_member 3 28800 &btrfs_block_rsv_refill_28800
++dvb_net_sec_callback_28786 dvb_net_sec_callback 2 28786 NULL
++sel_write_member_28800 sel_write_member 3 28800 NULL
++ocfs2_cow_contig_clusters_28803 ocfs2_cow_contig_clusters 0 28803 NULL
+cgroup_file_read_28804 cgroup_file_read 3 28804 NULL
+memory_bm_create_28814 memory_bm_create 0 28814 NULL
+iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
-+vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
++vp_request_msix_vectors_28849 vp_request_msix_vectors 2-0 28849 NULL
++paranoid_check_peb_vid_hdr_28866 paranoid_check_peb_vid_hdr 0 28866 NULL
+ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
+max_io_len_target_boundary_28879 max_io_len_target_boundary 0-1 28879 NULL
++iwl3945_sta_dbgfs_stats_table_read_28882 iwl3945_sta_dbgfs_stats_table_read 3 28882 NULL
+packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
-+to_cblock_28899 to_cblock 0-1 28899 NULL
-+da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
+ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
+iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL
+ocfs2_frozen_trigger_28929 ocfs2_frozen_trigger 4 28929 NULL
+push_rx_28939 push_rx 3 28939 NULL
-+btrfs_trim_block_group_28963 btrfs_trim_block_group 4-3 28963 NULL
++btrfs_trim_block_group_28963 btrfs_trim_block_group 3 28963 NULL
+alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
-+remap_pfn_range_28976 remap_pfn_range 3-4-2 28976 NULL
+ext4_mb_add_groupinfo_28988 ext4_mb_add_groupinfo 2 28988 NULL
+hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
+bin_uuid_28999 bin_uuid 3 28999 NULL
-+fd_execute_rw_29004 fd_execute_rw 3 29004 NULL nohasharray
-+offset_to_bitmap_29004 offset_to_bitmap 2 29004 &fd_execute_rw_29004
-+xz_dec_init_29029 xz_dec_init 2 29029 NULL
-+i915_gem_object_bind_to_vm_29035 i915_gem_object_bind_to_vm 0 29035 NULL
-+ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
-+ProcessGetHostMibs_29049 ProcessGetHostMibs 0 29049 NULL nohasharray
-+rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 &ProcessGetHostMibs_29049
-+btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL
++sys_fcntl64_29031 sys_fcntl64 3 29031 NULL
++rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL nohasharray
++ProcessGetHostMibs_29049 ProcessGetHostMibs 0 29049 &rxrpc_sendmsg_29049
++tso_fragment_29050 tso_fragment 3 29050 NULL
++split_bvec_29058 split_bvec 5 29058 NULL
+iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
-+roundup_64_29066 roundup_64 2-0-1 29066 NULL
+lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
-+sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
++ieee80211_probereq_get_29069 ieee80211_probereq_get 4-6 29069 NULL
++mark_extents_written_29082 mark_extents_written 2-3 29082 NULL
+iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
-+i915_error_object_create_sized_29091 i915_error_object_create_sized 3 29091 NULL
+isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
++rbd_req_sync_op_29115 rbd_req_sync_op 10-9 29115 NULL
+snprintf_29125 snprintf 0 29125 NULL
+iov_shorten_29130 iov_shorten 0 29130 NULL
+proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
-+alloc_irqs_from_29152 alloc_irqs_from 1-2-0 29152 NULL
-+kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL
-+drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
++reshape_ring_29147 reshape_ring 2 29147 NULL
+wusb_prf_256_29203 wusb_prf_256 7 29203 NULL
-+__mm_populate_29204 __mm_populate 1-2 29204 NULL
+do_shrinker_shrink_29208 do_shrinker_shrink 0 29208 NULL
+rds_iw_inc_copy_to_user_29214 rds_iw_inc_copy_to_user 3 29214 NULL
-+iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
-+nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL
-+irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
-+recover_peb_29238 recover_peb 0-7-6 29238 NULL
-+evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
-+rw_verify_area_29243 rw_verify_area 0-4 29243 NULL
++iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL nohasharray
++security_socket_recvmsg_29224 security_socket_recvmsg 0 29224 &iwl_dbgfs_temperature_read_29224
++recover_peb_29238 recover_peb 0 29238 NULL
+security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
-+block_div_29268 block_div 0-1-2 29268 NULL
+prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
+bitmap_ord_to_pos_29279 bitmap_ord_to_pos 3 29279 NULL
+ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
+sn9c102_read_29305 sn9c102_read 3 29305 NULL
-+replace_file_extents_29312 replace_file_extents 0 29312 NULL
-+__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
-+lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
-+kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
-+tun_put_user_29337 tun_put_user 5 29337 NULL
+__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
+ide_read_altstatus_29343 ide_read_altstatus 0 29343 NULL
+l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
-+gpiochip_find_base_29366 gpiochip_find_base 0-1 29366 NULL
-+ktime_us_delta_29375 ktime_us_delta 0 29375 NULL
-+mwifiex_cfg80211_mgmt_tx_29387 mwifiex_cfg80211_mgmt_tx 7 29387 NULL
++alloc_and_copy_ftrace_hash_29368 alloc_and_copy_ftrace_hash 1 29368 NULL
+pca953x_irq_setup_29407 pca953x_irq_setup 3 29407 NULL
-+btrfs_run_delayed_items_29428 btrfs_run_delayed_items 0 29428 NULL
+mempool_create_29437 mempool_create 1 29437 NULL
++iscsi_sw_tcp_session_create_29443 iscsi_sw_tcp_session_create 2 29443 NULL
+crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
+p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
-+ept_page_fault_29450 ept_page_fault 2 29450 NULL
+validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
-+SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
++ubi_scan_add_used_29468 ubi_scan_add_used 0 29468 NULL
+do_register_entry_29478 do_register_entry 4 29478 NULL
+simple_strtoul_29480 simple_strtoul 0 29480 NULL
+sched_clock_local_29498 sched_clock_local 0 29498 NULL
@@ -105821,216 +107476,169 @@ index 0000000..0a9d518
+btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL
+write_file_regidx_29517 write_file_regidx 3 29517 NULL
+atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
-+_regmap_raw_write_29541 _regmap_raw_write 2-4 29541 NULL
-+vfs_read_29543 vfs_read 0-3 29543 NULL
-+set_brk_29551 set_brk 1-2 29551 NULL nohasharray
-+ftrace_write_29551 ftrace_write 3 29551 &set_brk_29551
++pci_enable_msix_29524 pci_enable_msix 0 29524 NULL
+idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
+leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
+kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
-+p9_fd_read_29570 p9_fd_read 3 29570 NULL
+lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
+iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
+pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
-+dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
+slots_per_page_29601 slots_per_page 0 29601 NULL
-+osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
+nla_get_u16_29624 nla_get_u16 0 29624 NULL
-+tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
+sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL
++br_send_bpdu_29669 br_send_bpdu 3 29669 NULL
++new_lockspace_29674 new_lockspace 2 29674 NULL
+sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
+tracepoint_probe_register_29688 tracepoint_probe_register 0 29688 NULL
-+__btrfs_setxattr_29689 __btrfs_setxattr 0 29689 NULL
+jbd2_journal_restart_29692 jbd2_journal_restart 0 29692 NULL
-+lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
-+posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
++sd_alloc_ctl_entry_29708 sd_alloc_ctl_entry 1 29708 NULL
+probes_write_29711 probes_write 3 29711 NULL
++emi62_writememory_29731 emi62_writememory 4 29731 NULL
+read_cis_cache_29735 read_cis_cache 4 29735 NULL
-+xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
-+std_nic_write_29752 std_nic_write 3 29752 NULL
++cxio_hal_init_resource_29771 cxio_hal_init_resource 7-6-2 29771 NULL nohasharray
++ip_vs_conn_fill_param_sync_29771 ip_vs_conn_fill_param_sync 6 29771 &cxio_hal_init_resource_29771
++cifs_ucs2_bytes_29790 cifs_ucs2_bytes 0 29790 NULL
+dbAlloc_29794 dbAlloc 0 29794 NULL
+ext4_trim_all_free_29806 ext4_trim_all_free 4-3-2 29806 NULL
-+tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
++efx_wanted_channels_29813 efx_wanted_channels 0 29813 NULL
++tcp_sendpage_29829 tcp_sendpage 4-3 29829 NULL
+scan_bitmap_block_29840 scan_bitmap_block 4 29840 NULL
+__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
-+kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
+count_partial_29850 count_partial 0 29850 NULL
-+radeon_ttm_tt_create_29859 radeon_ttm_tt_create 2 29859 NULL
-+solo_enc_alloc_29860 solo_enc_alloc 3 29860 NULL
+ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
-+tlv_put_29872 tlv_put 0 29872 NULL
+scsi_end_request_29876 scsi_end_request 3 29876 NULL
-+changed_extent_29881 changed_extent 0 29881 NULL
+crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
-+lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
++nfc_targets_found_29886 nfc_targets_found 3 29886 NULL
++pin_code_reply_29893 pin_code_reply 4 29893 NULL
+write_file_queue_29922 write_file_queue 3 29922 NULL
+ext4_xattr_set_acl_29930 ext4_xattr_set_acl 4 29930 NULL
+__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL
-+diva_os_get_context_size_29983 diva_os_get_context_size 0 29983 NULL
-+arch_setup_dmar_msi_29992 arch_setup_dmar_msi 1 29992 NULL
-+vmci_host_setup_notify_30002 vmci_host_setup_notify 2 30002 NULL
-+dev_mem_write_30028 dev_mem_write 3 30028 NULL
++xfrm_count_auth_supported_29957 xfrm_count_auth_supported 0 29957 NULL
++irias_add_octseq_attrib_29983 irias_add_octseq_attrib 4 29983 NULL
++arch_setup_dmar_msi_29992 arch_setup_dmar_msi 1-0 29992 NULL
+alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
+scsi_vpd_inquiry_30040 scsi_vpd_inquiry 4 30040 NULL
-+drp_wmove_30043 drp_wmove 4 30043 NULL nohasharray
-+wrmalt_30043 wrmalt 0 30043 &drp_wmove_30043
-+mem_cgroup_charge_common_30047 mem_cgroup_charge_common 0 30047 NULL
-+SyS_write_30059 SyS_write 3 30059 NULL
++wrmalt_30043 wrmalt 0 30043 NULL
++__pci_request_selected_regions_30058 __pci_request_selected_regions 0 30058 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
-+rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
-+defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
++tg3_run_loopback_30093 tg3_run_loopback 2 30093 NULL
++skb_pagelen_30113 skb_pagelen 0 30113 NULL
+spi_async_locked_30117 spi_async_locked 0 30117 NULL
-+calgary_unmap_page_30130 calgary_unmap_page 3-2 30130 NULL
++calgary_unmap_page_30130 calgary_unmap_page 2-3 30130 NULL
++_osd_req_sizeof_alist_header_30134 _osd_req_sizeof_alist_header 0 30134 NULL
+recv_stream_30138 recv_stream 4 30138 NULL
-+u_memcpya_30139 u_memcpya 3-2 30139 NULL
-+elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
-+alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL
-+expand_inode_data_30169 expand_inode_data 2-3 30169 NULL
-+btrfs_start_transaction_lflush_30178 btrfs_start_transaction_lflush 2 30178 NULL
++u_memcpya_30139 u_memcpya 2-3 30139 NULL
++i915_gem_object_get_pages_gtt_30154 i915_gem_object_get_pages_gtt 0 30154 NULL
++i915_gem_object_wait_rendering_30173 i915_gem_object_wait_rendering 0 30173 NULL
++cx25821_video_ioctl_30188 cx25821_video_ioctl 2 30188 NULL
+mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
-+drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
+snd_pcm_playback_forward_30201 snd_pcm_playback_forward 0-2 30201 NULL
+usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
++preallocate_pcm_pages_30209 preallocate_pcm_pages 2 30209 NULL
+read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL
-+bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
-+shmem_unuse_inode_30263 shmem_unuse_inode 0 30263 NULL
++snd_ac97_pcm_assign_30218 snd_ac97_pcm_assign 2 30218 NULL
++dccp_manip_pkt_30229 dccp_manip_pkt 2 30229 NULL
+rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
-+hfsplus_trusted_setxattr_30270 hfsplus_trusted_setxattr 4 30270 NULL
+isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL
+compat_readv_30273 compat_readv 3 30273 NULL
+lapic_register_intr_30279 lapic_register_intr 1 30279 NULL
+skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
-+pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
-+tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
-+osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL
-+drm_core_get_reg_ofs_30309 drm_core_get_reg_ofs 0 30309 NULL
++ir_create_table_30303 ir_create_table 4 30303 NULL
+ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL
-+i8254_read_30330 i8254_read 0 30330 NULL
-+generic_ptrace_pokedata_30338 generic_ptrace_pokedata 2 30338 NULL
+resource_from_user_30341 resource_from_user 3 30341 NULL
-+o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
-+__vmalloc_node_flags_30352 __vmalloc_node_flags 1 30352 NULL
+kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
+inet_getid_30365 inet_getid 2 30365 NULL
-+C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
-+blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3-0 30392 NULL
-+c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
-+get_kernel_pages_30397 get_kernel_pages 0 30397 NULL
++sys_get_mempolicy_30379 sys_get_mempolicy 3 30379 NULL
++blkdev_issue_zeroout_30392 blkdev_issue_zeroout 0 30392 NULL
++c4iw_init_resource_30393 c4iw_init_resource 3-2 30393 NULL
+_drbd_bm_find_next_zero_30415 _drbd_bm_find_next_zero 2 30415 NULL
-+ext3_xattr_list_30419 ext3_xattr_list 3 30419 NULL
-+vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
-+tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
-+mq_create_30425 mq_create 1 30425 NULL nohasharray
-+lstcon_session_info_30425 lstcon_session_info 6 30425 &mq_create_30425
+ext4_ext_create_new_leaf_30428 ext4_ext_create_new_leaf 0 30428 NULL
+enable_write_30456 enable_write 3 30456 NULL
-+pci_resource_alignment_30457 pci_resource_alignment 0 30457 NULL
-+tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
+urandom_read_30462 urandom_read 3 30462 NULL
+zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
+i2c_ctrl_read_30467 i2c_ctrl_read 0 30467 NULL
-+send_rmdir_30470 send_rmdir 0 30470 NULL
-+i915_mutex_lock_interruptible_30474 i915_mutex_lock_interruptible 0 30474 NULL nohasharray
-+ocrdma_reg_user_mr_30474 ocrdma_reg_user_mr 2-3 30474 &i915_mutex_lock_interruptible_30474
-+write_head_30481 write_head 4 30481 NULL
++i915_mutex_lock_interruptible_30474 i915_mutex_lock_interruptible 0 30474 NULL
+adu_write_30487 adu_write 3 30487 NULL
+dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
-+btrfs_free_extent_30515 btrfs_free_extent 0 30515 NULL
-+dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
-+debug_debug2_read_30526 debug_debug2_read 3 30526 NULL nohasharray
-+set_config_30526 set_config 0 30526 &debug_debug2_read_30526
++nouveau_vm_new_30495 nouveau_vm_new 3-2 30495 NULL
++set_config_30526 set_config 0 30526 NULL
+disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
-+set_le_30581 set_le 4 30581 NULL
-+from_cblock_30582 from_cblock 0-1 30582 NULL
+blk_init_tags_30592 blk_init_tags 1 30592 NULL
-+i2c_hid_get_report_length_30598 i2c_hid_get_report_length 0 30598 NULL
-+sgl_map_user_pages_30610 sgl_map_user_pages 2-3-4 30610 NULL
-+SyS_msgrcv_30611 SyS_msgrcv 3 30611 NULL
++sgl_map_user_pages_30610 sgl_map_user_pages 2 30610 NULL
+macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
-+ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL
+compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
-+mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL
-+SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
-+agp_remap_30665 agp_remap 2 30665 NULL
++nfsd_nrpools_30651 nfsd_nrpools 0 30651 NULL
+jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
-+ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
+dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
++wled_proc_write_30709 wled_proc_write 3 30709 NULL
+lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
+ocfs2_find_cpos_for_left_leaf_30713 ocfs2_find_cpos_for_left_leaf 0 30713 NULL
-+__mutex_lock_common_30717 __mutex_lock_common 0 30717 NULL
++l2cap_build_conf_rsp_30719 l2cap_build_conf_rsp 0 30719 NULL
+lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
+snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL
-+snapshot_status_30744 snapshot_status 5 30744 NULL
-+fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
-+SyS_pread64_30778 SyS_pread64 3 30778 NULL
-+btrfs_run_ordered_operations_30793 btrfs_run_ordered_operations 0 30793 NULL
++ath6kl_wmi_send_action_cmd_30735 ath6kl_wmi_send_action_cmd 6 30735 NULL
++fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL nohasharray
++tcf_csum_ipv4_udp_30777 tcf_csum_ipv4_udp 4 30777 &fuse_conn_limit_write_30777
+smk_read_doi_30813 smk_read_doi 3 30813 NULL
-+SYSC_splice_30820 SYSC_splice 5 30820 NULL
-+xlog_grant_head_wait_30829 xlog_grant_head_wait 4 30829 NULL
+get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
+sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
-+cfg80211_rx_mgmt_30844 cfg80211_rx_mgmt 5 30844 NULL
-+wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
+ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
+pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
++f1x_match_to_this_node_30888 f1x_match_to_this_node 3 30888 NULL
++get_params_30899 get_params 0 30899 NULL
++fc_host_post_vendor_event_30903 fc_host_post_vendor_event 3 30903 NULL
+sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
+find_free_dev_extent_30963 find_free_dev_extent 0 30963 NULL
+tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
+huge_page_mask_30981 huge_page_mask 0 30981 NULL
-+read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL
++nlmsg_put_answer_30988 nlmsg_put_answer 4 30988 NULL
++i2400mu_rx_size_grow_30989 i2400mu_rx_size_grow 0 30989 NULL
+lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
-+do_setup_msi_irqs_31043 do_setup_msi_irqs 2 31043 NULL
-+stride_pg_count_31053 stride_pg_count 0-2-1-4-3-5 31053 NULL
++compat_sys_mq_timedsend_31060 compat_sys_mq_timedsend 3 31060 NULL
+lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
+find_next_bit_le_31064 find_next_bit_le 0-2-3 31064 NULL
++sys_mincore_31079 sys_mincore 2-1 31079 NULL
+sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
-+proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
+compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3 31109 NULL
-+si_calculate_power_efficiency_ratio_31111 si_calculate_power_efficiency_ratio 3-2 31111 NULL
+depth_read_31112 depth_read 3 31112 NULL
++kvm_mmu_pte_write_31120 kvm_mmu_pte_write 2-4 31120 NULL
++ssb_read16_31139 ssb_read16 0 31139 NULL
+kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
+size_inside_page_31141 size_inside_page 0-1-2 31141 NULL
+w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
+ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
++input_mt_init_slots_31183 input_mt_init_slots 2 31183 NULL
+r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
-+mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
-+__btrfs_free_reserved_extent_31207 __btrfs_free_reserved_extent 2 31207 NULL
-+kvm_mmu_page_fault_31213 kvm_mmu_page_fault 2 31213 NULL
+cpumask_weight_31215 cpumask_weight 0 31215 NULL
+__read_reg_31216 __read_reg 0 31216 NULL
+atm_get_addr_31221 atm_get_addr 3 31221 NULL
-+ulist_rbtree_insert_31235 ulist_rbtree_insert 0 31235 NULL
+tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL
+cyy_readb_31240 cyy_readb 0 31240 NULL
+_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
+ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
++ceph_copy_page_vector_to_user_31270 ceph_copy_page_vector_to_user 0-4-3 31270 NULL
+sctp_tsnmap_find_gap_ack_31272 sctp_tsnmap_find_gap_ack 3-2 31272 NULL
+uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
+push_leaf_left_31306 push_leaf_left 0 31306 NULL
+sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
+command_file_write_31318 command_file_write 3 31318 NULL
-+ext4_xattr_block_list_31325 ext4_xattr_block_list 3 31325 NULL
+hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL
-+radix_tree_insert_31336 radix_tree_insert 0 31336 NULL
-+em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
+__cpu_to_node_31345 __cpu_to_node 0 31345 NULL
-+outlen_write_31358 outlen_write 3 31358 NULL
-+ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
-+xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
-+vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 2-3 31374 NULL
++rbd_do_op_31366 rbd_do_op 8-9 31366 NULL
++native_setup_msi_irqs_31367 native_setup_msi_irqs 2 31367 NULL
++buffDnld_31372 buffDnld 0 31372 NULL nohasharray
++xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 &buffDnld_31372
+trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
+inb_31388 inb 0 31388 NULL
+key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
-+i915_gem_object_put_fence_31413 i915_gem_object_put_fence 0 31413 NULL
-+_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
++i915_gem_object_put_fence_31413 i915_gem_object_put_fence 0 31413 NULL nohasharray
++mcs7830_set_reg_31413 mcs7830_set_reg 3 31413 &i915_gem_object_put_fence_31413
+TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
+snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL
+acpi_sci_ioapic_setup_31445 acpi_sci_ioapic_setup 4 31445 NULL
-+transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL
+opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
+register_ftrace_graph_31456 register_ftrace_graph 0 31456 NULL
-+input_get_new_minor_31464 input_get_new_minor 1 31464 NULL
+do_fcntl_31468 do_fcntl 3 31468 NULL
+xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL
+__ext4_journal_get_write_access_31482 __ext4_journal_get_write_access 0 31482 NULL
@@ -106038,148 +107646,112 @@ index 0000000..0a9d518
+rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
+qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
+__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
-+nouveau_mc_create__31513 nouveau_mc_create_ 5 31513 NULL
+hidraw_write_31536 hidraw_write 3 31536 NULL
-+mtd_div_by_eb_31543 mtd_div_by_eb 0-1 31543 NULL
-+usbvision_read_31555 usbvision_read 3 31555 NULL
-+tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
-+get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL
++normalize_31566 normalize 0-1-2 31566 NULL
++inet6_ifaddr_msgsize_31568 inet6_ifaddr_msgsize 0 31568 NULL
+osst_write_31581 osst_write 3 31581 NULL
-+snd_compr_get_avail_31584 snd_compr_get_avail 0 31584 NULL
+iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
-+mtd_get_user_prot_info_31616 mtd_get_user_prot_info 0 31616 NULL
+arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 NULL
++iwl_legacy_dbgfs_traffic_log_read_31625 iwl_legacy_dbgfs_traffic_log_read 3 31625 NULL
++xfs_log_move_tail_31628 xfs_log_move_tail 2 31628 NULL
+videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
+pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
+xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL
-+emulator_set_cr_31665 emulator_set_cr 3 31665 NULL
+__lgread_31668 __lgread 4 31668 NULL
-+forced_ps_read_31685 forced_ps_read 3 31685 NULL
++xfs_ail_min_lsn_31684 xfs_ail_min_lsn 0 31684 NULL
+fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
-+reiserfs_in_journal_31689 reiserfs_in_journal 3 31689 NULL
-+gfn_to_hva_read_31728 gfn_to_hva_read 2 31728 NULL
-+utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL nohasharray
-+lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 &utf16s_to_utf8s_31735
-+shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
++handle_interrupt_31689 handle_interrupt 0 31689 NULL nohasharray
++reiserfs_in_journal_31689 reiserfs_in_journal 3 31689 &handle_interrupt_31689
++iwl_legacy_dbgfs_chain_noise_read_31692 iwl_legacy_dbgfs_chain_noise_read 3 31692 NULL
++audit_log_n_string_31705 audit_log_n_string 3 31705 NULL
++sctp_make_asconf_ack_31726 sctp_make_asconf_ack 3 31726 NULL
++ata_tport_add_31733 ata_tport_add 0 31733 NULL
++utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL
+NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 NULL nohasharray
+input_abs_get_max_31742 input_abs_get_max 0 31742 &NCR_700_change_queue_depth_31742
-+muldiv64_31743 muldiv64 3-2-0 31743 NULL
-+stmpe_set_altfunc_31750 stmpe_set_altfunc 2 31750 NULL nohasharray
-+bcm_char_read_31750 bcm_char_read 3 31750 &stmpe_set_altfunc_31750
++bcm_char_read_31750 bcm_char_read 3 31750 NULL
+snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
-+SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
+usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
++get_count_order_31800 get_count_order 0 31800 NULL
+ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
+isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
-+data_write_31805 data_write 3 31805 NULL
-+SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL
+strnlen_user_31815 strnlen_user 0-2 31815 NULL
+sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
-+fsnotify_perm_31843 fsnotify_perm 0 31843 NULL
-+SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
+iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
-+drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
+ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
+xattr_permission_31907 xattr_permission 0 31907 NULL
-+lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
-+new_dir_31919 new_dir 3 31919 NULL
+kmem_alloc_31920 kmem_alloc 1 31920 NULL
+guestwidth_to_adjustwidth_31937 guestwidth_to_adjustwidth 0-1 31937 NULL
-+process_recorded_refs_if_needed_31938 process_recorded_refs_if_needed 0 31938 NULL
-+SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
+iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4-0 31942 NULL nohasharray
+read_mem_31942 read_mem 3 31942 &iov_iter_copy_from_user_31942
+vb2_write_31948 vb2_write 3 31948 NULL
+pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
-+regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
+copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
-+mtd_add_partition_31971 mtd_add_partition 3 31971 NULL
-+btrfs_insert_empty_inode_31975 btrfs_insert_empty_inode 0 31975 NULL
-+vx_read_status_31982 vx_read_status 0 31982 NULL nohasharray
-+iblock_execute_rw_31982 iblock_execute_rw 3 31982 &vx_read_status_31982
-+find_next_zero_bit_31990 find_next_zero_bit 3-2-0 31990 NULL
-+default_setup_hpet_msi_31991 default_setup_hpet_msi 1 31991 NULL
-+lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL
++vx_read_status_31982 vx_read_status 0 31982 NULL
++find_next_zero_bit_31990 find_next_zero_bit 0-2-3 31990 NULL
+sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
-+tps6586x_irq_map_32002 tps6586x_irq_map 2 32002 NULL
+calc_hmac_32010 calc_hmac 3 32010 NULL
-+vmcs_read64_32012 vmcs_read64 0 32012 NULL
-+resource_alignment_32020 resource_alignment 0 32020 NULL
-+aead_len_32021 aead_len 0 32021 NULL
-+ocfs2_remove_extent_32032 ocfs2_remove_extent 4-3-0 32032 NULL
++aer_init_32021 aer_init 0 32021 NULL nohasharray
++aead_len_32021 aead_len 0 32021 &aer_init_32021
++ocfs2_remove_extent_32032 ocfs2_remove_extent 0-4-3 32032 NULL
+posix_acl_set_32037 posix_acl_set 4 32037 NULL
-+stk_read_32038 stk_read 3 32038 NULL
-+vmw_cursor_update_dmabuf_32045 vmw_cursor_update_dmabuf 3-4 32045 NULL
-+ocfs2_update_edge_lengths_32046 ocfs2_update_edge_lengths 0 32046 NULL
-+SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
++ocfs2_update_edge_lengths_32046 ocfs2_update_edge_lengths 0 32046 NULL nohasharray
++sys_sched_setaffinity_32046 sys_sched_setaffinity 2 32046 &ocfs2_update_edge_lengths_32046
+proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
-+cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
-+bio_alloc_32095 bio_alloc 2 32095 NULL
-+alloc_pwms_32100 alloc_pwms 1-2 32100 NULL
++nlmsg_put_32069 nlmsg_put 5 32069 NULL
++cfg80211_send_unprot_deauth_32080 cfg80211_send_unprot_deauth 3 32080 NULL
+ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
++set_discoverable_32102 set_discoverable 4 32102 NULL
+disk_status_32120 disk_status 4 32120 NULL
+kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
-+btrfs_split_item_32164 btrfs_split_item 0 32164 NULL
++alloc_tx_32143 alloc_tx 2 32143 NULL
++norm_maxh_32151 norm_maxh 0 32151 NULL
+venus_link_32165 venus_link 5 32165 NULL
-+do_writepages_32173 do_writepages 0 32173 NULL nohasharray
-+ntfs_rl_realloc_nofail_32173 ntfs_rl_realloc_nofail 3 32173 &do_writepages_32173
++drbd_new_dev_size_32171 drbd_new_dev_size 0 32171 NULL
++do_writepages_32173 do_writepages 0 32173 NULL
+load_header_32183 load_header 0 32183 NULL
+ubi_wl_scrub_peb_32196 ubi_wl_scrub_peb 0 32196 NULL
+wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
-+__mem_cgroup_try_charge_swapin_32204 __mem_cgroup_try_charge_swapin 0 32204 NULL
+riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
+caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
+lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
+ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL
-+vmalloc_user_32308 vmalloc_user 1 32308 NULL
-+kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL
++l3_alloc_skb_32289 l3_alloc_skb 1 32289 NULL
+cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL
-+SyS_select_32319 SyS_select 1 32319 NULL
-+nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
+nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
-+apic_get_tmcct_32338 apic_get_tmcct 0 32338 NULL
+t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
+dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
+rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
-+sel_read_initcon_32362 sel_read_initcon 3 32362 NULL nohasharray
-+ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 &sel_read_initcon_32362
-+__wait_seqno_32370 __wait_seqno 0 32370 NULL
-+_drbd_bm_find_next_32372 _drbd_bm_find_next 2 32372 NULL
-+cpuset_slab_spread_node_32376 cpuset_slab_spread_node 0 32376 NULL
++f1x_translate_sysaddr_to_cs_32359 f1x_translate_sysaddr_to_cs 2 32359 NULL
++sel_read_initcon_32362 sel_read_initcon 3 32362 NULL
++send_mpa_reply_32372 send_mpa_reply 3 32372 NULL nohasharray
++_drbd_bm_find_next_32372 _drbd_bm_find_next 2 32372 &send_mpa_reply_32372
++variax_set_raw2_32374 variax_set_raw2 4 32374 NULL
++usbtmc_read_32377 usbtmc_read 3 32377 NULL
+intel_iommu_map_32384 intel_iommu_map 4-3 32384 NULL
+local_clock_32385 local_clock 0 32385 NULL
-+ocfs2_cancel_convert_32392 ocfs2_cancel_convert 0 32392 NULL
-+ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
+xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
-+__add_missing_keys_32402 __add_missing_keys 0 32402 NULL
-+vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
-+regmap_irq_map_32429 regmap_irq_map 2 32429 NULL
-+__ext4_handle_dirty_super_32458 __ext4_handle_dirty_super 0 32458 NULL
++hid_input_report_32458 hid_input_report 4 32458 NULL
+snd_pcm_sync_ptr_32461 snd_pcm_sync_ptr 0 32461 NULL
-+cache_status_32462 cache_status 5 32462 NULL
+fill_readbuf_32464 fill_readbuf 3 32464 NULL
-+dgap_usertoboard_32490 dgap_usertoboard 4 32490 NULL
++ieee80211_fill_mesh_addresses_32465 ieee80211_fill_mesh_addresses 0 32465 NULL
+ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
-+bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
-+mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
+ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
+ocfs2_local_alloc_reserve_for_window_32518 ocfs2_local_alloc_reserve_for_window 0 32518 NULL
-+disconnect_32521 disconnect 4 32521 NULL
+qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
-+audio_get_intf_req_32524 audio_get_intf_req 0 32524 NULL nohasharray
-+ocfs2_refresh_qinfo_32524 ocfs2_refresh_qinfo 0 32524 &audio_get_intf_req_32524
+ilo_read_32531 ilo_read 3 32531 NULL
+ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
+format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
+__first_node_32558 __first_node 0 32558 NULL
+aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
-+osc_iocontrol_32565 osc_iocontrol 3 32565 NULL
+mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
-+pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
+read_file_beacon_32595 read_file_beacon 3 32595 NULL
+ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
++sys_set_mempolicy_32608 sys_set_mempolicy 3 32608 NULL
++__iter_shared_inline_ref_32610 __iter_shared_inline_ref 0 32610 NULL
+irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
-+cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
++cfg80211_roamed_32632 cfg80211_roamed 7-5 32632 NULL
++ieee80211_hdrlen_32637 ieee80211_hdrlen 0 32637 NULL
+ite_decode_bytes_32642 ite_decode_bytes 3 32642 NULL
+kvmalloc_32646 kvmalloc 1 32646 NULL
+ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
@@ -106187,844 +107759,638 @@ index 0000000..0a9d518
+ftrace_startup_32654 ftrace_startup 0 32654 &generic_readlink_32654
+move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
+apei_res_add_32674 apei_res_add 0 32674 NULL
-+jfs_readpages_32702 jfs_readpages 4 32702 NULL
+rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
-+i40e_pci_sriov_enable_32742 i40e_pci_sriov_enable 2 32742 NULL
-+get_arg_page_32746 get_arg_page 2 32746 NULL
++slhc_remember_32741 slhc_remember 3-0 32741 NULL
+megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
+stats_read_ul_32751 stats_read_ul 3 32751 NULL
-+begin_cmd_32766 begin_cmd 0 32766 NULL
-+vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
++write_file_disable_ani_32761 write_file_disable_ani 3 32761 NULL
+sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
+ocfs2_read_inode_block_full_32790 ocfs2_read_inode_block_full 0 32790 NULL
-+rproc_name_read_32805 rproc_name_read 3 32805 NULL
++firmwareUpload_32794 firmwareUpload 3 32794 NULL
++get_register_page_interruptible_32809 get_register_page_interruptible 5 32809 NULL
++orig_node_add_if_32833 orig_node_add_if 2 32833 NULL
++nlmsg_validate_32861 nlmsg_validate 2 32861 NULL
+new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
+io_apic_setup_irq_pin_32868 io_apic_setup_irq_pin 1 32868 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
-+vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 6-4 32884 NULL
-+ext4_get_group_number_32899 ext4_get_group_number 0-2 32899 NULL
-+il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 NULL
++blkio_fill_stat_32874 blkio_fill_stat 2 32874 NULL
++vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 4-6 32884 NULL
+zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
-+rmap_recycle_32938 rmap_recycle 3 32938 NULL
+irq_reserve_irqs_32946 irq_reserve_irqs 1-2 32946 NULL
+ext4_valid_block_bitmap_32958 ext4_valid_block_bitmap 3 32958 NULL
-+xfs_log_reserve_32959 xfs_log_reserve 2 32959 NULL
-+ext4_group_overhead_blocks_32971 ext4_group_overhead_blocks 0 32971 NULL
-+arch_ptrace_32981 arch_ptrace 3 32981 NULL
+compat_filldir_32999 compat_filldir 3 32999 NULL
-+btrfs_lookup_extent_info_33000 btrfs_lookup_extent_info 0 33000 NULL
-+ext3_alloc_blocks_33007 ext3_alloc_blocks 3-0 33007 NULL nohasharray
-+SyS_syslog_33007 SyS_syslog 3 33007 &ext3_alloc_blocks_33007
++ext3_alloc_blocks_33007 ext3_alloc_blocks 3-0 33007 NULL
+br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
-+write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL
+snd_pcm_prepare_33036 snd_pcm_prepare 0 33036 NULL
-+SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL
-+pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
++xfrm_mapping_msgsize_33044 xfrm_mapping_msgsize 0 33044 NULL
+ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL
-+bitmap_resize_33054 bitmap_resize 2-3 33054 NULL
-+intel_ring_flush_all_caches_33059 intel_ring_flush_all_caches 0 33059 NULL
+stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
+sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
-+alloc_tio_33077 alloc_tio 3 33077 NULL
+acl_permission_check_33083 acl_permission_check 0 33083 NULL
-+write_node_33121 write_node 4 33121 NULL
++ieee80211_fragment_33112 ieee80211_fragment 4 33112 NULL
+fb_sys_write_33130 fb_sys_write 3 33130 NULL
-+__len_within_target_33132 __len_within_target 0 33132 NULL
-+SyS_poll_33152 SyS_poll 2 33152 NULL
-+debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
++nfs4_init_slot_table_33152 nfs4_init_slot_table 2 33152 NULL
++tun_get_user_33178 tun_get_user 3 33178 NULL
+dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
+pp_read_33210 pp_read 3 33210 NULL
-+xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL nohasharray
-+i915_gem_object_wait_rendering__tail_33234 i915_gem_object_wait_rendering__tail 0 33234 &xfs_file_aio_write_33234
++xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL
+__vb2_wait_for_done_vb_33246 __vb2_wait_for_done_vb 0 33246 NULL
+snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
++sched_find_first_bit_33270 sched_find_first_bit 0 33270 NULL
+cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
-+sync_pt_create_33282 sync_pt_create 2 33282 NULL
-+btrfs_delete_one_dir_name_33303 btrfs_delete_one_dir_name 0 33303 NULL
++i915_gem_object_flush_fence_33304 i915_gem_object_flush_fence 0 33304 NULL
+mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
-+isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL
++ceph_msgpool_init_33312 ceph_msgpool_init 3 33312 NULL
+vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL
++gsm_mux_rx_netchar_33336 gsm_mux_rx_netchar 3 33336 NULL
+joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
-+lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 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
++create_xattr_datum_33356 create_xattr_datum 5 33356 NULL
++pvscsi_allocate_sg_33357 pvscsi_allocate_sg 0 33357 NULL
+read_file_regidx_33370 read_file_regidx 3 33370 NULL
++ceph_osdc_writepages_33375 ceph_osdc_writepages 5 33375 NULL
++sctp_ulpevent_new_33377 sctp_ulpevent_new 1 33377 NULL
+ocfs2_quota_read_33382 ocfs2_quota_read 5 33382 NULL
+ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
+scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
-+tg_get_cfs_period_33390 tg_get_cfs_period 0 33390 NULL
+ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL
-+cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
-+ext4_meta_bg_first_block_no_33408 ext4_meta_bg_first_block_no 2 33408 NULL nohasharray
-+snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 &ext4_meta_bg_first_block_no_33408
++snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 NULL
+ufs_getfrag_block_33409 ufs_getfrag_block 2 33409 NULL
+filemap_fdatawrite_33415 filemap_fdatawrite 0 33415 NULL
-+dis_tap_write_33426 dis_tap_write 3 33426 NULL
++sys_dup3_33421 sys_dup3 2 33421 NULL
+ubh_scanc_33436 ubh_scanc 0-3-4 33436 NULL
-+message_stats_list_33440 message_stats_list 5 33440 NULL
-+ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
+create_entry_33479 create_entry 2 33479 NULL
+ip_setsockopt_33487 ip_setsockopt 5 33487 NULL nohasharray
+elf_map_33487 elf_map 0-2 33487 &ip_setsockopt_33487
+ol_dqblk_chunk_off_33489 ol_dqblk_chunk_off 2 33489 NULL
+res_counter_read_33499 res_counter_read 4 33499 NULL
+fb_read_33506 fb_read 3 33506 NULL
-+musb_test_mode_write_33518 musb_test_mode_write 3 33518 NULL
+ahash_setkey_unaligned_33521 ahash_setkey_unaligned 3 33521 NULL
+nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
-+aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
+acpi_gsi_to_irq_33533 acpi_gsi_to_irq 1 33533 NULL
-+osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 NULL nohasharray
-+tomoyo_read_self_33539 tomoyo_read_self 3 33539 &osc_max_rpcs_in_flight_seq_write_33539
-+read_symlink_33572 read_symlink 0 33572 NULL
-+count_subheaders_33591 count_subheaders 0 33591 NULL
++tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL
++dup_array_33551 dup_array 3 33551 NULL
++solo_enc_read_33553 solo_enc_read 3 33553 NULL
+scsi_execute_33596 scsi_execute 5 33596 NULL
+comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
-+xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
-+usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 NULL nohasharray
-+il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 &usb_gstrings_attach_33615
-+do_sync_write_33624 do_sync_write 0 33624 NULL
-+stride_page_count_33641 stride_page_count 2 33641 NULL
-+irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
++xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL nohasharray
++ip6_find_1stfragopt_33608 ip6_find_1stfragopt 0 33608 &xt_compat_target_offset_33608
+inw_p_33668 inw_p 0 33668 NULL
+arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
-+i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
-+nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
-+netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
-+tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
-+ext4_wb_update_i_disksize_33717 ext4_wb_update_i_disksize 2 33717 NULL
++rbd_alloc_coll_33678 rbd_alloc_coll 1 33678 NULL
++sys_keyctl_33708 sys_keyctl 4 33708 NULL nohasharray
++netlink_sendmsg_33708 netlink_sendmsg 4 33708 &sys_keyctl_33708
++get_free_de_33714 get_free_de 2 33714 NULL
+pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
+ocfs2_extent_map_get_blocks_33720 ocfs2_extent_map_get_blocks 2 33720 NULL
-+write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL nohasharray
-+ocfs2_lock_allocators_move_extents_33723 ocfs2_lock_allocators_move_extents 0 33723 &write_file_spectral_count_33723
++ocfs2_lock_allocators_move_extents_33723 ocfs2_lock_allocators_move_extents 0 33723 NULL
+__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL
-+vifs_state_read_33762 vifs_state_read 3 33762 NULL
++Read_hfc_33755 Read_hfc 0 33755 NULL
+hashtab_create_33769 hashtab_create 3 33769 NULL
-+btrfs_delayed_refs_qgroup_accounting_33775 btrfs_delayed_refs_qgroup_accounting 0 33775 NULL
-+irq_map_generic_chip_33793 irq_map_generic_chip 2 33793 NULL
++midibuf_message_length_33770 midibuf_message_length 0 33770 NULL
++i8042_create_aux_port_33777 i8042_create_aux_port 0 33777 NULL
+if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
-+find_next_offset_33804 find_next_offset 3-0 33804 NULL
-+filter_write_33819 filter_write 3 33819 NULL
-+sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
-+scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
-+ext4_journal_extend_33835 ext4_journal_extend 2-0 33835 NULL
++find_next_offset_33804 find_next_offset 3-0 33804 NULL nohasharray
++apei_estatus_len_33804 apei_estatus_len 0 33804 &find_next_offset_33804
++sky2_rx_pad_33819 sky2_rx_pad 0 33819 NULL nohasharray
++filter_write_33819 filter_write 3 33819 &sky2_rx_pad_33819
++ext4_journal_extend_33835 ext4_journal_extend 0 33835 NULL
+snd_pcm_action_nonatomic_33844 snd_pcm_action_nonatomic 0 33844 NULL
-+calgary_alloc_coherent_33851 calgary_alloc_coherent 2 33851 NULL
-+oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
-+bin_string_33884 bin_string 3-5 33884 NULL
-+get_user_pages_33908 get_user_pages 0-3-4 33908 NULL
-+ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
++get_user_pages_33908 get_user_pages 0 33908 NULL
+queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL
-+atomic64_add_return_33927 atomic64_add_return 0-1 33927 NULL
++max8649_read_device_33930 max8649_read_device 3 33930 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 nohasharray
-+btrfs_uuid_tree_rem_33944 btrfs_uuid_tree_rem 0 33944 &read_file_tgt_rx_stats_33944
-+hfsplus_osx_setxattr_33952 hfsplus_osx_setxattr 4 33952 NULL
-+__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
++read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
+ocfs2_create_new_meta_bhs_33955 ocfs2_create_new_meta_bhs 0 33955 NULL
++btrfs_delalloc_reserve_metadata_33963 btrfs_delalloc_reserve_metadata 0 33963 NULL
+vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
+snd_interval_refine_33987 snd_interval_refine 0 33987 NULL
-+__ntfs_malloc_34022 __ntfs_malloc 1 34022 NULL
++uio_dev_add_attributes_34003 uio_dev_add_attributes 0 34003 NULL
++select_size_34004 select_size 0 34004 NULL
+lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
+ppp_write_34034 ppp_write 3 34034 NULL
+tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
+__domain_flush_pages_34045 __domain_flush_pages 2-3 34045 NULL
-+is_trap_at_addr_34047 is_trap_at_addr 2 34047 NULL
-+memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
-+pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
-+__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
-+i915_gem_object_set_cache_level_34107 i915_gem_object_set_cache_level 0 34107 NULL nohasharray
-+proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 &i915_gem_object_set_cache_level_34107
-+is_discarded_oblock_34120 is_discarded_oblock 2 34120 NULL
+islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
-+ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
-+ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
-+shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
-+ext4_xattr_list_34162 ext4_xattr_list 3 34162 NULL
++mtu2blksize_34139 mtu2blksize 0 34139 NULL
+ocfs2_xattr_list_entry_34165 ocfs2_xattr_list_entry 0 34165 NULL
+skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
-+dtf_write_run_34196 dtf_write_run 3 34196 NULL
-+ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
-+i915_gem_execbuffer_reserve_object_34224 i915_gem_execbuffer_reserve_object 0 34224 NULL
++iwl_legacy_dbgfs_tx_queue_read_34192 iwl_legacy_dbgfs_tx_queue_read 3 34192 NULL
++mtd_write_34207 mtd_write 3 34207 NULL
+setup_nodes_for_search_34248 setup_nodes_for_search 0 34248 NULL
-+numa_migrate_prep_34256 numa_migrate_prep 0 34256 NULL
-+btrfs_bitmap_cluster_34257 btrfs_bitmap_cluster 4 34257 NULL
+bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
+ocfs2_dlm_lock_34265 ocfs2_dlm_lock 0 34265 NULL
-+pcf857x_to_irq_34273 pcf857x_to_irq 2 34273 NULL
++rw_copy_check_uvector_34271 rw_copy_check_uvector 3-0 34271 NULL
+device_private_init_34279 device_private_init 0 34279 NULL
-+ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
++zone_spanned_pages_in_node_34299 zone_spanned_pages_in_node 0 34299 NULL
+iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 NULL nohasharray
+pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 &iov_iter_single_seg_count_34326
-+SYSC_brk_34331 SYSC_brk 1 34331 NULL
-+__insert_34349 __insert 2-3 34349 NULL
-+sync_page_io_34363 sync_page_io 3 34363 NULL nohasharray
-+crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 &sync_page_io_34363
-+rngapi_reset_34366 rngapi_reset 3 34366 NULL
-+reiserfs_resize_34377 reiserfs_resize 2 34377 NULL
++crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL
++rngapi_reset_34366 rngapi_reset 3 34366 NULL nohasharray
++p54_alloc_skb_34366 p54_alloc_skb 3 34366 &rngapi_reset_34366
+ea_read_34378 ea_read 0 34378 NULL
-+fuse_send_read_34379 fuse_send_read 4 34379 NULL
+av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
+usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
+read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
-+iwl_calib_set_34400 iwl_calib_set 3 34400 NULL nohasharray
-+ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400
-+wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
++ivtv_read_pos_34400 ivtv_read_pos 3 34400 NULL
++sctp_make_heartbeat_ack_34411 sctp_make_heartbeat_ack 4 34411 NULL
+nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
-+security_socket_create_34439 security_socket_create 0 34439 NULL
+usbtest_alloc_urb_34446 usbtest_alloc_urb 5-3 34446 NULL
++sctp_make_abort_34459 sctp_make_abort 3 34459 NULL
+mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
++line6_dumpreq_init_34473 line6_dumpreq_init 3 34473 NULL
+skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
+i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
+ocfs2_block_group_clear_bits_34484 ocfs2_block_group_clear_bits 0 34484 NULL
+security_inode_permission_34488 security_inode_permission 0 34488 NULL
-+SyS_pwritev_34494 SyS_pwritev 3 34494 NULL nohasharray
-+__ffs64_34494 __ffs64 1-0 34494 &SyS_pwritev_34494
-+qp_alloc_res_34496 qp_alloc_res 5 34496 NULL
-+lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL
+snd_pcm_hw_param_value_34525 snd_pcm_hw_param_value 0 34525 NULL
-+ext4_fallocate_34537 ext4_fallocate 4-3 34537 NULL nohasharray
-+tracing_stats_read_34537 tracing_stats_read 3 34537 &ext4_fallocate_34537
++alloc_buf_34532 alloc_buf 1 34532 NULL
++tracing_stats_read_34537 tracing_stats_read 3 34537 NULL
+hugetlbfs_read_actor_34547 hugetlbfs_read_actor 4-5-2-0 34547 NULL
++intel_alloc_coherent_34551 intel_alloc_coherent 2 34551 NULL
+dbBackSplit_34561 dbBackSplit 0 34561 NULL
-+alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL nohasharray
-+self_check_peb_ec_hdr_34564 self_check_peb_ec_hdr 0 34564 &alloc_ieee80211_rsl_34564
-+i915_gem_execbuffer_relocate_object_34575 i915_gem_execbuffer_relocate_object 0 34575 NULL
-+lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
++alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL
++velocity_rx_copy_34583 velocity_rx_copy 2 34583 NULL
+init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
+inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
-+ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray
-+cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
-+__add_prelim_ref_34600 __add_prelim_ref 0 34600 NULL
-+brcmf_cfg80211_mgmt_tx_34608 brcmf_cfg80211_mgmt_tx 7 34608 NULL
-+__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL nohasharray
-+mtd_write_34609 mtd_write 0 34609 &__jffs2_ref_totlen_34609
-+apei_get_nvs_resources_34616 apei_get_nvs_resources 0 34616 NULL
++iwl_legacy_dbgfs_disable_ht40_write_34605 iwl_legacy_dbgfs_disable_ht40_write 3 34605 NULL
++__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL
+__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
+cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
-+tomoyo_dump_page_34649 tomoyo_dump_page 2 34649 NULL
-+kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
-+sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
+isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
-+port_print_34704 port_print 3 34704 NULL
+alloc_irq_and_cfg_at_34706 alloc_irq_and_cfg_at 1 34706 NULL
-+ext4_listxattr_34712 ext4_listxattr 3 34712 NULL
+ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
+platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
-+reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
-+lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
++reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL nohasharray
++fib_rule_nlmsg_size_34736 fib_rule_nlmsg_size 0 34736 ®_w_ixbuf_34736
++sctp_make_datafrag_empty_34737 sctp_make_datafrag_empty 3 34737 NULL
++solos_param_store_34755 solos_param_store 4 34755 NULL
+device_add_34766 device_add 0 34766 NULL
+qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
-+SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
-+can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
++tipc_log_resize_34803 tipc_log_resize 1 34803 NULL
+drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
-+ll_setxattr_34806 ll_setxattr 4 34806 NULL
-+file_page_index_34820 file_page_index 0-2 34820 NULL
++sep_prepare_input_dma_table_34832 sep_prepare_input_dma_table 3-2 34832 NULL
++ext4_groupinfo_create_slab_34837 ext4_groupinfo_create_slab 1 34837 NULL
+b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
-+nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
++bl_mark_for_commit_34852 bl_mark_for_commit 3-2 34852 NULL
+acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
+usb_serial_generic_prepare_write_buffer_34857 usb_serial_generic_prepare_write_buffer 3 34857 NULL
-+ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
-+msg_print_text_34889 msg_print_text 0 34889 NULL
+ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
-+si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
-+__inode_permission_34925 __inode_permission 0 34925 NULL nohasharray
-+btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 &__inode_permission_34925
-+ODM_AllocateMemory_34929 ODM_AllocateMemory 3 34929 NULL
-+ceph_aio_write_34930 ceph_aio_write 4 34930 NULL
-+sec_flags2str_34933 sec_flags2str 3 34933 NULL
++write_msg_34916 write_msg 3 34916 NULL
++iwl_dbgfs_force_reset_write_34930 iwl_dbgfs_force_reset_write 3 34930 NULL
+snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
-+i2c_transfer_34958 i2c_transfer 0 34958 NULL
-+do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
-+mq_lookup_34990 mq_lookup 2 34990 NULL
-+i915_gem_gtt_prepare_object_34991 i915_gem_gtt_prepare_object 0 34991 NULL
-+schedule_erase_34996 schedule_erase 0 34996 NULL
-+rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
++skb_gro_header_slow_34958 skb_gro_header_slow 2 34958 NULL nohasharray
++i2c_transfer_34958 i2c_transfer 0 34958 &skb_gro_header_slow_34958
++Realloc_34961 Realloc 2 34961 NULL
++iwl_legacy_dbgfs_missed_beacon_write_34966 iwl_legacy_dbgfs_missed_beacon_write 3 34966 NULL
+l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
-+dm_cache_insert_mapping_35005 dm_cache_insert_mapping 2-3 35005 NULL
+sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
+snd_pcm_hw_params_35020 snd_pcm_hw_params 0 35020 NULL
-+process_changed_xattr_35025 process_changed_xattr 0 35025 NULL
++generic_file_llseek_size_35024 generic_file_llseek_size 2 35024 NULL
++paranoid_check_peb_ec_hdr_35027 paranoid_check_peb_ec_hdr 0 35027 NULL
+coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
-+brcmf_sdio_chip_writenvram_35042 brcmf_sdio_chip_writenvram 4 35042 NULL
-+pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
++xfs_rtallocate_extent_35052 xfs_rtallocate_extent 2-4-8 35052 NULL
++btmrvl_gpiogap_write_35053 btmrvl_gpiogap_write 3 35053 NULL
+ext4_split_unwritten_extents_35063 ext4_split_unwritten_extents 0 35063 NULL
+store_ifalias_35088 store_ifalias 4 35088 NULL
+__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 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
++capi_write_35104 capi_write 3 35104 NULL
+ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
+ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL
-+message_stats_print_35158 message_stats_print 6 35158 NULL
++gntdev_alloc_map_35145 gntdev_alloc_map 2 35145 NULL
+iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
+ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
-+relocate_entry_cpu_35176 relocate_entry_cpu 0 35176 NULL
-+solo_v4l2_init_35179 solo_v4l2_init 2 35179 NULL
-+SyS_init_module_35180 SyS_init_module 2 35180 NULL
-+mlx4_ib_get_cq_umem_35184 mlx4_ib_get_cq_umem 5-6 35184 NULL
-+uprobe_get_swbp_addr_35201 uprobe_get_swbp_addr 0 35201 NULL
++bat_ogm_aggr_packet_35202 bat_ogm_aggr_packet 3 35202 NULL
+unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
-+striped_read_35218 striped_read 0-3-2 35218 NULL nohasharray
++_osd_req_alist_elem_size_35216 _osd_req_alist_elem_size 0-2 35216 NULL
++striped_read_35218 striped_read 0-3-2-8 35218 NULL nohasharray
+security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218
-+video_register_device_no_warn_35226 video_register_device_no_warn 3 35226 NULL nohasharray
-+rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 &video_register_device_no_warn_35226
-+gfn_to_page_many_atomic_35234 gfn_to_page_many_atomic 2 35234 NULL nohasharray
-+may_commit_transaction_35234 may_commit_transaction 0 35234 &gfn_to_page_many_atomic_35234
-+SYSC_madvise_35241 SYSC_madvise 1-2 35241 NULL
++video_register_device_no_warn_35226 video_register_device_no_warn 3 35226 NULL
++may_commit_transaction_35234 may_commit_transaction 0 35234 NULL
+set_fd_set_35249 set_fd_set 1 35249 NULL
+ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
-+alloc_thread_groups_35256 alloc_thread_groups 2 35256 NULL
+jbd2_journal_get_write_access_35263 jbd2_journal_get_write_access 0 35263 NULL
-+dis_disc_write_35265 dis_disc_write 3 35265 NULL
+dma_show_regs_35266 dma_show_regs 3 35266 NULL
+irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
+i2o_block_end_request_35282 i2o_block_end_request 3 35282 NULL
+isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 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
++__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 NULL
+tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
-+fallback_on_nodma_alloc_35332 fallback_on_nodma_alloc 2 35332 NULL
-+ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
-+nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
-+ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
++sys_setsockopt_35320 sys_setsockopt 5 35320 NULL
++new_bind_ctl_35324 new_bind_ctl 2 35324 NULL
++pskb_network_may_pull_35336 pskb_network_may_pull 2 35336 NULL
++mlx4_alloc_hwq_res_35339 mlx4_alloc_hwq_res 3 35339 NULL
++hpi_alloc_control_cache_35351 hpi_alloc_control_cache 1 35351 NULL
+compat_filldir64_35354 compat_filldir64 3 35354 NULL
-+amd_iommu_map_35355 amd_iommu_map 4 35355 NULL
++tt_update_orig_35361 tt_update_orig 4 35361 NULL
+read_kmem_35372 read_kmem 3 35372 NULL
+ocfs2_journal_access_di_35393 ocfs2_journal_access_di 0 35393 NULL
-+create_pending_snapshots_35402 create_pending_snapshots 0 35402 NULL
-+btrfs_search_old_slot_35406 btrfs_search_old_slot 0 35406 NULL
-+SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
+rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
-+C_SYSC_sendfile_35432 C_SYSC_sendfile 4 35432 NULL
-+__set_test_and_free_35436 __set_test_and_free 2 35436 NULL
+buffer_to_user_35439 buffer_to_user 3 35439 NULL
-+memcg_memory_allocated_read_35469 memcg_memory_allocated_read 0 35469 NULL
-+fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL
-+btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4-0 35500 NULL
++i915_wedged_read_35474 i915_wedged_read 3 35474 NULL
+async_setkey_35521 async_setkey 3 35521 NULL
-+inet_mask_len_35527 inet_mask_len 1 35527 NULL
+__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL
+iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
-+pstore_mkfile_35536 pstore_mkfile 7 35536 NULL
+rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
+ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
+ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
-+send_update_extent_35556 send_update_extent 0 35556 NULL
+vb2_dqbuf_35559 vb2_dqbuf 0 35559 NULL
+sysfs_create_subdir_35567 sysfs_create_subdir 0 35567 NULL
-+ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
++xfs_mount_log_sb_35576 xfs_mount_log_sb 2 35576 NULL
+ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
-+spk_msg_set_35586 spk_msg_set 3 35586 NULL
++ReadZReg_35604 ReadZReg 0 35604 NULL
++rbd_req_sync_read_35615 rbd_req_sync_read 6-5 35615 NULL
+kernel_readv_35617 kernel_readv 3 35617 NULL
-+reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
-+ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
-+nv50_vm_create_35643 nv50_vm_create 2-3 35643 NULL
++pci_request_regions_35635 pci_request_regions 0 35635 NULL
++scrub_stripe_35637 scrub_stripe 4-3 35637 NULL
+spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
++store_debug_level_35652 store_debug_level 3 35652 NULL
+rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
-+ext3_mark_iloc_dirty_35686 ext3_mark_iloc_dirty 0 35686 NULL
-+dm_table_create_35687 dm_table_create 3 35687 NULL
-+SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
++compat_sys_kexec_load_35674 compat_sys_kexec_load 2 35674 NULL
+rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
-+md_super_write_35703 md_super_write 4 35703 NULL
+btrfs_commit_transaction_35725 btrfs_commit_transaction 0 35725 NULL
-+rtw_IOL_cmd_tx_pkt_buf_dump_35732 rtw_IOL_cmd_tx_pkt_buf_dump 2 35732 NULL
++fixup_low_keys_35734 fixup_low_keys 0 35734 NULL
+ext4_truncate_restart_trans_35750 ext4_truncate_restart_trans 0 35750 NULL
+iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
++send_wqe_overhead_35780 send_wqe_overhead 0 35780 NULL
+udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
++store_fan1_input_35793 store_fan1_input 4 35793 NULL
++read_file_stations_35795 read_file_stations 3 35795 NULL
+pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
-+tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
+vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
-+changed_xattr_35860 changed_xattr 0 35860 NULL
+mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
-+fls64_35862 fls64 0 35862 NULL
++fls64_35862 fls64 0-1 35862 NULL
++wait_mgsl_event_35872 wait_mgsl_event 0 35872 NULL
+kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
+ieee80211_if_fmt_dot11MeshRetryTimeout_35890 ieee80211_if_fmt_dot11MeshRetryTimeout 3 35890 NULL
+uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
-+SyS_set_mempolicy_35909 SyS_set_mempolicy 3 35909 NULL
++tcp_mark_head_lost_35895 tcp_mark_head_lost 2 35895 NULL
++igmpv3_newpack_35912 igmpv3_newpack 2 35912 NULL
+kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
-+rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
++dccp_listen_start_35918 dccp_listen_start 2 35918 NULL
+balance_node_right_35920 balance_node_right 0 35920 NULL
-+sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
-+rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
+put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
-+ext_rts51x_sd_execute_write_data_35971 ext_rts51x_sd_execute_write_data 9 35971 NULL
-+ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL nohasharray
-+generic_ocp_read_35974 generic_ocp_read 3 35974 &ceph_buffer_new_35974
++ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL
+acl_alloc_35979 acl_alloc 1 35979 NULL
+device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
+generic_file_aio_read_35987 generic_file_aio_read 0 35987 NULL
-+write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray
-+kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998
-+locks_mandatory_area_35999 locks_mandatory_area 0 35999 NULL
-+il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
-+ubi_eba_write_leb_36029 ubi_eba_write_leb 0-6-5 36029 NULL
-+__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
-+account_shadowed_36048 account_shadowed 2 36048 NULL
++koneplus_sysfs_write_35993 koneplus_sysfs_write 6 35993 NULL
++write_file_antenna_35998 write_file_antenna 3 35998 NULL
++console_store_36007 console_store 4 36007 NULL
++i965_write_fence_reg_36017 i965_write_fence_reg 0 36017 NULL
++sys_init_module_36047 sys_init_module 2 36047 NULL
+gpio_power_read_36059 gpio_power_read 3 36059 NULL
+snd_pcm_playback_hw_avail_36061 snd_pcm_playback_hw_avail 0 36061 NULL
-+did_create_dir_36062 did_create_dir 0 36062 NULL
+write_emulate_36065 write_emulate 2-4 36065 NULL
+stack_max_size_write_36068 stack_max_size_write 3 36068 NULL
-+radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL
+ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL
+ext3_new_blocks_36073 ext3_new_blocks 3-0 36073 NULL
+ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
+snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL
-+mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL
++genlmsg_new_36094 genlmsg_new 1 36094 NULL
+vga_arb_write_36112 vga_arb_write 3 36112 NULL
-+simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
-+compat_ptrace_request_36131 compat_ptrace_request 3 36131 NULL
-+vmalloc_exec_36132 vmalloc_exec 1 36132 NULL
-+max8925_irq_domain_map_36133 max8925_irq_domain_map 2 36133 NULL
-+set_flexbg_block_bitmap_36136 set_flexbg_block_bitmap 0-4-5 36136 NULL
-+ext3_readpages_36144 ext3_readpages 4 36144 NULL
-+twl_set_36154 twl_set 2 36154 NULL
++rx_enable_36125 rx_enable 0 36125 NULL
++iwl_trans_txq_alloc_36147 iwl_trans_txq_alloc 3 36147 NULL
+b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
+btrfs_file_extent_inline_len_36158 btrfs_file_extent_inline_len 0 36158 NULL
+snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
-+wm8994_edge_irq_map_36170 wm8994_edge_irq_map 2 36170 NULL
-+SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL
-+ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL
-+SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL
-+SYSC_process_vm_readv_36216 SYSC_process_vm_readv 5-3 36216 NULL
++FTL_Get_Block_Table_Flash_Size_Bytes_36187 FTL_Get_Block_Table_Flash_Size_Bytes 0 36187 NULL
++__ip_append_data_36191 __ip_append_data 7-8 36191 NULL
+ubifs_read_nnode_36221 ubifs_read_nnode 0 36221 NULL
-+is_dirty_36223 is_dirty 2 36223 NULL
-+ept_walk_addr_36226 ept_walk_addr 3 36226 NULL
+atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
+viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
-+SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
-+rproc_recovery_read_36245 rproc_recovery_read 3 36245 NULL
-+scrub_stripe_36248 scrub_stripe 5-4 36248 NULL
+compat_sys_mbind_36256 compat_sys_mbind 5 36256 NULL
-+usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL nohasharray
-+cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 &usb_buffer_alloc_36276
++usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL
++modem_input_wait_36278 modem_input_wait 0 36278 NULL
++mangle_sdp_packet_36279 mangle_sdp_packet 9 36279 NULL
+codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
-+crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
-+nouveau_cli_create_36293 nouveau_cli_create 3 36293 NULL
+lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
-+cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
+ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
-+fuse_get_user_addr_36312 fuse_get_user_addr 0 36312 NULL
+fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL
-+lc_create_36332 lc_create 4 36332 NULL
+jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
-+isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
++qla4xxx_session_create_36350 qla4xxx_session_create 2 36350 NULL
+ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 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
++v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL
+to_sector_36361 to_sector 0-1 36361 NULL
-+irq_domain_disassociate_36367 irq_domain_disassociate 2 36367 NULL
-+posix_acl_create_36383 posix_acl_create 0 36383 NULL
++mtd_do_writeoob_36373 mtd_do_writeoob 4 36373 NULL
++vring_new_virtqueue_36374 vring_new_virtqueue 1 36374 NULL
+tunables_read_36385 tunables_read 3 36385 NULL
+afs_alloc_flat_call_36399 afs_alloc_flat_call 3-2 36399 NULL
+sierra_write_36402 sierra_write 4 36402 NULL
-+msb_update_block_36412 msb_update_block 2 36412 NULL
-+SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
-+ReadW6692B_36445 ReadW6692B 0 36445 NULL
++sys_vm86_36421 sys_vm86 2 36421 NULL
++rtnl_link_get_size_36436 rtnl_link_get_size 0 36436 NULL
+sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
+alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
-+check_extent_in_eb_36467 check_extent_in_eb 0 36467 NULL
-+SyS_process_vm_writev_36476 SyS_process_vm_writev 5-3 36476 NULL
+b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
-+set_var_mtrr_range_36483 set_var_mtrr_range 2 36483 NULL
-+ip6_append_data_36490 ip6_append_data 4 36490 NULL nohasharray
-+tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 &ip6_append_data_36490
++ip6_append_data_36490 ip6_append_data 4-5 36490 NULL
+cmd_loop_36491 cmd_loop 0 36491 NULL
++iwl_legacy_dbgfs_power_save_status_read_36492 iwl_legacy_dbgfs_power_save_status_read 3 36492 NULL
+__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
+mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
-+get_param_l_36518 get_param_l 0 36518 NULL
+ieee80211_if_read_fwded_frames_36520 ieee80211_if_read_fwded_frames 3 36520 NULL
-+lguest_setup_irq_36531 lguest_setup_irq 1 36531 NULL
+crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL
+cpu_type_read_36540 cpu_type_read 3 36540 NULL
+__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL nohasharray
+macvtap_do_read_36555 macvtap_do_read 4 36555 &__kfifo_to_user_36555
-+btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL
+__erst_read_36579 __erst_read 0 36579 NULL
+put_cmsg_36589 put_cmsg 4 36589 NULL
-+do_sendfile_36610 do_sendfile 4-5 36610 NULL
++pcnet32_realloc_rx_ring_36598 pcnet32_realloc_rx_ring 3 36598 NULL
+fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
-+i915_gem_execbuffer_relocate_slow_36634 i915_gem_execbuffer_relocate_slow 0 36634 NULL
+vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL
-+convert_extent_item_v0_36645 convert_extent_item_v0 4-0 36645 NULL
-+ced_ioctl_36647 ced_ioctl 2 36647 NULL
-+lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL
++cxio_hal_rqtpool_alloc_36648 cxio_hal_rqtpool_alloc 2 36648 NULL nohasharray
++lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 &cxio_hal_rqtpool_alloc_36648
+perf_calculate_period_36662 perf_calculate_period 2-3 36662 NULL
+osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
+iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
-+xillybus_read_36678 xillybus_read 3 36678 NULL
-+tlv_put_btrfs_timespec_36685 tlv_put_btrfs_timespec 0 36685 NULL nohasharray
-+ext4_mb_discard_group_preallocations_36685 ext4_mb_discard_group_preallocations 2 36685 &tlv_put_btrfs_timespec_36685
++ext4_mb_discard_group_preallocations_36685 ext4_mb_discard_group_preallocations 2 36685 NULL
++get_txidle_36698 get_txidle 0 36698 NULL
+gsmtty_write_36702 gsmtty_write 3 36702 NULL
+sched_clock_36717 sched_clock 0 36717 NULL
+ocfs2_rotate_tree_right_36723 ocfs2_rotate_tree_right 0 36723 NULL
++saa7134_i2c_eeprom_36729 saa7134_i2c_eeprom 3 36729 NULL
++extract_icmp6_fields_36732 extract_icmp6_fields 2 36732 NULL
+snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
+cxgbi_device_register_36746 cxgbi_device_register 2-1 36746 NULL
-+fc_exch_mgr_alloc_36751 fc_exch_mgr_alloc 3-4 36751 NULL
-+ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
-+ext4_ext_convert_to_initialized_36765 ext4_ext_convert_to_initialized 0 36765 NULL
-+ptp_filter_init_36780 ptp_filter_init 2 36780 NULL
-+i40e_init_lan_hmc_36796 i40e_init_lan_hmc 2-3-4-5 36796 NULL
++i915_gem_evict_inactive_36767 i915_gem_evict_inactive 0 36767 NULL
++ip4ip6_err_36772 ip4ip6_err 5 36772 NULL
++llc_mac_header_len_36776 llc_mac_header_len 0 36776 NULL
+proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
++do_dmabuf_dirty_sou_36807 do_dmabuf_dirty_sou 7 36807 NULL
+hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
+ocfs2_journal_access_rb_36823 ocfs2_journal_access_rb 0 36823 NULL
+int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
+fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
+keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
+cm_write_36858 cm_write 3 36858 NULL
-+range_to_mtrr_with_hole_36861 range_to_mtrr_with_hole 2 36861 NULL
-+tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 NULL
+svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
-+raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
-+__btrfs_map_block_36883 __btrfs_map_block 3 36883 NULL
+ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
+selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
+OS_kmalloc_36909 OS_kmalloc 1 36909 NULL
-+audio_set_endpoint_req_36918 audio_set_endpoint_req 0 36918 NULL
-+build_key_36931 build_key 1 36931 NULL
++genlmsg_total_size_36938 genlmsg_total_size 0-1 36938 NULL
+crypto_blkcipher_ivsize_36944 crypto_blkcipher_ivsize 0 36944 NULL
+div_u64_36951 div_u64 0 36951 NULL
-+write_leb_36957 write_leb 0-5 36957 NULL
++write_leb_36957 write_leb 0 36957 NULL
++call_usermodehelper_exec_36960 call_usermodehelper_exec 0 36960 NULL
+ntfs_external_attr_find_36963 ntfs_external_attr_find 0 36963 NULL
+sparse_early_mem_maps_alloc_node_36971 sparse_early_mem_maps_alloc_node 4 36971 NULL
-+il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
-+drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
-+auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
+setxattr_37006 setxattr 4 37006 NULL
-+btrfs_update_root_37035 btrfs_update_root 0 37035 NULL
-+ocfs2_dlm_unlock_37037 ocfs2_dlm_unlock 0 37037 NULL
++ondemand_readahead_37015 ondemand_readahead 6-5 37015 NULL
+command_file_read_37038 command_file_read 3 37038 NULL
-+__hfsplus_brec_find_37048 __hfsplus_brec_find 0 37048 NULL
-+figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
-+qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray
-+ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053
-+SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
++em28xx_gpio_set_37040 em28xx_gpio_set 0 37040 NULL
++ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 NULL
++find_next_chunk_37067 find_next_chunk 0 37067 NULL
+parse_command_37079 parse_command 2 37079 NULL
-+pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
-+tun_get_user_37094 tun_get_user 5 37094 NULL
-+has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL
+snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
-+mtt_free_res_37144 mtt_free_res 5 37144 NULL
++xfrm_expire_msgsize_37133 xfrm_expire_msgsize 0 37133 NULL
+msg_word_37164 msg_word 0 37164 NULL
+BeceemNVMRead_37166 BeceemNVMRead 0 37166 NULL
-+f2fs_direct_IO_37167 f2fs_direct_IO 4 37167 NULL
+can_set_xattr_37182 can_set_xattr 4 37182 NULL
-+btrfs_insert_delayed_items_37191 btrfs_insert_delayed_items 0 37191 NULL
++store_wimax_37196 store_wimax 4 37196 NULL
+vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
+sysfs_add_file_37200 sysfs_add_file 0 37200 NULL
-+mpol_misplaced_37205 mpol_misplaced 0 37205 NULL
-+forced_ps_write_37209 forced_ps_write 3 37209 NULL
-+crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL nohasharray
-+ext4_ind_direct_IO_37212 ext4_ind_direct_IO 0-4 37212 &crypto_shash_descsize_37212
-+bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL
++crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL
++uapsd_queues_read_37217 uapsd_queues_read 3 37217 NULL
+regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
+__do_replace_37227 __do_replace 5 37227 NULL
+produce_free_peb_37232 produce_free_peb 0 37232 NULL
-+iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
-+rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL
++ctnetlink_secctx_size_37236 ctnetlink_secctx_size 0 37236 NULL
++ReadLEDInformationFromEEPROM_37247 ReadLEDInformationFromEEPROM 0 37247 NULL
+BeceemFlashBulkWrite_37255 BeceemFlashBulkWrite 0 37255 NULL
+prot_queue_del_37258 prot_queue_del 0 37258 NULL
+exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
-+__add_keyed_refs_37264 __add_keyed_refs 0 37264 NULL
-+nested_svm_map_37268 nested_svm_map 2 37268 NULL
-+create_cq_user_37278 create_cq_user 5 37278 NULL
++srp_target_alloc_37288 srp_target_alloc 3 37288 NULL
+request_threaded_irq_37303 request_threaded_irq 0 37303 NULL
-+ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
-+ext3_direct_IO_37308 ext3_direct_IO 4 37308 NULL
+jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
+send_msg_37323 send_msg 4 37323 NULL
-+l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray
-+bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327
++brcmf_sdbrcm_membytes_37324 brcmf_sdbrcm_membytes 3-5 37324 NULL
+scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
+rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
-+lz4_compressbound_37337 lz4_compressbound 0-1 37337 NULL
++nf_bridge_pad_37351 nf_bridge_pad 0 37351 NULL
+security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
-+cl_io_submit_rw_37374 cl_io_submit_rw 0 37374 NULL
-+iterate_leaf_refs_37385 iterate_leaf_refs 0 37385 NULL
-+iommu_num_pages_37391 iommu_num_pages 0-1-3-2 37391 NULL
-+btrfs_find_free_objectid_37412 btrfs_find_free_objectid 0 37412 NULL
++iommu_num_pages_37391 iommu_num_pages 0-2-3-1 37391 NULL
++sys_getxattr_37418 sys_getxattr 4 37418 NULL
+hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
+acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL nohasharray
-+find_next_bit_37422 find_next_bit 0-3-2 37422 &acpi_os_allocate_zeroed_37422
++find_next_bit_37422 find_next_bit 0-2-3 37422 &acpi_os_allocate_zeroed_37422
+ocfs2_insert_path_37425 ocfs2_insert_path 0 37425 NULL
+tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
-+iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
-+fru_alloc_37442 fru_alloc 1 37442 NULL
++iwl_print_last_event_logs_37433 iwl_print_last_event_logs 7-9-0 37433 NULL
+tcp_established_options_37450 tcp_established_options 0 37450 NULL
-+brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
-+__remove_37457 __remove 2 37457 NULL
++cmd_input_size_37457 cmd_input_size 0-1 37457 NULL
+ufs_data_ptr_to_cpu_37475 ufs_data_ptr_to_cpu 0 37475 NULL
+get_est_timing_37484 get_est_timing 0 37484 NULL
+kmem_realloc_37489 kmem_realloc 2 37489 NULL
-+__hfsplus_setxattr_37499 __hfsplus_setxattr 4 37499 NULL
-+bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL
-+osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL
-+bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL nohasharray
-+vmalloc_32_user_37519 vmalloc_32_user 1 37519 &bdev_writeseg_37519
+xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL
-+fault_inject_read_37534 fault_inject_read 3 37534 NULL
+hdr_size_37536 hdr_size 0 37536 NULL
-+extent_map_end_37550 extent_map_end 0 37550 NULL
-+sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
-+ioat_chansts_37558 ioat_chansts 0 37558 NULL
+xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
+ocfs2_add_branch_37588 ocfs2_add_branch 0 37588 NULL
+alloc_descs_37593 alloc_descs 0-1 37593 NULL
+qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
-+find_extent_clone_37603 find_extent_clone 0 37603 NULL
+btrfs_write_and_wait_marked_extents_37604 btrfs_write_and_wait_marked_extents 0 37604 NULL
-+kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6-3 37611 NULL
-+SYSC_mbind_37622 SYSC_mbind 5 37622 NULL nohasharray
-+ocfs2_split_refcount_rec_37622 ocfs2_split_refcount_rec 0 37622 &SYSC_mbind_37622
-+btrfs_calc_trans_metadata_size_37629 btrfs_calc_trans_metadata_size 0-2 37629 NULL nohasharray
-+policy_residency_37629 policy_residency 0 37629 &btrfs_calc_trans_metadata_size_37629
++kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6 37611 NULL
++ocfs2_split_refcount_rec_37622 ocfs2_split_refcount_rec 0 37622 NULL
+alloc_fd_37637 alloc_fd 1 37637 NULL
-+SyS_mbind_37638 SyS_mbind 5 37638 NULL
++tcp_dma_try_early_copy_37651 tcp_dma_try_early_copy 3 37651 NULL
+bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 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
-+SYSC_get_mempolicy_37664 SYSC_get_mempolicy 4-3 37664 NULL
-+lnw_gpio_to_irq_37665 lnw_gpio_to_irq 2 37665 NULL
-+ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
++iwl_legacy_dbgfs_rxon_filter_flags_read_37666 iwl_legacy_dbgfs_rxon_filter_flags_read 3 37666 NULL
+regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
-+page_chain_free_37697 page_chain_free 0 37697 NULL
-+nametbl_header_37698 nametbl_header 2-0 37698 NULL
+__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
-+dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
-+dm_thin_remove_block_37724 dm_thin_remove_block 2 37724 NULL
-+find_active_uprobe_37733 find_active_uprobe 1 37733 NULL
++netxen_validate_ringparam_37740 netxen_validate_ringparam 1-2-3 37740 NULL
+read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
+ocfs2_duplicate_clusters_by_jbd_37749 ocfs2_duplicate_clusters_by_jbd 5-4-6 37749 NULL
+ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
+ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
+dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
-+il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
+smk_read_logging_37804 smk_read_logging 3 37804 NULL
+deny_write_access_37813 deny_write_access 0 37813 NULL
-+ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
-+rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
+bitmap_find_next_zero_area_37827 bitmap_find_next_zero_area 2-3-0-5-4 37827 NULL
-+android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
+jbd2_journal_get_undo_access_37837 jbd2_journal_get_undo_access 0 37837 NULL
+o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
-+SYSC_pwrite64_37862 SYSC_pwrite64 3 37862 NULL
+xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
-+set_registers_37883 set_registers 4 37883 NULL
-+btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
-+max77686_irq_domain_map_37897 max77686_irq_domain_map 2 37897 NULL
++iwmct_fw_parser_init_37876 iwmct_fw_parser_init 4 37876 NULL
++sys_setxattr_37880 sys_setxattr 4 37880 NULL
++dvb_net_sec_37884 dvb_net_sec 3 37884 NULL
+tipc_link_send_sections_fast_37920 tipc_link_send_sections_fast 4 37920 NULL
-+_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray
-+pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928
++xfs_highbit32_37921 xfs_highbit32 0 37921 NULL
++pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 NULL
+read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
+write_file_bool_37957 write_file_bool 3 37957 NULL
-+fifo_alloc_37961 fifo_alloc 1 37961 NULL
+ext3_free_blocks_sb_37967 ext3_free_blocks_sb 4-3 37967 NULL
+rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL
-+persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL
+vfs_readv_38011 vfs_readv 3 38011 NULL
+aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
-+SyS_pwrite64_38041 SyS_pwrite64 3 38041 NULL
-+klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 NULL nohasharray
-+il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 &klsi_105_prepare_write_buffer_38044
-+SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
++store_wlan_38040 store_wlan 4 38040 NULL
++klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 NULL
+sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
-+_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL nohasharray
-+is_discarded_38058 is_discarded 2 38058 &_xfs_buf_alloc_38058
+nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
+alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
-+xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL
+uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
++em28xx_set_mode_38088 em28xx_set_mode 0 38088 NULL
+request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
+proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
+ep0_read_38095 ep0_read 3 38095 NULL
-+sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 NULL nohasharray
-+osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 &sk_wmem_schedule_38096
-+o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
+snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
-+_get_val_38115 _get_val 2 38115 NULL
+vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
+__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 0-4-3 38153 NULL
+kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
-+cirrus_ttm_tt_create_38167 cirrus_ttm_tt_create 2 38167 NULL
-+send_rename_38170 send_rename 0 38170 NULL
+cdev_add_38176 cdev_add 2-3 38176 NULL
-+create_srq_user_38191 create_srq_user 5 38191 NULL
+rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
-+do_chunk_alloc_38200 do_chunk_alloc 0 38200 NULL
+get_ucode_user_38202 get_ucode_user 3 38202 NULL
+ext3_new_block_38208 ext3_new_block 3-0 38208 NULL
-+stmpe_gpio_irq_map_38222 stmpe_gpio_irq_map 3 38222 NULL
-+osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
-+palmas_gpio_to_irq_38235 palmas_gpio_to_irq 2 38235 NULL
++osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL nohasharray
++xfs_rtallocate_range_38223 xfs_rtallocate_range 4-3 38223 &osd_req_list_partition_collections_38223
++inet_csk_listen_start_38233 inet_csk_listen_start 2 38233 NULL
+ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
+_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
+snd_pcm_playback_rewind_38249 snd_pcm_playback_rewind 0-2 38249 NULL
-+from_dblock_38256 from_dblock 0-1 38256 NULL
-+vmci_qp_broker_set_page_store_38260 vmci_qp_broker_set_page_store 3-2 38260 NULL
-+SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 NULL nohasharray
-+ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &SYSC_msgrcv_38268 nohasharray
-+mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 &ieee80211_if_read_auto_open_plinks_38268
-+xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 NULL nohasharray
-+xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 &xfs_bmdr_to_bmbt_38275
-+ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
-+gpa_to_gfn_38291 gpa_to_gfn 0-1 38291 NULL
-+ucma_query_path_38305 ucma_query_path 3 38305 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 3-4 38268 &ieee80211_if_read_auto_open_plinks_38268
++xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray
++xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275
++zd_mac_rx_38296 zd_mac_rx 3 38296 NULL
+isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
-+ida_simple_get_38326 ida_simple_get 2-0 38326 NULL
++ida_simple_get_38326 ida_simple_get 2 38326 NULL
+ocfs2_rotate_rightmost_leaf_left_38330 ocfs2_rotate_rightmost_leaf_left 0 38330 NULL
+__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
+ocfs2_replace_extent_rec_38357 ocfs2_replace_extent_rec 0 38357 NULL
+btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
++sctp_sf_abort_violation_38380 sctp_sf_abort_violation 6 38380 NULL
++norm_maxh_38387 norm_maxh 0 38387 NULL
+dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
++ttm_put_pages_38411 ttm_put_pages 2 38411 NULL
+get_valid_node_allowed_38412 get_valid_node_allowed 1-0 38412 NULL
+ocfs2_which_cluster_group_38413 ocfs2_which_cluster_group 0-2 38413 NULL
++iwm_wdev_alloc_38415 iwm_wdev_alloc 1 38415 NULL
+ht_destroy_irq_38418 ht_destroy_irq 1 38418 NULL
+ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
++pcnet32_realloc_tx_ring_38428 pcnet32_realloc_tx_ring 3 38428 NULL
+pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
++var_name_strnsize_38447 var_name_strnsize 0-2 38447 NULL
+kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
-+btrfs_next_old_leaf_38465 btrfs_next_old_leaf 0 38465 NULL
-+kvm_arch_setup_async_pf_38481 kvm_arch_setup_async_pf 3 38481 NULL
+blk_end_bidi_request_38482 blk_end_bidi_request 4-3 38482 NULL
+cpu_to_mem_38501 cpu_to_mem 0 38501 NULL
+dev_names_read_38509 dev_names_read 3 38509 NULL
+iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
++sdhci_resume_host_38512 sdhci_resume_host 0 38512 NULL
+event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
-+mlx4_ib_db_map_user_38529 mlx4_ib_db_map_user 2 38529 NULL
+ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
-+btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
-+kuc_len_38557 kuc_len 0-1 38557 NULL
+cpu_to_node_38561 cpu_to_node 0 38561 NULL
++si_domain_work_fn_38562 si_domain_work_fn 1-2 38562 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
+_ipw_read32_38565 _ipw_read32 0 38565 NULL
+snd_nm256_playback_copy_38567 snd_nm256_playback_copy 5-3 38567 NULL
++sctp_tsnmap_num_dups_38578 sctp_tsnmap_num_dups 0 38578 NULL
+copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL
-+compat_sys_ptrace_38595 compat_sys_ptrace 3 38595 NULL
-+blkg_stat_read_38612 blkg_stat_read 0 38612 NULL
++cosa_net_setup_rx_38594 cosa_net_setup_rx 2 38594 NULL
++reportdesc_callback_38603 reportdesc_callback 3 38603 NULL
++pep_indicate_38611 pep_indicate 5 38611 NULL
++__css_put_38613 __css_put 2 38613 NULL
+icn_writecmd_38629 icn_writecmd 2 38629 NULL
+write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL
-+ext2_readpages_38640 ext2_readpages 4 38640 NULL
-+cma_create_area_38642 cma_create_area 2 38642 NULL
++receive_extralen_38634 receive_extralen 0 38634 NULL
+audit_init_entry_38644 audit_init_entry 1 38644 NULL
-+qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
+mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
-+nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
+snd_es1371_wait_src_ready_38673 snd_es1371_wait_src_ready 0 38673 NULL
++cfg80211_send_disassoc_38678 cfg80211_send_disassoc 3 38678 NULL
+iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
-+ext4_wait_block_bitmap_38695 ext4_wait_block_bitmap 2 38695 NULL
+validate_vid_hdr_38699 validate_vid_hdr 0 38699 NULL
-+rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
+find_next_usable_block_38716 find_next_usable_block 3-1-0 38716 NULL
-+alloc_trace_probe_38720 alloc_trace_probe 6 38720 NULL
++v4l2_ctrl_new_38725 v4l2_ctrl_new 7 38725 NULL
+w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL
-+udf_readpages_38761 udf_readpages 4 38761 NULL
+iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
-+bcache_device_init_38781 bcache_device_init 3 38781 NULL
+snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
-+slab_order_38794 slab_order 0 38794 NULL
++gre_manip_pkt_38785 gre_manip_pkt 2 38785 NULL
+do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL
+err_decode_38804 err_decode 2 38804 NULL
-+btrfs_find_space_cluster_38812 btrfs_find_space_cluster 4-0 38812 NULL
+ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
++sys_select_38827 sys_select 1 38827 NULL
++b43_txhdr_size_38832 b43_txhdr_size 0 38832 NULL
+direct_entry_38836 direct_entry 3 38836 NULL
+compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
+read_nic_io_word_38853 read_nic_io_word 0 38853 NULL
+interfaces_38859 interfaces 2 38859 NULL
+pci_msix_table_size_38867 pci_msix_table_size 0 38867 NULL
++sizeof_gpio_leds_priv_38882 sizeof_gpio_leds_priv 0-1 38882 NULL
++reserve_metadata_bytes_38886 reserve_metadata_bytes 0 38886 NULL
+dbgfs_state_38894 dbgfs_state 3 38894 NULL
-+f2fs_xattr_set_acl_38895 f2fs_xattr_set_acl 4 38895 NULL
+traverse_38897 traverse 0 38897 NULL
+__fswab16_38898 __fswab16 0 38898 NULL
-+ext3_trim_all_free_38929 ext3_trim_all_free 4-3-2 38929 NULL
-+il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
-+__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
-+C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 NULL nohasharray
-+usb_maxpacket_38977 usb_maxpacket 0 38977 &C_SYSC_preadv64_38977
++ext3_trim_all_free_38929 ext3_trim_all_free 2-4-3 38929 NULL
++usb_maxpacket_38977 usb_maxpacket 0 38977 NULL
+OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL
+lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
+udf_new_block_38999 udf_new_block 4 38999 NULL
++t4vf_pktgl_to_skb_39005 t4vf_pktgl_to_skb 2 39005 NULL
+get_nodes_39012 get_nodes 3 39012 NULL
-+twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
-+__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3-0 39020 NULL
-+qgroup_account_ref_step1_39024 qgroup_account_ref_step1 0 39024 NULL
++disp_proc_write_39024 disp_proc_write 3 39024 NULL
+acpi_install_gpe_block_39031 acpi_install_gpe_block 4 39031 NULL
+_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
+do_write_kmem_39051 do_write_kmem 1-3-0 39051 NULL
++line6_midibuf_read_39067 line6_midibuf_read 0-3 39067 NULL
+ext4_init_block_bitmap_39071 ext4_init_block_bitmap 3 39071 NULL
-+atomic64_add_negative_39098 atomic64_add_negative 1 39098 NULL
+ReadHFC_39104 ReadHFC 0 39104 NULL
+tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
+leb_write_lock_39111 leb_write_lock 0 39111 NULL
+__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
+ttm_mem_global_alloc_zone_39125 ttm_mem_global_alloc_zone 0 39125 NULL
++i915_gem_evict_something_39130 i915_gem_evict_something 0 39130 NULL
+ea_foreach_39133 ea_foreach 0 39133 NULL
+generic_permission_39150 generic_permission 0 39150 NULL
++alloc_ring_39151 alloc_ring 4-2 39151 NULL
+proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
-+echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
-+btrfs_start_delalloc_flush_39173 btrfs_start_delalloc_flush 0 39173 NULL
+ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
++init_list_set_39188 init_list_set 3-2 39188 NULL
+ubi_more_update_data_39189 ubi_more_update_data 4-0 39189 NULL
+qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
+ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
-+posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
+drm_order_39244 drm_order 0 39244 NULL
+snd_pcm_capture_forward_39248 snd_pcm_capture_forward 0-2 39248 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
-+i915_error_state_read_39254 i915_error_state_read 3 39254 NULL
++r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL
++__skb_cow_39254 __skb_cow 2 39254 NULL
+bitmap_set_bits_39272 bitmap_set_bits 3 39272 NULL
-+rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
-+__vmalloc_node_39308 __vmalloc_node 1 39308 NULL
++expand_fdtable_39273 expand_fdtable 2 39273 NULL
++pohmelfs_setxattr_39281 pohmelfs_setxattr 4 39281 NULL
++mei_registration_cdev_39284 mei_registration_cdev 2 39284 NULL
+__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL
-+insert_reserved_file_extent_39327 insert_reserved_file_extent 3-0 39327 NULL
+wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
-+__copy_from_user_nocache_39351 __copy_from_user_nocache 3-0 39351 NULL
++__cfg80211_send_deauth_39344 __cfg80211_send_deauth 3 39344 NULL
+ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
-+do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
+vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
-+regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
-+fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
-+ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
-+__send_to_port_39386 __send_to_port 3 39386 NULL
-+perf_trace_buf_submit_39413 perf_trace_buf_submit 5 39413 NULL
+user_power_read_39414 user_power_read 3 39414 NULL
+alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
-+__vb2_get_done_vb_39448 __vb2_get_done_vb 0 39448 NULL
-+apei_resources_add_39470 apei_resources_add 0 39470 NULL
++sys_semop_39457 sys_semop 3 39457 NULL
+setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
-+do_get_mempolicy_39485 do_get_mempolicy 3 39485 NULL
++btrfs_mksubvol_39479 btrfs_mksubvol 3 39479 NULL
+ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
+atomic64_read_unchecked_39505 atomic64_read_unchecked 0 39505 NULL
-+cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
-+int_proc_write_39542 int_proc_write 3 39542 NULL
++wm8350_i2c_read_device_39542 wm8350_i2c_read_device 3 39542 NULL nohasharray
++int_proc_write_39542 int_proc_write 3 39542 &wm8350_i2c_read_device_39542
+pp_write_39554 pp_write 3 39554 NULL
+ol_dqblk_block_39558 ol_dqblk_block 2-0-3 39558 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
++handle_response_icmp_39574 handle_response_icmp 7 39574 NULL
+ext_depth_39607 ext_depth 0 39607 NULL
-+nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
+sdio_readb_39618 sdio_readb 0 39618 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
++fm_send_cmd_39639 fm_send_cmd 5 39639 NULL
+snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
-+tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
++prism2_info_hostscanresults_39657 prism2_info_hostscanresults 3 39657 NULL
++pfkey_sockaddr_size_39661 pfkey_sockaddr_size 0 39661 NULL
+kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
+v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
-+hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
-+do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
-+vmx_set_cr3_39688 vmx_set_cr3 2 39688 NULL
+sd_completed_bytes_39705 sd_completed_bytes 0 39705 NULL
+ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
-+test_add_free_space_entry_39754 test_add_free_space_entry 2-3 39754 NULL
-+adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
-+remap_to_origin_clear_discard_39767 remap_to_origin_clear_discard 3 39767 NULL
-+crypto_ablkcipher_blocksize_39811 crypto_ablkcipher_blocksize 0 39811 NULL
++tcf_csum_ipv4_tcp_39713 tcf_csum_ipv4_tcp 4 39713 NULL
++mlx4_ib_resize_cq_39744 mlx4_ib_resize_cq 2 39744 NULL
++tcp_write_xmit_39755 tcp_write_xmit 2 39755 NULL
++usb_hcd_map_urb_for_dma_39774 usb_hcd_map_urb_for_dma 0 39774 NULL
++ocfs2_pages_per_cluster_39790 ocfs2_pages_per_cluster 0 39790 NULL
+security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
+snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
++sys_migrate_pages_39825 sys_migrate_pages 2 39825 NULL
+get_priv_size_39828 get_priv_size 0-1 39828 NULL
-+can_rmdir_39890 can_rmdir 0 39890 NULL
++beiscsi_process_async_pdu_39834 beiscsi_process_async_pdu 7 39834 NULL
+pkt_add_39897 pkt_add 3 39897 NULL
+read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
+gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
@@ -107034,661 +108400,527 @@ index 0000000..0a9d518
+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
+__spi_async_39932 __spi_async 0 39932 NULL
-+__get_order_39935 __get_order 0 39935 NULL
-+error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
++iwl_legacy_dbgfs_missed_beacon_read_39939 iwl_legacy_dbgfs_missed_beacon_read 3 39939 NULL
++fwnet_pd_new_39947 fwnet_pd_new 4 39947 NULL
+tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL
-+lstcon_group_list_39958 lstcon_group_list 2 39958 NULL
+dma_push_rx_39973 dma_push_rx 2 39973 NULL
+broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
+mthca_array_init_39987 mthca_array_init 2 39987 NULL
+fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
-+server_name2svname_39998 server_name2svname 4 39998 NULL
++i2c_readn_40001 i2c_readn 0 40001 NULL
+xen_hvm_config_40018 xen_hvm_config 2 40018 NULL
+ivtvfb_write_40023 ivtvfb_write 3 40023 NULL
-+disc_pwup_write_40027 disc_pwup_write 3 40027 NULL
+ea_foreach_i_40028 ea_foreach_i 0 40028 NULL
+datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
-+regmap_add_irq_chip_40042 regmap_add_irq_chip 4 40042 NULL
+ocfs2_claim_clusters_40050 ocfs2_claim_clusters 0 40050 NULL
-+add_tty_40055 add_tty 1 40055 NULL nohasharray
-+l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 &add_tty_40055
+atomic_xchg_40070 atomic_xchg 0 40070 NULL
+snd_pcm_sw_params_user_40095 snd_pcm_sw_params_user 0 40095 NULL
-+gen_pool_first_fit_40110 gen_pool_first_fit 2-3-4 40110 NULL
++netlink_broadcast_filtered_40105 netlink_broadcast_filtered 0 40105 NULL
+sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
-+dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
-+rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
-+ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL
+iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
-+clone_backref_node_40154 clone_backref_node 0 40154 NULL
+pt_write_40159 pt_write 3 40159 NULL
+scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
+ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL nohasharray
+devnode_find_40199 devnode_find 3-2 40199 &ipr_alloc_ucode_buffer_40199
+allocate_probes_40204 allocate_probes 1 40204 NULL
-+acpi_system_write_alarm_40205 acpi_system_write_alarm 3 40205 NULL
+au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
+compress_file_range_40225 compress_file_range 3-4 40225 NULL
+osst_read_40237 osst_read 3 40237 NULL
-+lpage_info_slot_40243 lpage_info_slot 3-1 40243 NULL
-+ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4-3 40248 NULL
-+rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
++brcmf_sdioh_request_buffer_40239 brcmf_sdioh_request_buffer 7 40239 NULL
++ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4 40248 NULL
++rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL nohasharray
++fuse_update_attributes_40262 fuse_update_attributes 0 40262 &rs_sta_dbgfs_scale_table_read_40262
+ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
-+usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
++reqsk_queue_alloc_40272 reqsk_queue_alloc 2 40272 NULL
+rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
-+vfio_unmap_unpin_40284 vfio_unmap_unpin 3 40284 NULL
-+_calc_trunk_info_40291 _calc_trunk_info 2 40291 NULL
-+SyS_bind_40303 SyS_bind 3 40303 NULL
-+ubi_io_write_data_40305 ubi_io_write_data 0-5-4 40305 NULL
-+batadv_tt_changes_fill_buff_40323 batadv_tt_changes_fill_buff 4 40323 NULL
++ubi_io_write_data_40305 ubi_io_write_data 0 40305 NULL
++nfs_file_llseek_40306 nfs_file_llseek 2 40306 NULL
+ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
++bat_ogm_queue_add_40337 bat_ogm_queue_add 3 40337 NULL
+mmio_read_40348 mmio_read 4 40348 NULL
-+ocfs2_release_clusters_40355 ocfs2_release_clusters 4-0 40355 NULL
++ocfs2_release_clusters_40355 ocfs2_release_clusters 0-4 40355 NULL
+event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
+ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL
+get_chars_40373 get_chars 3 40373 NULL
-+submit_page_section_40408 submit_page_section 0 40408 NULL
-+ecryptfs_read_lower_40419 ecryptfs_read_lower 3 40419 NULL
-+slab_node_40421 slab_node 0 40421 NULL
++usb_gadget_config_buf_40374 usb_gadget_config_buf 0 40374 NULL
++fwnet_incoming_packet_40380 fwnet_incoming_packet 3 40380 NULL
++brcmf_sdbrcm_get_image_40397 brcmf_sdbrcm_get_image 0-2 40397 NULL
+fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
++atmel_rmem16_40450 atmel_rmem16 0 40450 NULL
+tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
+zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
-+SyS_writev_40467 SyS_writev 3 40467 NULL
-+__i915_add_request_40469 __i915_add_request 0 40469 NULL
-+SyS_select_40473 SyS_select 1 40473 NULL
+afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
-+batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
+devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
-+drm_vma_node_start_40500 drm_vma_node_start 0 40500 NULL
++tty_write_room_40495 tty_write_room 0 40495 NULL
+sg_phys_40507 sg_phys 0 40507 NULL
+__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
+TSS_checkhmac2_40520 TSS_checkhmac2 7-5 40520 NULL
-+ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
+i915_gem_execbuffer_relocate_object_slow_40546 i915_gem_execbuffer_relocate_object_slow 0 40546 NULL
+ima_write_policy_40548 ima_write_policy 3 40548 NULL
-+btrfs_flush_all_pending_stuffs_40553 btrfs_flush_all_pending_stuffs 0 40553 NULL
+esp_alloc_tmp_40558 esp_alloc_tmp 2-3 40558 NULL
+ufs_inode_getfrag_40560 ufs_inode_getfrag 2-4 40560 NULL
-+bdev_sectors_40564 bdev_sectors 0 40564 NULL
-+lba_to_map_index_40580 lba_to_map_index 0-1 40580 NULL
++arch_setup_hpet_msi_40584 arch_setup_hpet_msi 1 40584 NULL
+b1_get_byte_40597 b1_get_byte 0 40597 NULL
++skge_rx_get_40598 skge_rx_get 3 40598 NULL
+get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
-+qla8044_rd_reg_40652 qla8044_rd_reg 0 40652 NULL
++sctp_manip_pkt_40620 sctp_manip_pkt 2 40620 NULL
+pid_nr_ns_40654 pid_nr_ns 0 40654 NULL
-+twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
-+__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
-+pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
+fops_read_40672 fops_read 3 40672 NULL
+ext4_mark_inode_dirty_40673 ext4_mark_inode_dirty 0 40673 NULL
-+idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL
-+alloc_rbio_40676 alloc_rbio 4 40676 NULL
-+videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 3-4 40678 NULL
++videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 4-3 40678 NULL
+pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
-+nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
++regulator_enable_40689 regulator_enable 0 40689 NULL
+__seq_open_private_40715 __seq_open_private 3 40715 NULL
-+btrfs_find_one_extref_40724 btrfs_find_one_extref 0 40724 NULL
-+fuse_readpages_40737 fuse_readpages 4 40737 NULL
+xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL nohasharray
+find_next_zero_bit_le_40744 find_next_zero_bit_le 2-3-0 40744 &xfs_iext_remove_direct_40744
-+i915_gem_execbuffer_relocate_entry_40750 i915_gem_execbuffer_relocate_entry 0 40750 NULL
+security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
+card_send_command_40757 card_send_command 3 40757 NULL
+ad1889_readl_40765 ad1889_readl 0 40765 NULL
+pg_write_40766 pg_write 3 40766 NULL
-+show_list_40775 show_list 3-0 40775 NULL
-+calcu_metadata_size_40782 calcu_metadata_size 0 40782 NULL
-+kfifo_out_copy_r_40784 kfifo_out_copy_r 3-0 40784 NULL
++ecryptfs_readlink_40775 ecryptfs_readlink 3 40775 NULL nohasharray
++show_list_40775 show_list 3-0 40775 &ecryptfs_readlink_40775
++kfifo_out_copy_r_40784 kfifo_out_copy_r 3 40784 NULL
+bitmap_weight_40791 bitmap_weight 0-2 40791 NULL
-+pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
-+add_action_40811 add_action 4 40811 NULL
++idr_get_new_40797 idr_get_new 0 40797 NULL
++netdev_alloc_skb_ip_align_40811 netdev_alloc_skb_ip_align 2 40811 NULL nohasharray
++paranoid_check_not_bad_40811 paranoid_check_not_bad 0 40811 &netdev_alloc_skb_ip_align_40811
+nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
-+SyS_mbind_40828 SyS_mbind 5 40828 NULL
-+__mlx4_qp_reserve_range_40847 __mlx4_qp_reserve_range 2-3 40847 NULL
+nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
++__shared_list_add_40850 __shared_list_add 0 40850 NULL
+ocfs2_zero_partial_clusters_40856 ocfs2_zero_partial_clusters 2-3 40856 NULL
+v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
++iwch_alloc_pbl_40885 iwch_alloc_pbl 2 40885 NULL
+read_file_queue_40895 read_file_queue 3 40895 NULL
-+btrfs_set_inode_index_count_40901 btrfs_set_inode_index_count 0 40901 NULL
+waiters_read_40902 waiters_read 3 40902 NULL
+isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
++iwl_legacy_dbgfs_disable_ht40_read_40910 iwl_legacy_dbgfs_disable_ht40_read 3 40910 NULL
+gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
+vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
-+snd_vx_create_40948 snd_vx_create 4 40948 NULL nohasharray
-+sg_alloc_table_40948 sg_alloc_table 0 40948 &snd_vx_create_40948
-+wm8994_free_irq_40951 wm8994_free_irq 2 40951 NULL
++__kfifo_init_40918 __kfifo_init 4-3 40918 NULL
++iterate_extent_inodes_40923 iterate_extent_inodes 0 40923 NULL
++btrfs_setsize_40931 btrfs_setsize 2 40931 NULL
++snd_vx_create_40948 snd_vx_create 4 40948 NULL
++tcp_skb_mss_40964 tcp_skb_mss 0 40964 NULL
+rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
-+btrfs_find_orphan_item_40977 btrfs_find_orphan_item 0 40977 NULL
++econet_recvmsg_40978 econet_recvmsg 4 40978 NULL
+insert_old_idx_40987 insert_old_idx 0 40987 NULL
-+il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
+mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
-+mtd_block_isbad_41015 mtd_block_isbad 0 41015 NULL
-+__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
+_req_append_segment_41031 _req_append_segment 2 41031 NULL
+mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
+ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL
-+lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
+BcmFlash2xBulkWrite_41054 BcmFlash2xBulkWrite 0 41054 NULL
-+calculate_order_41061 calculate_order 0 41061 NULL
+vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
+beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
+cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
-+roccat_read_41093 roccat_read 3 41093 NULL nohasharray
-+nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 &roccat_read_41093
-+dma_attach_41094 dma_attach 6-5 41094 NULL
++roccat_read_41093 roccat_read 3 41093 NULL
+provide_user_output_41105 provide_user_output 3 41105 NULL
+f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
-+ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
-+ocfs2_extend_trans_41116 ocfs2_extend_trans 0 41116 NULL
-+btrfs_subvolume_reserve_metadata_41130 btrfs_subvolume_reserve_metadata 3 41130 NULL
-+v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
-+tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
++ocfs2_extend_trans_41116 ocfs2_extend_trans 0 41116 NULL nohasharray
++oom_adjust_write_41116 oom_adjust_write 3 41116 &ocfs2_extend_trans_41116
+dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
+ol_quota_chunk_block_41177 ol_quota_chunk_block 0-2 41177 NULL
-+dgap_driver_kzmalloc_41189 dgap_driver_kzmalloc 1 41189 NULL
++request_irq_41192 request_irq 0 41192 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
++UpdateRegs_41200 UpdateRegs 0 41200 NULL nohasharray
++xfs_readdir_41200 xfs_readdir 3 41200 &UpdateRegs_41200
+ocfs2_read_quota_block_41207 ocfs2_read_quota_block 2 41207 NULL
++ceph_calc_raw_layout_41212 ceph_calc_raw_layout 4 41212 NULL
++tun_alloc_skb_41216 tun_alloc_skb 2-4-3 41216 NULL
+nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
-+cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
+hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
+create_dir_41256 create_dir 0 41256 NULL
+erst_read_41260 erst_read 0 41260 NULL
-+setup_cluster_bitmap_41270 setup_cluster_bitmap 4-0 41270 NULL
+alloc_context_41283 alloc_context 1 41283 NULL
-+objio_alloc_io_state_41316 objio_alloc_io_state 7-6 41316 NULL
-+o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
++ewma_init_41305 ewma_init 2-3 41305 NULL
++objio_alloc_io_state_41316 objio_alloc_io_state 7 41316 NULL
++create_bounce_buffer_41330 create_bounce_buffer 3 41330 NULL
++user_update_41332 user_update 3 41332 NULL
+twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
-+rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
+irq_expand_nr_irqs_41351 irq_expand_nr_irqs 0 41351 NULL
+cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
+jbd2_alloc_41359 jbd2_alloc 1 41359 NULL
+kmp_init_41373 kmp_init 2 41373 NULL
-+netlink_alloc_large_skb_41375 netlink_alloc_large_skb 1 41375 NULL
++tifm_add_adapter_41390 tifm_add_adapter 0 41390 NULL
+isr_commands_read_41398 isr_commands_read 3 41398 NULL
-+is_writethrough_io_41406 is_writethrough_io 3 41406 NULL
-+rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
++sys_flistxattr_41407 sys_flistxattr 3 41407 NULL
+xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
+isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
+lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
-+iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
++ext4_trim_extent_41436 ext4_trim_extent 4 41436 NULL
+ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL
+pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
+layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
+snd_pcm_status_41472 snd_pcm_status 0 41472 NULL
-+rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
-+bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
-+split_item_41483 split_item 0 41483 NULL
-+kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
-+ipath_user_sdma_page_length_41490 ipath_user_sdma_page_length 0-2-1 41490 NULL
+wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
-+SyS_get_mempolicy_41495 SyS_get_mempolicy 3-4 41495 NULL
+hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
+xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
-+perf_sw_event_41517 perf_sw_event 2 41517 NULL
-+SyS_preadv_41523 SyS_preadv 3 41523 NULL
-+dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL
-+add_excluded_extent_41547 add_excluded_extent 0 41547 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
-+si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 NULL nohasharray
-+nr_status_frames_41559 nr_status_frames 0-1 41559 &si476x_radio_fops_read_41559
++ldisc_receive_41516 ldisc_receive 4 41516 NULL
+rng_dev_read_41581 rng_dev_read 3 41581 NULL
++map_offset_to_paddr_41592 map_offset_to_paddr 0-1 41592 NULL
++read_file_rx_chainmask_41605 read_file_rx_chainmask 3 41605 NULL
+vga_io_r_41609 vga_io_r 0 41609 NULL
+tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
+lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray
+usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613
-+a2mp_send_41615 a2mp_send 4 41615 NULL
-+btrfs_calc_trunc_metadata_size_41626 btrfs_calc_trunc_metadata_size 0-2 41626 NULL
-+lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL
++lis3l02dq_read_accel_from_buffer_41615 lis3l02dq_read_accel_from_buffer 2 41615 NULL
+mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
-+rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
+get_std_timing_41654 get_std_timing 0 41654 NULL
-+start_graph_tracing_41656 start_graph_tracing 0 41656 NULL
++start_graph_tracing_41656 start_graph_tracing 0 41656 NULL nohasharray
++squashfs_cache_init_41656 squashfs_cache_init 2 41656 &start_graph_tracing_41656
+ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
-+params_period_bytes_41683 params_period_bytes 0 41683 NULL
-+fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL
-+lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
-+__ext3_journal_get_write_access_41705 __ext3_journal_get_write_access 0 41705 NULL
++uapsd_max_sp_len_write_41683 uapsd_max_sp_len_write 3 41683 NULL
+apei_exec_for_each_entry_41717 apei_exec_for_each_entry 0 41717 NULL
-+bdx_tx_db_init_41719 bdx_tx_db_init 2 41719 NULL
-+ocfs2_block_group_fill_41744 ocfs2_block_group_fill 0 41744 NULL
++sys_pwritev_41722 sys_pwritev 3 41722 NULL
++hc_gpa_41744 hc_gpa 0-2-3 41744 NULL
+fillonedir_41746 fillonedir 3 41746 NULL
++get_slab_41770 get_slab 1 41770 NULL
+ocfs2_dx_dir_rebalance_41793 ocfs2_dx_dir_rebalance 7 41793 NULL
-+iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
-+remap_pte_range_41800 remap_pte_range 5 41800 NULL
-+hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
-+regcache_sync_block_raw_41803 regcache_sync_block_raw 4-3 41803 NULL
-+rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
-+da9052_enable_irq_41814 da9052_enable_irq 2 41814 NULL
++bat_socket_read_41813 bat_socket_read 3 41813 NULL
+sco_send_frame_41815 sco_send_frame 3 41815 NULL
-+lp_gpio_to_irq_41822 lp_gpio_to_irq 2 41822 NULL
-+ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
+do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
++tcp_packets_in_flight_41853 tcp_packets_in_flight 0 41853 NULL
+keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
++spin_time_start_41857 spin_time_start 0 41857 NULL
+pci_map_single_41869 pci_map_single 0 41869 NULL
+usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL
-+v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 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
+find_ge_pid_41918 find_ge_pid 1 41918 NULL
+build_inv_iotlb_pages_41922 build_inv_iotlb_pages 4-5 41922 NULL
++ReadConfigFileStructure_41929 ReadConfigFileStructure 0 41929 NULL
+nfsd_getxattr_41934 nfsd_getxattr 0 41934 NULL
-+ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 3-4 41935 NULL
-+read_gssp_41947 read_gssp 3 41947 NULL
++iscsi_iser_recv_41948 iscsi_iser_recv 4 41948 NULL
+ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
++efx_tx_queue_insert_41955 efx_tx_queue_insert 2 41955 NULL
+portnames_read_41958 portnames_read 3 41958 NULL
-+ubi_self_check_all_ff_41959 ubi_self_check_all_ff 0-4 41959 NULL
+dst_mtu_41969 dst_mtu 0 41969 NULL
-+btrfs_check_trunc_cache_free_space_41973 btrfs_check_trunc_cache_free_space 0 41973 NULL
+cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
+ubi_io_is_bad_41983 ubi_io_is_bad 0 41983 NULL
++_get_slice_41991 _get_slice 0 41991 NULL
++em28xx_write_regs_41996 em28xx_write_regs 0 41996 NULL
++flakey_status_42000 flakey_status 4 42000 NULL
+pool_allocate_42012 pool_allocate 3 42012 NULL
+spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
+rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
-+nouveau_ttm_tt_create_42026 nouveau_ttm_tt_create 2 42026 NULL
++ensure_wear_leveling_42029 ensure_wear_leveling 0 42029 NULL
+acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
-+__btrfs_drop_extents_42032 __btrfs_drop_extents 5-0 42032 NULL
+__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
+irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
-+dma_generic_alloc_coherent_42048 dma_generic_alloc_coherent 2 42048 NULL nohasharray
-+jffs2_do_link_42048 jffs2_do_link 6 42048 &dma_generic_alloc_coherent_42048
-+ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
++jffs2_do_link_42048 jffs2_do_link 6 42048 NULL
+InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
-+alloc_bitset_42085 alloc_bitset 1 42085 NULL
++brcmf_sdbrcm_downloadvars_42064 brcmf_sdbrcm_downloadvars 3 42064 NULL
+scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
+sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
-+send_truncate_42107 send_truncate 0 42107 NULL
+submit_inquiry_42108 submit_inquiry 3 42108 NULL
-+sysfs_read_file_42113 sysfs_read_file 3 42113 NULL nohasharray
-+dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 &sysfs_read_file_42113
-+__btrfs_unlink_inode_42114 __btrfs_unlink_inode 0 42114 NULL
++sysfs_read_file_42113 sysfs_read_file 3 42113 NULL
++store_gps_42118 store_gps 4 42118 NULL
+ext4_do_update_inode_42127 ext4_do_update_inode 0 42127 NULL
-+blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL
++tipc_createport_raw_42129 tipc_createport_raw 4 42129 NULL
++Read_hfc16_stable_42131 Read_hfc16_stable 0 42131 NULL
++ttm_agp_populate_42144 ttm_agp_populate 2 42144 NULL
++v9fs_alloc_rdir_buf_42150 v9fs_alloc_rdir_buf 2 42150 NULL
+mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL
-+kvm_lapic_get_cr8_42166 kvm_lapic_get_cr8 0 42166 NULL
+read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
+oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
+write_file_beacon_42185 write_file_beacon 3 42185 NULL
+get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
-+ocfs2_resv_window_bits_42207 ocfs2_resv_window_bits 0 42207 NULL
-+pla_ocp_read_42235 pla_ocp_read 3 42235 NULL
-+rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
-+vfio_remove_dma_overlap_42255 vfio_remove_dma_overlap 2 42255 NULL
++xfs_rtfree_range_42244 xfs_rtfree_range 4-3 42244 NULL
++btmrvl_hsmode_write_42252 btmrvl_hsmode_write 3 42252 NULL
++find_last_bit_42260 find_last_bit 2 42260 NULL
++ctnetlink_proto_size_42270 ctnetlink_proto_size 0 42270 NULL
+__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
+snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL
-+__cpus_weight_42299 __cpus_weight 2-0 42299 NULL
-+sel_read_perm_42302 sel_read_perm 3 42302 NULL
++rtnl_link_get_af_size_42296 rtnl_link_get_af_size 0 42296 NULL
++sel_read_perm_42302 sel_read_perm 3 42302 NULL nohasharray
++crypt_status_42302 crypt_status 4 42302 &sel_read_perm_42302
+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
-+gfn_to_hva_42305 gfn_to_hva 2-0 42305 NULL
-+close_cur_inode_file_42308 close_cur_inode_file 0 42308 NULL nohasharray
-+xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 &close_cur_inode_file_42308
-+free_cblock_42318 free_cblock 2 42318 NULL
-+hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
-+tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
-+snd_pcm_plug_alloc_42339 snd_pcm_plug_alloc 2 42339 NULL
++tracing_ctrl_write_42324 tracing_ctrl_write 3 42324 NULL nohasharray
++hysdn_conf_read_42324 hysdn_conf_read 3 42324 &tracing_ctrl_write_42324 nohasharray
++lpfc_config_msi_42324 lpfc_config_msi 0 42324 &hysdn_conf_read_42324
++tcp_sync_mss_42330 tcp_sync_mss 0-2 42330 NULL
+ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
-+drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
-+il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
-+hash_ipportnet4_expire_42391 hash_ipportnet4_expire 3 42391 NULL
+msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
++brn_proc_write_42407 brn_proc_write 3 42407 NULL
+krng_get_random_42420 krng_get_random 3 42420 NULL
+gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
+key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
-+alloc_request_42448 alloc_request 0 42448 NULL
+snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
+tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
-+kuc_free_42455 kuc_free 2 42455 NULL
-+tc3589x_gpio_irq_get_virq_42457 tc3589x_gpio_irq_get_virq 2 42457 NULL
+ext3_valid_block_bitmap_42459 ext3_valid_block_bitmap 3 42459 NULL
-+__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
++neigh_nlmsg_size_42464 neigh_nlmsg_size 0 42464 NULL
++kernel_recvmsg_42482 kernel_recvmsg 0 42482 NULL
+follow_hugetlb_page_42486 follow_hugetlb_page 0-7 42486 NULL
-+omfs_readpages_42490 omfs_readpages 4 42490 NULL
-+bypass_write_42498 bypass_write 3 42498 NULL
-+SyS_mincore_42511 SyS_mincore 1-2 42511 NULL
++brcmf_sdbrcm_bus_txctl_42492 brcmf_sdbrcm_bus_txctl 3 42492 NULL
+jbd2_log_wait_commit_42519 jbd2_log_wait_commit 0 42519 NULL
+kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL
-+dio_bio_complete_42524 dio_bio_complete 0 42524 NULL
+smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
-+self_check_ec_hdr_42528 self_check_ec_hdr 0 42528 NULL
++snd_emux_create_port_42533 snd_emux_create_port 3 42533 NULL
+__register_ftrace_function_42543 __register_ftrace_function 0 42543 NULL
+dbAllocNear_42546 dbAllocNear 0 42546 NULL
-+inorder_next_42548 inorder_next 1-0 42548 NULL
-+ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
+udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
-+iwl_print_event_log_42566 iwl_print_event_log 0-5-7 42566 NULL
++iwl_print_event_log_42566 iwl_print_event_log 7-5-0 42566 NULL
+ocfs2_reserve_suballoc_bits_42569 ocfs2_reserve_suballoc_bits 0 42569 NULL
+xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
+oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
-+map_state_42602 map_state 1 42602 NULL
-+resp_write_42628 resp_write 2 42628 NULL
++map_state_42602 map_state 1 42602 NULL nohasharray
++__pskb_pull_42602 __pskb_pull 2 42602 &map_state_42602
++sys_move_pages_42626 sys_move_pages 2 42626 NULL
+ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
+scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
+br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
+parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL
++_regmap_raw_write_42652 _regmap_raw_write 4 42652 NULL
+ocfs2_search_chain_42655 ocfs2_search_chain 0 42655 NULL
++l2tp_xmit_skb_42672 l2tp_xmit_skb 3 42672 NULL
+request_key_and_link_42693 request_key_and_link 4 42693 NULL
-+acpi_dev_get_irqresource_42694 acpi_dev_get_irqresource 2 42694 NULL
+vb2_read_42703 vb2_read 3 42703 NULL
-+__ocfs2_decrease_refcount_42717 __ocfs2_decrease_refcount 5-4-0 42717 NULL
++__ocfs2_decrease_refcount_42717 __ocfs2_decrease_refcount 0-5-4 42717 NULL
+read_status_42722 read_status 0 42722 NULL
+dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
+set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
+ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
+xen_bind_pirq_gsi_to_irq_42750 xen_bind_pirq_gsi_to_irq 1 42750 NULL
+dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL
++qla2x00_get_ctx_bsg_sp_42768 qla2x00_get_ctx_bsg_sp 3 42768 NULL
+x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
+snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL
-+cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray
-+isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781
-+elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL
++cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL
+koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
+ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0-2 42796 NULL
+fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
+drm_ioctl_42813 drm_ioctl 2 42813 NULL
+iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
-+xfs_iomap_eof_prealloc_initial_size_42822 xfs_iomap_eof_prealloc_initial_size 0-3 42822 NULL
+set_arg_42824 set_arg 3 42824 NULL
-+si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL
+ocfs2_desc_bitmap_to_cluster_off_42831 ocfs2_desc_bitmap_to_cluster_off 2 42831 NULL
-+prandom_u32_42853 prandom_u32 0 42853 NULL
+ntfs_mapping_pairs_build_42859 ntfs_mapping_pairs_build 0 42859 NULL
-+nouveau_vm_create_42869 nouveau_vm_create 3-2 42869 NULL
+ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL
-+nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL
++pskb_expand_head_42881 pskb_expand_head 3-2 42881 NULL
++tipc_port_recv_sections_42890 tipc_port_recv_sections 4 42890 NULL
+xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
++SendTxCommandPacket_42901 SendTxCommandPacket 3 42901 NULL
+hd_end_request_42904 hd_end_request 2 42904 NULL
-+sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
+sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
+get_unmapped_area_42944 get_unmapped_area 0 42944 NULL
+vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
-+send_link_42948 send_link 0 42948 NULL
-+blkdev_direct_IO_42962 blkdev_direct_IO 4 42962 NULL
-+read_file_node_stat_42964 read_file_node_stat 3 42964 NULL
-+compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
-+nfs_idmap_get_desc_42990 nfs_idmap_get_desc 2-4 42990 NULL nohasharray
-+rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
++sys_sethostname_42962 sys_sethostname 2 42962 NULL
++ixj_enhanced_read_42980 ixj_enhanced_read 3 42980 NULL
++compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL nohasharray
++pfkey_xfrm_policy2sec_ctx_size_42981 pfkey_xfrm_policy2sec_ctx_size 0 42981 &compat_udpv6_setsockopt_42981
++nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL
+mlx4_qp_reserve_range_43000 mlx4_qp_reserve_range 2-3 43000 NULL
+isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
-+add_bytes_to_bitmap_43026 add_bytes_to_bitmap 0-3-4 43026 NULL
-+init_phys_status_page_43028 init_phys_status_page 0 43028 NULL
-+wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
-+send_to_group_43051 send_to_group 0 43051 NULL
-+nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
-+nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
++add_bytes_to_bitmap_43026 add_bytes_to_bitmap 3-0-4 43026 NULL
++store_lssw_43035 store_lssw 4 43035 NULL nohasharray
++wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 &store_lssw_43035
++uapsd_queues_write_43040 uapsd_queues_write 3 43040 NULL
++sep_prepare_input_output_dma_table_in_dcb_43064 sep_prepare_input_output_dma_table_in_dcb 4-5-3-2 43064 NULL
+ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
-+calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
-+cow_file_range_inline_43132 cow_file_range_inline 4 43132 NULL
-+read_file_dfs_43145 read_file_dfs 3 43145 NULL
-+cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
++e1000_request_msix_43134 e1000_request_msix 0 43134 NULL
+usb_string_sub_43164 usb_string_sub 0 43164 NULL
-+il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
-+send_cmd_43168 send_cmd 0 43168 NULL
-+ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
+ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL
++teiup_create_43201 teiup_create 3 43201 NULL
+uio_write_43202 uio_write 3 43202 NULL
+iso_callback_43208 iso_callback 3 43208 NULL
-+ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
-+f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
-+atomic_long_add_return_43217 atomic_long_add_return 1-0 43217 NULL
++atomic_long_add_return_43217 atomic_long_add_return 1 43217 NULL
+vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
-+fixup_leb_43256 fixup_leb 3 43256 NULL
++store_wwan_43264 store_wwan 4 43264 NULL
+ide_end_rq_43269 ide_end_rq 4 43269 NULL
-+nilfs_direct_IO_43271 nilfs_direct_IO 4 43271 NULL
-+mlx5_ib_reg_user_mr_43275 mlx5_ib_reg_user_mr 2-3 43275 NULL
+parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 NULL nohasharray
+evtchn_write_43278 evtchn_write 3 43278 &parport_pc_ecp_write_block_pio_43278
+filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
-+mpage_alloc_43299 mpage_alloc 3 43299 NULL
++alloc_subdevices_43300 alloc_subdevices 2 43300 NULL
++store_ledd_43312 store_ledd 4 43312 NULL
+get_nr_irqs_gsi_43315 get_nr_irqs_gsi 0 43315 NULL
-+mmu_set_spte_43327 mmu_set_spte 7-6 43327 NULL
+__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
-+kvm_host_page_size_43348 kvm_host_page_size 2-0 43348 NULL
-+gart_free_coherent_43362 gart_free_coherent 4-2 43362 NULL
-+hash_net4_expire_43378 hash_net4_expire 3 43378 NULL
++svc_pool_map_get_43386 svc_pool_map_get 0 43386 NULL
+xenfb_write_43412 xenfb_write 3 43412 NULL
-+__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL
++__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL nohasharray
++msi_capability_init_43423 msi_capability_init 0 43423 &__alloc_bootmem_low_43423
+usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
-+ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
+ocfs2_rotate_tree_left_43442 ocfs2_rotate_tree_left 0 43442 NULL
-+usemap_size_43443 usemap_size 0-2-1 43443 NULL nohasharray
-+usb_string_43443 usb_string 0 43443 &usemap_size_43443
-+get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
-+nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
-+calculate_discard_block_size_43480 calculate_discard_block_size 0 43480 NULL nohasharray
-+alloc_new_reservation_43480 alloc_new_reservation 4-0-2 43480 &calculate_discard_block_size_43480
-+tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
++usb_string_43443 usb_string 0 43443 NULL nohasharray
++usemap_size_43443 usemap_size 0-2-1 43443 &usb_string_43443
++__data_list_add_eb_43472 __data_list_add_eb 0 43472 NULL
++alloc_new_reservation_43480 alloc_new_reservation 4-0-2 43480 NULL
++nf_nat_ftp_fmt_cmd_43495 nf_nat_ftp_fmt_cmd 0 43495 NULL
+ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
+do_readlink_43518 do_readlink 2 43518 NULL
+dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
-+read_events_43534 read_events 3 43534 NULL
+cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
-+tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL nohasharray
-+ufs_alloccg_block_43540 ufs_alloccg_block 3-0 43540 &tx_frag_failed_read_43540
++ufs_alloccg_block_43540 ufs_alloccg_block 3-0 43540 NULL
+request_resource_43548 request_resource 0 43548 NULL
++ath_rx_init_43564 ath_rx_init 2 43564 NULL nohasharray
++_send_control_msg_43564 _send_control_msg 6 43564 &ath_rx_init_43564
++_fc_frame_alloc_43568 _fc_frame_alloc 1 43568 NULL
+rpc_malloc_43573 rpc_malloc 2 43573 NULL
+handle_frequent_errors_43599 handle_frequent_errors 4 43599 NULL
+lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL
+proc_read_43614 proc_read 3 43614 NULL
-+i915_gem_execbuffer_relocate_object_slow_43618 i915_gem_execbuffer_relocate_object_slow 0 43618 NULL nohasharray
-+disable_dma_on_even_43618 disable_dma_on_even 0 43618 &i915_gem_execbuffer_relocate_object_slow_43618
++prison_create_43623 prison_create 1 43623 NULL
+random_write_43656 random_write 3 43656 NULL
+bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL
+ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL
-+fs_path_copy_43673 fs_path_copy 0 43673 NULL
+dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
+calgary_map_page_43686 calgary_map_page 4 43686 NULL
-+max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
++hidp_send_ctrl_message_43702 hidp_send_ctrl_message 4 43702 NULL
++user_confirm_reply_43708 user_confirm_reply 4 43708 NULL
+wait_for_completion_interruptible_43723 wait_for_completion_interruptible 0 43723 NULL
+drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
+reset_card_proc_43731 reset_card_proc 0 43731 NULL
+snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
-+ocfs2_replace_clusters_43733 ocfs2_replace_clusters 5-0 43733 NULL
++ocfs2_replace_clusters_43733 ocfs2_replace_clusters 0-5 43733 NULL
+fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
-+__bm_find_next_43748 __bm_find_next 2 43748 NULL
++osdv1_attr_list_elem_size_43747 osdv1_attr_list_elem_size 0-1 43747 NULL
+gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
+sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
+ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
-+byte_pos_43787 byte_pos 0-2 43787 &ocfs2_xattr_get_value_outside_43787
-+btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL
++byte_pos_43787 byte_pos 0-2 43787 &ocfs2_xattr_get_value_outside_43787 nohasharray
++xfs_highbit64_43787 xfs_highbit64 1 43787 &byte_pos_43787
++btrfs_copy_from_user_43806 btrfs_copy_from_user 3-1-0 43806 NULL
++store_cpufv_disabled_43809 store_cpufv_disabled 4 43809 NULL
++hci_send_cmd_43810 hci_send_cmd 3 43810 NULL
+ext4_read_block_bitmap_43814 ext4_read_block_bitmap 2 43814 NULL
-+div64_u64_safe_43815 div64_u64_safe 2-1 43815 NULL
+ext4_split_extent_43818 ext4_split_extent 0 43818 NULL
+i915_gem_execbuffer_relocate_entry_43822 i915_gem_execbuffer_relocate_entry 0 43822 NULL
+ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
+ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
++atomic64_cmpxchg_unchecked_43840 atomic64_cmpxchg_unchecked 0 43840 NULL
++p54_download_eeprom_43842 p54_download_eeprom 4 43842 NULL
+read_flush_43851 read_flush 3 43851 NULL
+ocfs2_block_group_find_clear_bits_43874 ocfs2_block_group_find_clear_bits 4 43874 NULL
-+pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
-+SendString_43928 SendString 3 43928 NULL
++idmap_update_entry_43885 idmap_update_entry 3 43885 NULL
++prism2_sta_send_mgmt_43916 prism2_sta_send_mgmt 5 43916 NULL
+xen_register_gsi_43946 xen_register_gsi 2-1 43946 NULL
+stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
-+perf_tp_event_43971 perf_tp_event 2 43971 NULL
++i915_ring_idle_43969 i915_ring_idle 0 43969 NULL
+__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
+nla_reserve_43984 nla_reserve 3 43984 NULL
-+__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
+scsi_command_size_43992 scsi_command_size 0 43992 NULL nohasharray
+kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 &scsi_command_size_43992 nohasharray
+bcm_recvmsg_43992 bcm_recvmsg 4 43992 &kvm_read_guest_virt_43992
-+ulist_add_43994 ulist_add 0 43994 NULL
-+emit_flags_44006 emit_flags 4-3 44006 NULL
+write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
-+fru_strlen_44046 fru_strlen 0 44046 NULL
-+tree_insert_offset_44069 tree_insert_offset 0 44069 NULL
-+SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
-+btrfs_prev_leaf_44083 btrfs_prev_leaf 0 44083 NULL nohasharray
-+load_discard_44083 load_discard 3 44083 &btrfs_prev_leaf_44083
-+__vxge_hw_vpath_tim_configure_44093 __vxge_hw_vpath_tim_configure 2 44093 NULL
++btrfs_prev_leaf_44083 btrfs_prev_leaf 0 44083 NULL
+xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
+skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
+tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL
-+SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
-+vmw_gmr_bind_44130 vmw_gmr_bind 3 44130 NULL
-+lookup_extent_data_ref_44136 lookup_extent_data_ref 0 44136 NULL
-+ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
++em28xx_read_reg_req_44130 em28xx_read_reg_req 0 44130 NULL
+scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
+ubifs_find_dirty_idx_leb_44169 ubifs_find_dirty_idx_leb 0 44169 NULL
+ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
-+SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
+readreg_ipac_44186 readreg_ipac 0 44186 NULL
+handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
+IO_APIC_get_PCI_irq_vector_44198 IO_APIC_get_PCI_irq_vector 0 44198 NULL
-+__set_free_44211 __set_free 2 44211 NULL
+claim_ptd_buffers_44213 claim_ptd_buffers 3 44213 NULL
+srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
+ioapic_register_intr_44238 ioapic_register_intr 1 44238 NULL
+scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
-+sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
-+tc3589x_gpio_irq_map_44245 tc3589x_gpio_irq_map 2 44245 NULL
++enlarge_skb_44248 enlarge_skb 2 44248 NULL
+apei_resources_sub_44252 apei_resources_sub 0 44252 NULL
-+byt_gpio_irq_map_44275 byt_gpio_irq_map 2 44275 NULL
+device_create_file_44285 device_create_file 0 44285 NULL
+ufs_clusteracct_44293 ufs_clusteracct 3 44293 NULL
+ocfs2_zero_range_for_truncate_44294 ocfs2_zero_range_for_truncate 3 44294 NULL
-+ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
-+bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
++iwl3945_statistics_flag_44310 iwl3945_statistics_flag 3-0 44310 NULL
++bitmap_scnprintf_44318 bitmap_scnprintf 2-0 44318 NULL
+dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
+rs_init_44327 rs_init 1 44327 NULL
-+create_free_space_inode_44332 create_free_space_inode 0 44332 NULL
-+insert_into_bitmap_44340 insert_into_bitmap 0 44340 NULL
-+ubi_eba_write_leb_st_44343 ubi_eba_write_leb_st 0-5 44343 NULL
-+radix_tree_maybe_preload_44346 radix_tree_maybe_preload 0 44346 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
-+__is_discarded_44359 __is_discarded 2 44359 NULL
++count_ah_combs_44334 count_ah_combs 0 44334 NULL
++blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 NULL
+ipx_recvmsg_44366 ipx_recvmsg 4 44366 NULL
-+alloc_requests_44372 alloc_requests 0 44372 NULL
+rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
-+iterate_dir_item_44386 iterate_dir_item 0 44386 NULL
-+mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
+aoedev_flush_44398 aoedev_flush 2 44398 NULL
+strlcpy_44400 strlcpy 3 44400 NULL
+drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
+osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
-+check_user_page_hwpoison_44412 check_user_page_hwpoison 1 44412 NULL
-+ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
-+prandom_u32_state_44445 prandom_u32_state 0 44445 NULL
-+iwl_dbgfs_bf_params_write_44450 iwl_dbgfs_bf_params_write 3 44450 NULL
+write_file_debug_44476 write_file_debug 3 44476 NULL
+btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
+sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
-+bio_advance_44496 bio_advance 2 44496 NULL
++ath6kl_tm_rx_report_44494 ath6kl_tm_rx_report 3 44494 NULL
+ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
++xfrm_sa_len_44502 xfrm_sa_len 0 44502 NULL
+ac_register_board_44504 ac_register_board 3 44504 NULL
+security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray
+iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505
+spidev_write_44510 spidev_write 3 44510 NULL
-+SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL
-+ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
-+comm_write_44537 comm_write 3 44537 NULL
-+xfs_log_calc_unit_res_44540 xfs_log_calc_unit_res 0-2 44540 NULL
++sys_msgsnd_44537 sys_msgsnd 3 44537 NULL nohasharray
++comm_write_44537 comm_write 3 44537 &sys_msgsnd_44537
+snd_pcm_drop_44542 snd_pcm_drop 0 44542 NULL
+dbg_chk_pnode_44555 dbg_chk_pnode 0 44555 NULL
-+shmem_getpage_gfp_44556 shmem_getpage_gfp 0 44556 NULL
-+hash_ipport4_expire_44564 hash_ipport4_expire 3 44564 NULL
-+dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
-+snd_pcm_alloc_vmalloc_buffer_44595 snd_pcm_alloc_vmalloc_buffer 2 44595 NULL
-+btrfs_qgroup_account_ref_44604 btrfs_qgroup_account_ref 0 44604 NULL
-+huge_page_shift_44618 huge_page_shift 0 44618 NULL
+sysfs_add_one_44629 sysfs_add_one 0 44629 NULL
-+msb_get_free_block_44633 msb_get_free_block 2 44633 NULL
++cfpkt_add_body_44630 cfpkt_add_body 3 44630 NULL
+ext2_new_block_44645 ext2_new_block 2-0 44645 NULL
+alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
-+mpi_resize_44674 mpi_resize 2 44674 NULL
-+sysfs_create_link_44685 sysfs_create_link 0 44685 NULL nohasharray
-+__copy_user_intel_nocache_44685 __copy_user_intel_nocache 0-3 44685 &sysfs_create_link_44685
++sysfs_create_link_44685 sysfs_create_link 0 44685 NULL
+ts_read_44687 ts_read 3 44687 NULL
-+qib_get_user_pages_44689 qib_get_user_pages 1-2 44689 NULL
-+lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
++i915_wait_request_44703 i915_wait_request 0 44703 NULL
+__ocfs2_rotate_tree_left_44705 __ocfs2_rotate_tree_left 0 44705 NULL
-+xfer_to_user_44713 xfer_to_user 3 44713 NULL nohasharray
-+__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 &xfer_to_user_44713
++__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 NULL
++mempool_create_node_44715 mempool_create_node 1 44715 NULL
+_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
+clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
+fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
-+SyS_read_44732 SyS_read 3 44732 NULL
-+vm_insert_mixed_44738 vm_insert_mixed 3 44738 NULL
+key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
-+set_brk_44749 set_brk 1-2 44749 NULL
+tnode_new_44757 tnode_new 3 44757 NULL nohasharray
+pty_write_44757 pty_write 3 44757 &tnode_new_44757
+__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL
-+handsfree_ramp_44777 handsfree_ramp 2 44777 NULL
-+irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL
+sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
+rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
-+qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
-+mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
-+rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
++x25_pacsize_to_bytes_44812 x25_pacsize_to_bytes 0 44812 NULL
+sisusb_write_44834 sisusb_write 3 44834 NULL
-+kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
++nl80211_send_unprot_disassoc_44846 nl80211_send_unprot_disassoc 4 44846 NULL
+cubic_root_44848 cubic_root 1 44848 NULL
+qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL
-+copydesc_user_44855 copydesc_user 3 44855 NULL
-+i915_gem_execbuffer_relocate_44868 i915_gem_execbuffer_relocate 0 44868 NULL
+init_rs_44873 init_rs 1 44873 NULL
+skb_availroom_44883 skb_availroom 0 44883 NULL
++nf_bridge_encap_header_len_44890 nf_bridge_encap_header_len 0 44890 NULL
+ocfs2_wait_for_mask_44893 ocfs2_wait_for_mask 0 44893 NULL
+do_tty_write_44896 do_tty_write 5 44896 NULL
-+regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
+_snd_pcm_hw_param_last_44947 _snd_pcm_hw_param_last 0 44947 NULL
-+__add_delayed_refs_44977 __add_delayed_refs 0 44977 NULL
+tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
-+map_index_to_lba_44993 map_index_to_lba 0-1 44993 NULL
-+send_chmod_45011 send_chmod 0 45011 NULL
++ftdi_process_packet_45005 ftdi_process_packet 5 45005 NULL
+i915_gem_do_execbuffer_45012 i915_gem_do_execbuffer 0 45012 NULL
-+bytepos_delta_45017 bytepos_delta 0-2 45017 NULL
+read_block_bitmap_45021 read_block_bitmap 2 45021 NULL nohasharray
-+ptrace_writedata_45021 ptrace_writedata 4-3 45021 &read_block_bitmap_45021
-+dm_kvzalloc_45025 dm_kvzalloc 1 45025 NULL
++ptrace_writedata_45021 ptrace_writedata 4 45021 &read_block_bitmap_45021
+vhci_get_user_45039 vhci_get_user 3 45039 NULL
-+sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
-+remap_oldmem_pfn_range_45060 remap_oldmem_pfn_range 2-3-4 45060 NULL nohasharray
-+sel_write_user_45060 sel_write_user 3 45060 &remap_oldmem_pfn_range_45060
-+vmscan_swappiness_45062 vmscan_swappiness 0 45062 NULL
++sel_write_user_45060 sel_write_user 3 45060 NULL
+snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
-+kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
-+pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
++ata_tdev_add_45079 ata_tdev_add 0 45079 NULL
++orig_hash_del_if_45080 orig_hash_del_if 2 45080 NULL
+usbdev_read_45114 usbdev_read 3 45114 NULL
+send_to_tty_45141 send_to_tty 3 45141 NULL
-+stmpe_irq_map_45146 stmpe_irq_map 2 45146 NULL
-+cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL
++crypto_aead_blocksize_45148 crypto_aead_blocksize 0 45148 NULL
+gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL
+ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 NULL nohasharray
+device_write_45156 device_write 3 45156 &ocfs2_remove_inode_range_45156
+ocfs2_dq_frozen_trigger_45159 ocfs2_dq_frozen_trigger 4 45159 NULL
-+SYSC_write_45160 SYSC_write 3 45160 NULL
+tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
+sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
+sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 NULL nohasharray
+snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 &sctp_pack_cookie_45190
+num_clusters_in_group_45194 num_clusters_in_group 2 45194 NULL
-+__radix_tree_preload_45197 __radix_tree_preload 0 45197 NULL
++add_child_45201 add_child 4 45201 NULL
+iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
+spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
-+__dirty_45228 __dirty 2 45228 NULL
+ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
+event_enable_write_45238 event_enable_write 3 45238 NULL
-+prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL
-+input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
+gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
+snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
+e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
-+pte_val_45313 pte_val 0 45313 NULL
+copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
-+null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
-+sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
-+paging64_gva_to_gpa_45421 paging64_gva_to_gpa 2 45421 NULL nohasharray
-+ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 &paging64_gva_to_gpa_45421
-+ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
++lane2_associate_req_45398 lane2_associate_req 4 45398 NULL
++__data_list_add_45403 __data_list_add 0 45403 NULL
++keymap_store_45406 keymap_store 4 45406 NULL
++ath6kl_wmi_send_probe_response_cmd_45422 ath6kl_wmi_send_probe_response_cmd 5 45422 NULL
+tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
-+SYSC_mremap_45446 SYSC_mremap 5-1-2-3 45446 NULL
++do_mmap_pgoff_45441 do_mmap_pgoff 0 45441 NULL
+__node_remap_45458 __node_remap 4 45458 NULL
+rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
+tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
+snd_pcm_hwsync_45479 snd_pcm_hwsync 0 45479 NULL
-+arizona_init_fll_45503 arizona_init_fll 5 45503 NULL
+rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
-+i40e_alloc_vfs_45511 i40e_alloc_vfs 2 45511 NULL
++sys_lgetxattr_45531 sys_lgetxattr 4 45531 NULL
+cgroup_read_u64_45532 cgroup_read_u64 5 45532 NULL
+copy_macs_45534 copy_macs 4 45534 NULL
+nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
@@ -107696,958 +108928,746 @@ index 0000000..0a9d518
+cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
+ext3_group_first_block_no_45555 ext3_group_first_block_no 0-2 45555 NULL
+stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
-+_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL
+posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL
+venus_rmdir_45564 venus_rmdir 4 45564 NULL
-+btrfs_find_free_ino_45585 btrfs_find_free_ino 0 45585 NULL
-+ipath_create_cq_45586 ipath_create_cq 2 45586 NULL
-+ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
++rdma_set_ib_paths_45592 rdma_set_ib_paths 3 45592 NULL
+hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
-+commit_cowonly_roots_45640 commit_cowonly_roots 0 45640 NULL
++audit_log_n_hex_45617 audit_log_n_hex 3 45617 NULL
++i915_gem_evict_everything_45629 i915_gem_evict_everything 0 45629 NULL
+ebitmap_next_positive_45651 ebitmap_next_positive 3-0 45651 NULL
+ext4_reserve_inode_write_45654 ext4_reserve_inode_write 0 45654 NULL
+dma_map_cont_45668 dma_map_cont 5 45668 NULL
+compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
+dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
+smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
++ip_nat_sip_expect_45693 ip_nat_sip_expect 7 45693 NULL
+unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 NULL nohasharray
-+bscnl_emit_45699 bscnl_emit 0-2-5 45699 &unix_dgram_sendmsg_45699
++bscnl_emit_45699 bscnl_emit 2-5-0 45699 &unix_dgram_sendmsg_45699 nohasharray
++__spin_time_accum_45699 __spin_time_accum 1 45699 &bscnl_emit_45699
+sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
-+snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL nohasharray
-+task_cgroup_path_45734 task_cgroup_path 3 45734 &snd_cs46xx_io_read_45734
-+rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
-+v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
++dvb_ca_en50221_init_45718 dvb_ca_en50221_init 4 45718 NULL
++snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
++v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 NULL
+lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
-+btrfs_delete_delayed_dir_index_45757 btrfs_delete_delayed_dir_index 0 45757 NULL
++i915_gem_object_flush_gpu_write_domain_45755 i915_gem_object_flush_gpu_write_domain 0 45755 NULL
+alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
-+osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL
++dma_alloc_coherent_mask_45787 dma_alloc_coherent_mask 0 45787 NULL
++nfs_idmap_request_key_45791 nfs_idmap_request_key 2 45791 NULL
+raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
+rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL
+lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
+pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
-+ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
+fm_v4l2_init_video_device_45821 fm_v4l2_init_video_device 2 45821 NULL
-+memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
-+task_state_char_45839 task_state_char 1 45839 NULL
++r600_texture_size_45823 r600_texture_size 6-5-4 45823 NULL
++amthi_read_45831 amthi_read 4 45831 NULL
++audit_make_reply_45835 audit_make_reply 7 45835 NULL
+__ip_select_ident_45851 __ip_select_ident 3 45851 NULL
-+x509_process_extension_45854 x509_process_extension 5 45854 NULL
-+efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
++smp_build_cmd_45853 smp_build_cmd 3 45853 NULL
+isdn_write_45863 isdn_write 3 45863 NULL
++rbd_get_num_segments_45864 rbd_get_num_segments 0-2-3 45864 NULL
+unpack_orig_pfns_45867 unpack_orig_pfns 0 45867 NULL
+tpm_config_in_45880 tpm_config_in 0 45880 NULL
+get_rdac_req_45882 get_rdac_req 3 45882 NULL
+ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
-+online_page_cgroup_45894 online_page_cgroup 3 45894 NULL
-+cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
-+wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL
++__svc_create_45903 __svc_create 3 45903 NULL
+dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
+alloc_mr_45935 alloc_mr 1 45935 NULL
-+copy_to_45969 copy_to 3 45969 NULL
++cma_user_data_offset_45954 cma_user_data_offset 0 45954 NULL
++ndisc_opt_addr_space_45959 ndisc_opt_addr_space 0 45959 NULL
+rb_simple_read_45972 rb_simple_read 3 45972 NULL
++ezusb_writememory_45976 ezusb_writememory 4 45976 NULL
+ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
-+ore_calc_stripe_info_46023 ore_calc_stripe_info 2 46023 NULL
+sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
+get_free_entries_46030 get_free_entries 1 46030 NULL
-+__access_remote_vm_46031 __access_remote_vm 0-3-5 46031 NULL
++__access_remote_vm_46031 __access_remote_vm 0 46031 NULL
+snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
+acpi_register_gsi_xen_hvm_46052 acpi_register_gsi_xen_hvm 2 46052 NULL
-+__ocfs2_move_extent_46060 __ocfs2_move_extent 5-6-4-0-3 46060 NULL nohasharray
++run_card_proc_46057 run_card_proc 0 46057 NULL
++line6_midibuf_bytes_used_46059 line6_midibuf_bytes_used 0 46059 NULL
++__ocfs2_move_extent_46060 __ocfs2_move_extent 0-3-4-6-5 46060 NULL nohasharray
+dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 &__ocfs2_move_extent_46060
++slhc_toss_46066 slhc_toss 0 46066 NULL
++mgmt_event_46069 mgmt_event 4 46069 NULL
++xfrm_sadinfo_msgsize_46073 xfrm_sadinfo_msgsize 0 46073 NULL
+sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
-+arizona_set_irq_wake_46101 arizona_set_irq_wake 2 46101 NULL
-+memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray
-+il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111
-+C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
++ata_host_alloc_46094 ata_host_alloc 2 46094 NULL
+mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
-+paging32_walk_addr_nested_46121 paging32_walk_addr_nested 3 46121 NULL
-+replay_dir_deletes_46136 replay_dir_deletes 0 46136 NULL
-+rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
-+vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 2-3 46146 NULL
++ddp_clear_map_46152 ddp_clear_map 4 46152 NULL
+__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
-+alloc_iova_46160 alloc_iova 2 46160 NULL
-+twl_direction_out_46182 twl_direction_out 2 46182 NULL
++qlcnic_alloc_msix_entries_46160 qlcnic_alloc_msix_entries 2 46160 NULL nohasharray
++alloc_iova_46160 alloc_iova 2 46160 &qlcnic_alloc_msix_entries_46160
+vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
-+fq_resize_46195 fq_resize 2 46195 NULL
-+add_conn_list_46197 add_conn_list 3-0 46197 NULL
+i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL
+tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
+dsp_write_46218 dsp_write 2 46218 NULL
++tx_abort_46232 tx_abort 0 46232 NULL
+xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
-+mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
++__le64_to_cpup_46257 __le64_to_cpup 0 46257 NULL
+ReadReg_46277 ReadReg 0 46277 NULL
++pep_alloc_skb_46303 pep_alloc_skb 3 46303 NULL
++pvclock_clocksource_read_46308 pvclock_clocksource_read 0 46308 NULL
+sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
-+__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray
-+compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328
++__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL
+iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
+smk_write_direct_46363 smk_write_direct 3 46363 NULL
+__iommu_calculate_agaw_46366 __iommu_calculate_agaw 2 46366 NULL
-+ubi_dump_flash_46381 ubi_dump_flash 4 46381 NULL
-+mmap_ureg_46388 mmap_ureg 3 46388 NULL
++fib_nlmsg_size_46383 fib_nlmsg_size 0 46383 NULL
+fuse_file_aio_write_46399 fuse_file_aio_write 4 46399 NULL
+crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
+ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
-+cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
-+hash_ipportip6_expire_46443 hash_ipportip6_expire 3 46443 NULL
+cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
+parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL
-+il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
+filldir64_46469 filldir64 3 46469 NULL
+ocfs2_reserve_clusters_with_limit_46479 ocfs2_reserve_clusters_with_limit 0 46479 NULL
-+fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL
+p9pdu_vreadf_46500 p9pdu_vreadf 0 46500 NULL
-+pin_code_reply_46510 pin_code_reply 4 46510 NULL
+mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
-+nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 NULL nohasharray
-+kmsg_read_46514 kmsg_read 3 46514 &nouveau_drm_ioctl_46514
-+bdx_rxdb_create_46525 bdx_rxdb_create 1 46525 NULL
++uio_get_minor_46522 uio_get_minor 0 46522 NULL
+nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
-+pm860x_irq_domain_map_46553 pm860x_irq_domain_map 2 46553 NULL
++mv_get_hc_count_46554 mv_get_hc_count 0 46554 NULL
+link_send_sections_long_46556 link_send_sections_long 4 46556 NULL
-+dn_current_mss_46574 dn_current_mss 0 46574 NULL nohasharray
-+blk_flush_complete_seq_46574 blk_flush_complete_seq 2 46574 &dn_current_mss_46574
++ubi_wl_put_peb_46565 ubi_wl_put_peb 0 46565 NULL
++dn_current_mss_46574 dn_current_mss 0 46574 NULL
+serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
-+snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
-+il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
+vscnprintf_46617 vscnprintf 0-2 46617 NULL
-+__kfifo_out_r_46623 __kfifo_out_r 3-0 46623 NULL
++__kfifo_out_r_46623 __kfifo_out_r 3 46623 NULL
+request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
++aircable_process_packet_46639 aircable_process_packet 5 46639 NULL
+pci_enable_device_46642 pci_enable_device 0 46642 NULL
-+vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
-+av7110_ipack_init_46655 av7110_ipack_init 2 46655 NULL
++cx18_v4l2_ioctl_46647 cx18_v4l2_ioctl 2 46647 NULL
+e1000_tx_map_46672 e1000_tx_map 4 46672 NULL
++iwl4965_ucode_rx_stats_read_46676 iwl4965_ucode_rx_stats_read 3 46676 NULL
++l2cap_parse_conf_rsp_46683 l2cap_parse_conf_rsp 0 46683 NULL
+alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
+__ilog2_u32_46706 __ilog2_u32 0 46706 NULL
+erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
+ide_read_status_46719 ide_read_status 0 46719 NULL
-+wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
-+irq_domain_add_simple_46734 irq_domain_add_simple 2-3 46734 NULL
-+ext4_count_free_46754 ext4_count_free 2 46754 NULL nohasharray
-+pte_pfn_46754 pte_pfn 0 46754 &ext4_count_free_46754
++ctnetlink_nlmsg_size_46736 ctnetlink_nlmsg_size 0 46736 NULL
++snd_ymfpci_readl_46738 snd_ymfpci_readl 0 46738 NULL
+hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
+int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
-+regcache_lzo_sync_46777 regcache_lzo_sync 2 46777 NULL
+_xfs_buf_get_pages_46811 _xfs_buf_get_pages 2 46811 NULL
-+btrfs_insert_empty_items_46822 btrfs_insert_empty_items 0 46822 NULL
+xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
-+shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
-+readreg_46845 readreg 0 46845 NULL
++ieee80211_rx_radiotap_len_46846 ieee80211_rx_radiotap_len 0 46846 NULL
+spi_async_46857 spi_async 0 46857 NULL
-+vsnprintf_46863 vsnprintf 0 46863 NULL nohasharray
-+SyS_move_pages_46863 SyS_move_pages 2 46863 &vsnprintf_46863
-+nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
-+rvmalloc_46873 rvmalloc 1 46873 NULL
-+qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
-+lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
-+stmpe_gpio_irq_unmap_46884 stmpe_gpio_irq_unmap 2 46884 NULL
-+ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
++vsnprintf_46863 vsnprintf 0 46863 NULL
++hpi_read_word_nolock_46881 hpi_read_word_nolock 0 46881 NULL
+sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
+ol_dqblk_off_46904 ol_dqblk_off 2-3 46904 NULL
-+ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
-+wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL
++tracing_ctrl_read_46922 tracing_ctrl_read 3 46922 NULL
+fb_write_46924 fb_write 3 46924 NULL
-+i915_gem_check_olr_46925 i915_gem_check_olr 0 46925 NULL
++btmrvl_curpsmode_read_46939 btmrvl_curpsmode_read 3 46939 NULL
+kvm_register_read_46948 kvm_register_read 0 46948 NULL
+__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
-+qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
-+SYSC_poll_46965 SYSC_poll 2 46965 NULL
+crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
-+mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
++ath6kl_add_bss_if_needed_46978 ath6kl_add_bss_if_needed 5 46978 NULL
+strlcat_46985 strlcat 3 46985 NULL
-+bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL
+gfs2_xattr_system_set_46996 gfs2_xattr_system_set 4 46996 NULL nohasharray
+sel_write_bool_46996 sel_write_bool 3 46996 &gfs2_xattr_system_set_46996
+ttm_bo_io_47000 ttm_bo_io 5 47000 NULL
+blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
+__map_single_47020 __map_single 3-4-7-0 47020 NULL
+cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
-+fs_path_len_47060 fs_path_len 0 47060 NULL
+ufs_new_fragments_47070 ufs_new_fragments 4-3-5 47070 NULL nohasharray
-+ext4_xattr_list_entries_47070 ext4_xattr_list_entries 0-4 47070 &ufs_new_fragments_47070
-+pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
++ext4_xattr_list_entries_47070 ext4_xattr_list_entries 0 47070 &ufs_new_fragments_47070
++xfrm_report_msgsize_47077 xfrm_report_msgsize 0 47077 NULL
+scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
-+iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
-+ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL
-+tboot_log_read_47110 tboot_log_read 3 47110 NULL
++set_params_47113 set_params 0 47113 NULL
+mousedev_read_47123 mousedev_read 3 47123 NULL
-+ubi_compare_lebs_47141 ubi_compare_lebs 0 47141 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
-+mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
++cxio_init_resource_fifo_random_47151 cxio_init_resource_fifo_random 3 47151 NULL
+rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
-+bpf_alloc_binary_47170 bpf_alloc_binary 1 47170 NULL
-+rts51x_ms_rw_47171 rts51x_ms_rw 3-4 47171 NULL
-+btrfs_del_inode_ref_47181 btrfs_del_inode_ref 0 47181 NULL
++svc_pool_map_alloc_arrays_47181 svc_pool_map_alloc_arrays 2 47181 NULL
+can_set_system_xattr_47182 can_set_system_xattr 4 47182 NULL
++l2headersize_47238 l2headersize 0 47238 NULL
+options_write_47243 options_write 3 47243 NULL
+portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
-+da9052_disable_irq_nosync_47260 da9052_disable_irq_nosync 2 47260 NULL
+p9pdu_readf_47269 p9pdu_readf 0 47269 NULL
-+ablkcipher_next_slow_47274 ablkcipher_next_slow 3-4 47274 NULL
-+gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
++ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
++tty_audit_log_47280 tty_audit_log 8 47280 NULL
+vsnprintf_47291 vsnprintf 0 47291 NULL
+tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
-+iterate_inode_ref_47322 iterate_inode_ref 0 47322 NULL
-+SyS_madvise_47354 SyS_madvise 1-2 47354 NULL
++channel_type_read_47308 channel_type_read 3 47308 NULL
+ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
+avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
+find_first_zero_bit_le_47369 find_first_zero_bit_le 2 47369 NULL
+__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
-+nv_rd32_47390 nv_rd32 0 47390 NULL nohasharray
-+trace_options_core_read_47390 trace_options_core_read 3 47390 &nv_rd32_47390
-+nametbl_list_47391 nametbl_list 2 47391 NULL
-+dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
++trace_options_core_read_47390 trace_options_core_read 3 47390 NULL
+pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
-+gfn_to_pfn_prot_47398 gfn_to_pfn_prot 2 47398 NULL
+lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL
+ocfs2_resv_end_47408 ocfs2_resv_end 0 47408 NULL
-+sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
+crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
+lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
-+vzalloc_47421 vzalloc 1 47421 NULL
-+hash_ipportip4_expire_47426 hash_ipportip4_expire 3 47426 NULL
+posix_acl_from_disk_47445 posix_acl_from_disk 2 47445 NULL
-+numaq_apicid_to_cpu_present_47449 numaq_apicid_to_cpu_present 1 47449 NULL
-+environ_read_47451 environ_read 3 47451 NULL
-+__load_mapping_47460 __load_mapping 2 47460 NULL
-+try_lock_extent_47465 try_lock_extent 0 47465 NULL
-+nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
-+wb_force_mapping_47485 wb_force_mapping 2 47485 NULL nohasharray
-+newpart_47485 newpart 6-4 47485 &wb_force_mapping_47485
-+mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL
++newpart_47485 newpart 6-4 47485 NULL
+core_sys_select_47494 core_sys_select 1 47494 NULL
-+read_block_for_search_47502 read_block_for_search 0 47502 NULL
-+alloc_arraycache_47505 alloc_arraycache 2 47505 NULL nohasharray
-+btrfs_init_inode_security_47505 btrfs_init_inode_security 0 47505 &alloc_arraycache_47505
++alloc_arraycache_47505 alloc_arraycache 2 47505 NULL
+unlink_simple_47506 unlink_simple 3 47506 NULL
-+pstore_decompress_47510 pstore_decompress 0 47510 NULL
+ufs_inode_getblock_47512 ufs_inode_getblock 4 47512 NULL
-+__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
+snd_pcm_resume_47530 snd_pcm_resume 0 47530 NULL
+vscnprintf_47533 vscnprintf 0-2 47533 NULL nohasharray
+process_vm_rw_47533 process_vm_rw 3-5 47533 &vscnprintf_47533
+einj_check_trigger_header_47534 einj_check_trigger_header 0 47534 NULL
+ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
-+ocfs2_resv_find_window_47557 ocfs2_resv_find_window 3 47557 NULL
++set_printer_interface_47551 set_printer_interface 0 47551 NULL
+read_ldt_47570 read_ldt 2 47570 NULL
-+isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
+rpipe_get_idx_47579 rpipe_get_idx 2-0 47579 NULL
-+SYSC_fcntl64_47581 SYSC_fcntl64 3 47581 NULL
+vendorextnReadSection_47583 vendorextnReadSection 0 47583 NULL
-+btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
+ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
+sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL
++uea_request_47613 uea_request 4 47613 NULL
+cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
-+twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
++kvm_pv_mmu_write_47630 kvm_pv_mmu_write 2 47630 NULL
++ivtv_serialized_ioctl_47632 ivtv_serialized_ioctl 3 47632 NULL
+irq_set_chip_47638 irq_set_chip 1 47638 NULL
-+get_size_47644 get_size 1-2 47644 NULL
++__build_packet_message_47643 __build_packet_message 3-9 47643 NULL
+snd_pcm_info_47699 snd_pcm_info 0 47699 NULL
+packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray
+ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700
-+global_rt_runtime_47712 global_rt_runtime 0 47712 NULL
-+save_microcode_47717 save_microcode 3 47717 NULL
+bits_to_user_47733 bits_to_user 3-2 47733 NULL
+carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
+ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL
+mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
+ext3_find_near_47752 ext3_find_near 0 47752 NULL
+alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
++i915_wedged_write_47771 i915_wedged_write 3 47771 NULL
+uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
-+SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
-+error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
-+posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
-+W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
-+lov_packmd_47810 lov_packmd 0 47810 NULL
-+pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
-+KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
++sst_prepare_output_buffers_47781 sst_prepare_output_buffers 4 47781 NULL
++tt_len_47789 tt_len 0-1 47789 NULL
++stmmac_set_bfsize_47834 stmmac_set_bfsize 0 47834 NULL
++ath6kl_wmi_set_appie_cmd_47855 ath6kl_wmi_set_appie_cmd 4 47855 NULL
+ubifs_unpack_nnode_47866 ubifs_unpack_nnode 0 47866 NULL
+vhci_read_47878 vhci_read 3 47878 NULL
-+ubi_wl_put_peb_47886 ubi_wl_put_peb 0 47886 NULL
+keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
-+load_mapping_47904 load_mapping 3 47904 NULL
-+btrfs_duplicate_item_47910 btrfs_duplicate_item 0 47910 NULL
-+cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
++osd_req_read_sg_47905 osd_req_read_sg 5 47905 NULL
+comedi_write_47926 comedi_write 3 47926 NULL
-+nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
-+lp8788_irq_map_47964 lp8788_irq_map 2 47964 NULL
-+gether_get_ifname_47972 gether_get_ifname 3 47972 NULL
++nf_nat_ftp_47948 nf_nat_ftp 5 47948 NULL
++cfg80211_testmode_alloc_reply_skb_47966 cfg80211_testmode_alloc_reply_skb 2 47966 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
-+dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
++pnpacpi_parse_allocated_irqresource_47986 pnpacpi_parse_allocated_irqresource 2 47986 NULL
++mgmt_pending_add_47990 mgmt_pending_add 5 47990 NULL nohasharray
++dbg_port_buf_47990 dbg_port_buf 2 47990 &mgmt_pending_add_47990
+ib_umad_write_47993 ib_umad_write 3 47993 NULL
+ocfs2_find_refcount_split_pos_48001 ocfs2_find_refcount_split_pos 0 48001 NULL
-+lustre_cfg_len_48002 lustre_cfg_len 0 48002 NULL
-+gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
+ffs_epfile_write_48014 ffs_epfile_write 3 48014 NULL
+bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
+pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
-+SYSC_writev_48040 SYSC_writev 3 48040 NULL
-+btrfs_reserve_extent_48044 btrfs_reserve_extent 6 48044 NULL
+wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
+ocfs2_change_refcount_rec_48059 ocfs2_change_refcount_rec 0 48059 NULL
+posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
-+palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
-+disc_write_48070 disc_write 3 48070 NULL
++c4iw_init_resource_fifo_48090 c4iw_init_resource_fifo 3 48090 NULL
+mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
-+skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5-0 48102 NULL
-+radio_isa_common_probe_48107 radio_isa_common_probe 3 48107 NULL
++skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
+vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
-+set_discoverable_48141 set_discoverable 4 48141 NULL
+dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
-+get_cur_inode_state_48149 get_cur_inode_state 0 48149 NULL
-+_add_to_r4w_48152 _add_to_r4w 4 48152 NULL nohasharray
-+bitmap_onto_48152 bitmap_onto 4 48152 &_add_to_r4w_48152
++__tcp_push_pending_frames_48148 __tcp_push_pending_frames 2 48148 NULL
++bitmap_onto_48152 bitmap_onto 4 48152 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
-+ocfs2_find_next_zero_bit_unaligned_48170 ocfs2_find_next_zero_bit_unaligned 2-3 48170 NULL nohasharray
-+rbd_obj_method_sync_48170 rbd_obj_method_sync 8 48170 &ocfs2_find_next_zero_bit_unaligned_48170
-+alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
++ocfs2_find_next_zero_bit_unaligned_48170 ocfs2_find_next_zero_bit_unaligned 2-3 48170 NULL
+init_ipath_48187 init_ipath 1 48187 NULL
-+brcmf_sdio_chip_cm3_exitdl_48192 brcmf_sdio_chip_cm3_exitdl 4 48192 NULL
-+cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
-+ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
+snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
-+ll_direct_IO_26_48216 ll_direct_IO_26 4 48216 NULL
+is_block_in_journal_48223 is_block_in_journal 3 48223 NULL
+uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
-+nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
+read_file_recv_48232 read_file_recv 3 48232 NULL
-+unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL nohasharray
-+blk_rq_pos_48233 blk_rq_pos 0 48233 &unaccount_shadowed_48233
-+nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
++blk_rq_pos_48233 blk_rq_pos 0 48233 NULL
+nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
-+batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
++usb_hcd_submit_urb_48256 usb_hcd_submit_urb 0 48256 NULL
+cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
+trace_options_write_48275 trace_options_write 3 48275 NULL
-+send_set_info_48288 send_set_info 7 48288 NULL
++pkt_bio_alloc_48284 pkt_bio_alloc 1 48284 NULL
+lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
+timblogiw_read_48305 timblogiw_read 3 48305 NULL
+hash_setkey_48310 hash_setkey 3 48310 NULL
-+audio_set_intf_req_48319 audio_set_intf_req 0 48319 NULL
-+kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL
-+__alloc_fd_48356 __alloc_fd 2 48356 NULL
++bcm_download_config_file_48313 bcm_download_config_file 0 48313 NULL
+skb_add_data_48363 skb_add_data 3 48363 NULL
-+tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
++iscsi_complete_pdu_48372 iscsi_complete_pdu 4 48372 NULL
+lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
-+uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
-+div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
+snd_power_wait_48422 snd_power_wait 0 48422 NULL
+pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
-+print_filtered_48442 print_filtered 2-0 48442 NULL
++nfs4_alloc_pages_48426 nfs4_alloc_pages 1 48426 NULL
++wm8994_write_48439 wm8994_write 3 48439 NULL
+tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
-+compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
+ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL
+r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
-+ocfs2_refcount_cow_48495 ocfs2_refcount_cow 3 48495 NULL
+send_control_msg_48498 send_control_msg 6 48498 NULL
+mlx4_en_create_tx_ring_48501 mlx4_en_create_tx_ring 4 48501 NULL
-+count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL
-+diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
-+brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
++diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL nohasharray
++iwl_legacy_dbgfs_status_read_48508 iwl_legacy_dbgfs_status_read 3 48508 &diva_os_copy_to_user_48508
+phantom_get_free_48514 phantom_get_free 0 48514 NULL
++ubi_dbg_check_write_48525 ubi_dbg_check_write 0 48525 NULL
++wiimote_hid_send_48528 wiimote_hid_send 3 48528 NULL
+drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
+ext3_splice_branch_48531 ext3_splice_branch 6 48531 NULL
-+raid10_size_48571 raid10_size 0-2-3 48571 NULL
-+llog_data_len_48607 llog_data_len 1 48607 NULL
++ext_sd_execute_read_data_48589 ext_sd_execute_read_data 9 48589 NULL
+ufs_dtogd_48616 ufs_dtogd 0-2 48616 NULL
+do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
-+ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
-+mtd_read_48655 mtd_read 0 48655 NULL
++lc_create_48662 lc_create 3 48662 NULL
+aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
-+ore_get_rw_state_48667 ore_get_rw_state 5-4 48667 NULL
-+sm501_create_subdev_48668 sm501_create_subdev 4-3 48668 NULL
++ore_get_rw_state_48667 ore_get_rw_state 5 48667 NULL
++sm501_create_subdev_48668 sm501_create_subdev 4-3 48668 NULL nohasharray
++sys_setgroups_48668 sys_setgroups 1 48668 &sm501_create_subdev_48668
+ubi_eba_unmap_leb_48671 ubi_eba_unmap_leb 0 48671 NULL
++l2cap_build_cmd_48676 l2cap_build_cmd 4 48676 NULL
+hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
+altera_drscan_48698 altera_drscan 2 48698 NULL
+kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
+recv_msg_48709 recv_msg 4 48709 NULL
+lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
-+SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
-+ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
++RFTrackingFiltersCorrection_48722 RFTrackingFiltersCorrection 0 48722 NULL
++disconnect_48738 disconnect 4 48738 NULL
+ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
-+event_buffer_read_48772 event_buffer_read 3 48772 NULL nohasharray
-+l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 &event_buffer_read_48772
-+gfs2_direct_IO_48774 gfs2_direct_IO 4 48774 NULL
-+il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
++event_buffer_read_48772 event_buffer_read 3 48772 NULL
++icmp_manip_pkt_48801 icmp_manip_pkt 2 48801 NULL
+twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
-+register_ftrace_profiler_48816 register_ftrace_profiler 0 48816 NULL
++register_ftrace_profiler_48816 register_ftrace_profiler 0 48816 NULL nohasharray
++tcp_push_one_48816 tcp_push_one 2 48816 ®ister_ftrace_profiler_48816
+atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
+azx_get_position_48841 azx_get_position 0 48841 NULL
+vc_do_resize_48842 vc_do_resize 4-3 48842 NULL
-+comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
-+suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
-+C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 NULL nohasharray
-+viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 &C_SYSC_pwritev64_48864
++viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 NULL
+__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
++sys_setgroups16_48882 sys_setgroups16 1 48882 NULL
++get_num_ops_48886 get_num_ops 0 48886 NULL
+ext2_alloc_branch_48889 ext2_alloc_branch 4 48889 NULL
+crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
-+joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
++mac_drv_rx_init_48898 mac_drv_rx_init 2 48898 NULL nohasharray
++joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 &mac_drv_rx_init_48898
+xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
+msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL
+snd_pcm_update_hw_ptr_48925 snd_pcm_update_hw_ptr 0 48925 NULL
-+sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL
-+si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL
++lpfc_sli4_get_els_iocb_cnt_48926 lpfc_sli4_get_els_iocb_cnt 0 48926 NULL
+event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
-+nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
-+vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
-+batadv_orig_hash_del_if_48972 batadv_orig_hash_del_if 2 48972 NULL
-+btrfs_delete_delayed_insertion_item_48981 btrfs_delete_delayed_insertion_item 0 48981 NULL
++_alloc_set_attr_list_48991 _alloc_set_attr_list 4 48991 NULL
+rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
+sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
-+null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
-+filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
++xd_rw_49020 xd_rw 3-4 49020 NULL
+aic_inb_49023 aic_inb 0 49023 NULL
+transient_status_49027 transient_status 4 49027 NULL
-+iwl_mvm_power_legacy_dbgfs_read_49038 iwl_mvm_power_legacy_dbgfs_read 4 49038 NULL nohasharray
-+ipath_reg_user_mr_49038 ipath_reg_user_mr 2-3 49038 &iwl_mvm_power_legacy_dbgfs_read_49038
-+aic7xxx_rem_scb_from_disc_list_49041 aic7xxx_rem_scb_from_disc_list 0 49041 NULL
-+setup_msi_irq_49052 setup_msi_irq 3-4 49052 NULL
+ubi_read_49061 ubi_read 0 49061 NULL
++l2cap_bredr_sig_cmd_49065 l2cap_bredr_sig_cmd 3 49065 NULL
++mirror_status_49073 mirror_status 4 49073 NULL
++vmx_set_msr_49090 vmx_set_msr 3 49090 NULL
+scsi_register_49094 scsi_register 2 49094 NULL
-+paging64_walk_addr_nested_49100 paging64_walk_addr_nested 3 49100 NULL
+compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
++receive_client_update_packet_49104 receive_client_update_packet 3 49104 NULL
+xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
-+ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
-+qib_user_sdma_pin_pages_49136 qib_user_sdma_pin_pages 4-5-6 49136 NULL nohasharray
-+pt_read_49136 pt_read 3 49136 &qib_user_sdma_pin_pages_49136
-+read_file_49137 read_file 4 49137 NULL
++pt_read_49136 pt_read 3 49136 NULL
++iwl_legacy_dbgfs_fh_reg_read_49144 iwl_legacy_dbgfs_fh_reg_read 3 49144 NULL nohasharray
++tipc_multicast_49144 tipc_multicast 5 49144 &iwl_legacy_dbgfs_fh_reg_read_49144
+ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
-+f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
+ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
+ext4_free_clusters_after_init_49174 ext4_free_clusters_after_init 2 49174 NULL
+__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
-+ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
+dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
-+print_queue_49191 print_queue 0 49191 NULL
+root_nfs_cat_49192 root_nfs_cat 3 49192 NULL
+iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
-+il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
+do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL
-+resp_write_same_49217 resp_write_same 2 49217 NULL
-+nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL
-+hugetlb_cgroup_read_49259 hugetlb_cgroup_read 5 49259 NULL
-+ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
-+isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL
-+ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL
-+rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
++osd_req_add_get_attr_list_49278 osd_req_add_get_attr_list 3 49278 NULL
+__ext4_ext_dirty_49284 __ext4_ext_dirty 0 49284 NULL
-+ext4_xattr_ibody_list_49287 ext4_xattr_ibody_list 3-0 49287 NULL
+viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL
+uio_read_49300 uio_read 3 49300 NULL
+ocfs2_resmap_find_free_bits_49301 ocfs2_resmap_find_free_bits 3 49301 NULL
-+isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL
-+update_ref_for_cow_49313 update_ref_for_cow 0 49313 NULL
-+SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL
-+fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL
-+srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL
++beiscsi_session_create_49304 beiscsi_session_create 2 49304 NULL
+__intel_map_single_49338 __intel_map_single 3-2 49338 NULL
-+intel_ring_invalidate_all_caches_49346 intel_ring_invalidate_all_caches 0 49346 NULL
++cfpkt_setlen_49343 cfpkt_setlen 2 49343 NULL
+joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
+ocfs2_remove_btree_range_49370 ocfs2_remove_btree_range 4-3-5 49370 NULL
++px_raw_event_49371 px_raw_event 4 49371 NULL
+iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
-+ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL
++applesmc_create_nodes_49392 applesmc_create_nodes 2 49392 NULL
+rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
++iwl_legacy_dbgfs_nvm_read_49405 iwl_legacy_dbgfs_nvm_read 3 49405 NULL
+tnode_alloc_49407 tnode_alloc 1 49407 NULL
+samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL
-+ubi_add_to_av_49432 ubi_add_to_av 0 49432 NULL nohasharray
-+md_domain_init_49432 md_domain_init 2 49432 &ubi_add_to_av_49432
-+compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
-+get_lru_size_49441 get_lru_size 0 49441 NULL
++md_domain_init_49432 md_domain_init 2 49432 NULL
+i915_gem_object_set_to_gtt_domain_49450 i915_gem_object_set_to_gtt_domain 0 49450 NULL
+ocfs2_merge_rec_left_49455 ocfs2_merge_rec_left 0 49455 NULL
-+__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
+agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 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 49474 NULL
++esp4_get_mtu_49483 esp4_get_mtu 0-2 49483 NULL
+isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
-+SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
-+emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL
-+btrfs_add_free_space_49524 btrfs_add_free_space 0 49524 NULL
++emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL nohasharray
++__sock_recvmsg_nosec_49520 __sock_recvmsg_nosec 0 49520 &emulator_write_phys_49520
+smk_write_access_49561 smk_write_access 3 49561 NULL
-+ntfs_malloc_nofs_49572 ntfs_malloc_nofs 1 49572 NULL
+alloc_chunk_49575 alloc_chunk 1 49575 NULL
+sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
+readfifo_49583 readfifo 1 49583 NULL
-+tap_write_49595 tap_write 3 49595 NULL
+isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
-+btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
+heap_init_49617 heap_init 2 49617 NULL
+smk_write_doi_49621 smk_write_doi 3 49621 NULL
+port_fops_read_49626 port_fops_read 3 49626 NULL
-+btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
-+__swab32p_49657 __swab32p 0 49657 NULL
-+ubi_wl_flush_49682 ubi_wl_flush 0 49682 NULL
++svm_set_msr_49643 svm_set_msr 3 49643 NULL
+aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
-+SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
+__setup_irq_49696 __setup_irq 0 49696 NULL
++sys_gethostname_49698 sys_gethostname 2 49698 NULL
+cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
-+do_splice_to_49714 do_splice_to 4 49714 NULL
++get_key_haup_common_49709 get_key_haup_common 4 49709 NULL
+write_pool_49718 write_pool 3 49718 NULL
-+dm_thin_insert_block_49720 dm_thin_insert_block 2-3 49720 NULL
-+kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL
-+sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
++sys_fsetxattr_49736 sys_fsetxattr 4 49736 NULL
++check_frame_49741 check_frame 0 49741 NULL
+zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
+btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
-+fuse_wr_pages_49753 fuse_wr_pages 0-1-2 49753 NULL
++nci_skb_alloc_49757 nci_skb_alloc 2 49757 NULL
+key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
+fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
+w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL
-+ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
++pohmelfs_send_xattr_req_49783 pohmelfs_send_xattr_req 6 49783 NULL
++ceph_osdc_readpages_49789 ceph_osdc_readpages 0-10-4 49789 NULL
++be_num_rxqs_want_49794 be_num_rxqs_want 0 49794 NULL
+nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
+ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL
-+add_uuid_49831 add_uuid 4 49831 NULL
-+ath6kl_fwlog_block_read_49836 ath6kl_fwlog_block_read 3 49836 NULL
++b1dma_tolink_49834 b1dma_tolink 0 49834 NULL
+iraw_loop_49842 iraw_loop 0-1 49842 NULL
-+twl4030_write_49846 twl4030_write 2 49846 NULL
++vmw_execbuf_process_49845 vmw_execbuf_process 5 49845 NULL
+scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
+timeradd_entry_49850 timeradd_entry 3 49850 NULL
+ubifs_destroy_tnc_subtree_49853 ubifs_destroy_tnc_subtree 0 49853 NULL
-+btrfs_subvolume_reserve_metadata_49859 btrfs_subvolume_reserve_metadata 3 49859 NULL
-+fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
+sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
+snd_mask_eq_49889 snd_mask_eq 0 49889 NULL
+ceph_get_caps_49890 ceph_get_caps 0 49890 NULL
-+osc_brw_49896 osc_brw 4 49896 NULL
-+__cow_file_range_49901 __cow_file_range 5 49901 NULL
-+__copy_from_user_inatomic_nocache_49921 __copy_from_user_inatomic_nocache 3 49921 NULL
+config_ep_by_speed_49939 config_ep_by_speed 0 49939 NULL
-+batadv_tt_realloc_packet_buff_49960 batadv_tt_realloc_packet_buff 4 49960 NULL
++hpi_stream_estimate_buffer_size_49965 hpi_stream_estimate_buffer_size 2 49965 NULL
++b43legacy_pio_read_49978 b43legacy_pio_read 0 49978 NULL
+ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
+drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
-+sta2x11_swiotlb_alloc_coherent_49994 sta2x11_swiotlb_alloc_coherent 2 49994 NULL
-+l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
-+__module_alloc_50004 __module_alloc 1 50004 NULL
+dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
-+ptrace_readdata_50020 ptrace_readdata 2-4 50020 NULL
+isdn_read_50021 isdn_read 3 50021 NULL
-+mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
-+qp_alloc_queue_50028 qp_alloc_queue 1 50028 NULL
-+ioread8_50049 ioread8 0 50049 NULL
++rbd_req_write_50041 rbd_req_write 4-5 50041 NULL
++alloc_ebda_hpc_50046 alloc_ebda_hpc 2-1 50046 NULL
+fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
-+vmw_surface_destroy_size_50072 vmw_surface_destroy_size 0 50072 NULL
+arch_setup_ht_irq_50073 arch_setup_ht_irq 1 50073 NULL
++call_usermodehelper_fns_50078 call_usermodehelper_fns 0 50078 NULL
+__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL
+dev_set_alias_50084 dev_set_alias 3 50084 NULL
-+libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 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
-+android_set_cntry_50100 android_set_cntry 0 50100 NULL
-+process_recorded_refs_50110 process_recorded_refs 0 50110 NULL
+read_file_slot_50111 read_file_slot 3 50111 NULL
-+xfs_dir3_sf_entsize_50112 xfs_dir3_sf_entsize 0-3 50112 NULL
++pn544_fw_read_50112 pn544_fw_read 0 50112 NULL
+rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
-+ocfs2_search_one_group_50125 ocfs2_search_one_group 0 50125 NULL nohasharray
-+jfs_direct_IO_50125 jfs_direct_IO 4 50125 &ocfs2_search_one_group_50125
-+SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
++ocfs2_search_one_group_50125 ocfs2_search_one_group 0 50125 NULL
+copy_items_50140 copy_items 6 50140 NULL
-+tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
-+reiserfs_bmap_count_50160 reiserfs_bmap_count 0 50160 NULL
+kmalloc_node_50163 kmalloc_node 1 50163 NULL
-+rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
+ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
+odev_update_50169 odev_update 2 50169 NULL
+ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 NULL nohasharray
-+xfs_get_blocks_direct_50172 xfs_get_blocks_direct 2 50172 &ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 nohasharray
-+ubi_resize_volume_50172 ubi_resize_volume 2 50172 &xfs_get_blocks_direct_50172
-+ext3_do_update_inode_50178 ext3_do_update_inode 0 50178 NULL
-+cfg80211_roamed_bss_50198 cfg80211_roamed_bss 6-4 50198 NULL
-+cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
-+rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
-+compat_SyS_sendfile_50206 compat_SyS_sendfile 4 50206 NULL nohasharray
-+mthca_buddy_init_50206 mthca_buddy_init 2 50206 &compat_SyS_sendfile_50206
++ubi_resize_volume_50172 ubi_resize_volume 2 50172 &ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172
++ib_send_cm_drep_50186 ib_send_cm_drep 3 50186 NULL
++mthca_buddy_init_50206 mthca_buddy_init 2 50206 NULL
+l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
++ieee80211_skb_resize_50211 ieee80211_skb_resize 3 50211 NULL
+mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
+sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
-+rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
++afs_extract_data_50261 afs_extract_data 5 50261 NULL
++qfq_calc_index_50263 qfq_calc_index 2-1 50263 NULL
++rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL nohasharray
++gart_free_coherent_50286 gart_free_coherent 4-2 50286 &rxrpc_setsockopt_50286
+soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL
-+SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL
-+SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL
+iterate_irefs_50313 iterate_irefs 0 50313 NULL
-+soc_camera_read_50319 soc_camera_read 3 50319 NULL
++cifs_readdata_alloc_50318 cifs_readdata_alloc 1 50318 NULL
+do_launder_page_50329 do_launder_page 0 50329 NULL
-+nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
+lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
+ocfs2_block_to_cluster_group_50337 ocfs2_block_to_cluster_group 2 50337 NULL nohasharray
+snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 &ocfs2_block_to_cluster_group_50337
+tpm_read_50344 tpm_read 3 50344 NULL
+sched_clock_remote_50347 sched_clock_remote 0 50347 NULL
-+efx_nic_update_stats_50352 efx_nic_update_stats 2 50352 NULL
-+kvm_arch_create_memslot_50354 kvm_arch_create_memslot 2 50354 NULL
+isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
++unpack_u16_chunk_50357 unpack_u16_chunk 0 50357 NULL
+ocfs2_figure_insert_type_50362 ocfs2_figure_insert_type 0 50362 NULL nohasharray
+iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 &ocfs2_figure_insert_type_50362
+xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL
-+roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
+sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
-+hash_ip6_expire_50390 hash_ip6_expire 3 50390 NULL
++inet_nlmsg_size_50399 inet_nlmsg_size 0 50399 NULL
+snd_mask_refine_last_50406 snd_mask_refine_last 0 50406 NULL
+l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
+iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
-+validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
-+btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL nohasharray
-+ecryptfs_write_lower_page_segment_50444 ecryptfs_write_lower_page_segment 4 50444 &btrfs_error_discard_extent_50444
-+calc_csum_metadata_size_50448 calc_csum_metadata_size 0 50448 NULL
+pgctrl_write_50453 pgctrl_write 3 50453 NULL
+device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
-+force_mapping_50464 force_mapping 2 50464 NULL
-+cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
+cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
-+mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
+pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
-+__ctzdi2_50536 __ctzdi2 1 50536 NULL
++fwnet_receive_packet_50537 fwnet_receive_packet 9 50537 NULL
+ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
+usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
-+self_check_peb_vid_hdr_50563 self_check_peb_vid_hdr 0 50563 NULL nohasharray
-+ttm_agp_tt_create_50563 ttm_agp_tt_create 3 50563 &self_check_peb_vid_hdr_50563
-+fat_readpages_50582 fat_readpages 4 50582 NULL
++hme_read_desc32_50574 hme_read_desc32 0 50574 NULL
++pep_reply_50582 pep_reply 5 50582 NULL
+iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
+build_inv_iommu_pages_50589 build_inv_iommu_pages 2-3 50589 NULL
-+xillybus_write_50605 xillybus_write 3 50605 NULL
-+rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
++sge_rx_50594 sge_rx 3 50594 NULL
+ocfs2_split_extent_50618 ocfs2_split_extent 0 50618 NULL
-+sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
-+__ffs_50625 __ffs 0-1 50625 NULL
-+regcache_rbtree_write_50629 regcache_rbtree_write 2 50629 NULL
++add_uevent_var_50620 add_uevent_var 0 50620 NULL
++GET_WORD_50624 GET_WORD 0 50624 NULL
++__ffs_50625 __ffs 0 50625 NULL
++macvtap_alloc_skb_50629 macvtap_alloc_skb 2-4-3 50629 NULL
+simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
++ocfs2_readlink_50656 ocfs2_readlink 3 50656 NULL
+ocfs2_do_insert_extent_50658 ocfs2_do_insert_extent 0 50658 NULL
-+ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
-+bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
-+ext2_try_to_allocate_with_rsv_50669 ext2_try_to_allocate_with_rsv 4-2-0 50669 NULL
-+prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL nohasharray
-+i2c_smbus_read_byte_data_50689 i2c_smbus_read_byte_data 0 50689 &prism2_read_fid_reg_50689
-+paging32_gva_to_gpa_50696 paging32_gva_to_gpa 2 50696 NULL
-+xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL
-+dev_mem_read_50706 dev_mem_read 3 50706 NULL
-+blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
++sys_readv_50664 sys_readv 3 50664 NULL
++ext2_try_to_allocate_with_rsv_50669 ext2_try_to_allocate_with_rsv 2-4-0 50669 NULL
++btmrvl_psstate_read_50683 btmrvl_psstate_read 3 50683 NULL
++prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL
++get_wear_leveling_table_len_50712 get_wear_leveling_table_len 0 50712 NULL
+__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
-+btrfs_truncate_free_space_cache_50769 btrfs_truncate_free_space_cache 0 50769 NULL
++skb_padto_50759 skb_padto 2 50759 NULL
++udp_manip_pkt_50770 udp_manip_pkt 2 50770 NULL
+ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
-+tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
++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
+bio_alloc_map_data_50782 bio_alloc_map_data 2-1 50782 NULL
++ixgbe_acquire_msix_vectors_50789 ixgbe_acquire_msix_vectors 2 50789 NULL
+tpm_write_50798 tpm_write 3 50798 NULL
++tun_do_read_50800 tun_do_read 4 50800 NULL
+write_flush_50803 write_flush 3 50803 NULL
+dvb_play_50814 dvb_play 3 50814 NULL
-+dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
+acpi_ev_install_gpe_block_50829 acpi_ev_install_gpe_block 2 50829 NULL
-+SetArea_50835 SetArea 4 50835 NULL nohasharray
-+create_mem_extents_50835 create_mem_extents 0 50835 &SetArea_50835 nohasharray
-+mask_from_50835 mask_from 0-1-2 50835 &create_mem_extents_50835
-+videobuf_dma_init_user_50839 videobuf_dma_init_user 3-4 50839 NULL
-+btrfs_search_slot_for_read_50843 btrfs_search_slot_for_read 0 50843 NULL
-+self_check_write_50856 self_check_write 0-5 50856 NULL
++pstore_mkfile_50830 pstore_mkfile 5 50830 NULL
++create_mem_extents_50835 create_mem_extents 0 50835 NULL
++videobuf_dma_init_user_50839 videobuf_dma_init_user 4-3 50839 NULL
++ChannelConfiguration_50853 ChannelConfiguration 0 50853 NULL
+carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
-+__percpu_counter_init_50878 __percpu_counter_init 0 50878 NULL
-+btrfs_insert_inode_ref_50884 btrfs_insert_inode_ref 0 50884 NULL
-+SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
+netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
-+__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
++osd_req_write_sg_50908 osd_req_write_sg 5 50908 NULL
+xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
+blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
+hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
+chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
-+show_device_status_50947 show_device_status 0 50947 NULL
-+irq_timeout_write_50950 irq_timeout_write 3 50950 NULL
++sock_bindtodevice_50942 sock_bindtodevice 3 50942 NULL
++mld_newpack_50950 mld_newpack 2 50950 NULL
+ocfs2_add_refcount_flag_50952 ocfs2_add_refcount_flag 6 50952 NULL
+sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
-+SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
-+btrfs_del_csums_50969 btrfs_del_csums 0 50969 NULL
-+__btrfs_mod_ref_50973 __btrfs_mod_ref 0 50973 NULL
-+iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
++iwl_statistics_flag_50981 iwl_statistics_flag 3-0 50981 NULL
+timeout_write_50991 timeout_write 3 50991 NULL
-+wm831x_irq_map_50995 wm831x_irq_map 2 50995 NULL
+proc_write_51003 proc_write 3 51003 NULL
-+jbd2_journal_extend_51012 jbd2_journal_extend 2-0 51012 NULL
++jbd2_journal_extend_51012 jbd2_journal_extend 0 51012 NULL
+lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
+ntfs_attr_find_51028 ntfs_attr_find 0 51028 NULL nohasharray
+fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 &ntfs_attr_find_51028
+BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL
+dump_midi_51040 dump_midi 3 51040 NULL
+usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL
-+srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
+do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
+wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
+jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
-+solo_enc_v4l2_init_51094 solo_enc_v4l2_init 2 51094 NULL
+__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
-+btrfs_del_item_51110 btrfs_del_item 0 51110 NULL nohasharray
-+ti_recv_51110 ti_recv 3 51110 &btrfs_del_item_51110
-+uasp_prepare_r_request_51124 uasp_prepare_r_request 0 51124 NULL
++read_file_wiphy_51103 read_file_wiphy 3 51103 NULL
++iscsi_nop_out_rsp_51117 iscsi_nop_out_rsp 4 51117 NULL
++xfs_file_splice_read_51121 xfs_file_splice_read 4 51121 NULL
+nfs_map_name_to_uid_51132 nfs_map_name_to_uid 3 51132 NULL
+alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
-+simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
-+set_dirty_51144 set_dirty 3 51144 NULL
++wl1271_cmd_build_probe_req_51141 wl1271_cmd_build_probe_req 3-5 51141 NULL
+xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
+walk_page_buffers_51170 walk_page_buffers 0 51170 NULL
+snd_pcm_unlink_51210 snd_pcm_unlink 0 51210 NULL
-+uhci_frame_skel_link_51213 uhci_frame_skel_link 2 51213 NULL
-+nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
+snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
+tipc_send_51238 tipc_send 4 51238 NULL
+drm_property_create_51239 drm_property_create 4 51239 NULL
-+__mxt_read_reg_51249 __mxt_read_reg 0 51249 NULL
+st_read_51251 st_read 3 51251 NULL
+compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
-+target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
+dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
+ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
-+zone_reclaimable_pages_51283 zone_reclaimable_pages 0 51283 NULL nohasharray
-+__get_cur_name_and_parent_51283 __get_cur_name_and_parent 0 51283 &zone_reclaimable_pages_51283
++zone_reclaimable_pages_51283 zone_reclaimable_pages 0 51283 NULL
+pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL
-+bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
-+get_cell_51316 get_cell 2 51316 NULL
-+init_map_ipmac_51317 init_map_ipmac 4-3-5 51317 NULL
++xfrm_count_enc_supported_51290 xfrm_count_enc_supported 0 51290 NULL
++buffDnldVerify_51297 buffDnldVerify 0 51297 NULL
+ocfs2_read_inode_block_51319 ocfs2_read_inode_block 0 51319 NULL
+alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
+ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
-+alloc_smp_req_51337 alloc_smp_req 1 51337 NULL nohasharray
-+compat_arch_ptrace_51337 compat_arch_ptrace 3 51337 &alloc_smp_req_51337
++alloc_smp_req_51337 alloc_smp_req 1 51337 NULL
+ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
+ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
+radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
-+pci_sriov_resource_alignment_51406 pci_sriov_resource_alignment 0 51406 NULL
++ieee80211_wx_set_gen_ie_51399 ieee80211_wx_set_gen_ie 3 51399 NULL
+ceph_sync_read_51410 ceph_sync_read 3-0 51410 NULL
-+get_first_ref_51413 get_first_ref 0 51413 NULL
-+__btrfs_end_transaction_51420 __btrfs_end_transaction 0 51420 NULL
+blk_register_region_51424 blk_register_region 1-2 51424 NULL
+mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
-+hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
++econet_sendmsg_51430 econet_sendmsg 4 51430 NULL
+ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
+print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
+____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
+xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
+btrfs_find_space_cluster_51482 btrfs_find_space_cluster 5 51482 NULL
+kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
-+ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
-+key_search_51533 key_search 0 51533 NULL
-+load_pdptrs_51541 load_pdptrs 3 51541 NULL
+__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
+ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL
-+get_cur_path_51589 get_cur_path 0 51589 NULL nohasharray
-+snd_interval_refine_first_51589 snd_interval_refine_first 0 51589 &get_cur_path_51589
-+aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
++snd_interval_refine_first_51589 snd_interval_refine_first 0 51589 NULL
++rfcomm_tty_write_51603 rfcomm_tty_write 3 51603 NULL
+table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL
-+extent_fiemap_51621 extent_fiemap 3 51621 NULL
++dns_resolve_server_name_to_ip_51632 dns_resolve_server_name_to_ip 0 51632 NULL
+sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
+iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
+get_new_cssid_51665 get_new_cssid 2 51665 NULL
+ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
+sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
-+host_mapping_level_51696 host_mapping_level 2 51696 NULL
+sel_write_access_51704 sel_write_access 3 51704 NULL
-+tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
-+v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
++gem_alloc_skb_51715 gem_alloc_skb 2 51715 NULL
+drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
+sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
++msg_set_51725 msg_set 3 51725 NULL
+dbg_check_lpt_nodes_51727 dbg_check_lpt_nodes 0 51727 NULL
+cm4040_read_51732 cm4040_read 3 51732 NULL
-+get_user_pages_fast_51751 get_user_pages_fast 1-2-0 51751 NULL
++pwc_video_read_51735 pwc_video_read 3 51735 NULL
++hid_parse_report_51737 hid_parse_report 3 51737 NULL
++get_user_pages_fast_51751 get_user_pages_fast 0 51751 NULL
+ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
+if_write_51756 if_write 3 51756 NULL
-+ext4_ext_create_new_leaf_51763 ext4_ext_create_new_leaf 0 51763 NULL
++iio_buffer_add_channel_sysfs_51766 iio_buffer_add_channel_sysfs 0 51766 NULL
++spin_time_accum_blocked_51769 spin_time_accum_blocked 1 51769 NULL
++swiotlb_init_with_tbl_51770 swiotlb_init_with_tbl 2 51770 NULL
+__fswab32_51781 __fswab32 0 51781 NULL
-+to_ratio_51809 to_ratio 1-2 51809 NULL
++l2cap_create_iframe_pdu_51801 l2cap_create_iframe_pdu 3 51801 NULL
+qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
+buffer_from_user_51826 buffer_from_user 3 51826 NULL
-+max732x_irq_pending_51840 max732x_irq_pending 0 51840 NULL
+ioread32_51847 ioread32 0 51847 NULL nohasharray
+read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847
+do_readv_writev_51849 do_readv_writev 4 51849 NULL
-+SYSC_sendto_51852 SYSC_sendto 6 51852 NULL
-+bm_page_io_async_51858 bm_page_io_async 2 51858 NULL
+pointer_size_read_51863 pointer_size_read 3 51863 NULL
+mlx4_alloc_db_from_pgdir_51865 mlx4_alloc_db_from_pgdir 3 51865 NULL
+get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
+user_read_51881 user_read 3 51881 NULL
+dbAdjCtl_51888 dbAdjCtl 0 51888 NULL
-+SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL nohasharray
-+virt_to_phys_51896 virt_to_phys 0 51896 &SyS_mq_timedsend_51896
-+commit_fs_roots_51898 commit_fs_roots 0 51898 NULL
-+wmi_set_ie_51919 wmi_set_ie 3 51919 NULL
++virt_to_phys_51896 virt_to_phys 0 51896 NULL
++iio_read_first_n_sw_rb_51911 iio_read_first_n_sw_rb 2 51911 NULL
++tipc_createport_51914 tipc_createport 2 51914 NULL
+dbg_status_buf_51930 dbg_status_buf 2 51930 NULL
-+__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
+xfrm_alg_len_51940 xfrm_alg_len 0 51940 NULL
-+irq_dispose_mapping_51941 irq_dispose_mapping 1 51941 NULL
+scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
-+arizona_free_irq_51969 arizona_free_irq 2 51969 NULL nohasharray
-+snd_mask_min_51969 snd_mask_min 0 51969 &arizona_free_irq_51969
-+__blkdev_get_51972 __blkdev_get 0 51972 NULL nohasharray
-+read_page_51972 read_page 2 51972 &__blkdev_get_51972
-+get_zone_51981 get_zone 0-1 51981 NULL
++ab8500_bank_write_51960 ab8500_bank_write 3 51960 NULL
++snd_mask_min_51969 snd_mask_min 0 51969 NULL
++__blkdev_get_51972 __blkdev_get 0 51972 NULL
++twl6030_init_irq_51979 twl6030_init_irq 2 51979 NULL
+ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
-+_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL
-+dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
++scsi_sysfs_add_host_52010 scsi_sysfs_add_host 0 52010 NULL
+skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
+rdmalt_52022 rdmalt 0 52022 NULL
++vxge_rx_alloc_52024 vxge_rx_alloc 3 52024 NULL
+override_release_52032 override_release 2 52032 NULL
+end_port_52042 end_port 0 52042 NULL
+dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
+msnd_fifo_write_52052 msnd_fifo_write 0-3 52052 NULL
+dvb_ringbuffer_avail_52057 dvb_ringbuffer_avail 0 52057 NULL
-+__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL
-+isofs_readpages_52067 isofs_readpages 4 52067 NULL
+nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
-+ulist_add_merge_52096 ulist_add_merge 0 52096 NULL
+o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
-+split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
++bcm_compare_buff_contents_52124 bcm_compare_buff_contents 0 52124 NULL
+retry_count_read_52129 retry_count_read 3 52129 NULL
+snd_pcm_channel_info_user_52135 snd_pcm_channel_info_user 0 52135 NULL
-+gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
-+sub_alloc_52140 sub_alloc 0 52140 NULL nohasharray
-+zram_meta_alloc_52140 zram_meta_alloc 1 52140 &sub_alloc_52140
+hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL nohasharray
-+ext2_alloc_blocks_52145 ext2_alloc_blocks 2-0 52145 &hysdn_conf_write_52145
-+htable_size_52148 htable_size 0-1 52148 NULL
-+smk_write_load2_52155 smk_write_load2 3 52155 NULL
++ext2_alloc_blocks_52145 ext2_alloc_blocks 2 52145 &hysdn_conf_write_52145
++wait_gpio_52146 wait_gpio 0 52146 NULL
++__le16_to_cpup_52155 __le16_to_cpup 0 52155 NULL
+ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
+mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
-+print_prefix_52176 print_prefix 0 52176 NULL
+proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
-+vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
-+do_dmabuf_dirty_ldu_52241 do_dmabuf_dirty_ldu 6 52241 NULL
-+fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL nohasharray
-+xfs_iomap_eof_align_last_fsb_52243 xfs_iomap_eof_align_last_fsb 3 52243 &fuse_request_alloc_52243
++iscsi_if_send_reply_52219 iscsi_if_send_reply 7 52219 NULL nohasharray
++iwl_dbgfs_wd_timeout_write_52219 iwl_dbgfs_wd_timeout_write 3 52219 &iscsi_if_send_reply_52219
++_alloc_mISDN_skb_52232 _alloc_mISDN_skb 3 52232 NULL
+ocfs2_try_to_merge_extent_52244 ocfs2_try_to_merge_extent 0 52244 NULL
-+pm80x_request_irq_52250 pm80x_request_irq 2 52250 NULL
-+mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
+shrink_slab_52261 shrink_slab 2-3 52261 NULL
-+hva_to_pfn_slow_52262 hva_to_pfn_slow 1 52262 NULL
+sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
++smk_write_load_list_52280 smk_write_load_list 3 52280 NULL
+handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL
+atomic64_read_52300 atomic64_read 0 52300 NULL
++ath6kl_wmi_get_new_buf_52304 ath6kl_wmi_get_new_buf 1 52304 NULL
++jbd2_free_52306 jbd2_free 2 52306 NULL
+kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
-+read_file_reset_52310 read_file_reset 3 52310 NULL
-+request_asymmetric_key_52317 request_asymmetric_key 4-2 52317 NULL
+hwflags_read_52318 hwflags_read 3 52318 NULL
+snd_pcm_hw_free_52327 snd_pcm_hw_free 0 52327 NULL
-+ntfs_rl_split_52328 ntfs_rl_split 4-2 52328 NULL
+test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
-+hur_len_52339 hur_len 0 52339 NULL
++iwl3945_ucode_rx_stats_read_52340 iwl3945_ucode_rx_stats_read 3 52340 NULL
+bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL
+copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
+iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
-+hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
+ocfs2_journal_access_eb_52377 ocfs2_journal_access_eb 0 52377 NULL
-+mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL
++pfkey_sockaddr_pair_size_52378 pfkey_sockaddr_pair_size 0 52378 NULL
+isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
+jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
-+aer_inject_write_52399 aer_inject_write 3 52399 NULL nohasharray
-+cl_page_own_52399 cl_page_own 0 52399 &aer_inject_write_52399
++aer_inject_write_52399 aer_inject_write 3 52399 NULL
+cgroup_file_write_52417 cgroup_file_write 3 52417 NULL
+line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
+hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
-+delay_status_52431 delay_status 5 52431 NULL
-+ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
+ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
-+acpi_nvs_for_each_region_52448 acpi_nvs_for_each_region 0 52448 NULL
++nl80211_send_mgmt_tx_status_52445 nl80211_send_mgmt_tx_status 5 52445 NULL
+alauda_read_data_52452 alauda_read_data 3 52452 NULL
-+ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
++ip6_skb_dst_mtu_52457 ip6_skb_dst_mtu 0 52457 NULL
++ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1-2 52477 NULL
+usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
+ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
-+fd_do_rw_52495 fd_do_rw 3 52495 NULL
-+qib_user_sdma_pin_pages_52498 qib_user_sdma_pin_pages 3-5-4 52498 NULL
++skb_cow_head_52495 skb_cow_head 2 52495 NULL
+int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
-+lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
++netlbl_unlabel_init_52506 netlbl_unlabel_init 1 52506 NULL
+pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
+bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
+dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
+raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
-+from_oblock_52546 from_oblock 0-1 52546 NULL
++x86_setup_msi_irqs_52535 x86_setup_msi_irqs 0 52535 NULL
+dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
+ocfs2_make_right_split_rec_52562 ocfs2_make_right_split_rec 3 52562 NULL
+debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
-+isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
+snd_pcm_sw_params_52594 snd_pcm_sw_params 0 52594 NULL
-+SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
-+ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
-+affs_set_blocksize_52625 affs_set_blocksize 2 52625 NULL
-+tps80031_writes_52638 tps80031_writes 3-4 52638 NULL
-+brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
-+perf_trace_sched_stat_template_52656 perf_trace_sched_stat_template 3 52656 NULL
-+nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL
-+htb_add_class_to_row_52663 htb_add_class_to_row 3 52663 NULL
-+posix_acl_equiv_mode_52666 posix_acl_equiv_mode 0 52666 NULL
-+SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
++xfs_file_buffered_aio_write_52609 xfs_file_buffered_aio_write 4 52609 NULL
++iwl_legacy_dbgfs_channels_read_52619 iwl_legacy_dbgfs_channels_read 3 52619 NULL
++__iter_shared_inline_ref_inodes_52668 __iter_shared_inline_ref_inodes 0 52668 NULL
++dirty_poll_interval_52669 dirty_poll_interval 1-2 52669 NULL
+ntfs_get_nr_significant_bytes_52688 ntfs_get_nr_significant_bytes 0 52688 NULL
-+nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL
+vendorextnWriteSection_52698 vendorextnWriteSection 0 52698 NULL
-+nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
-+__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL
+cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL
-+blkcipher_next_slow_52733 blkcipher_next_slow 4-3 52733 NULL
++blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL
+relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
-+hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL
++alloc_irte_52741 alloc_irte 3 52741 NULL
+carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
-+ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
+radeon_get_ib_value_52757 radeon_get_ib_value 0 52757 NULL
-+nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
++debug_lpm_write_52830 debug_lpm_write 3 52830 NULL
++bl_mark_sectors_init_52831 bl_mark_sectors_init 2-3 52831 NULL
+pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
-+map_try_harder_52846 map_try_harder 2-3 52846 NULL
+ext2_xattr_set_acl_52857 ext2_xattr_set_acl 4 52857 NULL
-+process_deleted_xattr_52861 process_deleted_xattr 0 52861 NULL
+mon_bin_get_event_52863 mon_bin_get_event 6-4 52863 NULL
-+twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL
++iwl_legacy_dbgfs_clear_traffic_statistics_write_52866 iwl_legacy_dbgfs_clear_traffic_statistics_write 3 52866 NULL
+qib_decode_6120_err_52876 qib_decode_6120_err 3 52876 NULL
-+twlreg_write_52880 twlreg_write 3 52880 NULL
+pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
+cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
-+kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
-+arizona_request_irq_52908 arizona_request_irq 2 52908 NULL
++ubi_wl_flush_52900 ubi_wl_flush 0 52900 NULL
+create_vtbl_52909 create_vtbl 0 52909 NULL
-+dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
+__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
-+iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
-+__nodes_remap_52951 __nodes_remap 5 52951 NULL
++__iio_device_attr_init_52936 __iio_device_attr_init 0 52936 NULL
++ip_nat_sdp_port_52938 ip_nat_sdp_port 6 52938 NULL
++norm_maxw_52951 norm_maxw 0 52951 NULL nohasharray
++__nodes_remap_52951 __nodes_remap 5 52951 &norm_maxw_52951
++store_disp_52952 store_disp 4 52952 NULL
+send_packet_52960 send_packet 4 52960 NULL
+ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
-+tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
+num_node_state_52989 num_node_state 0 52989 NULL
-+efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL
-+uasp_alloc_stream_res_53015 uasp_alloc_stream_res 0 53015 NULL
-+btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
-+tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
-+ext4_meta_bg_first_group_53031 ext4_meta_bg_first_group 0-2 53031 NULL
++xfs_rtfree_extent_53024 xfs_rtfree_extent 2-3 53024 NULL
+ocfs2_new_leaf_refcount_block_53036 ocfs2_new_leaf_refcount_block 0 53036 NULL
+bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
-+regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
++ValidateHWParmStructure_53048 ValidateHWParmStructure 0 53048 NULL
++kobject_uevent_53065 kobject_uevent 0 53065 NULL
+cfi_read_query_53066 cfi_read_query 0 53066 NULL
+iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
+mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
-+page_to_nid_53085 page_to_nid 0 53085 NULL
-+qib_resize_cq_53090 qib_resize_cq 2 53090 NULL
++pcbit_readw_53084 pcbit_readw 0 53084 NULL
+insert_new_root_53097 insert_new_root 0 53097 NULL
-+verity_status_53120 verity_status 5 53120 NULL
-+__copy_from_user_ll_nocache_nozero_53123 __copy_from_user_ll_nocache_nozero 0-3 53123 NULL
-+brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
-+btrfs_search_forward_53137 btrfs_search_forward 0 53137 NULL
-+ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL
-+ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
-+btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
++line6_dumpreq_initbuf_53123 line6_dumpreq_initbuf 3 53123 NULL
+clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
-+SyS_init_module_53202 SyS_init_module 2 53202 NULL
-+mtdoops_erase_block_53206 mtdoops_erase_block 2 53206 NULL
-+fixup_user_fault_53210 fixup_user_fault 3 53210 NULL
-+tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
-+ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
-+hfsplus_xattr_set_posix_acl_53249 hfsplus_xattr_set_posix_acl 4 53249 NULL
-+xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL
-+wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
++__pci_enable_device_flags_53213 __pci_enable_device_flags 0 53213 NULL
++sctp_make_fwdtsn_53265 sctp_make_fwdtsn 3 53265 NULL
+btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
-+btrfs_find_highest_objectid_53284 btrfs_find_highest_objectid 0 53284 NULL
-+setup_leaf_for_split_53312 setup_leaf_for_split 0 53312 NULL
++pn544_i2c_read_53270 pn544_i2c_read 0 53270 NULL
++lirc_buffer_init_53282 lirc_buffer_init 3-2 53282 NULL
++determine_dirtyable_memory_53290 determine_dirtyable_memory 0 53290 NULL
+ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
-+setup_cluster_no_bitmap_53328 setup_cluster_no_bitmap 0 53328 NULL
+gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
-+vm_mmap_53339 vm_mmap 0 53339 NULL
-+vendorextnIoctl_53350 vendorextnIoctl 0 53350 NULL nohasharray
-+btrfs_find_all_roots_53350 btrfs_find_all_roots 0 53350 &vendorextnIoctl_53350
-+read_6120_creg32_53363 read_6120_creg32 0 53363 NULL
-+sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
++vendorextnIoctl_53350 vendorextnIoctl 0 53350 NULL
++mmc_resume_host_53353 mmc_resume_host 0 53353 NULL nohasharray
++bnx2i_send_nl_mesg_53353 bnx2i_send_nl_mesg 4 53353 &mmc_resume_host_53353
+get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
-+isolate_lru_page_53417 isolate_lru_page 0 53417 NULL
++tsi721_open_outb_mbox_53397 tsi721_open_outb_mbox 4 53397 NULL
++roccat_common_receive_53407 roccat_common_receive 4 53407 NULL
+i915_gem_execbuffer_relocate_object_53435 i915_gem_execbuffer_relocate_object 0 53435 NULL
+isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
-+mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
++mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL nohasharray
++snd_dma_alloc_pages_53447 snd_dma_alloc_pages 3 53447 &mwifiex_info_read_53447
+apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
-+paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL
++rds_tcp_data_recv_53476 rds_tcp_data_recv 3-4 53476 NULL
+iowarrior_read_53483 iowarrior_read 3 53483 NULL
+osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
+do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
@@ -108656,375 +109676,295 @@ index 0000000..0a9d518
+dbAllocNext_53506 dbAllocNext 0 53506 NULL
+ocfs2_xattr_set_acl_53508 ocfs2_xattr_set_acl 4 53508 NULL
+check_acl_53512 check_acl 0 53512 NULL
-+send_utimes_53516 send_utimes 0 53516 NULL
-+SYSC_bind_53582 SYSC_bind 3 53582 NULL
-+cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
-+proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
-+gfn_to_pfn_async_53597 gfn_to_pfn_async 2 53597 NULL
++set_registers_53582 set_registers 3 53582 NULL
++__readw_53594 __readw 0 53594 NULL
+pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
+___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL
+xd_write_multiple_pages_53633 xd_write_multiple_pages 6-5 53633 NULL
-+stmpe_gpio_request_53634 stmpe_gpio_request 2 53634 NULL nohasharray
-+ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 &stmpe_gpio_request_53634
++ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
++uapsd_max_sp_len_read_53651 uapsd_max_sp_len_read 3 53651 NULL
+nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
-+fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL
-+v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
-+bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray
-+igb_alloc_q_vector_53690 igb_alloc_q_vector 6-4 53690 &bdev_logical_block_size_53690
++orig_hash_add_if_53676 orig_hash_add_if 2 53676 NULL nohasharray
++_preload_range_53676 _preload_range 2-3 53676 &orig_hash_add_if_53676
++fuse_fill_write_pages_53682 fuse_fill_write_pages 4 53682 NULL
++bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL
++i830_write_fence_reg_53695 i830_write_fence_reg 0 53695 NULL
++phy_read_1bit_53708 phy_read_1bit 0 53708 NULL
+find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
+bio_integrity_split_53714 bio_integrity_split 3 53714 NULL
+__ocfs2_resv_find_window_53721 __ocfs2_resv_find_window 3 53721 NULL
-+__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
++subscr_named_msg_event_53723 subscr_named_msg_event 6 53723 NULL
+wdm_write_53735 wdm_write 3 53735 NULL
-+ext3_try_to_allocate_with_rsv_53737 ext3_try_to_allocate_with_rsv 5-3-0 53737 NULL
-+da9052_disable_irq_53745 da9052_disable_irq 2 53745 NULL
++ext3_try_to_allocate_with_rsv_53737 ext3_try_to_allocate_with_rsv 3-5-0 53737 NULL
+lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL nohasharray
+amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 &lpfc_idiag_queacc_read_qe_53755
+ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
+__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
-+qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL
-+regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL
++regmap_raw_write_53803 regmap_raw_write 4 53803 NULL
+lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
+nls_nullsize_53815 nls_nullsize 0 53815 NULL
-+insert_pfn_53816 insert_pfn 3-0 53816 NULL
+setup_data_read_53822 setup_data_read 3 53822 NULL
++multipath_status_53836 multipath_status 4 53836 NULL
++i915_gem_flush_ring_53843 i915_gem_flush_ring 0 53843 NULL
+pms_read_53873 pms_read 3 53873 NULL
+ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
-+ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 4-5-3 53900 NULL nohasharray
-+SyS_setgroups_53900 SyS_setgroups 1 53900 &ocfs2_rm_xattr_cluster_53900
++ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 4-5-3 53900 NULL
++proc_file_read_53905 proc_file_read 3 53905 NULL
+azx_via_get_position_53916 azx_via_get_position 0 53916 NULL
++tcp_mss_split_point_53925 tcp_mss_split_point 0-4-3 53925 NULL
+usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
-+ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 5-4-0 53938 NULL
++ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 0-5-4 53938 NULL
++xfs_mod_sb_53960 xfs_mod_sb 2 53960 NULL
++mlx4_num_eq_uar_53965 mlx4_num_eq_uar 0 53965 NULL
+idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
-+mthca_reg_user_mr_53980 mthca_reg_user_mr 2-3 53980 NULL
+__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
-+ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
-+send_clone_54011 send_clone 0 54011 NULL
-+hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL
+snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL
-+mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL
++cmpk_message_handle_tx_54024 cmpk_message_handle_tx 4 54024 NULL
+ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
-+pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
+nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
-+rproc_state_read_54057 rproc_state_read 3 54057 NULL
-+btrfs_start_transaction_54066 btrfs_start_transaction 2 54066 NULL
++wl12xx_rx_get_buf_size_54070 wl12xx_rx_get_buf_size 0 54070 NULL
+_malloc_54077 _malloc 1 54077 NULL
+bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL
-+altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray
-+lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 &altera_set_ir_pre_54103
-+__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
++altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL
++create_xattr_54106 create_xattr 5 54106 NULL
+strn_len_54122 strn_len 0 54122 NULL
-+isku_receive_54130 isku_receive 4 54130 NULL
++store_sys_acpi_54129 store_sys_acpi 4 54129 NULL
+isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
-+irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL
-+memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL
-+nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL
++c4iw_pblpool_alloc_54148 c4iw_pblpool_alloc 2 54148 NULL
++i2400m_zrealloc_2x_54166 i2400m_zrealloc_2x 3 54166 NULL nohasharray
++memcpy_toiovec_54166 memcpy_toiovec 3 54166 &i2400m_zrealloc_2x_54166
+p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL
+devm_request_threaded_irq_54215 devm_request_threaded_irq 0 54215 NULL
+do_sys_poll_54221 do_sys_poll 2 54221 NULL
+__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
++_format_mac_addr_54229 _format_mac_addr 2-0 54229 NULL
+pi_read_regr_54231 pi_read_regr 0 54231 NULL
-+mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL
-+reada_add_block_54247 reada_add_block 2 54247 NULL
-+write_file_spec_scan_ctl_54248 write_file_spec_scan_ctl 3 54248 NULL
+jbd2__journal_restart_54249 jbd2__journal_restart 0 54249 NULL
-+barrier_all_devices_54254 barrier_all_devices 0 54254 NULL nohasharray
-+xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 &barrier_all_devices_54254
++xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
+ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
+wusb_prf_54261 wusb_prf 7 54261 NULL nohasharray
+audio_write_54261 audio_write 4 54261 &wusb_prf_54261
+mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
+kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
-+ubi_calc_data_len_54279 ubi_calc_data_len 0-3 54279 NULL
+altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
+dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
-+get_iovec_page_array_54298 get_iovec_page_array 6 54298 NULL
+ttm_mem_global_alloc_54299 ttm_mem_global_alloc 0 54299 NULL
-+reclaim_pages_54301 reclaim_pages 3 54301 NULL
+sprintf_54306 sprintf 0 54306 NULL
-+bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
++pn_raw_send_54330 pn_raw_send 2 54330 NULL
+br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
+__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
-+__get_free_pages_54352 __get_free_pages 0 54352 NULL
++_osd_realloc_seg_54352 _osd_realloc_seg 3 54352 NULL nohasharray
++__get_free_pages_54352 __get_free_pages 0 54352 &_osd_realloc_seg_54352
+tcf_hash_create_54360 tcf_hash_create 4 54360 NULL
+read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
+vfs_readlink_54368 vfs_readlink 3 54368 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
++do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 NULL
+ah_alloc_tmp_54378 ah_alloc_tmp 2-3 54378 NULL
+gart_unmap_page_54379 gart_unmap_page 3-2 54379 NULL
++sysfs_dir_llseek_54385 sysfs_dir_llseek 2 54385 NULL
+snd_pcm_oss_read2_54387 snd_pcm_oss_read2 3-0 54387 NULL
+iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL
-+efx_nic_describe_stats_54407 efx_nic_describe_stats 2 54407 NULL
-+ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
-+copy_gadget_strings_54417 copy_gadget_strings 3-2 54417 NULL
-+btrfs_inc_extent_ref_54442 btrfs_inc_extent_ref 0 54442 NULL
-+sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
++add_packet_54433 add_packet 3 54433 NULL
++__btrfs_alloc_chunk_54445 __btrfs_alloc_chunk 0 54445 NULL
++do_chunk_alloc_54457 do_chunk_alloc 0 54457 NULL
+simple_strtoull_54493 simple_strtoull 0 54493 NULL
-+swiotlb_tbl_map_single_54495 swiotlb_tbl_map_single 0 54495 NULL
++cifs_idmap_key_instantiate_54503 cifs_idmap_key_instantiate 3 54503 NULL
++l2cap_create_basic_pdu_54508 l2cap_create_basic_pdu 3 54508 NULL
+btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
+cgroup_write_X64_54514 cgroup_write_X64 5 54514 NULL
+rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
-+vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
+viacam_read_54526 viacam_read 3 54526 NULL
+unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL
+setsockopt_54539 setsockopt 5 54539 NULL
-+i915_reset_gen7_sol_offsets_54547 i915_reset_gen7_sol_offsets 0 54547 NULL
+lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL
-+i915_gem_get_seqno_54555 i915_gem_get_seqno 0 54555 NULL
-+btrfs_update_inode_item_54561 btrfs_update_inode_item 0 54561 NULL nohasharray
-+SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 &btrfs_update_inode_item_54561
+nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
+fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
-+nvme_npages_54601 nvme_npages 0-1 54601 NULL
-+irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
++xfrm_polexpire_msgsize_54589 xfrm_polexpire_msgsize 0 54589 NULL
++fwSendNullPacket_54618 fwSendNullPacket 2 54618 NULL
+port_fops_write_54627 port_fops_write 3 54627 NULL
-+irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
++setup_cluster_bitmap_54649 setup_cluster_bitmap 4 54649 NULL
++_regulator_enable_54655 _regulator_enable 0 54655 NULL
+dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
-+twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
-+kvm_read_cr3_54662 kvm_read_cr3 0 54662 NULL
+bus_add_device_54665 bus_add_device 0 54665 NULL
-+cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
+bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
-+vring_new_virtqueue_54673 vring_new_virtqueue 2 54673 NULL
+evm_read_key_54674 evm_read_key 3 54674 NULL
-+fs_path_add_path_54680 fs_path_add_path 0 54680 NULL
-+platform_get_irq_byname_54700 platform_get_irq_byname 0 54700 NULL
-+__btrfs_inc_extent_ref_54706 __btrfs_inc_extent_ref 7-0 54706 NULL
++addtgt_54703 addtgt 3 54703 NULL
+rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
-+clk_divider_set_rate_54726 clk_divider_set_rate 3-2 54726 NULL
++_add_sg_continuation_descriptor_54721 _add_sg_continuation_descriptor 3 54721 NULL
+ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
+kzalloc_54740 kzalloc 1 54740 NULL
++drm_mode_crtc_set_gamma_size_54742 drm_mode_crtc_set_gamma_size 2 54742 NULL
+wep_iv_read_54744 wep_iv_read 3 54744 NULL
+lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
-+iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
-+adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
-+ldsem_atomic_update_54774 ldsem_atomic_update 1-0 54774 NULL
-+gpiochip_add_54781 gpiochip_add 0 54781 NULL
++xfs_rtallocate_extent_block_54791 xfs_rtallocate_extent_block 5 54791 NULL
+flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
+domain_init_54797 domain_init 2 54797 NULL
+ext3_find_goal_54801 ext3_find_goal 0 54801 NULL
+get_dev_size_54807 get_dev_size 0 54807 NULL
+nfsd_write_54809 nfsd_write 6 54809 NULL
+aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 NULL nohasharray
-+kvzalloc_54815 kvzalloc 1 54815 &aes_decrypt_fail_read_54815 nohasharray
-+crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &kvzalloc_54815
++crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &aes_decrypt_fail_read_54815
+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 nohasharray
-+ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 &nouveau_engctx_create__54839
++ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 NULL
++edac_mc_alloc_54846 edac_mc_alloc 1 54846 NULL
++scsi_add_host_54847 scsi_add_host 0 54847 NULL
+ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
+printer_read_54851 printer_read 3 54851 NULL
-+qib_reg_user_mr_54858 qib_reg_user_mr 2-3 54858 NULL
++assign_irq_vector_54852 assign_irq_vector 0 54852 NULL
++em28xx_isoc_dvb_max_packetsize_54854 em28xx_isoc_dvb_max_packetsize 0 54854 NULL
+alloc_ep_req_54860 alloc_ep_req 2 54860 NULL
+broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
+prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
++tcf_csum_ipv6_tcp_54877 tcf_csum_ipv6_tcp 4 54877 NULL
+iscsi_pool_init_54913 iscsi_pool_init 4-2 54913 NULL nohasharray
+kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
+btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
-+bio_add_page_54933 bio_add_page 0-3 54933 NULL
-+mxms_structlen_54939 mxms_structlen 0 54939 NULL
+add_port_54941 add_port 2 54941 NULL
-+ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0 54949 NULL
+alauda_write_data_54967 alauda_write_data 3 54967 NULL
+c4_add_card_54968 c4_add_card 3 54968 NULL
-+iwl_pcie_dump_fh_54975 iwl_pcie_dump_fh 0 54975 NULL
++__proc_file_read_54978 __proc_file_read 3 54978 NULL
+ubi_change_vtbl_record_54979 ubi_change_vtbl_record 0 54979 NULL
++brcmf_sdcard_send_buf_54980 brcmf_sdcard_send_buf 6 54980 NULL
++_queue_data_54983 _queue_data 4 54983 NULL
+ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
+rds_ib_inc_copy_to_user_55007 rds_ib_inc_copy_to_user 3 55007 NULL
-+mem_cgroup_get_lru_size_55008 mem_cgroup_get_lru_size 0 55008 NULL
+cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
-+paging32_get_level1_sp_gpa_55022 paging32_get_level1_sp_gpa 0 55022 NULL
-+error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
-+dgap_do_bios_load_55025 dgap_do_bios_load 3 55025 NULL
-+btrfs_init_acl_55028 btrfs_init_acl 0 55028 NULL
-+write_ctree_super_55039 write_ctree_super 0 55039 NULL
+ext4_ext_handle_uninitialized_extents_55059 ext4_ext_handle_uninitialized_extents 0-6 55059 NULL
++__netdev_alloc_skb_ip_align_55067 __netdev_alloc_skb_ip_align 2 55067 NULL
+apei_exec_run_55075 apei_exec_run 0 55075 NULL
-+bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
-+snd_pcm_capture_hw_avail_55086 snd_pcm_capture_hw_avail 0 55086 NULL nohasharray
-+read_dma_55086 read_dma 3 55086 &snd_pcm_capture_hw_avail_55086
++set_interface_55085 set_interface 0 55085 NULL
++snd_pcm_capture_hw_avail_55086 snd_pcm_capture_hw_avail 0 55086 NULL
++PropagateCalParamsFromFlashToMemory_55099 PropagateCalParamsFromFlashToMemory 0 55099 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
-+corrupt_data_55120 corrupt_data 0-3 55120 NULL
++kmalloc_large_55111 kmalloc_large 1 55111 NULL
+crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
-+ocfs2_prepare_refcount_change_for_del_55137 ocfs2_prepare_refcount_change_for_del 3-0 55137 NULL nohasharray
++ocfs2_prepare_refcount_change_for_del_55137 ocfs2_prepare_refcount_change_for_del 0-3 55137 NULL nohasharray
+filldir_55137 filldir 3 55137 &ocfs2_prepare_refcount_change_for_del_55137
+validate_vid_hdr_55145 validate_vid_hdr 0 55145 NULL
+ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
-+npages_to_npools_55149 npages_to_npools 0-1 55149 NULL
-+ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
-+mtd_get_fact_prot_info_55186 mtd_get_fact_prot_info 0 55186 NULL
+sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
+sched_feat_write_55202 sched_feat_write 3 55202 NULL
-+ht40allow_map_read_55209 ht40allow_map_read 3 55209 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
+__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
+do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
-+qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
++sctp_abort_pkt_new_55218 sctp_abort_pkt_new 5 55218 NULL
+dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
-+hash_netport6_expire_55232 hash_netport6_expire 3 55232 NULL
++tipc_port_reject_sections_55229 tipc_port_reject_sections 5 55229 NULL
++ext4_ext_convert_to_initialized_55235 ext4_ext_convert_to_initialized 0 55235 NULL
+memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
+lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
-+persistent_ram_new_55286 persistent_ram_new 2-1 55286 NULL
-+ptrace_request_55288 ptrace_request 3 55288 NULL
+rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
-+lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
+gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
+wimax_msg_len_55304 wimax_msg_len 0 55304 NULL
-+qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 NULL
-+__vxge_hw_vpath_initialize_55328 __vxge_hw_vpath_initialize 2 55328 NULL
-+do_shmat_55336 do_shmat 5 55336 NULL
+vme_user_read_55338 vme_user_read 3 55338 NULL
+sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 NULL nohasharray
+__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 &sctp_datamsg_from_user_55342
-+iterate_inode_extrefs_55362 iterate_inode_extrefs 0 55362 NULL nohasharray
-+acpi_system_read_event_55362 acpi_system_read_event 3 55362 &iterate_inode_extrefs_55362
-+cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
++acpi_system_read_event_55362 acpi_system_read_event 3 55362 NULL
+__domain_mapping_55393 __domain_mapping 5 55393 NULL
++mm_to_dma_pfn_55394 mm_to_dma_pfn 0-1 55394 NULL
+iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
-+si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
-+SyS_read_55449 SyS_read 3 55449 NULL
-+add_relation_rb_55451 add_relation_rb 0 55451 NULL
++alloc_skb_55439 alloc_skb 1 55439 NULL
+__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
++isdnhdlc_decode_55466 isdnhdlc_decode 0 55466 NULL
+cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
+snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
+i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
-+ocfs2_rec_clusters_55501 ocfs2_rec_clusters 0 55501 NULL nohasharray
-+ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 &ocfs2_rec_clusters_55501
++ocfs2_rec_clusters_55501 ocfs2_rec_clusters 0 55501 NULL
+ext4_flex_bg_size_55502 ext4_flex_bg_size 0 55502 NULL
-+tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
++cfpkt_pad_trail_55511 cfpkt_pad_trail 2 55511 NULL
+ea_get_55522 ea_get 3-0 55522 NULL
-+buffer_size_55534 buffer_size 0 55534 NULL
+set_msr_interception_55538 set_msr_interception 2 55538 NULL
-+tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
-+dgap_do_config_load_55548 dgap_do_config_load 2 55548 NULL
-+dm_stats_list_55551 dm_stats_list 4 55551 NULL
-+gfs2_bitfit_55566 gfs2_bitfit 2-3-0 55566 NULL
-+hash_netport4_expire_55584 hash_netport4_expire 3 55584 NULL
++_regulator_is_enabled_55550 _regulator_is_enabled 0 55550 NULL
+add_partition_55588 add_partition 2 55588 NULL
+kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
-+SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
-+allocate_without_wrapping_disk_55607 allocate_without_wrapping_disk 4 55607 NULL
+macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
+selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
-+edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
+snd_pcm_hw_param_last_55624 snd_pcm_hw_param_last 0 55624 NULL
+reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray
+pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628
-+osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
-+dvb_dmxdev_set_buffer_size_55643 dvb_dmxdev_set_buffer_size 2 55643 NULL
+mlx4_buddy_alloc_55647 mlx4_buddy_alloc 2 55647 NULL
+xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
++read_oldmem_55658 read_oldmem 3 55658 NULL
+lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
-+il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
-+btrfs_reloc_cow_block_55672 btrfs_reloc_cow_block 0 55672 NULL
+get_info_55681 get_info 3 55681 NULL
+iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
+pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
-+ocfs2_lock_refcount_tree_55719 ocfs2_lock_refcount_tree 0 55719 NULL nohasharray
-+mtdswap_init_55719 mtdswap_init 2 55719 &ocfs2_lock_refcount_tree_55719
-+tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
-+__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
-+set_local_name_55757 set_local_name 4 55757 NULL
++ocfs2_lock_refcount_tree_55719 ocfs2_lock_refcount_tree 0 55719 NULL
++prepare_reply_55734 prepare_reply 4 55734 NULL
++__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2-3 55738 NULL
+strlen_55778 strlen 0 55778 NULL nohasharray
+is_idx_node_in_tnc_55778 is_idx_node_in_tnc 0 55778 &strlen_55778
-+set_spte_55783 set_spte 4-5 55783 NULL
-+req_bio_endio_55786 req_bio_endio 3 55786 NULL nohasharray
-+conf_read_55786 conf_read 3 55786 &req_bio_endio_55786
++req_bio_endio_55786 req_bio_endio 3 55786 NULL
++rtnl_vfinfo_size_55794 rtnl_vfinfo_size 0 55794 NULL
+uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
++iwl_legacy_dbgfs_sensitivity_read_55816 iwl_legacy_dbgfs_sensitivity_read 3 55816 NULL
+sb16_copy_from_user_55836 sb16_copy_from_user 7-6-10 55836 NULL
-+ept_gva_to_gpa_55848 ept_gva_to_gpa 2 55848 NULL
++xfs_da_buf_make_55845 xfs_da_buf_make 1 55845 NULL
+ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
-+hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
++hcd_alloc_coherent_55862 hcd_alloc_coherent 5-0 55862 NULL
+shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
+__check_block_validity_55869 __check_block_validity 0 55869 NULL
-+hsc_write_55875 hsc_write 3 55875 NULL
+pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
+snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
-+ext2_direct_IO_55932 ext2_direct_IO 4 55932 NULL
-+paging64_page_fault_55942 paging64_page_fault 2 55942 NULL
+kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
+sel_read_policy_55947 sel_read_policy 3 55947 NULL
-+ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
++handle_response_55951 handle_response 5 55951 NULL
+simple_read_from_buffer_55957 simple_read_from_buffer 5-2 55957 NULL
-+tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
-+wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 2-3 55992 NULL
-+nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
++acct_stack_growth_56023 acct_stack_growth 0 56023 NULL
+dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
-+__set_discard_56081 __set_discard 2 56081 NULL
+pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
-+usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
++em28xx_write_reg_bits_56107 em28xx_write_reg_bits 0 56107 NULL
+sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
+write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
-+add_extent_mapping_56157 add_extent_mapping 0 56157 NULL
-+__i2c_transfer_56162 __i2c_transfer 0 56162 NULL
++ath6kl_wmi_bssinfo_event_rx_56146 ath6kl_wmi_bssinfo_event_rx 3 56146 NULL
+rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
+create_irq_nr_56180 create_irq_nr 1-0 56180 NULL
-+ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 0 56194 NULL
++skb_headroom_56200 skb_headroom 0 56200 NULL
+ocfs2_journal_access_gd_56209 ocfs2_journal_access_gd 0 56209 NULL
-+update_space_info_56213 update_space_info 0 56213 NULL
-+ncp_read_bounce_size_56221 ncp_read_bounce_size 0-1 56221 NULL
-+vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
+ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
++cp210x_get_config_56229 cp210x_get_config 4 56229 NULL
+do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
+fd_copyin_56247 fd_copyin 3 56247 NULL
-+sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
+p9pdu_vreadf_56271 p9pdu_vreadf 0 56271 NULL
-+il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
-+ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
-+RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
+dvb_aplay_56296 dvb_aplay 3 56296 NULL
+btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
+speakup_file_write_56310 speakup_file_write 3 56310 NULL
-+pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
+journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
+snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 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
-+mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
-+iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 0-4 56368 NULL
++iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 4-0 56368 NULL
+dev_read_56369 dev_read 3 56369 NULL
-+ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
-+ata_qc_complete_multiple_56376 ata_qc_complete_multiple 2 56376 NULL
+snd_pcm_common_ioctl1_56382 snd_pcm_common_ioctl1 0 56382 NULL
-+write_gssp_56404 write_gssp 3 56404 NULL
+ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
+do_get_write_access_56410 do_get_write_access 0 56410 NULL
-+i915_gem_object_sync_56417 i915_gem_object_sync 0 56417 NULL nohasharray
-+store_msg_56417 store_msg 3 56417 &i915_gem_object_sync_56417
++store_msg_56417 store_msg 3 56417 NULL
+pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
+fl_create_56435 fl_create 5 56435 NULL
+gnttab_map_56439 gnttab_map 2 56439 NULL
++ata_scsi_add_hosts_56448 ata_scsi_add_hosts 0 56448 NULL
+cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
-+set_connectable_56458 set_connectable 4 56458 NULL
+osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
-+putused_user_56467 putused_user 3 56467 NULL
+lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
+calc_linear_pos_56472 calc_linear_pos 0-3 56472 NULL
-+global_rt_period_56476 global_rt_period 0 56476 NULL
+crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
-+ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
-+cfs_access_process_vm_56503 cfs_access_process_vm 2-4-0 56503 NULL
-+init_map_ip_56508 init_map_ip 5 56508 NULL
-+lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL
-+ext4_zeroout_es_56514 ext4_zeroout_es 0 56514 NULL
+cfg80211_connect_result_56515 cfg80211_connect_result 6-4 56515 NULL
++iwl_legacy_dbgfs_rx_queue_read_56533 iwl_legacy_dbgfs_rx_queue_read 3 56533 NULL
++l1oip_socket_recv_56537 l1oip_socket_recv 6 56537 NULL
+ip_options_get_56538 ip_options_get 4 56538 NULL
-+ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
-+vb2_queue_or_prepare_buf_56547 vb2_queue_or_prepare_buf 0 56547 NULL
++tcp_cwnd_test_56547 tcp_cwnd_test 0 56547 NULL
+ocfs2_change_extent_flag_56549 ocfs2_change_extent_flag 5 56549 NULL
+alloc_apertures_56561 alloc_apertures 1 56561 NULL
+rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
+portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
+event_filter_write_56609 event_filter_write 3 56609 NULL
-+nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
+gather_array_56641 gather_array 3 56641 NULL
-+lookup_extent_backref_56644 lookup_extent_backref 9-0 56644 NULL
-+uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
++dlm_dir_lookup_56662 dlm_dir_lookup 4 56662 NULL
+tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
+btrfs_cow_block_56678 btrfs_cow_block 0 56678 NULL
-+snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL nohasharray
-+da9055_gpio_to_irq_56686 da9055_gpio_to_irq 2 56686 &snd_gus_dram_read_56686
-+build_map_info_56696 build_map_info 2 56696 NULL
++snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL
+dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
+sta_flags_read_56710 sta_flags_read 3 56710 NULL
+ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
@@ -109032,48 +109972,32 @@ index 0000000..0a9d518
+__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
+pcpu_populate_chunk_56741 pcpu_populate_chunk 3-2 56741 NULL
+drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
-+btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
++mfd_add_devices_56753 mfd_add_devices 4 56753 NULL
+alloc_iommu_56778 alloc_iommu 2-3-0 56778 NULL
-+hash_lookup_56792 hash_lookup 2 56792 NULL nohasharray
-+ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 &hash_lookup_56792
-+do_syslog_56807 do_syslog 3 56807 NULL
++__carl9170_rx_56784 __carl9170_rx 3 56784 NULL
++ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 NULL
+ext4_ext_rm_idx_56827 ext4_ext_rm_idx 0 56827 NULL
-+mtdchar_write_56831 mtdchar_write 3 56831 NULL nohasharray
-+ntfs_rl_realloc_56831 ntfs_rl_realloc 3 56831 &mtdchar_write_56831
-+sysctl_sync_threshold_56835 sysctl_sync_threshold 0 56835 NULL
+snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
-+si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
-+wb_lookup_56858 wb_lookup 2 56858 NULL
+ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
+pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
-+debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
-+batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 NULL
-+hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
-+hfsplus_setxattr_56902 hfsplus_setxattr 4 56902 NULL
+__bitmap_clear_bits_56912 __bitmap_clear_bits 3 56912 NULL
-+strcspn_56913 strcspn 0 56913 NULL
+__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
-+CopyBufferToControlPacket_56933 CopyBufferToControlPacket 0 56933 NULL nohasharray
-+journal_init_revoke_56933 journal_init_revoke 2 56933 &CopyBufferToControlPacket_56933
-+nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
++journal_init_revoke_56933 journal_init_revoke 2 56933 NULL nohasharray
++CopyBufferToControlPacket_56933 CopyBufferToControlPacket 0 56933 &journal_init_revoke_56933
+diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
-+nouveau_device_create__56984 nouveau_device_create_ 6 56984 NULL
-+sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL
+vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
+btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
-+aircable_process_packet_57027 aircable_process_packet 4 57027 NULL
-+i915_gem_evict_everything_57038 i915_gem_evict_everything 0 57038 NULL
++snd_dma_alloc_pages_fallback_57029 snd_dma_alloc_pages_fallback 3 57029 NULL
+skb_network_offset_57043 skb_network_offset 0 57043 NULL nohasharray
+ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 &skb_network_offset_57043
+bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL
-+xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL
-+__wl_get_peb_57058 __wl_get_peb 0 57058 NULL
+cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
+sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
+pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
++sis190_try_rx_copy_57069 sis190_try_rx_copy 3 57069 NULL
++thin_status_57084 thin_status 4 57084 NULL
+tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
+altera_get_note_57099 altera_get_note 6 57099 NULL
-+hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
+snd_pcm_hw_params_old_user_57108 snd_pcm_hw_params_old_user 0 57108 NULL
+crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
+sysfs_write_file_57116 sysfs_write_file 3 57116 NULL
@@ -109082,502 +110006,401 @@ index 0000000..0a9d518
+rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &nl80211_send_deauth_57136 nohasharray
+ima_show_htable_value_57136 ima_show_htable_value 2 57136 &rds_ib_sub_signaled_57136
+snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
-+changed_inode_57156 changed_inode 0 57156 NULL
-+udl_prime_create_57159 udl_prime_create 2 57159 NULL
-+__ipath_get_user_pages_57166 __ipath_get_user_pages 1-2 57166 NULL
+stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
-+rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
++extent_from_logical_57179 extent_from_logical 0 57179 NULL nohasharray
++rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 &extent_from_logical_57179
++sys_poll_57190 sys_poll 2 57190 NULL
+ocfs2_claim_metadata_57192 ocfs2_claim_metadata 0 57192 NULL
-+tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
-+dma_fifo_alloc_57236 dma_fifo_alloc 5-3-2 57236 NULL
-+flush_space_57241 flush_space 3-0 57241 NULL
-+rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
+ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
+oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
-+alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
+lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
+pstore_file_read_57288 pstore_file_read 3 57288 NULL
+snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
-+fw_file_size_57307 fw_file_size 0 57307 NULL
++ath6kl_buf_alloc_57304 ath6kl_buf_alloc 1 57304 NULL
+ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
+write_file_regval_57313 write_file_regval 3 57313 NULL
-+__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
+ocfs2_xattr_shrink_size_57328 ocfs2_xattr_shrink_size 3 57328 NULL
+usblp_read_57342 usblp_read 3 57342 NULL
+print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
-+dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
-+tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
-+max8997_irq_domain_map_57375 max8997_irq_domain_map 2 57375 NULL
-+tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
+read_file_blob_57406 read_file_blob 3 57406 NULL
+enclosure_register_57412 enclosure_register 3 57412 NULL
-+compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 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
-+__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
-+crypto_tfm_alg_blocksize_57463 crypto_tfm_alg_blocksize 0 57463 NULL
-+sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
-+blk_flush_cur_seq_57467 blk_flush_cur_seq 0 57467 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
-+ocfs2_write_cluster_57483 ocfs2_write_cluster 9-8-2 57483 NULL
-+bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
++sys_pselect6_57449 sys_pselect6 1 57449 NULL
++ReadReg_57453 ReadReg 0 57453 NULL
++__roundup_pow_of_two_57461 __roundup_pow_of_two 0-1 57461 NULL
++crypto_tfm_alg_blocksize_57463 crypto_tfm_alg_blocksize 0 57463 NULL nohasharray
++send_midi_async_57463 send_midi_async 3 57463 &crypto_tfm_alg_blocksize_57463
++iwl4965_statistics_flag_57466 iwl4965_statistics_flag 3-0 57466 NULL nohasharray
++sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 &iwl4965_statistics_flag_57466
++ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL
++ocfs2_write_cluster_57483 ocfs2_write_cluster 8-9-2 57483 NULL
++nl80211_send_mgmt_57497 nl80211_send_mgmt 6 57497 NULL
+skb_headlen_57501 skb_headlen 0 57501 NULL
+copy_in_user_57502 copy_in_user 3 57502 NULL
-+ckhdid_printf_57505 ckhdid_printf 2 57505 NULL
++ks8842_read32_57505 ks8842_read32 0 57505 NULL nohasharray
++ckhdid_printf_57505 ckhdid_printf 2 57505 &ks8842_read32_57505
+init_tag_map_57515 init_tag_map 3 57515 NULL
-+wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray
-+il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517 nohasharray
-+btrfs_insert_inode_extref_57517 btrfs_insert_inode_extref 0 57517 &il_dbgfs_force_reset_read_57517
+cmm_read_57520 cmm_read 3 57520 NULL
+inode_permission_57531 inode_permission 0 57531 NULL
-+acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
-+ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
+ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL nohasharray
+ext4_group_first_block_no_57559 ext4_group_first_block_no 0-2 57559 &ReadHDLCPnP_57559
-+obd_unpackmd_57563 obd_unpackmd 0 57563 NULL
+snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
+get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
-+ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
-+il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
-+read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
-+wm831x_gpio_to_irq_57614 wm831x_gpio_to_irq 2 57614 NULL
-+vma_kernel_pagesize_57616 vma_kernel_pagesize 0 57616 NULL
-+tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
-+sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
++iwl4965_rs_sta_dbgfs_scale_table_write_57595 iwl4965_rs_sta_dbgfs_scale_table_write 3 57595 NULL
++sk_stream_alloc_skb_57622 sk_stream_alloc_skb 2 57622 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
-+tc3589x_irq_map_57639 tc3589x_irq_map 2 57639 NULL
++pci_enable_msi_block_57632 pci_enable_msi_block 0 57632 NULL
++msi_compose_msg_57637 msi_compose_msg 0 57637 NULL
++sys_mq_timedsend_57661 sys_mq_timedsend 3 57661 NULL
+r3964_write_57662 r3964_write 4 57662 NULL
-+proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
+__lgwrite_57669 __lgwrite 4 57669 NULL
-+f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL
++ieee80211_MFIE_rate_len_57692 ieee80211_MFIE_rate_len 0 57692 NULL
+i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
+snd_interval_value_57713 snd_interval_value 0 57713 NULL
-+ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
-+i915_gem_object_get_pages_57734 i915_gem_object_get_pages 0 57734 NULL
-+nouveau_gpio_create__57735 nouveau_gpio_create_ 4-5 57735 NULL
++calgary_alloc_coherent_57714 calgary_alloc_coherent 2 57714 NULL
++aa_matching_read_57720 aa_matching_read 3 57720 NULL
++vm_find_vqs_57729 vm_find_vqs 0 57729 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
+ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
-+SYSC_process_vm_writev_57776 SYSC_process_vm_writev 5-3 57776 NULL
++read_block_for_search_57781 read_block_for_search 0 57781 NULL
+apei_exec_collect_resources_57788 apei_exec_collect_resources 0 57788 NULL
+ld2_57794 ld2 0 57794 NULL
+ivtv_read_57796 ivtv_read 3 57796 NULL
-+generic_ptrace_peekdata_57806 generic_ptrace_peekdata 2 57806 NULL
-+ipath_user_sdma_num_pages_57813 ipath_user_sdma_num_pages 0 57813 NULL
+bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
+copy_to_user_57835 copy_to_user 3-0 57835 NULL
+flash_read_57843 flash_read 3 57843 NULL
-+kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
-+process_all_new_xattrs_57881 process_all_new_xattrs 0 57881 NULL
++tt_response_fill_table_57902 tt_response_fill_table 1 57902 NULL
+xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
-+iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL nohasharray
-+atomic_add_return_unchecked_57910 atomic_add_return_unchecked 0-1 57910 &iio_read_first_n_kfifo_57910
-+memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
-+twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
++emi26_writememory_57908 emi26_writememory 4 57908 NULL
++atomic_add_return_unchecked_57910 atomic_add_return_unchecked 0-1 57910 NULL nohasharray
++iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 &atomic_add_return_unchecked_57910
+__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
+sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
-+nvc0_vm_create_57942 nvc0_vm_create 2-3 57942 NULL
+xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
++rx_57944 rx 4 57944 NULL
+key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
+ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
+ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
-+c2_reg_user_mr_57982 c2_reg_user_mr 2-3 57982 NULL
-+interleave_nodes_57992 interleave_nodes 0 57992 NULL
-+do_rx_dma_57996 do_rx_dma 5 57996 NULL
++i915_cache_sharing_write_57961 i915_cache_sharing_write 3 57961 NULL
++hfc_empty_fifo_57972 hfc_empty_fifo 2 57972 NULL
++stripe_status_57985 stripe_status 4 57985 NULL
+rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
++regcache_rbtree_insert_to_block_58009 regcache_rbtree_insert_to_block 5 58009 NULL
+iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
+io_playback_transfer_58030 io_playback_transfer 4 58030 NULL
-+ext4_block_bitmap_58033 ext4_block_bitmap 0 58033 NULL
+mce_async_out_58056 mce_async_out 3 58056 NULL
+ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
-+dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
-+cm4040_write_58079 cm4040_write 3 58079 NULL
++cm4040_write_58079 cm4040_write 3 58079 NULL nohasharray
++usb_stor_acquire_resources_58079 usb_stor_acquire_resources 0 58079 &cm4040_write_58079
++rfcomm_wmalloc_58090 rfcomm_wmalloc 2 58090 NULL
++i915_add_request_58096 i915_add_request 0 58096 NULL
++savemem_58129 savemem 3 58129 NULL
+ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
+slhc_init_58135 slhc_init 2-1 58135 &ipv6_flowlabel_opt_58135
+ocfs2_reserve_clusters_58164 ocfs2_reserve_clusters 0 58164 NULL
-+ext4_bg_num_gdb_58171 ext4_bg_num_gdb 0 58171 NULL
+garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
++asix_write_cmd_58192 asix_write_cmd 5 58192 NULL
+ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
++nci_send_cmd_58206 nci_send_cmd 3 58206 NULL
+sysfs_add_file_mode_58222 sysfs_add_file_mode 0 58222 NULL
-+hva_to_pfn_58241 hva_to_pfn 1-0 58241 NULL
-+btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
+read_file_debug_58256 read_file_debug 3 58256 NULL
-+osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL
+cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL
+profile_load_58267 profile_load 3 58267 NULL
+kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
+acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
+iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
-+intel_alloc_coherent_58302 intel_alloc_coherent 2 58302 NULL
++my_skb_head_push_58297 my_skb_head_push 2 58297 NULL
+ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
-+i915_wait_seqno_58309 i915_wait_seqno 0 58309 NULL
-+tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
-+ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
-+diva_init_dma_map_58336 diva_init_dma_map 3 58336 NULL
-+__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
+next_pidmap_58347 next_pidmap 2-0 58347 NULL
-+SyS_migrate_pages_58348 SyS_migrate_pages 2 58348 NULL
-+save_hint_58359 save_hint 2 58359 NULL
-+vmw_ttm_tt_create_58369 vmw_ttm_tt_create 2 58369 NULL nohasharray
-+brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 &vmw_ttm_tt_create_58369
-+hash_ipportnet6_expire_58379 hash_ipportnet6_expire 3 58379 NULL
-+il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
-+_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
-+kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3-4 58406 NULL nohasharray
-+idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406
++vmalloc_to_sg_58354 vmalloc_to_sg 2 58354 NULL
++sctp_make_init_58401 sctp_make_init 4 58401 NULL
++idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 NULL
+i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
-+__mlx4_alloc_mtt_range_58418 __mlx4_alloc_mtt_range 2 58418 NULL
++iscsi_offload_mesg_58425 iscsi_offload_mesg 5 58425 NULL
++__iio_add_chan_devattr_58451 __iio_add_chan_devattr 0 58451 NULL
+capabilities_read_58457 capabilities_read 3 58457 NULL
-+batadv_iv_ogm_aggr_packet_58462 batadv_iv_ogm_aggr_packet 3 58462 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
-+nv_rd08_58472 nv_rd08 0 58472 NULL
+snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
+snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
-+btrfs_cont_expand_58498 btrfs_cont_expand 2-3 58498 NULL
+rndis_add_response_58544 rndis_add_response 2 58544 NULL
-+__clear_discard_58546 __clear_discard 2 58546 NULL
++efx_tsoh_heap_alloc_58545 efx_tsoh_heap_alloc 2 58545 NULL
+wrap_max_58548 wrap_max 0-1-2 58548 NULL
++gen_pool_alloc_58558 gen_pool_alloc 2 58558 NULL
+wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
+scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
+get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL
+ea_read_inline_58589 ea_read_inline 0 58589 NULL
-+isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
+xip_file_read_58592 xip_file_read 3 58592 NULL
+ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
-+radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
-+ebt_buf_count_58607 ebt_buf_count 0 58607 NULL
-+xfs_iomap_write_delay_58616 xfs_iomap_write_delay 2 58616 NULL
++ixj_read_58615 ixj_read 3 58615 NULL
+skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
+filemap_fdatawrite_range_58630 filemap_fdatawrite_range 0 58630 NULL
++vb2_qbuf_58631 vb2_qbuf 0 58631 NULL
+module_alloc_update_bounds_rx_58634 module_alloc_update_bounds_rx 1 58634 NULL
-+tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
+ocfs2_block_to_cluster_start_58653 ocfs2_block_to_cluster_start 2 58653 NULL
+iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
-+__gfn_to_pfn_58671 __gfn_to_pfn 2 58671 NULL
-+find_zero_58685 find_zero 0-1 58685 NULL
+uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
-+tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
-+vmalloc_node_58700 vmalloc_node 1 58700 NULL
++scsi_setup_command_freelist_58703 scsi_setup_command_freelist 0 58703 NULL
+vx_send_msg_58711 vx_send_msg 0 58711 NULL
-+i915_gem_execbuffer_reserve_58722 i915_gem_execbuffer_reserve 0 58722 NULL
-+da9052_gpio_to_irq_58729 da9052_gpio_to_irq 2 58729 NULL
+csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
+frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
+ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
+agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
-+oblock_to_dblock_58762 oblock_to_dblock 0-2 58762 NULL
++__do_config_autodelink_58763 __do_config_autodelink 3 58763 NULL
+regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL
+raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
-+isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL
-+write_file_58812 write_file 4 58812 NULL
+ep_read_58813 ep_read 3 58813 NULL
+command_write_58841 command_write 3 58841 NULL
-+ocfs2_truncate_log_append_58850 ocfs2_truncate_log_append 3-0 58850 NULL
-+ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
++ocfs2_truncate_log_append_58850 ocfs2_truncate_log_append 0-3 58850 NULL
++iwl_dbgfs_traffic_log_read_58870 iwl_dbgfs_traffic_log_read 3 58870 NULL
+gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
-+esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL
-+lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
+print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
-+pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
-+SyS_pread64_58935 SyS_pread64 3 58935 NULL
++st5481_isoc_flatten_58952 st5481_isoc_flatten 0 58952 NULL
++netpoll_send_udp_58955 netpoll_send_udp 3 58955 NULL
+wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
-+ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
+crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
-+__mem_cgroup_try_charge_58976 __mem_cgroup_try_charge 0 58976 NULL
-+remap_to_cache_dirty_58991 remap_to_cache_dirty 4-3 58991 NULL
++max3107_handlerx_58978 max3107_handlerx 2 58978 NULL
++handle_rx_packet_58993 handle_rx_packet 3 58993 NULL
+ep_write_59008 ep_write 3 59008 NULL
+lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
-+SyS_preadv_59029 SyS_preadv 3 59029 NULL
-+init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
++receive_server_sync_packet_59021 receive_server_sync_packet 3 59021 NULL
+selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
+crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
-+regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL
-+sysfs_link_sibling_59078 sysfs_link_sibling 0 59078 NULL
-+do_perf_sw_event_59099 do_perf_sw_event 3 59099 NULL
++i8042_enable_kbd_port_59049 i8042_enable_kbd_port 0 59049 NULL
+mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
+scsi_io_completion_59122 scsi_io_completion 2 59122 NULL
-+init_status_page_59124 init_status_page 0 59124 NULL
-+nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
++__iio_add_event_config_attrs_59136 __iio_add_event_config_attrs 0 59136 NULL
+print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 NULL nohasharray
+framebuffer_alloc_59145 framebuffer_alloc 1 59145 &print_devstats_dot11RTSSuccessCount_59145
+ocfs2_claim_local_alloc_bits_59147 ocfs2_claim_local_alloc_bits 0 59147 NULL
+radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
+pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
-+ksize_59176 ksize 0 59176 NULL
++mthca_create_eq_59157 mthca_create_eq 2 59157 NULL
+setup_window_59178 setup_window 4-2-5-7 59178 NULL
-+ocfs2_move_extent_59187 ocfs2_move_extent 3-5-2 59187 NULL
++ocfs2_move_extent_59187 ocfs2_move_extent 2-5-3 59187 NULL
++InitLedSettings_59192 InitLedSettings 0 59192 NULL
+validate_exec_list_59204 validate_exec_list 0 59204 NULL
+xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
-+check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL
++fast_rx_path_59214 fast_rx_path 3 59214 NULL
++check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL nohasharray
++inftl_partscan_59216 inftl_partscan 0 59216 &check_mapped_selector_name_59216
+dt3155_read_59226 dt3155_read 3 59226 NULL
-+paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-1-2 59229 NULL
++tcp_try_rmem_schedule_59231 tcp_try_rmem_schedule 2 59231 NULL
+tty_prepare_flip_string_flags_59240 tty_prepare_flip_string_flags 4 59240 NULL
++solo_v4l2_read_59247 solo_v4l2_read 3 59247 NULL
+nla_len_59258 nla_len 0 59258 NULL
-+drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
+__push_leaf_right_59302 __push_leaf_right 0 59302 NULL
-+btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4-0 59304 NULL
++btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
+fd_copyout_59323 fd_copyout 3 59323 NULL
+read_9287_modal_eeprom_59327 read_9287_modal_eeprom 3 59327 NULL
-+rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
-+paging64_get_level1_sp_gpa_59346 paging64_get_level1_sp_gpa 0 59346 NULL nohasharray
-+xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 &paging64_get_level1_sp_gpa_59346
++xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL
+__map_request_59350 __map_request 0 59350 NULL
+xfs_dir2_sf_entsize_59366 xfs_dir2_sf_entsize 0-2 59366 NULL
-+blk_flush_policy_59368 blk_flush_policy 0 59368 NULL
-+f2fs_fallocate_59377 f2fs_fallocate 3-4 59377 NULL
+pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
-+ocfs2_replay_truncate_records_59382 ocfs2_replay_truncate_records 0 59382 NULL
+journal_init_dev_59384 journal_init_dev 5 59384 NULL
-+isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
++fc_frame_alloc_fill_59394 fc_frame_alloc_fill 2 59394 NULL
+pci_ctrl_read_59424 pci_ctrl_read 0 59424 NULL
+vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
+snd_pcm_tstamp_59431 snd_pcm_tstamp 0 59431 NULL
-+SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
-+fs_path_ensure_buf_59445 fs_path_ensure_buf 2-0 59445 NULL
++squashfs_read_data_59440 squashfs_read_data 6 59440 NULL
+descriptor_loc_59446 descriptor_loc 3 59446 NULL
-+block_rsv_use_bytes_59464 block_rsv_use_bytes 0 59464 NULL
+shrink_tnc_trees_59481 shrink_tnc_trees 0 59481 NULL
-+btrfs_del_dir_entries_in_log_59490 btrfs_del_dir_entries_in_log 0 59490 NULL
+ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
-+rds_pin_pages_59507 rds_pin_pages 1-2 59507 NULL
-+ext4_resize_fs_59543 ext4_resize_fs 2 59543 NULL
-+mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
++rds_pin_pages_59507 rds_pin_pages 0 59507 NULL
+tunables_write_59563 tunables_write 3 59563 NULL
+__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
+write_pbl_59583 write_pbl 4 59583 NULL
+memdup_user_59590 memdup_user 2 59590 NULL
-+tps6586x_irq_get_virq_59601 tps6586x_irq_get_virq 2 59601 NULL
-+mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL nohasharray
-+xrcdn_free_res_59616 xrcdn_free_res 5 59616 &mem_fwlog_free_mem_blks_read_59616
-+ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
++fcoe_ctlr_vn_send_59607 fcoe_ctlr_vn_send 4 59607 NULL
+mtrr_write_59622 mtrr_write 3 59622 NULL
+ocfs2_adjust_rightmost_branch_59623 ocfs2_adjust_rightmost_branch 0 59623 NULL
++ip_vs_icmp_xmit_59624 ip_vs_icmp_xmit 4 59624 NULL
+find_first_zero_bit_59636 find_first_zero_bit 0-2 59636 NULL
-+SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
-+hidraw_read_59650 hidraw_read 3 59650 NULL
++dn_fib_nlmsg_size_59643 dn_fib_nlmsg_size 0 59643 NULL
++ubifs_setxattr_59650 ubifs_setxattr 4 59650 NULL nohasharray
++hidraw_read_59650 hidraw_read 3 59650 &ubifs_setxattr_59650
+v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
+paravirt_sched_clock_59660 paravirt_sched_clock 0 59660 NULL
-+__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
-+iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL
++tcp_skb_pcount_59664 tcp_skb_pcount 0 59664 NULL
+alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
++ieee80211_mgmt_tx_59699 ieee80211_mgmt_tx 9 59699 NULL
+mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
+ioperm_get_59701 ioperm_get 4-3 59701 NULL
+snd_pcm_info_user_59711 snd_pcm_info_user 0 59711 NULL
+prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
-+ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL
-+fat_direct_IO_59741 fat_direct_IO 4 59741 NULL
++nfs_file_splice_read_59735 nfs_file_splice_read 4 59735 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
+qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
-+strnlen_59746 strnlen 0 59746 NULL
-+process_all_refs_59754 process_all_refs 0 59754 NULL nohasharray
-+ext3_acl_count_59754 ext3_acl_count 0-1 59754 &process_all_refs_59754
-+process_new_xattr_59755 process_new_xattr 0 59755 NULL
++strnlen_59746 strnlen 0 59746 NULL nohasharray
++fuse_file_llseek_59746 fuse_file_llseek 2 59746 &strnlen_59746
++ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL
+long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL
+venus_remove_59781 venus_remove 4 59781 NULL
-+mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
+xlog_do_recover_59789 xlog_do_recover 3 59789 NULL
-+msb_get_zone_from_lba_59800 msb_get_zone_from_lba 0-1 59800 NULL
+ipw_write_59807 ipw_write 3 59807 NULL
++rtllib_wx_set_gen_ie_59808 rtllib_wx_set_gen_ie 3 59808 NULL
++ubi_dbg_check_all_ff_59810 ubi_dbg_check_all_ff 0 59810 NULL
+scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
+ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
+gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
+fs64_to_cpu_59845 fs64_to_cpu 0 59845 NULL
-+regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
-+intel_ring_wait_request_59865 intel_ring_wait_request 0 59865 NULL
++tun_put_user_59849 tun_put_user 4 59849 NULL
++format_array_59854 format_array 0 59854 NULL
+pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
-+shmem_zero_setup_59885 shmem_zero_setup 0 59885 NULL nohasharray
-+start_transaction_59885 start_transaction 2 59885 &shmem_zero_setup_59885
++shmem_zero_setup_59885 shmem_zero_setup 0 59885 NULL
+l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
+ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
+ocfs2_extend_rotate_transaction_59894 ocfs2_extend_rotate_transaction 0 59894 NULL
+swiotlb_map_page_59909 swiotlb_map_page 3 59909 NULL
-+aic7xxx_abort_waiting_scb_59932 aic7xxx_abort_waiting_scb 0 59932 NULL
-+kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL
+ocfs2_expand_inline_ref_root_59945 ocfs2_expand_inline_ref_root 0 59945 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
-+lookup_node_59953 lookup_node 2 59953 NULL
-+il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
-+kvm_set_cr3_59965 kvm_set_cr3 2 59965 NULL
++dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 NULL
+__arch_hweight16_59975 __arch_hweight16 0 59975 NULL
+osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
+ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
-+ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL
+rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
+mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
+osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
+xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
++sys_sched_getaffinity_60033 sys_sched_getaffinity 2 60033 NULL
+bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
+do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
+vcs_size_60050 vcs_size 0 60050 NULL nohasharray
+pin_2_irq_60050 pin_2_irq 0-3 60050 &vcs_size_60050
-+gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL
-+open_cur_inode_file_60057 open_cur_inode_file 0 60057 NULL
++load_module_60056 load_module 2 60056 NULL nohasharray
++gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 &load_module_60056
+compat_writev_60063 compat_writev 3 60063 NULL
-+ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
+c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
+mp_register_gsi_60079 mp_register_gsi 2 60079 NULL
+rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
+ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
-+SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
-+nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
-+__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
+ld_usb_read_60156 ld_usb_read 3 60156 NULL
+jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
+init_state_60165 init_state 2 60165 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
-+fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
-+rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL
-+qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
-+btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
-+arizona_map_irq_60230 arizona_map_irq 2 60230 NULL nohasharray
-+__phys_addr_nodebug_60230 __phys_addr_nodebug 0 60230 &arizona_map_irq_60230
-+wm831x_irq_60254 wm831x_irq 2 60254 NULL
-+irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 3-2 60264 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
++store_iwmct_log_level_60209 store_iwmct_log_level 4 60209 NULL
++pvclock_scale_delta_60231 pvclock_scale_delta 0 60231 NULL
++compat_sys_fcntl64_60256 compat_sys_fcntl64 3 60256 NULL
+printer_write_60276 printer_write 3 60276 NULL
++__pskb_pull_tail_60287 __pskb_pull_tail 2 60287 NULL
+do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
+getDataLength_60301 getDataLength 0 60301 NULL
-+xfs_next_bit_60322 xfs_next_bit 0-3 60322 NULL
-+inorder_to_tree_60331 inorder_to_tree 1-0 60331 NULL
+usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
+__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
-+max_unfragmented_pages_60362 max_unfragmented_pages 0 60362 NULL
++brcmf_alloc_wdev_60347 brcmf_alloc_wdev 1 60347 NULL
++rh_call_control_60349 rh_call_control 0 60349 NULL
+dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
-+ubi_eba_atomic_leb_change_60379 ubi_eba_atomic_leb_change 0-5 60379 NULL
-+instruction_pointer_60384 instruction_pointer 0 60384 NULL
-+drop_outstanding_extent_60390 drop_outstanding_extent 0 60390 NULL
+mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
+ocfs2_zero_extend_60396 ocfs2_zero_extend 3 60396 NULL
++tveeprom_read_60397 tveeprom_read 3 60397 NULL
+driver_names_read_60399 driver_names_read 3 60399 NULL
-+paging32_walk_addr_generic_60415 paging32_walk_addr_generic 4 60415 NULL
+simple_alloc_urb_60420 simple_alloc_urb 3 60420 NULL
+excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
+tstats_write_60432 tstats_write 3 60432 NULL nohasharray
+kmalloc_60432 kmalloc 1 60432 &tstats_write_60432
-+scaled_div32_60442 scaled_div32 2-1-0 60442 NULL
-+snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
++tipc_buf_acquire_60437 tipc_buf_acquire 1 60437 NULL
++rx_data_60442 rx_data 4 60442 NULL
++tcf_csum_ipv4_igmp_60446 tcf_csum_ipv4_igmp 3 60446 NULL
++iwm_ntf_rx_packet_60452 iwm_ntf_rx_packet 3 60452 NULL
+crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
-+lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
++ath_tx_init_60515 ath_tx_init 2 60515 NULL
++ubi_wl_get_peb_60525 ubi_wl_get_peb 0 60525 NULL
++hysdn_sched_rx_60533 hysdn_sched_rx 3 60533 NULL
+v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
-+nonpaging_map_60551 nonpaging_map 4 60551 NULL
-+osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
+tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
-+hash_net6_expire_60598 hash_net6_expire 3 60598 NULL
-+btrfs_add_delayed_tree_ref_60602 btrfs_add_delayed_tree_ref 0 60602 NULL
+skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
+wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
+usb_control_msg_60624 usb_control_msg 0 60624 NULL
+acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
+free_dind_blocks_60635 free_dind_blocks 0 60635 NULL
-+ubifs_recover_leb_60639 ubifs_recover_leb 3 60639 NULL
-+__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
-+mv_ffc64_60648 mv_ffc64 1 60648 NULL
+if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
-+run_clustered_refs_60668 run_clustered_refs 0 60668 NULL
+ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
-+btrfs_reserve_extent_60674 btrfs_reserve_extent 5-0 60674 NULL
+init_data_container_60709 init_data_container 1 60709 NULL
+vga_rcrt_60731 vga_rcrt 0 60731 NULL
++add_to_list_60744 add_to_list 0 60744 NULL
+snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
-+raid_status_60755 raid_status 5 60755 NULL
+sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
+opticon_write_60775 opticon_write 4 60775 NULL
+acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
+snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
-+block_rsv_migrate_bytes_60843 block_rsv_migrate_bytes 0 60843 NULL
+pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
-+alloc_buf_60864 alloc_buf 2-3 60864 NULL
++pool_status_60861 pool_status 4 60861 NULL
++ieee80211_send_auth_60865 ieee80211_send_auth 5 60865 NULL
++alloc_irq_from_60868 alloc_irq_from 1-0 60868 NULL
+generic_writepages_60871 generic_writepages 0 60871 NULL
-+tipc_createport_60875 tipc_createport 4 60875 NULL
+ubifs_read_one_lp_60882 ubifs_read_one_lp 0 60882 NULL
-+ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
-+iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
-+libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
+mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
-+scrub_chunk_60926 scrub_chunk 5 60926 NULL
-+submit_extent_page_60928 submit_extent_page 5 60928 NULL
++xen_clocksource_read_60918 xen_clocksource_read 0 60918 NULL
++set_powered_60938 set_powered 4 60938 NULL
++xfs_rtallocate_extent_size_60939 xfs_rtallocate_extent_size 4 60939 NULL
+pti_char_write_60960 pti_char_write 3 60960 NULL
-+mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 3-2 60961 NULL
-+__a2mp_build_60987 __a2mp_build 3 60987 NULL
-+hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
++mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
++blkio_get_key_name_61014 blkio_get_key_name 4 61014 NULL
+ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
-+graph_depth_write_61024 graph_depth_write 3 61024 NULL
-+sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
+lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
+symtab_init_61050 symtab_init 2 61050 NULL
-+fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
++fuse_send_write_61053 fuse_send_write 0 61053 NULL
+snd_pcm_pause_61054 snd_pcm_pause 0 61054 NULL
-+bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-4-2 61062 NULL
++bitmap_scnlistprintf_61062 bitmap_scnlistprintf 2-4-0 61062 NULL
+ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
-+journal_stop_61080 journal_stop 0 61080 NULL
+snd_pcm_update_hw_ptr0_61084 snd_pcm_update_hw_ptr0 0 61084 NULL
+get_derived_key_61100 get_derived_key 4 61100 NULL
-+mem_cgroup_cache_charge_61101 mem_cgroup_cache_charge 0 61101 NULL
-+i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-1-2-3-4 61104 NULL
+alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
-+__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
++p80211_headerlen_61119 p80211_headerlen 0 61119 NULL nohasharray
++__probe_kernel_read_61119 __probe_kernel_read 3 61119 &p80211_headerlen_61119
++proto_ports_offset_61125 proto_ports_offset 0 61125 NULL
+vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
+afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
-+brcmf_sdio_chip_cr4_exitdl_61143 brcmf_sdio_chip_cr4_exitdl 4 61143 NULL
-+__vmalloc_61168 __vmalloc 1 61168 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
-+dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
-+btrfs_reloc_post_snapshot_61189 btrfs_reloc_post_snapshot 0 61189 NULL
-+SyS_prctl_61202 SyS_prctl 4 61202 NULL
++event_oom_late_read_61175 event_oom_late_read 3 61175 NULL
++sys_lsetxattr_61177 sys_lsetxattr 4 61177 NULL
++cfpkt_append_61206 cfpkt_append 3 61206 NULL
+arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
++pn544_write_61215 pn544_write 3 61215 NULL
+smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
+__verify_planes_array_61249 __verify_planes_array 0 61249 NULL
-+find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL nohasharray
-+ifalias_store_61270 ifalias_store 4 61270 &find_get_pages_tag_61270 nohasharray
-+btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 &ifalias_store_61270
++find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL
+kick_a_thread_61273 kick_a_thread 0 61273 NULL
-+hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 NULL nohasharray
-+vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 &hfsplus_getxattr_finder_info_61283
-+nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
++vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 NULL
++sys_add_key_61288 sys_add_key 4 61288 NULL
+ext4_issue_discard_61305 ext4_issue_discard 2 61305 NULL
-+xfer_from_user_61307 xfer_from_user 3 61307 NULL
-+ocfs2_get_sector_61309 ocfs2_get_sector 4 61309 NULL
-+timespec_to_ns_61317 timespec_to_ns 0 61317 NULL
+xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
-+C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL
-+write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL
-+__fls_61340 __fls 0 61340 NULL nohasharray
++__fls_61340 __fls 0-1 61340 NULL nohasharray
+st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 &__fls_61340
-+do_splice_direct_61341 do_splice_direct 5 61341 NULL nohasharray
-+rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 &do_splice_direct_61341
-+__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-2-3 61342 NULL
-+f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL
-+kvm_apic_id_61363 kvm_apic_id 0 61363 NULL
-+debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
-+get_inode_info_61387 get_inode_info 0 61387 NULL
++set_params_61373 set_params 0 61373 NULL
++change_xattr_61390 change_xattr 5 61390 NULL
+system_enable_write_61396 system_enable_write 3 61396 NULL
-+size_entry_mwt_61400 size_entry_mwt 0 61400 NULL
-+xfs_zero_remaining_bytes_61423 xfs_zero_remaining_bytes 3 61423 NULL
++pm860x_bulk_read_61415 pm860x_bulk_read 3 61415 NULL
+i915_emit_box_61436 i915_emit_box 0 61436 NULL
+dma_ops_area_alloc_61440 dma_ops_area_alloc 3-4-5-0 61440 NULL
-+tc3589x_irq_unmap_61447 tc3589x_irq_unmap 2 61447 NULL
+unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
+snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
+btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
+ocfs2_get_refcount_rec_61514 ocfs2_get_refcount_rec 0 61514 NULL
-+erst_errno_61526 erst_errno 0 61526 NULL
++clone_bio_61526 clone_bio 5 61526 NULL nohasharray
++erst_errno_61526 erst_errno 0 61526 &clone_bio_61526
+ntfs_attr_lookup_61539 ntfs_attr_lookup 0 61539 NULL
-+get_ohm_of_thermistor_61545 get_ohm_of_thermistor 2 61545 NULL
+trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
+o2hb_pop_count_61553 o2hb_pop_count 2 61553 NULL
+dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
++rbd_do_request_61561 rbd_do_request 6-7 61561 NULL
+parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL
+fan_proc_write_61569 fan_proc_write 3 61569 NULL
+ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
-+ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL
++mip_minify_61584 mip_minify 2-1-0 61584 NULL
+seq_open_private_61589 seq_open_private 3 61589 NULL
-+ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-2-1 61591 NULL
+netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
-+nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL
++cx2341x_handler_init_61601 cx2341x_handler_init 2 61601 NULL
+configfs_write_file_61621 configfs_write_file 3 61621 NULL
-+ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL
++ieee80211_rx_bss_info_61630 ieee80211_rx_bss_info 3 61630 NULL
+i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
+snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL
+resize_stripes_61650 resize_stripes 2 61650 NULL
@@ -109586,57 +110409,47 @@ index 0000000..0a9d518
+snd_pcm_playback_avail_61671 snd_pcm_playback_avail 0 61671 NULL
+qib_format_hwmsg_61679 qib_format_hwmsg 2 61679 NULL
+lock_loop_61681 lock_loop 1 61681 NULL
-+__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL
+filter_read_61692 filter_read 3 61692 NULL
-+prog_page_61711 prog_page 2 61711 NULL
+iov_length_61716 iov_length 0 61716 NULL
+fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
-+null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 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
-+SyS_sendto_61763 SyS_sendto 6 61763 NULL
+gfs2_meta_wait_61773 gfs2_meta_wait 0 61773 NULL
-+num_counter_active_61789 num_counter_active 0 61789 NULL
+mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
-+tps80031_irq_init_61830 tps80031_irq_init 3 61830 NULL
++btrfs_file_llseek_61838 btrfs_file_llseek 2 61838 NULL
+bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
-+regcache_sync_block_61846 regcache_sync_block 4-5 61846 NULL
-+fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2-0 61854 NULL
++btrfs_bitmap_cluster_61854 btrfs_bitmap_cluster 4 61854 NULL
+evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
-+SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
+get_fw_name_61874 get_fw_name 3 61874 NULL
-+twl4030_sih_setup_61878 twl4030_sih_setup 3-0 61878 NULL
-+btrfs_ioctl_clone_61886 btrfs_ioctl_clone 4-3-5 61886 NULL
-+lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
-+lov_mds_md_stripecnt_61899 lov_mds_md_stripecnt 0-1 61899 NULL
++ieee80211_rtl_auth_challenge_61897 ieee80211_rtl_auth_challenge 3 61897 NULL
++ax25_addr_size_61899 ax25_addr_size 0 61899 NULL nohasharray
++cxgb4_pktgl_to_skb_61899 cxgb4_pktgl_to_skb 2 61899 &ax25_addr_size_61899
++roundup_ring_size_61901 roundup_ring_size 1 61901 NULL
+clear_refs_write_61904 clear_refs_write 3 61904 NULL
-+rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
+au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
+sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
+ocfs2_reserve_new_metadata_blocks_61926 ocfs2_reserve_new_metadata_blocks 0 61926 NULL
-+SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
-+gfn_to_pfn_memslot_atomic_61947 gfn_to_pfn_memslot_atomic 2 61947 NULL
-+il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
++send_bulk_static_data_61932 send_bulk_static_data 3 61932 NULL
++cluster_pages_for_defrag_61956 cluster_pages_for_defrag 0 61956 NULL
+squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
-+fix_read_error_61965 fix_read_error 4 61965 NULL
+mlx4_alloc_mtt_range_61966 mlx4_alloc_mtt_range 2 61966 NULL
+ocfs2_quota_write_61972 ocfs2_quota_write 5-4 61972 NULL
+fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
+cow_file_range_61979 cow_file_range 3 61979 NULL
++ext4_da_get_block_prep_61987 ext4_da_get_block_prep 2 61987 NULL
+module_alloc_exec_61991 module_alloc_exec 1 61991 NULL
++virtnet_send_command_61993 virtnet_send_command 5-6 61993 NULL
+dequeue_event_62000 dequeue_event 3 62000 NULL
+xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
-+SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
+jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
-+SYSC_select_62024 SYSC_select 1 62024 NULL
+pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
++proc_fdinfo_read_62043 proc_fdinfo_read 3 62043 NULL
++ppp_tx_cp_62044 ppp_tx_cp 5 62044 NULL
+sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
+do_pselect_62061 do_pselect 1 62061 NULL
+pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
+get_domain_for_dev_62099 get_domain_for_dev 2 62099 NULL
-+ipath_user_sdma_pin_pages_62100 ipath_user_sdma_pin_pages 3-5-4 62100 NULL
+jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
-+btrfs_direct_IO_62114 btrfs_direct_IO 4 62114 NULL
+generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
+llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
+qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray
@@ -109645,386 +110458,293 @@ index 0000000..0a9d518
+device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135
+video_usercopy_62151 video_usercopy 2 62151 NULL
+wrmWithLock_62164 wrmWithLock 0 62164 NULL
-+SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
+prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
-+write_file_dfs_62180 write_file_dfs 3 62180 NULL
+alloc_upcall_62186 alloc_upcall 2 62186 NULL
++global_page_state_62202 global_page_state 0 62202 NULL
+btrfs_xattr_acl_set_62203 btrfs_xattr_acl_set 4 62203 NULL
+sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
-+SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
++check_unicast_packet_62217 check_unicast_packet 2 62217 NULL
++hash_new_62224 hash_new 1 62224 NULL
+nfsd_read_file_62241 nfsd_read_file 6 62241 NULL
-+allocate_partition_62245 allocate_partition 4 62245 NULL
-+security_file_permission_62278 security_file_permission 0 62278 NULL
-+get_random_int_62279 get_random_int 0 62279 NULL
-+__qib_get_user_pages_62287 __qib_get_user_pages 1-2 62287 NULL
-+il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
-+sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
++send_control_msg_62261 send_control_msg 5 62261 NULL
+ocfs2_find_victim_alloc_group_62306 ocfs2_find_victim_alloc_group 0 62306 NULL
+subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
-+timespec_to_jiffies_62321 timespec_to_jiffies 0 62321 NULL
++udf_sb_alloc_partition_maps_62313 udf_sb_alloc_partition_maps 2 62313 NULL
++hfcpci_empty_bfifo_62323 hfcpci_empty_bfifo 4 62323 NULL
+Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
-+subseq_list_62332 subseq_list 3-0 62332 NULL
-+ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL
+flash_write_62354 flash_write 3 62354 NULL
+xfpregs_set_62363 xfpregs_set 4 62363 NULL
-+rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
+altera_irscan_62396 altera_irscan 2 62396 NULL
-+set_ssp_62411 set_ssp 4 62411 NULL
-+mlx4_en_create_rx_ring_62498 mlx4_en_create_rx_ring 3 62498 NULL
-+ext_rts51x_sd_execute_read_data_62501 ext_rts51x_sd_execute_read_data 9 62501 NULL
++udplite_manip_pkt_62433 udplite_manip_pkt 2 62433 NULL
++netdev_alloc_skb_62437 netdev_alloc_skb 2 62437 NULL
++e1000_check_copybreak_62448 e1000_check_copybreak 3 62448 NULL
+ocfs2_path_bh_journal_access_62504 ocfs2_path_bh_journal_access 0 62504 NULL
-+pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
++count_open_files_62524 count_open_files 0 62524 NULL nohasharray
++pep_sendmsg_62524 pep_sendmsg 4 62524 &count_open_files_62524
++store_pwm1_62529 store_pwm1 4 62529 NULL
+test_iso_queue_62534 test_iso_queue 5 62534 NULL
+debugfs_read_62535 debugfs_read 3 62535 NULL
+sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
+qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
+xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
-+get_subdir_62581 get_subdir 3 62581 NULL
-+nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 NULL
-+get_desc_base_62617 get_desc_base 0 62617 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
+iommu_area_alloc_62619 iommu_area_alloc 2-3-4-7-0 62619 NULL
-+vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
++iwl_dbgfs_force_reset_read_62628 iwl_dbgfs_force_reset_read 3 62628 NULL
+lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
++tt_changes_fill_buffer_62649 tt_changes_fill_buffer 3 62649 NULL
++ima_file_mmap_62663 ima_file_mmap 0 62663 NULL
+write_62671 write 3 62671 NULL
-+ocfs2_wait_for_mask_interruptible_62675 ocfs2_wait_for_mask_interruptible 0 62675 NULL
-+printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
++printer_req_alloc_62687 printer_req_alloc 2 62687 NULL nohasharray
++iwl_dbgfs_rx_statistics_read_62687 iwl_dbgfs_rx_statistics_read 3 62687 &printer_req_alloc_62687
+ext4_ind_map_blocks_62690 ext4_ind_map_blocks 0 62690 NULL
-+htb_remove_class_from_row_62692 htb_remove_class_from_row 3 62692 NULL
-+qla4_83xx_rd_reg_62693 qla4_83xx_rd_reg 0 62693 NULL
++adxl34x_i2c_read_block_62691 adxl34x_i2c_read_block 3 62691 NULL
+bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
-+gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
+rdm_62719 rdm 0 62719 NULL
-+obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
+key_replays_read_62746 key_replays_read 3 62746 NULL
-+lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
+mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
+ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL
-+page_key_alloc_62771 page_key_alloc 0 62771 NULL
-+C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
-+SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
-+dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
-+posix_acl_valid_62788 posix_acl_valid 0 62788 NULL
-+is_first_ref_62805 is_first_ref 0 62805 NULL
++scrub_chunk_62771 scrub_chunk 4 62771 NULL nohasharray
++page_key_alloc_62771 page_key_alloc 0 62771 &scrub_chunk_62771
+tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
-+name_cache_insert_62822 name_cache_insert 0 62822 NULL
++__generic_file_splice_read_62834 __generic_file_splice_read 4 62834 NULL
+BeceemEEPROMBulkRead_62835 BeceemEEPROMBulkRead 0 62835 NULL
-+__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
-+bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
++__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0-1 62836 NULL
+xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
+rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
-+set_swbp_62853 set_swbp 3 62853 NULL
++genlmsg_msg_size_62845 genlmsg_msg_size 0-1 62845 NULL
+read_nic_io_dword_62859 read_nic_io_dword 0 62859 NULL
-+l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
++hpi_read_word_62862 hpi_read_word 0 62862 NULL
++nfs_writedata_alloc_62868 nfs_writedata_alloc 1 62868 NULL
+aoechr_write_62883 aoechr_write 3 62883 NULL
++resize_info_buffer_62889 resize_info_buffer 2 62889 NULL
+if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
+ocfs2_validate_gd_parent_62905 ocfs2_validate_gd_parent 0 62905 NULL
+mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
+getdqbuf_62908 getdqbuf 1 62908 NULL
-+try_async_pf_62914 try_async_pf 3 62914 NULL nohasharray
-+SyS_remap_file_pages_62914 SyS_remap_file_pages 1-2 62914 &try_async_pf_62914
-+ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
-+atomic64_sub_return_62941 atomic64_sub_return 1 62941 NULL
+agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
-+send_write_62969 send_write 0-3 62969 NULL
-+__ext3_journal_stop_63017 __ext3_journal_stop 0 63017 NULL
++get_skb_63008 get_skb 2 63008 NULL
+kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL
+PTR_ERR_63033 PTR_ERR 0 63033 NULL nohasharray
+__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 &PTR_ERR_63033
-+pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
+scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
-+run_delayed_tree_ref_63042 run_delayed_tree_ref 0 63042 NULL
+unlink1_63059 unlink1 3 63059 NULL
-+xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
-+iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL
-+ocfs2_decrease_refcount_63078 ocfs2_decrease_refcount 4-3-0 63078 NULL
-+find_extent_in_eb_63082 find_extent_in_eb 0 63082 NULL
-+sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5-3-2 63087 NULL
-+__ocfs2_flush_truncate_log_63097 __ocfs2_flush_truncate_log 0 63097 NULL
-+iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
-+ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
-+alloc_cblock_63133 alloc_cblock 2 63133 NULL
++ocfs2_decrease_refcount_63078 ocfs2_decrease_refcount 0-4-3 63078 NULL
++compare_lebs_63098 compare_lebs 0 63098 NULL
++brcmf_alloc_pkt_and_read_63116 brcmf_alloc_pkt_and_read 2 63116 NULL nohasharray
++iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 &brcmf_alloc_pkt_and_read_63116
++ib_send_cm_rtu_63138 ib_send_cm_rtu 3 63138 NULL
+snd_pcm_status_user_63140 snd_pcm_status_user 0 63140 NULL
+ubifs_change_one_lp_63157 ubifs_change_one_lp 0 63157 NULL
-+smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
-+SyS_syslog_63178 SyS_syslog 3 63178 NULL
-+security_policydb_len_63198 security_policydb_len 0 63198 NULL
++dma_set_mask_63172 dma_set_mask 0 63172 NULL
++snd_pcm_lib_malloc_pages_63182 snd_pcm_lib_malloc_pages 2 63182 NULL
+vme_master_read_63221 vme_master_read 0 63221 NULL
-+SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
+module_alloc_update_bounds_rw_63233 module_alloc_update_bounds_rw 1 63233 NULL
++sched_domain_node_span_63234 sched_domain_node_span 1 63234 NULL
+ptp_read_63251 ptp_read 4 63251 NULL
-+xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
+ntfs_attr_can_be_non_resident_63267 ntfs_attr_can_be_non_resident 0 63267 NULL
-+raid5_resize_63306 raid5_resize 2 63306 NULL
++readword_63288 readword 0 63288 NULL
++tcp_collapse_63294 tcp_collapse 5-6 63294 NULL
++isdn_ppp_ccp_xmit_reset_63297 isdn_ppp_ccp_xmit_reset 6 63297 NULL
++dns_resolver_instantiate_63314 dns_resolver_instantiate 3 63314 NULL
+proc_info_read_63344 proc_info_read 3 63344 NULL
+ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
+idmouse_read_63374 idmouse_read 3 63374 NULL
-+edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 NULL nohasharray
-+usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 &edac_pci_alloc_ctl_info_63388
++edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 NULL
+rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
-+nouveau_event_create_63411 nouveau_event_create 1 63411 NULL
++noack_read_63419 noack_read 3 63419 NULL
+l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
-+sep_prepare_input_output_dma_table_63429 sep_prepare_input_output_dma_table 3-4-2 63429 NULL
-+gfn_to_hva_many_63437 gfn_to_hva_many 2-0 63437 NULL
++iwl_dbgfs_debug_level_read_63430 iwl_dbgfs_debug_level_read 3 63430 NULL
++brcmu_pkttotlen_63431 brcmu_pkttotlen 0 63431 NULL
++kone_send_63435 kone_send 4 63435 NULL
+nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
-+lookup_dir_item_inode_63447 lookup_dir_item_inode 0 63447 NULL
-+i915_gem_object_get_fence_63455 i915_gem_object_get_fence 0 63455 NULL
-+si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
+snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
+do_work_63483 do_work 0 63483 NULL
-+reada_find_extent_63486 reada_find_extent 2 63486 NULL
-+__copy_from_user_ll_nocache_63487 __copy_from_user_ll_nocache 0-3 63487 NULL
+read_kcore_63488 read_kcore 3 63488 NULL nohasharray
-+alloc_reserved_tree_block_63488 alloc_reserved_tree_block 0 63488 &read_kcore_63488
-+save_hint_63497 save_hint 2 63497 NULL
-+wl1271_tx_min_rate_get_63498 wl1271_tx_min_rate_get 2 63498 NULL
-+sis_voice_irq_63501 sis_voice_irq 1 63501 NULL
++get_gpio_63488 get_gpio 0 63488 &read_kcore_63488
+snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
-+efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 5-4 63529 NULL
+ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4-0 63534 NULL
-+write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
++snapshot_status_63538 snapshot_status 4 63538 NULL
+if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
+append_to_buffer_63550 append_to_buffer 3 63550 NULL
-+dbg_leb_write_63555 dbg_leb_write 4-5 63555 NULL nohasharray
-+kvm_write_guest_page_63555 kvm_write_guest_page 2-5 63555 &dbg_leb_write_63555
++kvm_write_guest_page_63555 kvm_write_guest_page 5 63555 NULL
+ubifs_lpt_scan_nolock_63572 ubifs_lpt_scan_nolock 0 63572 NULL
-+iwch_reg_user_mr_63575 iwch_reg_user_mr 2-3 63575 NULL
+ocfs2_calc_trunc_pos_63576 ocfs2_calc_trunc_pos 4 63576 NULL
-+rproc_alloc_63577 rproc_alloc 5 63577 NULL
+ext3_clear_blocks_63597 ext3_clear_blocks 4-5 63597 NULL
-+write_debug_level_63613 write_debug_level 3 63613 NULL
++mlx4_ib_alloc_cq_buf_63610 mlx4_ib_alloc_cq_buf 3 63610 NULL
+module_alloc_63630 module_alloc 1 63630 NULL
-+ntfs_malloc_nofs_nofail_63631 ntfs_malloc_nofs_nofail 1 63631 NULL
+symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
+_ubh_find_next_zero_bit__63640 _ubh_find_next_zero_bit_ 3-5-4 63640 NULL
+ext4_ext_get_access_63642 ext4_ext_get_access 0 63642 NULL
+proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
-+ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
-+ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
++nand_ecc_test_63654 nand_ecc_test 1 63654 NULL nohasharray
++ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3-0 63654 &nand_ecc_test_63654
+hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
++iwl4965_rs_sta_dbgfs_scale_table_read_63672 iwl4965_rs_sta_dbgfs_scale_table_read 3 63672 NULL
+vbi_read_63673 vbi_read 3 63673 NULL nohasharray
+xen_register_pirq_63673 xen_register_pirq 1-2 63673 &vbi_read_63673
-+write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
+bin_search_63697 bin_search 0 63697 NULL
-+arizona_irq_map_63709 arizona_irq_map 2 63709 NULL
+ocfs2_et_root_journal_access_63713 ocfs2_et_root_journal_access 0 63713 NULL
-+nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
-+btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4-0 63720 NULL
++btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
++nfs4_reset_slot_table_63721 nfs4_reset_slot_table 2 63721 NULL
++i915_gem_execbuffer_relocate_63728 i915_gem_execbuffer_relocate 0 63728 NULL
+selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
++i915_gem_execbuffer_flush_63749 i915_gem_execbuffer_flush 0 63749 NULL
+snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
+snd_pcm_link_63772 snd_pcm_link 0 63772 NULL
+snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
+spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
+mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
+copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
-+prepare_copy_63826 prepare_copy 2 63826 NULL
+sel_write_load_63830 sel_write_load 3 63830 NULL
-+ll_readlink_63836 ll_readlink 3 63836 NULL
+IsSectionWritable_63842 IsSectionWritable 0 63842 NULL
+proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
-+divas_write_63901 divas_write 3 63901 NULL
++ieee80211_if_fmt_channel_type_63855 ieee80211_if_fmt_channel_type 3 63855 NULL
++init_map_ipmac_63896 init_map_ipmac 4-3 63896 NULL
+IsOffsetWritable_63902 IsOffsetWritable 0 63902 NULL nohasharray
+xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 &IsOffsetWritable_63902
++pohmelfs_readpages_trans_complete_63912 pohmelfs_readpages_trans_complete 2 63912 NULL
+uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
-+snd_compr_write_63923 snd_compr_write 3 63923 NULL
+acpi_ev_get_gpe_xrupt_block_63924 acpi_ev_get_gpe_xrupt_block 1 63924 NULL
++ledd_proc_write_63928 ledd_proc_write 3 63928 NULL
+tipc_send2port_63935 tipc_send2port 5 63935 NULL
+afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
-+__team_options_register_63941 __team_options_register 3 63941 NULL
+macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
-+generic_acl_init_63955 generic_acl_init 0 63955 NULL
+domain_pfn_mapping_63957 domain_pfn_mapping 4 63957 NULL
-+diva_xdi_write_63975 diva_xdi_write 4 63975 NULL
-+rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
++ieee80211_authentication_req_63973 ieee80211_authentication_req 3 63973 NULL
++iwl_legacy_dbgfs_tx_statistics_read_63987 iwl_legacy_dbgfs_tx_statistics_read 3 63987 NULL
+read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
-+hfsplus_security_setxattr_64009 hfsplus_security_setxattr 4 64009 NULL
-+C_SYSC_sendfile64_64017 C_SYSC_sendfile64 4 64017 NULL
-+SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
-+offset_to_vaddr_64025 offset_to_vaddr 0-2 64025 NULL
++kmemdup_64015 kmemdup 2 64015 NULL
++tcf_csum_skb_nextlayer_64025 tcf_csum_skb_nextlayer 3 64025 NULL
+dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
-+resize_async_buffer_64031 resize_async_buffer 4 64031 NULL
-+SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
-+tfrc_calc_x_reverse_lookup_64057 tfrc_calc_x_reverse_lookup 0 64057 NULL
-+__sock_create_64069 __sock_create 0 64069 NULL
++frequency_read_64031 frequency_read 3 64031 NULL
+get_u8_64076 get_u8 0 64076 NULL
-+xilly_malloc_64077 xilly_malloc 2 64077 NULL
-+btrfs_copy_root_64079 btrfs_copy_root 0 64079 NULL
+sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
-+clear_update_marker_64088 clear_update_marker 0 64088 NULL nohasharray
-+vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 &clear_update_marker_64088
++clear_update_marker_64088 clear_update_marker 0 64088 NULL
+lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
-+SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL
-+SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
-+rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
+do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
-+bypass_wd_write_64120 bypass_wd_write 3 64120 NULL
+ol_quota_entries_per_block_64122 ol_quota_entries_per_block 0 64122 NULL
-+ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
++i915_gem_execbuffer_reserve_64127 i915_gem_execbuffer_reserve 0 64127 NULL
+init_bch_64130 init_bch 2-1 64130 NULL
-+SYSC_ptrace_64136 SYSC_ptrace 3 64136 NULL
++uea_idma_write_64139 uea_idma_write 3 64139 NULL
+ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
+dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
-+__comedi_buf_alloc_64155 __comedi_buf_alloc 3 64155 NULL
-+cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
-+ocfs2_reserve_blocks_for_rec_trunc_64206 ocfs2_reserve_blocks_for_rec_trunc 0 64206 NULL
-+xfs_vm_direct_IO_64223 xfs_vm_direct_IO 4 64223 NULL
-+read_pulse_64227 read_pulse 0-3 64227 NULL
++WriteReg_64163 WriteReg 0 64163 NULL
++cpumask_scnprintf_64170 cpumask_scnprintf 2 64170 NULL
++alloc_session_64171 alloc_session 2-1 64171 NULL
+ea_len_64229 ea_len 0 64229 NULL
-+btrfs_make_block_group_64241 btrfs_make_block_group 0 64241 NULL
-+__btrfs_update_delayed_inode_64248 __btrfs_update_delayed_inode 0 64248 NULL
++header_len_64232 header_len 0 64232 NULL
++xfrm_acquire_msgsize_64239 xfrm_acquire_msgsize 0 64239 NULL
++redrat3_transmit_ir_64244 redrat3_transmit_ir 3 64244 NULL
++fuse_do_getattr_64245 fuse_do_getattr 0 64245 NULL
+io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
+btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL
-+btrfs_next_item_64285 btrfs_next_item 0 64285 NULL
-+sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 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
++btrfs_reserve_extent_64293 btrfs_reserve_extent 6 64293 NULL
+ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
+snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
-+error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
-+ffz_64324 ffz 0-1 64324 NULL
-+map_region_64328 map_region 1 64328 NULL
++ffz_64324 ffz 0 64324 NULL
+sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
+ts_write_64336 ts_write 3 64336 NULL
+usbtmc_write_64340 usbtmc_write 3 64340 NULL
-+do_write_orph_node_64343 do_write_orph_node 2 64343 NULL
+ft1000_read_reg_64352 ft1000_read_reg 0 64352 NULL
-+bnx2x_vfop_mcast_cmd_64354 bnx2x_vfop_mcast_cmd 5 64354 NULL
+user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
-+wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
-+reg_create_64372 reg_create 5 64372 NULL
++llc_alloc_frame_64366 llc_alloc_frame 4 64366 NULL
++bnx2_enable_msix_64372 bnx2_enable_msix 2 64372 NULL
+ilo_write_64378 ilo_write 3 64378 NULL
-+btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
-+vmcs_readl_64381 vmcs_readl 0 64381 NULL
-+nilfs_alloc_seg_bio_64383 nilfs_alloc_seg_bio 3 64383 NULL
+ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
+pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
+rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 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
-+nl80211_send_mgmt_64419 nl80211_send_mgmt 7 64419 NULL
-+oom_adj_write_64428 oom_adj_write 3 64428 NULL
-+ext4_trim_extent_64431 ext4_trim_extent 4 64431 NULL nohasharray
-+read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 &ext4_trim_extent_64431
+ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
-+single_open_size_64483 single_open_size 4 64483 NULL
++pfkey_sockaddr_len_64453 pfkey_sockaddr_len 0 64453 NULL
++ip_vs_create_timeout_table_64478 ip_vs_create_timeout_table 2 64478 NULL
++alloc_large_system_hash_64490 alloc_large_system_hash 2-8-4-3 64490 NULL
+p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
++emulator_cmpxchg_emulated_64501 emulator_cmpxchg_emulated 5 64501 NULL
+msg_data_sz_64503 msg_data_sz 0 64503 NULL
-+remove_uuid_64505 remove_uuid 4 64505 NULL nohasharray
-+handle_abnormal_pfn_64505 handle_abnormal_pfn 3 64505 &remove_uuid_64505
+crypto_blkcipher_alignmask_64520 crypto_blkcipher_alignmask 0 64520 NULL
+opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
+iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
+ses_send_diag_64527 ses_send_diag 4 64527 NULL
-+prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
-+SyS_bind_64544 SyS_bind 3 64544 NULL
-+rbd_obj_read_sync_64554 rbd_obj_read_sync 4-3 64554 NULL
-+__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3-0 64557 NULL
-+__spi_sync_64561 __spi_sync 0 64561 NULL nohasharray
-+ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 &__spi_sync_64561
++lm8323_read_64547 lm8323_read 4 64547 NULL
++__spi_sync_64561 __spi_sync 0 64561 NULL
+__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
++diva_os_alloc_message_buffer_64568 diva_os_alloc_message_buffer 1 64568 NULL
+kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
-+do_erase_64574 do_erase 4 64574 NULL
++use_pool_64607 use_pool 2 64607 NULL
+fanotify_write_64623 fanotify_write 3 64623 NULL
+ocfs2_remove_refcount_extent_64631 ocfs2_remove_refcount_extent 0 64631 NULL
-+to_dblock_64655 to_dblock 0-1 64655 NULL
-+regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
-+ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray
-+tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661 nohasharray
-+pool_create_64661 pool_create 3 64661 &tlbflush_read_file_64661
-+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
++ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL
+nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL
-+sec_bulk_write_64691 sec_bulk_write 2-3 64691 NULL
-+pfn_to_hpa_64703 pfn_to_hpa 0-1 64703 NULL
+ip_select_ident_more_64707 ip_select_ident_more 4 64707 NULL
++__feat_register_sp_64712 __feat_register_sp 6 64712 NULL
+snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL
+dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
+atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
+i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
+AscGetChipVersion_64737 AscGetChipVersion 0 64737 NULL
+squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
-+perf_swevent_event_64745 perf_swevent_event 2 64745 NULL
+bio_map_kern_64751 bio_map_kern 3 64751 NULL
+rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
-+message_for_md_64777 message_for_md 5 64777 NULL
+isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
-+regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
+nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
+rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL
-+proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
+megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
+ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
-+vaddr_get_pfn_64818 vaddr_get_pfn 1 64818 NULL
-+gfn_to_page_64826 gfn_to_page 2 64826 NULL
+do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
++em28xx_read_reg_64839 em28xx_read_reg 0 64839 NULL
+altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
-+gfn_to_pfn_64870 gfn_to_pfn 2 64870 NULL
-+lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
+ffs_epfile_io_64886 ffs_epfile_io 3 64886 NULL
+mk_pid_64894 mk_pid 0-3 64894 NULL
+ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
+usb_reset_and_verify_device_64933 usb_reset_and_verify_device 0 64933 NULL
-+ubifs_wbuf_write_nolock_64946 ubifs_wbuf_write_nolock 3 64946 NULL
+ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL
+acpi_os_install_interrupt_handler_64968 acpi_os_install_interrupt_handler 1 64968 NULL
-+traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
-+suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
+ext2_group_first_block_no_64972 ext2_group_first_block_no 0-2 64972 NULL
++pskb_pull_65005 pskb_pull 2 65005 NULL
+crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
++c4iw_ocqp_pool_alloc_65023 c4iw_ocqp_pool_alloc 2 65023 NULL
+insert_dent_65034 insert_dent 7 65034 NULL
-+snd_hda_get_pin_label_65035 snd_hda_get_pin_label 5 65035 NULL
-+ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL
++brcmf_sdcard_rwdata_65041 brcmf_sdcard_rwdata 5 65041 NULL
++ath9k_multi_regread_65056 ath9k_multi_regread 4 65056 NULL
+pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL
+make_idx_node_65068 make_idx_node 0 65068 NULL
-+count_run_65072 count_run 0-2-4-5 65072 NULL
++count_run_65072 count_run 0-4-5-2 65072 NULL nohasharray
++bnx2fc_process_l2_frame_compl_65072 bnx2fc_process_l2_frame_compl 3 65072 &count_run_65072
+__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
+ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
-+send_create_inode_65090 send_create_inode 0 65090 NULL nohasharray
-+ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0 65090 &send_create_inode_65090
-+uasp_alloc_cmd_65097 uasp_alloc_cmd 0 65097 NULL
-+__ext3_journal_dirty_metadata_65103 __ext3_journal_dirty_metadata 0 65103 NULL
-+generic_ocp_write_65107 generic_ocp_write 4 65107 NULL
-+kswapd_shrink_zone_65174 kswapd_shrink_zone 4 65174 NULL
-+i2c_smbus_xfer_emulated_65183 i2c_smbus_xfer_emulated 0 65183 NULL
-+btrfs_run_delayed_items_nr_65204 btrfs_run_delayed_items_nr 0 65204 NULL
-+rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
-+print_endpoint_stat_65232 print_endpoint_stat 3-4-0 65232 NULL
-+journal_get_write_access_65243 journal_get_write_access 0 65243 NULL
++scsi_add_host_with_dma_65093 scsi_add_host_with_dma 0 65093 NULL
++nf_bridge_mtu_reduction_65192 nf_bridge_mtu_reduction 0 65192 NULL
++nfulnl_alloc_skb_65207 nfulnl_alloc_skb 2-1 65207 NULL
+whci_n_caps_65247 whci_n_caps 0 65247 NULL
+atomic_long_read_65263 atomic_long_read 0 65263 NULL
-+kmem_zalloc_greedy_65268 kmem_zalloc_greedy 3-2 65268 NULL
+kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
+compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
+get_unaligned_le16_65293 get_unaligned_le16 0 65293 NULL
-+mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
+redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
+get_var_len_65304 get_var_len 0 65304 NULL
+unpack_array_65318 unpack_array 0 65318 NULL
-+pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL
+dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
-+init_list_set_65351 init_list_set 3-2 65351 NULL
+dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
-+batadv_tt_save_orig_buffer_65361 batadv_tt_save_orig_buffer 4 65361 NULL
+alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
-+__ext4_new_inode_65370 __ext4_new_inode 5 65370 NULL
-+SyS_writev_65372 SyS_writev 3 65372 NULL
-+mi_set_context_65395 mi_set_context 0 65395 NULL
+__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
+trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
-+mtd_get_device_size_65400 mtd_get_device_size 0 65400 NULL
-+__read_vmcore_65402 __read_vmcore 2 65402 NULL
+usb_ep_enable_65405 usb_ep_enable 0 65405 NULL
-+ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 4-3 65410 NULL
++iio_device_add_channel_sysfs_65406 iio_device_add_channel_sysfs 0 65406 NULL
++ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL
+drm_calloc_large_65421 drm_calloc_large 2-1 65421 NULL
+device_add_groups_65423 device_add_groups 0 65423 NULL
++cap_capable_65430 cap_capable 0 65430 NULL
+xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
-+vmalloc_to_pfn_65437 vmalloc_to_pfn 0 65437 NULL
+usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
-+il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
-+ext4_es_zeroout_65465 ext4_es_zeroout 0 65465 NULL
+clear_user_65470 clear_user 2 65470 NULL
-+dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
-+lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9-0 65493 NULL
-+nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
++ath_rx_edma_init_65483 ath_rx_edma_init 2 65483 NULL
++alloc_dr_65495 alloc_dr 2 65495 NULL
++selnl_msglen_65499 selnl_msglen 0 65499 NULL
diff --git a/tools/gcc/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin.c
new file mode 100644
index 0000000..87dd5e2
@@ -114487,19 +115207,6 @@ index 0000000..4fae911
+
+ return 0;
+}
-diff --git a/tools/lib/lk/Makefile b/tools/lib/lk/Makefile
-index 3dba0a4..97175dc 100644
---- a/tools/lib/lk/Makefile
-+++ b/tools/lib/lk/Makefile
-@@ -13,7 +13,7 @@ LIB_OBJS += $(OUTPUT)debugfs.o
-
- LIBFILE = liblk.a
-
--CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
-+CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
- EXTLIBS = -lelf -lpthread -lrt -lm
- ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- ALL_LDFLAGS = $(LDFLAGS)
diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
index 6789d78..4afd019e 100644
--- a/tools/perf/util/include/asm/alternative-asm.h
@@ -114513,12 +115220,12 @@ index 6789d78..4afd019e 100644
+
#endif
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
-index 96b919d..c49bb74 100644
+index 547628e..74de9f2 100644
--- a/tools/perf/util/include/linux/compiler.h
+++ b/tools/perf/util/include/linux/compiler.h
-@@ -18,4 +18,12 @@
- #define __force
- #endif
+@@ -11,4 +11,12 @@
+
+ #define __used __attribute__((__unused__))
+#ifndef __size_overflow
+# define __size_overflow(...)
@@ -114530,7 +115237,7 @@ index 96b919d..c49bb74 100644
+
#endif
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 1cf9ccb..b9236e2 100644
+index 8bf05f0..61ba256 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -75,12 +75,17 @@ LIST_HEAD(vm_list);
@@ -114553,16 +115260,76 @@ index 1cf9ccb..b9236e2 100644
struct dentry *kvm_debugfs_dir;
-@@ -749,7 +754,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
+@@ -659,7 +664,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
/* We can read the guest memory with __xxx_user() later on. */
- if ((mem->slot < KVM_USER_MEM_SLOTS) &&
+ if (user_alloc &&
((mem->userspace_addr & (PAGE_SIZE - 1)) ||
- !access_ok(VERIFY_WRITE,
+ !__access_ok(VERIFY_WRITE,
(void __user *)(unsigned long)mem->userspace_addr,
mem->memory_size)))
goto out;
-@@ -1867,7 +1872,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
+@@ -774,7 +779,7 @@ skip_lpage:
+ new.userspace_addr = mem->userspace_addr;
+ #endif /* not defined CONFIG_S390 */
+
+- if (!npages) {
++ if (!npages || base_gfn != old.base_gfn) {
+ r = -ENOMEM;
+ slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
+ if (!slots)
+@@ -788,8 +793,10 @@ skip_lpage:
+ old_memslots = kvm->memslots;
+ rcu_assign_pointer(kvm->memslots, slots);
+ synchronize_srcu_expedited(&kvm->srcu);
+- /* From this point no new shadow pages pointing to a deleted
+- * memslot will be created.
++ /* slot was deleted or moved, clear iommu mapping */
++ kvm_iommu_unmap_pages(kvm, &old);
++ /* From this point no new shadow pages pointing to a deleted,
++ * or moved, memslot will be created.
+ *
+ * validation of sp->gfn happens in:
+ * - gfn_to_hva (kvm_read_guest, gfn_to_pfn)
+@@ -803,14 +810,6 @@ skip_lpage:
+ if (r)
+ goto out_free;
+
+- /* map/unmap the pages in iommu page table */
+- if (npages) {
+- r = kvm_iommu_map_pages(kvm, &new);
+- if (r)
+- goto out_free;
+- } else
+- kvm_iommu_unmap_pages(kvm, &old);
+-
+ r = -ENOMEM;
+ slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
+ if (!slots)
+@@ -820,6 +819,13 @@ skip_lpage:
+ slots->nmemslots = mem->slot + 1;
+ slots->generation++;
+
++ /* map new memory slot into the iommu */
++ if (npages) {
++ r = kvm_iommu_map_pages(kvm, &new);
++ if (r)
++ goto out_slots;
++ }
++
+ /* actual memory is freed via old in kvm_free_physmem_slot below */
+ if (!npages) {
+ new.rmap = NULL;
+@@ -847,6 +853,8 @@ skip_lpage:
+
+ return 0;
+
++out_slots:
++ kfree(slots);
+ out_free:
+ kvm_free_physmem_slot(&new, &old);
+ out:
+@@ -1657,7 +1665,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
return 0;
}
@@ -114571,7 +115338,7 @@ index 1cf9ccb..b9236e2 100644
.release = kvm_vcpu_release,
.unlocked_ioctl = kvm_vcpu_ioctl,
#ifdef CONFIG_COMPAT
-@@ -2550,7 +2555,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -2177,7 +2185,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
return 0;
}
@@ -114580,7 +115347,7 @@ index 1cf9ccb..b9236e2 100644
.release = kvm_vm_release,
.unlocked_ioctl = kvm_vm_ioctl,
#ifdef CONFIG_COMPAT
-@@ -2651,7 +2656,7 @@ out:
+@@ -2275,7 +2283,7 @@ out:
return r;
}
@@ -114589,7 +115356,7 @@ index 1cf9ccb..b9236e2 100644
.unlocked_ioctl = kvm_dev_ioctl,
.compat_ioctl = kvm_dev_ioctl,
.llseek = noop_llseek,
-@@ -2677,7 +2682,7 @@ static void hardware_enable_nolock(void *junk)
+@@ -2301,7 +2309,7 @@ static void hardware_enable_nolock(void *junk)
if (r) {
cpumask_clear_cpu(cpu, cpus_hardware_enabled);
@@ -114598,7 +115365,7 @@ index 1cf9ccb..b9236e2 100644
printk(KERN_INFO "kvm: enabling virtualization on "
"CPU%d failed\n", cpu);
}
-@@ -2731,10 +2736,10 @@ static int hardware_enable_all(void)
+@@ -2355,10 +2363,10 @@ static int hardware_enable_all(void)
kvm_usage_count++;
if (kvm_usage_count == 1) {
@@ -114611,7 +115378,7 @@ index 1cf9ccb..b9236e2 100644
hardware_disable_all_nolock();
r = -EBUSY;
}
-@@ -3168,7 +3173,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
+@@ -2709,7 +2717,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
kvm_arch_vcpu_put(vcpu);
}
@@ -114620,7 +115387,7 @@ index 1cf9ccb..b9236e2 100644
struct module *module)
{
int r;
-@@ -3215,7 +3220,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -2772,7 +2780,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,
@@ -114629,7 +115396,7 @@ index 1cf9ccb..b9236e2 100644
if (!kvm_vcpu_cache) {
r = -ENOMEM;
goto out_free_3;
-@@ -3225,9 +3230,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -2782,9 +2790,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
if (r)
goto out_free;
@@ -114641,13 +115408,13 @@ index 1cf9ccb..b9236e2 100644
r = misc_register(&kvm_dev);
if (r) {
-@@ -3237,9 +3244,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -2794,9 +2804,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");
+ kvm_init_debug();
+
+ return 0;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-11-27 21:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-27 21:05 [gentoo-commits] proj/hardened-patchset:master commit in: 3.2.52/, 3.12.1/ Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox