From: Alexander Grund <theflamefire89@gmail.com>
To: stable@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>,
Alexander Grund <theflamefire89@gmail.com>
Subject: [PATCH 4.9 3/6] selinux: Clean up initialization of isec->sclass
Date: Sat, 30 Jul 2022 19:03:40 +0200 [thread overview]
Message-ID: <20220730170343.11477-4-theflamefire89@gmail.com> (raw)
In-Reply-To: <20220730170343.11477-1-theflamefire89@gmail.com>
From: Andreas Gruenbacher <agruenba@redhat.com>
commit 13457d073c29da92001f6ee809075eaa8757fb96 upstream.
Now that isec->initialized == LABEL_INITIALIZED implies that
isec->sclass is valid, skip such inodes immediately in
inode_doinit_with_dentry.
For the remaining inodes, initialize isec->sclass at the beginning of
inode_doinit_with_dentry to simplify the code.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Alexander Grund <theflamefire89@gmail.com>
---
security/selinux/hooks.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 1997d87b35d5..d21b95a848b8 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1395,12 +1395,15 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
int rc = 0;
if (isec->initialized == LABEL_INITIALIZED)
- goto out;
+ return 0;
mutex_lock(&isec->lock);
if (isec->initialized == LABEL_INITIALIZED)
goto out_unlock;
+ if (isec->sclass == SECCLASS_FILE)
+ isec->sclass = inode_mode_to_security_class(inode->i_mode);
+
sbsec = inode->i_sb->s_security;
if (!(sbsec->flags & SE_SBINITIALIZED)) {
/* Defer initialization until selinux_complete_init,
@@ -1518,7 +1521,6 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
isec->sid = sbsec->sid;
/* Try to obtain a transition SID. */
- isec->sclass = inode_mode_to_security_class(inode->i_mode);
rc = security_transition_sid(isec->task_sid, sbsec->sid,
isec->sclass, NULL, &sid);
if (rc)
@@ -1554,7 +1556,6 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
*/
if (!dentry)
goto out_unlock;
- isec->sclass = inode_mode_to_security_class(inode->i_mode);
rc = selinux_genfs_get_sid(dentry, isec->sclass,
sbsec->flags, &sid);
dput(dentry);
@@ -1569,9 +1570,6 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
out_unlock:
mutex_unlock(&isec->lock);
-out:
- if (isec->sclass == SECCLASS_FILE)
- isec->sclass = inode_mode_to_security_class(inode->i_mode);
return rc;
}
--
2.25.1
next prev parent reply other threads:[~2022-07-30 17:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-30 17:03 [PATCH 4.9 0/6] Convert isec->lock into a spinlock fixing deadlock on GFS2 Alexander Grund
2022-07-30 17:03 ` [PATCH 4.9 1/6] selinux: Minor cleanups Alexander Grund
2022-07-30 17:03 ` [PATCH 4.9 2/6] proc: Pass file mode to proc_pid_make_inode Alexander Grund
2022-07-30 17:03 ` Alexander Grund [this message]
2022-07-30 17:03 ` [PATCH 4.9 4/6] selinux: Convert isec->lock into a spinlock Alexander Grund
2022-07-30 17:03 ` [PATCH 4.9 5/6] selinux: fix error initialization in inode_doinit_with_dentry() Alexander Grund
2022-07-30 17:03 ` [PATCH 4.9 6/6] selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling Alexander Grund
2022-08-01 11:14 ` [PATCH 4.9 0/6] Convert isec->lock into a spinlock fixing deadlock on GFS2 Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220730170343.11477-4-theflamefire89@gmail.com \
--to=theflamefire89@gmail.com \
--cc=agruenba@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox