diff options
Diffstat (limited to 'security/selinux/selinuxfs.c')
| -rw-r--r-- | security/selinux/selinuxfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 8eb140dd2e4b..a45cc971e735 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
| @@ -879,7 +879,7 @@ static ssize_t sel_commit_bools_write(struct file *filep, | |||
| 879 | if (sscanf(page, "%d", &new_value) != 1) | 879 | if (sscanf(page, "%d", &new_value) != 1) |
| 880 | goto out; | 880 | goto out; |
| 881 | 881 | ||
| 882 | if (new_value) { | 882 | if (new_value && bool_pending_values) { |
| 883 | security_set_bools(bool_num, bool_pending_values); | 883 | security_set_bools(bool_num, bool_pending_values); |
| 884 | } | 884 | } |
| 885 | 885 | ||
| @@ -952,6 +952,7 @@ static int sel_make_bools(void) | |||
| 952 | 952 | ||
| 953 | /* remove any existing files */ | 953 | /* remove any existing files */ |
| 954 | kfree(bool_pending_values); | 954 | kfree(bool_pending_values); |
| 955 | bool_pending_values = NULL; | ||
| 955 | 956 | ||
| 956 | sel_remove_bools(dir); | 957 | sel_remove_bools(dir); |
| 957 | 958 | ||
| @@ -1002,6 +1003,7 @@ out: | |||
| 1002 | } | 1003 | } |
| 1003 | return ret; | 1004 | return ret; |
| 1004 | err: | 1005 | err: |
| 1006 | kfree(values); | ||
| 1005 | d_genocide(dir); | 1007 | d_genocide(dir); |
| 1006 | ret = -ENOMEM; | 1008 | ret = -ENOMEM; |
| 1007 | goto out; | 1009 | goto out; |
