From: Paul Moore <paul@paul-moore.com>
Date: Mon, 23 Dec 2019 21:38:36 +0000 (-0500)
Subject: selinux: ensure the policy has been loaded before reading the sidtab stats
X-Git-Tag: v5.6-rc1~181^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15b590a81fcdd44ddcb4810f2a6334df8b6ca512;p=thirdparty%2Fkernel%2Flinux.git

selinux: ensure the policy has been loaded before reading the sidtab stats

Check to make sure we have loaded a policy before we query the
sidtab's hash stats.  Failure to do so could result in a kernel
panic/oops due to a dereferenced NULL pointer.

Fixes: 66f8e2f03c02 ("selinux: sidtab reverse lookup hash table")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
---

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 743b85ede4ef9..c9e38f1ede02e 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1286,6 +1286,12 @@ int security_sidtab_hash_stats(struct selinux_state *state, char *page)
 {
 	int rc;
 
+	if (!state->initialized) {
+		pr_err("SELinux: %s:  called before initial load_policy\n",
+		       __func__);
+		return -EINVAL;
+	}
+
 	read_lock(&state->ss->policy_rwlock);
 	rc = sidtab_hash_stats(state->ss->sidtab, page);
 	read_unlock(&state->ss->policy_rwlock);