- smack-fuse-mount-hang-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     smack: fix fuse mount hang
has been removed from the -mm tree.  Its filename was
     smack-fuse-mount-hang-fix.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: smack: fix fuse mount hang
From: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>

The d_instantiate hook for Smack can hang on the root inode of a
filesystem if the file system code has not really done all the set-up. 
Fuse is known to encounter this problem.  This change detects an attempt
to instantiate a root inode and addresses it early in the processing,
before any attempt is made to do something that might hang.

Signed-off-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Tested-by: Luiz Fernando N. Capitulino <lcapitulino@xxxxxxxxxxxxxxx>
Cc: "Ahmed S. Darwish" <darwish.07@xxxxxxxxx>
Cc: Miklos Szeredi <miklos@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 security/smack/smack_lsm.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff -puN security/smack/smack_lsm.c~smack-fuse-mount-hang-fix security/smack/smack_lsm.c
--- a/security/smack/smack_lsm.c~smack-fuse-mount-hang-fix
+++ a/security/smack/smack_lsm.c
@@ -1893,6 +1893,18 @@ static void smack_d_instantiate(struct d
 	}
 
 	/*
+	 * If this is the root inode the superblock
+	 * may be in the process of initialization.
+	 * If that is the case use the root value out
+	 * of the superblock.
+	 */
+	if (opt_dentry->d_parent == opt_dentry) {
+		isp->smk_inode = sbsp->smk_root;
+		isp->smk_flags |= SMK_INODE_INSTANT;
+		goto unlockandout;
+	}
+
+	/*
 	 * This is pretty hackish.
 	 * Casey says that we shouldn't have to do
 	 * file system specific code, but it does help
_

Patches currently in -mm which might be from casey@xxxxxxxxxxxxxxxx are

smack-fuse-mount-hang-fix.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux