summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2018-12-10 15:34:12 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2018-12-21 11:46:57 -0500
commit8d64124a6a93ec68fda6f781e48a7b95d9dd17d9 (patch)
tree476ac17aa35c5a38bd0a999d0b1e7e5b076e1fb0 /security
parenta10d7c22b34bcf744679019269bfb33ebf0b75ee (diff)
downloadlinux-8d64124a6a93ec68fda6f781e48a7b95d9dd17d9.tar.gz
linux-8d64124a6a93ec68fda6f781e48a7b95d9dd17d9.tar.bz2
linux-8d64124a6a93ec68fda6f781e48a7b95d9dd17d9.zip
selinux; don't open-code a loop in sb_finish_set_opts()
Reviewed-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 59b164d7134d..630fe8883957 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -571,10 +571,9 @@ static int sb_finish_set_opts(struct super_block *sb)
during get_sb by a pseudo filesystem that directly
populates itself. */
spin_lock(&sbsec->isec_lock);
-next_inode:
- if (!list_empty(&sbsec->isec_head)) {
+ while (!list_empty(&sbsec->isec_head)) {
struct inode_security_struct *isec =
- list_entry(sbsec->isec_head.next,
+ list_first_entry(&sbsec->isec_head,
struct inode_security_struct, list);
struct inode *inode = isec->inode;
list_del_init(&isec->list);
@@ -586,7 +585,6 @@ next_inode:
iput(inode);
}
spin_lock(&sbsec->isec_lock);
- goto next_inode;
}
spin_unlock(&sbsec->isec_lock);
out: