aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2019-01-09 10:55:10 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-22 21:40:35 +0100
commit5a79e71e0bc85045606a34641170c560362d8c84 (patch)
tree6ddaa3f396c4ec67ba51e044c51923d9d72a40d2
parent4cc66cc4f81fb8b1d6e83548fa79005dcc93ee2a (diff)
downloadlinux-yocto-5a79e71e0bc85045606a34641170c560362d8c84.tar.gz
linux-yocto-5a79e71e0bc85045606a34641170c560362d8c84.tar.bz2
linux-yocto-5a79e71e0bc85045606a34641170c560362d8c84.zip
selinux: fix GPF on invalid policy
commit 5b0e7310a2a33c06edc7eb81ffc521af9b2c5610 upstream. levdatum->level can be NULL if we encounter an error while loading the policy during sens_read prior to initializing it. Make sure sens_destroy handles that case correctly. Reported-by: syzbot+6664500f0f18f07a5c0e@syzkaller.appspotmail.com Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--security/selinux/ss/policydb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index b63ef865ce1e..d31a52e56b9e 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -732,7 +732,8 @@ static int sens_destroy(void *key, void *datum, void *p)
kfree(key);
if (datum) {
levdatum = datum;
- ebitmap_destroy(&levdatum->level->cat);
+ if (levdatum->level)
+ ebitmap_destroy(&levdatum->level->cat);
kfree(levdatum->level);
}
kfree(datum);