From: Greg Kroah-Hartman Date: Wed, 8 Jul 2015 21:49:00 +0000 (-0700) Subject: 4.1-stable patches X-Git-Tag: v4.0.8~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80c4e6cb0394842ea35dcabf483bbca1e5085e25;p=thirdparty%2Fkernel%2Fstable-queue.git 4.1-stable patches added patches: fs-ufs-restore-s_lock-mutex_init.patch ufs-fix-possible-deadlock-when-looking-up-directories.patch ufs-fix-warning-from-unlock_new_inode.patch --- diff --git a/queue-4.1/fs-ufs-restore-s_lock-mutex_init.patch b/queue-4.1/fs-ufs-restore-s_lock-mutex_init.patch new file mode 100644 index 00000000000..97ff3cb56f9 --- /dev/null +++ b/queue-4.1/fs-ufs-restore-s_lock-mutex_init.patch @@ -0,0 +1,30 @@ +From e4f95517f18271b1da36cfc5d700e46844396d6e Mon Sep 17 00:00:00 2001 +From: Fabian Frederick +Date: Wed, 17 Jun 2015 18:15:45 +0200 +Subject: fs/ufs: restore s_lock mutex_init() + +From: Fabian Frederick + +commit e4f95517f18271b1da36cfc5d700e46844396d6e upstream. + +Add last missing line in commit "cdd9eefdf905" +("fs/ufs: restore s_lock mutex") + +Signed-off-by: Fabian Frederick +Signed-off-by: Al Viro +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ufs/super.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/fs/ufs/super.c ++++ b/fs/ufs/super.c +@@ -801,6 +801,7 @@ static int ufs_fill_super(struct super_b + UFSD("flag %u\n", (int)(sb->s_flags & MS_RDONLY)); + + mutex_init(&sbi->mutex); ++ mutex_init(&sbi->s_lock); + spin_lock_init(&sbi->work_lock); + INIT_DELAYED_WORK(&sbi->sync_work, delayed_sync_fs); + /* diff --git a/queue-4.1/series b/queue-4.1/series index 39d3a284b2c..6924dea061e 100644 --- a/queue-4.1/series +++ b/queue-4.1/series @@ -54,3 +54,6 @@ fs-ufs-revert-ufs-fix-deadlocks-introduced-by-sb-mutex-merge.patch fs-ufs-restore-s_lock-mutex.patch vfs-remove-incorrect-debugging-warn-in-prepend_path.patch vfs-ignore-unlocked-mounts-in-fs_fully_visible.patch +ufs-fix-warning-from-unlock_new_inode.patch +ufs-fix-possible-deadlock-when-looking-up-directories.patch +fs-ufs-restore-s_lock-mutex_init.patch diff --git a/queue-4.1/ufs-fix-possible-deadlock-when-looking-up-directories.patch b/queue-4.1/ufs-fix-possible-deadlock-when-looking-up-directories.patch new file mode 100644 index 00000000000..24e47aa7a46 --- /dev/null +++ b/queue-4.1/ufs-fix-possible-deadlock-when-looking-up-directories.patch @@ -0,0 +1,41 @@ +From 514d748f69c97a51a2645eb198ac5c6218f22ff9 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Tue, 2 Jun 2015 11:26:34 +0200 +Subject: ufs: Fix possible deadlock when looking up directories + +From: Jan Kara + +commit 514d748f69c97a51a2645eb198ac5c6218f22ff9 upstream. + +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 +Signed-off-by: Jan Kara +Signed-off-by: Al Viro +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ufs/namei.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/fs/ufs/namei.c ++++ b/fs/ufs/namei.c +@@ -212,6 +212,7 @@ static int ufs_mkdir(struct inode * dir, + goto out_fail; + unlock_ufs(dir->i_sb); + ++ unlock_new_inode(inode); + d_instantiate(dentry, inode); + out: + return err; diff --git a/queue-4.1/ufs-fix-warning-from-unlock_new_inode.patch b/queue-4.1/ufs-fix-warning-from-unlock_new_inode.patch new file mode 100644 index 00000000000..43a70a67e9b --- /dev/null +++ b/queue-4.1/ufs-fix-warning-from-unlock_new_inode.patch @@ -0,0 +1,42 @@ +From 12ecbb4b1d765a5076920999298d9625439dbe58 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Mon, 1 Jun 2015 14:52:04 +0200 +Subject: ufs: Fix warning from unlock_new_inode() + +From: Jan Kara + +commit 12ecbb4b1d765a5076920999298d9625439dbe58 upstream. + +Commit e4502c63f56aeca88 (ufs: deal with nfsd/iget races) introduced +unlock_new_inode() call into ufs_add_nondir(). However that function +gets called also from ufs_link() which hands it already initialized +inode and thus unlock_new_inode() complains. The problem is harmless but +annoying. + +Fix the problem by opencoding necessary stuff in ufs_link() + +Fixes: e4502c63f56aeca887ced37f24e0def1ef11cec8 +Signed-off-by: Jan Kara +Signed-off-by: Al Viro +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ufs/namei.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/fs/ufs/namei.c ++++ b/fs/ufs/namei.c +@@ -174,7 +174,12 @@ static int ufs_link (struct dentry * old + inode_inc_link_count(inode); + ihold(inode); + +- error = ufs_add_nondir(dentry, inode); ++ error = ufs_add_link(dentry, inode); ++ if (error) { ++ inode_dec_link_count(inode); ++ iput(inode); ++ } else ++ d_instantiate(dentry, inode); + unlock_ufs(dir->i_sb); + return error; + }