GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 21:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

Browse source
This commit is contained in:
James Morris 2011-03-08 11:38:10 +11:00
commit fe3fa43039
52 changed files with 594 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/sysctl.c
View file

@ -1685,13 +1685,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