From: youngjun <her0gyugyu@gmail.com>
To: amir73il@gmail.com
Cc: linux-unionfs@vger.kernel.org, youngjun <her0gyugyu@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH 4/4] ovl: inode reference leak in ovl_is_inuse true case.
Date: Tue, 16 Jun 2020 17:30:43 +0900 [thread overview]
Message-ID: <20200616083043.25801-1-her0gyugyu@gmail.com> (raw)
In-Reply-To: <20200615155645.32939-1-her0gyugyu@gmail.com>
When "ovl_is_inuse" true case, trap inode reference not put.
plus adding the comment explaining sequence of
ovl_is_inuse after ovl_setup_trap.
Fixes: 0be0bfd2de9d ("ovl: fix regression caused by overlapping layers..")
Cc: <stable@vger.kernel.org> # v4.19+
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: youngjun <her0gyugyu@gmail.com>
---
fs/overlayfs/super.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 91476bc422f9..3097142b1e23 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1493,14 +1493,22 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,
if (err < 0)
goto out;
+ /*
+ * Check if lower root conflicts with this overlay layers before checking
+ * if it is in-use as upperdir/workdir of "another" mount, because we do
+ * not bother to check in ovl_is_inuse() if the upperdir/workdir is in fact
+ * in-use by our upperdir/workdir.
+ */
err = ovl_setup_trap(sb, stack[i].dentry, &trap, "lowerdir");
if (err)
goto out;
if (ovl_is_inuse(stack[i].dentry)) {
err = ovl_report_in_use(ofs, "lowerdir");
- if (err)
+ if (err) {
+ iput(trap);
goto out;
+ }
}
mnt = clone_private_mount(&stack[i]);
--
2.17.1
Again, Great thanks Amir. I revise my patch through your kind guidance.
next prev parent reply other threads:[~2020-06-16 8:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 15:56 [PATCH] ovl: inode reference leak in "ovl_is_inuse" true case youngjun
2020-06-15 16:45 ` Amir Goldstein
2020-06-16 4:46 ` [PATCH] ovl: inode reference leak in ovl_is_inuse " youngjun
2020-06-16 5:33 ` Amir Goldstein
2020-06-16 6:57 ` [PATCH v3] " youngjun
2020-06-16 7:11 ` Amir Goldstein
2020-06-16 8:30 ` youngjun [this message]
2020-07-14 14:40 ` [PATCH 4/4] " Miklos Szeredi
2020-06-16 8:33 ` [PATCH v4] " youngjun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200616083043.25801-1-her0gyugyu@gmail.com \
--to=her0gyugyu@gmail.com \
--cc=amir73il@gmail.com \
--cc=linux-unionfs@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).