From: Casey Schaufler <[email protected]>
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 <[email protected]>
---
security/smack/smack_lsm.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff -uprN -X linux-2.6.25-g0530-base/Documentation/dontdiff linux-2.6.25-g0530-base/security/smack/smack_lsm.c linux-2.6.25-g0530/security/smack/smack_lsm.c
--- linux-2.6.25-g0530-base/security/smack/smack_lsm.c 2008-06-01 14:41:06.000000000 -0700
+++ linux-2.6.25-g0530/security/smack/smack_lsm.c 2008-06-01 20:29:57.000000000 -0700
@@ -1881,6 +1881,18 @@ static void smack_d_instantiate(struct d
final = sbsp->smk_default;
/*
+ * 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
Em Mon, 02 Jun 2008 10:04:32 -0700
Casey Schaufler <[email protected]> escreveu:
| From: Casey Schaufler <[email protected]>
|
| 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 <[email protected]>
Fixed the problem for me, thank very much.
Tested-by: Luiz Fernando N. Capitulino <[email protected]>
--
Luiz Fernando N. Capitulino