diff options
| author | Casey Schaufler <casey@schaufler-ca.com> | 2008-06-02 10:04:32 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-06-09 11:27:04 -0700 |
| commit | 50e3ae09d6b1cc0146942437ce7a5f33fdb933fb (patch) | |
| tree | 674c943c6d4da46ddb880725ab76497ad44ab608 /security | |
| parent | 1965da94d854758b4beebfeadcfae480039cbb76 (diff) | |
Smack: fuse mount hang fix
upstream commit: e97dcb0eadbb821eccd549d4987b653cf61e2374
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@schaufler-ca.com>
Tested-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/smack/smack_lsm.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 732ba27923c4..62d77ff98495 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -1865,6 +1865,18 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode) 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 |