Merge tag 'v5.0-rc3' into next-general

Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.

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);