From: Vivek Goyal <vgoyal@redhat.com>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>, linux-unionfs@vger.kernel.org
Subject: Re: [PATCH 1/3] ovl: force read-only sb on failure to create index dir
Date: Tue, 14 Jul 2020 14:18:04 -0400 [thread overview]
Message-ID: <20200714181804.GF324688@redhat.com> (raw)
In-Reply-To: <20200713141945.11719-2-amir73il@gmail.com>
On Mon, Jul 13, 2020 at 05:19:43PM +0300, Amir Goldstein wrote:
> With index feature enabled, on failure to create index dir, overlay
> is being mounted read-only. However, we do not forbid user to remount
> overlay read-write. Fix that by setting ofs->workdir to NULL, which
> prevents remount read-write.
>
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
This patch does not apply for me. What branch you have generated it
against. I am using 5.8-rc4.
Vivek
> ---
> fs/overlayfs/super.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
> index 4b7cb2d98203..41d7fe2b8129 100644
> --- a/fs/overlayfs/super.c
> +++ b/fs/overlayfs/super.c
> @@ -1374,12 +1374,13 @@ static int ovl_get_indexdir(struct super_block *sb, struct ovl_fs *ofs,
> goto out;
> }
>
> + /* index dir will act also as workdir */
> + iput(ofs->workdir_trap);
> + ofs->workdir_trap = NULL;
> + dput(ofs->workdir);
> + ofs->workdir = NULL;
> ofs->indexdir = ovl_workdir_create(ofs, OVL_INDEXDIR_NAME, true);
> if (ofs->indexdir) {
> - /* index dir will act also as workdir */
> - iput(ofs->workdir_trap);
> - ofs->workdir_trap = NULL;
> - dput(ofs->workdir);
> ofs->workdir = dget(ofs->indexdir);
>
> err = ovl_setup_trap(sb, ofs->indexdir, &ofs->indexdir_trap,
> @@ -1884,7 +1885,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
> if (!ovl_upper_mnt(ofs))
> sb->s_flags |= SB_RDONLY;
>
> - if (!(ovl_force_readonly(ofs)) && ofs->config.index) {
> + if (!ovl_force_readonly(ofs) && ofs->config.index) {
> err = ovl_get_indexdir(sb, ofs, oe, &upperpath);
> if (err)
> goto out_free_oe;
> --
> 2.17.1
>
next prev parent reply other threads:[~2020-07-14 18:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 14:19 [PATCH 0/3] Misc. redirect_dir=nofollow fixes Amir Goldstein
2020-07-13 14:19 ` [PATCH 1/3] ovl: force read-only sb on failure to create index dir Amir Goldstein
2020-07-14 18:18 ` Vivek Goyal [this message]
2020-07-14 18:32 ` Amir Goldstein
2020-07-14 18:38 ` Vivek Goyal
2020-07-14 18:45 ` Amir Goldstein
2020-07-15 20:04 ` Miklos Szeredi
2020-07-16 5:00 ` Amir Goldstein
2020-07-15 20:03 ` Miklos Szeredi
2020-07-13 14:19 ` [PATCH 2/3] ovl: fix mount option checks for nfs_export with no upperdir Amir Goldstein
2020-07-14 14:52 ` Miklos Szeredi
2020-07-14 14:58 ` Amir Goldstein
2020-07-14 15:08 ` Miklos Szeredi
2020-07-14 15:20 ` Amir Goldstein
2020-07-15 20:05 ` Miklos Szeredi
2020-07-13 14:19 ` [PATCH 3/3] ovl: do not follow non-dir origin with redirect_dir=nofollow Amir Goldstein
2020-10-30 12:05 ` Miklos Szeredi
2020-10-30 13:20 ` Amir Goldstein
2020-10-30 13:51 ` Miklos Szeredi
2020-07-14 18:07 ` [PATCH 0/3] Misc. redirect_dir=nofollow fixes Vivek Goyal
2020-07-14 18:42 ` Amir Goldstein
2020-07-15 13:06 ` Vivek Goyal
2020-07-15 13:56 ` Amir Goldstein
2020-07-16 13:27 ` Vivek Goyal
2020-07-16 13:43 ` Amir Goldstein
2020-07-16 15:26 ` Vivek Goyal
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=20200714181804.GF324688@redhat.com \
--to=vgoyal@redhat.com \
--cc=amir73il@gmail.com \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
/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).