Merge tag 'yama-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next

2 files changed, 5 insertions, 10 deletions

diff --git a/security/yama/Kconfig b/security/yama/Kconfig
index 20ef5143c0c0..3123e1da2fed 100644
--- a/security/yama/Kconfig
+++ b/security/yama/Kconfig
@@ -1,8 +1,6 @@
 config SECURITY_YAMA
         bool "Yama support"
         depends on SECURITY
-        select SECURITYFS
-        select SECURITY_PATH
         default n
         help
           This selects Yama, which extends DAC support with additional
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 13c88fbcf037..24aae2ae2b30 100644
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -379,20 +379,17 @@ static struct security_operations yama_ops = {
 static int yama_dointvec_minmax(struct ctl_table *table, int write,
                                 void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-        int rc;
+        struct ctl_table table_copy;
 
         if (write && !capable(CAP_SYS_PTRACE))
                 return -EPERM;
 
-        rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
-        if (rc)
-                return rc;
-
         /* Lock the max value if it ever gets set. */
-        if (write && *(int *)table->data == *(int *)table->extra2)
-                table->extra1 = table->extra2;
+        table_copy = *table;
+        if (*(int *)table_copy.data == *(int *)table_copy.extra2)
+                table_copy.extra1 = table_copy.extra2;
 
-        return rc;
+        return proc_dointvec_minmax(&table_copy, write, buffer, lenp, ppos);
 }
 
 static int zero;