aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/ss
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2019-01-09 10:55:10 -0500
committerPaul Moore <paul@paul-moore.com>2019-01-10 20:23:05 -0500
commit5b0e7310a2a33c06edc7eb81ffc521af9b2c5610 (patch)
tree7026349a619080870f87e1648ae8387c1ef574c1 /security/selinux/ss
parentselinux: overhaul sidtab to fix bug and improve performance (diff)
downloadlinux-dev-5b0e7310a2a33c06edc7eb81ffc521af9b2c5610.tar.xz
linux-dev-5b0e7310a2a33c06edc7eb81ffc521af9b2c5610.zip
selinux: fix GPF on invalid policy
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>
Diffstat (limited to 'security/selinux/ss')
-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 a50d625e7946..c1c31e33657a 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);