aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-04-04 13:47:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-01 15:12:54 +0800
commitee9ffef206a54067e6fa728756c8b2ce10f31acf (patch)
tree6b06637229db898900c91a38c816f4872c02a0e5 /security
parent5032d5a70bf303543fef56d014a2b69f70d5714c (diff)
downloadkernel_samsung_smdk4412-ee9ffef206a54067e6fa728756c8b2ce10f31acf.zip
kernel_samsung_smdk4412-ee9ffef206a54067e6fa728756c8b2ce10f31acf.tar.gz
kernel_samsung_smdk4412-ee9ffef206a54067e6fa728756c8b2ce10f31acf.tar.bz2
SELinux: if sel_make_bools errors don't leave inconsistent state
commit 154c50ca4eb9ae472f50b6a481213e21ead4457d upstream. We reset the bool names and values array to NULL, but do not reset the number of entries in these arrays to 0. If we error out and then get back into this function we will walk these NULL pointers based on the belief that they are non-zero length. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/selinuxfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 3545934..27a9673 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1241,6 +1241,7 @@ static int sel_make_bools(void)
kfree(bool_pending_names[i]);
kfree(bool_pending_names);
kfree(bool_pending_values);
+ bool_num = 0;
bool_pending_names = NULL;
bool_pending_values = NULL;