selinux: simply inode label states to INVALID and INITIALIZED (4b57d6bc) · Commits · 戴 / test

There really is no need for LABEL_MISSING as we really only care if the inode's label is INVALID or INITIALIZED. Also adjust the revalidate code to reload the label whenever the label is not INITIALIZED so we are less sensitive to label state in the future. Signed-off-by:

Paul Moore <paul@paul-moore.com>

security/selinux/hooks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ static int __inode_security_revalidate(struct inode *inode,

		might_sleep_if(may_sleep);

		if (isec->initialized == LABEL_INVALID) {
		if (isec->initialized != LABEL_INITIALIZED) {
		if (!may_sleep)
		return -ECHILD;

security/selinux/include/objsec.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -38,9 +38,8 @@ struct task_security_struct {
		};

		enum label_initialized {
		LABEL_MISSING, /* not initialized */
		LABEL_INITIALIZED, /* inizialized */
		LABEL_INVALID /* invalid */
		LABEL_INVALID, /* invalid or not initialized */
		LABEL_INITIALIZED /* initialized */
		};

		struct inode_security_struct {

Admin message