summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-03-15 23:41:17 +0100
committerJames Morris <jmorris@namei.org>2011-03-15 23:41:17 +0100
commita002951c97ff8da49938c982a4c236bf2fafdc9f (patch)
treed43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /kernel
parentLinux 2.6.38 (diff)
parentMerge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
downloadlinux-a002951c97ff8da49938c982a4c236bf2fafdc9f.tar.xz
linux-a002951c97ff8da49938c982a4c236bf2fafdc9f.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 4eed0af5d144..4cb152574433 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1690,13 +1690,8 @@ static int test_perm(int mode, int op)
int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
{
- int error;
int mode;
- error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
- if (error)
- return error;
-
if (root->permissions)
mode = root->permissions(root, current->nsproxy, table);
else