---

yaml --- r: 10071 b: refs/heads/master c: 20c19e4 h: refs/heads/master i: 10069: a753718 10067: 3967ebe 10063: 73fe162 v: v3
git-mirror · Oct 23, 2005 · 0e76070 · 0e76070
1 parent 7ad8ca1
commit 0e76070
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 282c1f5eba150d0b156ffa9e6b064f1d92f8315f
+refs/heads/master: 20c19e4179884d7e843314071e2dfb1ea7b0afcd
diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c
@@ -879,7 +879,7 @@ static ssize_t sel_commit_bools_write(struct file *filep,
 	if (sscanf(page, "%d", &new_value) != 1)
 		goto out;
 
-	if (new_value) {
+	if (new_value && bool_pending_values) {
 		security_set_bools(bool_num, bool_pending_values);
 	}
 
@@ -952,6 +952,7 @@ static int sel_make_bools(void)
 
 	/* remove any existing files */
 	kfree(bool_pending_values);
+	bool_pending_values = NULL;
 
 	sel_remove_bools(dir);
 
@@ -1002,6 +1003,7 @@ static int sel_make_bools(void)
 	}
 	return ret;
 err:
+	kfree(values);
 	d_genocide(dir);
 	ret = -ENOMEM;
 	goto out;