Commit 41a4695c authored by Kees Cook's avatar Kees Cook

Yama: do not modify global sysctl table entry

When the sysctl table is constified, we won't be able to directly modify
it. Instead, use a table copy that carries any needed changes.
Suggested-by: default avatarPaX Team <pageexec@freemail.hu>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 04f81f01
...@@ -379,20 +379,17 @@ static struct security_operations yama_ops = { ...@@ -379,20 +379,17 @@ static struct security_operations yama_ops = {
static int yama_dointvec_minmax(struct ctl_table *table, int write, static int yama_dointvec_minmax(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
int rc; struct ctl_table table_copy;
if (write && !capable(CAP_SYS_PTRACE)) if (write && !capable(CAP_SYS_PTRACE))
return -EPERM; return -EPERM;
rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
if (rc)
return rc;
/* Lock the max value if it ever gets set. */ /* Lock the max value if it ever gets set. */
if (write && *(int *)table->data == *(int *)table->extra2) table_copy = *table;
table->extra1 = table->extra2; 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; static int zero;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment