FAILED: patch "[PATCH] ovl: fix recursive oi->lock in ovl_link()" failed to apply to 4.14-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
6cd078702f2f33cb6b19a682de3e9184112f1a46Mon Sep 17 00:00:00 2001
From: Amir Goldstein <[email protected]>
Date: Thu, 18 Oct 2018 09:45:49 +0300
Subject: [PATCH] ovl: fix recursive oi->lock in ovl_link()
linking a non-copied-up file into a non-copied-up parent results in a nested call to mutex_lock_interruptible(&oi->lock). Fix this by copying up target parent before ovl_nlink_start(), same as done in ovl_rename().
~/unionmount-testsuite$ ./run --ov -s ~/unionmount-testsuite$ ln /mnt/a/foo100 /mnt/a/dir100/
WARNING: possible recursive locking detected
--------------------------------------------
ln/1545 is trying to acquire lock:
00000000bcce7c4c (&ovl_i_lock_key[depth]){+.+.}, at:
ovl_copy_up_start+0x28/0x7d
but task is already holding lock:
0000000026d73d5b (&ovl_i_lock_key[depth]){+.+.}, at:
ovl_nlink_start+0x3c/0xc1[SzM: this seems to be a false positive, but doing the copy-up first is harmless and removes the lockdep splat]
fs/overlayfs/dir.c +4 -0
@@ -663,6 +663,10 @@ static int ovl_link(struct dentry *old, struct inode *newdir,if (err) goto out_drop_write; + err =ovl_copy_up (new->d_parent); +if (err) + goto out_drop_write; +if (ovl_is_metacopy_dentry (old)) { err =ovl_set_redirect (old, false);if (err)