summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2015-06-02 11:26:34 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-06-16 02:08:12 -0400
commit514d748f69c97a51a2645eb198ac5c6218f22ff9 (patch)
tree62b4f0f249c523eaba9fe4b8ce407782922a5b11 /fs
parent12ecbb4b1d765a5076920999298d9625439dbe58 (diff)
downloadop-kernel-dev-514d748f69c97a51a2645eb198ac5c6218f22ff9.zip
op-kernel-dev-514d748f69c97a51a2645eb198ac5c6218f22ff9.tar.gz
ufs: Fix possible deadlock when looking up directories
Commit e4502c63f56aeca88 (ufs: deal with nfsd/iget races) made ufs create inodes with I_NEW flag set. However ufs_mkdir() never cleared this flag. Thus if someone ever tried to lookup the directory by inode number, he would deadlock waiting for I_NEW to be cleared. Luckily this mostly happens only if the filesystem is exported over NFS since otherwise we have the inode attached to dentry and don't look it up by inode number. In rare cases dentry can get freed without inode being freed and then we'd hit the deadlock even without NFS export. Fix the problem by clearing I_NEW before instantiating new directory inode. Fixes: e4502c63f56aeca887ced37f24e0def1ef11cec8 Reported-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/ufs/namei.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 2346b83..60ee322 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -212,6 +212,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
goto out_fail;
unlock_ufs(dir->i_sb);
+ unlock_new_inode(inode);
d_instantiate(dentry, inode);
out:
return err;
OpenPOWER on IntegriCloud