[PATCH v4 20/19] LSM: Correct file blob free empty blob check
flat view
STALE2918d
From: casey@schaufler-ca.com (Casey Schaufler)
Date: 2018-09-27 04:12:08
Also in:
linux-fsdevel, lkml, selinux
Subsystem:
security subsystem, the rest · Maintainers:
Paul Moore, James Morris, "Serge E. Hallyn", Linus Torvalds
Revision v4 of 3 in this series.
Revisions (3)
- v4 current
- v5 [diff vs current]
- v5 [diff vs current]
Instead of checking if the kmem_cache for file blobs has been initialized check if the blob is NULL. This allows non-blob using modules to do other kinds of clean up in the security_file_free hooks. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> --- security/security.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/security/security.c b/security/security.c
index e7c8506041f1..76f7dc49b63c 100644
--- a/security/security.c
+++ b/security/security.c@@ -1202,14 +1202,13 @@ void security_file_free(struct file *file) { void *blob; - if (!lsm_file_cache) - return; - call_void_hook(file_free_security, file); blob = file->f_security; - file->f_security = NULL; - kmem_cache_free(lsm_file_cache, blob); + if (blob) { + file->f_security = NULL; + kmem_cache_free(lsm_file_cache, blob); + } } int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
--
2.17.1