ubifs: dbg_orphan_check: Fix missed key type checking

When selinux/encryption is enabled, xattr entry node is added into TNC
before host inode when creating new file. So it is possible to find
xattr entry without host inode from TNC. Orphan debug checking is called
by ubifs_orphan_end_commit(), at that time, the commit semaphore is
already unlock, so the new creation won't be blocked.

Fixes: d7f0b70d30ff ("UBIFS: Add security.* XATTR support for the UBIFS")
Fixes: d475a507457b ("ubifs: Add skeleton for fscrypto")
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index 37d206097112638735d9c34731ae8d6f684b81ad..fb957d963ba6c0edcb9a0a6eca2009309bbdb0da 100644 (file)
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -816,8 +816,12 @@ static int dbg_orphan_check(struct ubifs_info *c, struct ubifs_zbranch *zbr,
 
        inum = key_inum(c, &zbr->key);
        if (inum != ci->last_ino) {
-               /* Lowest node type is the inode node, so it comes first */
-               if (key_type(c, &zbr->key) != UBIFS_INO_KEY)
+               /*
+                * Lowest node type is the inode node or xattr entry(when
+                * selinux/encryption is enabled), so it comes first
+                */
+               if (key_type(c, &zbr->key) != UBIFS_INO_KEY &&
+                   key_type(c, &zbr->key) != UBIFS_XENT_KEY)
                        ubifs_err(c, "found orphan node ino %lu, type %d",
                                  (unsigned long)inum, key_type(c, &zbr->key));
                ci->last_ino = inum;