diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-03-03 19:56:08 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-03-03 19:56:08 +1100 |
| commit | 74f0414b2f9a6b12df208a69baa21e22178a2463 (patch) | |
| tree | ebcd6985ad3267b926d45a672470f89a2104f13c | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| parent | 44aa1d4413876cca0962debc9483ba009d71737f (diff) | |
| download | linux-74f0414b2f9a6b12df208a69baa21e22178a2463.tar.gz linux-74f0414b2f9a6b12df208a69baa21e22178a2463.tar.bz2 linux-74f0414b2f9a6b12df208a69baa21e22178a2463.zip | |
Merge tag 'yama-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next
| -rw-r--r-- | security/yama/Kconfig | 2 | ||||
| -rw-r--r-- | security/yama/yama_lsm.c | 13 |
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; |