diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-16 17:06:39 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-16 17:06:39 +1200 |
| commit | 47bfa6d9dc8c060bf56554a465c9031e286d2f80 (patch) | |
| tree | 38cf7c197fb9bc7d5a6e70638087571575a7e1ec | |
| parent | Merge tag 'trace-v5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| parent | selinux: fix GPF on invalid policy (diff) | |
| download | linux-dev-47bfa6d9dc8c060bf56554a465c9031e286d2f80.tar.xz linux-dev-47bfa6d9dc8c060bf56554a465c9031e286d2f80.zip | |
Merge tag 'selinux-pr-20190115' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Pull SELinux fix from Paul Moore:
"One small patch to fix a potential NULL dereference on a failed
SELinux policy load"
* tag 'selinux-pr-20190115' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
selinux: fix GPF on invalid policy
| -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 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); |