diff options
author | Stephen Smalley <sds@tycho.nsa.gov> | 2019-01-09 10:55:10 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-26 09:44:26 +0100 |
commit | f643372c915bbb9d11787b785890642fce3c1ab2 (patch) | |
tree | 1108b8b6b1828247e7b0da2c37d9ea5ddb44d9cf /security | |
parent | 8554867473096389ca0f5b75ee6a7eb9a965eb76 (diff) | |
download | linux-stable-f643372c915bbb9d11787b785890642fce3c1ab2.tar.gz linux-stable-f643372c915bbb9d11787b785890642fce3c1ab2.tar.bz2 linux-stable-f643372c915bbb9d11787b785890642fce3c1ab2.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>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/ss/policydb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index bc2a586f095c..0b31d61eea78 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -717,7 +717,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); |