redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] SELinux: handle sel_make_bools() failure in selinuxfs

Browse source 
This patch fixes error handling in sel_make_bools(), where currently we'd
get a memory leak via security_get_bools() and try to kfree() the wrong
pointer if called again.

Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Davi Arnaut 2005-10-23 12:57:16 -07:00 committed by Linus Torvalds
parent 282c1f5eba
commit 20c19e4179
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/selinux/selinuxfs.c
View file

@ -879,7 +879,7 @@ static ssize_t sel_commit_bools_write(struct file *filep,
if (sscanf(page, "%d", &new_value) != 1) if (sscanf(page, "%d", &new_value) != 1)
goto out; goto out;
if (new_value) { if (new_value && bool_pending_values) {
security_set_bools(bool_num, 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 */ /* remove any existing files */
kfree(bool_pending_values); kfree(bool_pending_values);
bool_pending_values = NULL;
sel_remove_bools(dir); sel_remove_bools(dir);
@ -1002,6 +1003,7 @@ out:
} }
return ret; return ret;
err: err:
kfree(values);
d_genocide(dir); d_genocide(dir);
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;