Revert "integrity: double check iint_cache was initialized"
authorRoberto Sassu <roberto.sassu@huawei.com>
Fri, 10 Mar 2023 08:54:00 +0000 (09:54 +0100)
committerPaul Moore <paul@paul-moore.com>
Fri, 10 Mar 2023 23:33:52 +0000 (18:33 -0500)
With the recent introduction of LSM_ORDER_LAST, the 'integrity' LSM is
always initialized (if selected in the kernel configuration) and the
iint_cache is always created (the kernel panics on error). Thus, the
additional check of iint_cache in integrity_inode_get() is no longer
necessary. If the 'integrity' LSM is not selected in the kernel
configuration, integrity_inode_get() just returns NULL.

This reverts commit 92063f3ca73aab794bd5408d3361fd5b5ea33079.

Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Acked-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
security/integrity/iint.c

index b97eb59e0e32300377e4f653893c217c8c10dcfd..c73858e8c6d5137e2e811b2431dd46b1d36b4998 100644 (file)
@@ -98,14 +98,6 @@ struct integrity_iint_cache *integrity_inode_get(struct inode *inode)
        struct rb_node *node, *parent = NULL;
        struct integrity_iint_cache *iint, *test_iint;
 
-       /*
-        * The integrity's "iint_cache" is initialized at security_init(),
-        * unless it is not included in the ordered list of LSMs enabled
-        * on the boot command line.
-        */
-       if (!iint_cache)
-               panic("%s: lsm=integrity required.\n", __func__);
-
        iint = integrity_iint_find(inode);
        if (iint)
                return iint;