diff options
-rw-r--r-- | security/selinux/selinuxfs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index aca099aa2ed3..e9552462d16b 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -940,9 +940,8 @@ static const struct file_operations sel_commit_bools_ops = { | |||
940 | .write = sel_commit_bools_write, | 940 | .write = sel_commit_bools_write, |
941 | }; | 941 | }; |
942 | 942 | ||
943 | /* delete booleans - partial revoke() from | 943 | /* partial revoke() from fs/proc/generic.c proc_kill_inodes */ |
944 | * fs/proc/generic.c proc_kill_inodes */ | 944 | static void sel_remove_entries(struct dentry *de) |
945 | static void sel_remove_bools(struct dentry *de) | ||
946 | { | 945 | { |
947 | struct list_head *p, *node; | 946 | struct list_head *p, *node; |
948 | struct super_block *sb = de->d_sb; | 947 | struct super_block *sb = de->d_sb; |
@@ -998,7 +997,7 @@ static int sel_make_bools(void) | |||
998 | kfree(bool_pending_values); | 997 | kfree(bool_pending_values); |
999 | bool_pending_values = NULL; | 998 | bool_pending_values = NULL; |
1000 | 999 | ||
1001 | sel_remove_bools(dir); | 1000 | sel_remove_entries(dir); |
1002 | 1001 | ||
1003 | if (!(page = (char*)get_zeroed_page(GFP_KERNEL))) | 1002 | if (!(page = (char*)get_zeroed_page(GFP_KERNEL))) |
1004 | return -ENOMEM; | 1003 | return -ENOMEM; |
@@ -1048,7 +1047,7 @@ out: | |||
1048 | return ret; | 1047 | return ret; |
1049 | err: | 1048 | err: |
1050 | kfree(values); | 1049 | kfree(values); |
1051 | sel_remove_bools(dir); | 1050 | sel_remove_entries(dir); |
1052 | ret = -ENOMEM; | 1051 | ret = -ENOMEM; |
1053 | goto out; | 1052 | goto out; |
1054 | } | 1053 | } |