diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:09:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:09:21 +1100 |
| commit | 14fb23e5b670f3a314f10206e9643a10f46a91f2 (patch) | |
| tree | f8a0b5cbd91bb591c88d293b1a382115b50356c4 /kernel | |
| parent | 085966022d51faac8ecb4be286258eed12398830 (diff) | |
| parent | 0b24dcb7f2f7a0ce9b762eef0362c21c88f47b32 (diff) | |
Merge remote-tracking branch 'selinux/master'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index cb7c830f7faa..90a593e62b42 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1678,13 +1678,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 |