From: Christian Brauner <brauner@kernel.org>
To: Amir Goldstein <amir73il@gmail.com>,
Miklos Szeredi <miklos@szeredi.hu>,
"Darrick J . Wong" <djwong@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@lst.de>,
Seth Forshee <sforshee@kernel.org>,
Yang Xu <xuyang2018.jy@fujitsu.com>,
Filipe Manana <fdmanana@kernel.org>,
Christian Brauner <brauner@kernel.org>,
linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Miklos Szeredi <mszeredi@redhat.com>
Subject: [PATCH v2 4/5] ovl: remove privs in ovl_copyfile()
Date: Fri, 7 Oct 2022 16:05:42 +0200 [thread overview]
Message-ID: <20221007140543.1039983-5-brauner@kernel.org> (raw)
In-Reply-To: <20221007140543.1039983-1-brauner@kernel.org>
From: Amir Goldstein <amir73il@gmail.com>
Underlying fs doesn't remove privs because copy_range/remap_range are
called with privileged mounter credentials.
This fixes some failures in fstest generic/673.
Fixes: 8ede205541ff ("ovl: add reflink/copyfile/dedup support")
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Acked-by: Miklos Szeredi <mszeredi@redhat.com>
---
Notes:
/* v2 */
Acked-by: Miklos Szeredi <miklos@szeredi.hu>
fs/overlayfs/file.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index daff601b5c41..362a4eed92b5 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -567,14 +567,23 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,
const struct cred *old_cred;
loff_t ret;
+ inode_lock(inode_out);
+ if (op != OVL_DEDUPE) {
+ /* Update mode */
+ ovl_copyattr(inode_out);
+ ret = file_remove_privs(file_out);
+ if (ret)
+ goto out_unlock;
+ }
+
ret = ovl_real_fdget(file_out, &real_out);
if (ret)
- return ret;
+ goto out_unlock;
ret = ovl_real_fdget(file_in, &real_in);
if (ret) {
fdput(real_out);
- return ret;
+ goto out_unlock;
}
old_cred = ovl_override_creds(file_inode(file_out)->i_sb);
@@ -603,6 +612,9 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,
fdput(real_in);
fdput(real_out);
+out_unlock:
+ inode_unlock(inode_out);
+
return ret;
}
--
2.34.1
next prev parent reply other threads:[~2022-10-07 14:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 14:05 [PATCH v2 0/5] fs: improve setgid stripping consistency even more Christian Brauner
2022-10-07 14:05 ` [PATCH v2 1/5] attr: add setattr_drop_sgid() Christian Brauner
2022-10-11 8:11 ` Amir Goldstein
2022-10-11 8:57 ` Christian Brauner
2022-10-07 14:05 ` [PATCH v2 2/5] attr: add should_remove_sgid() Christian Brauner
[not found] ` <202210080357.inSALqdT-lkp@intel.com>
2022-10-08 5:56 ` Christian Brauner
2022-10-11 8:18 ` Amir Goldstein
2022-10-11 8:46 ` Christian Brauner
2022-10-07 14:05 ` [PATCH v2 3/5] attr: use consistent sgid stripping checks Christian Brauner
2022-10-11 8:43 ` Amir Goldstein
2022-10-11 8:56 ` Christian Brauner
2022-10-11 11:07 ` Amir Goldstein
2022-10-11 13:48 ` Christian Brauner
2022-10-07 14:05 ` Christian Brauner [this message]
2022-10-07 14:05 ` [PATCH v2 5/5] ovl: remove privs in ovl_fallocate() Christian Brauner
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=20221007140543.1039983-5-brauner@kernel.org \
--to=brauner@kernel.org \
--cc=amir73il@gmail.com \
--cc=djwong@kernel.org \
--cc=fdmanana@kernel.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=mszeredi@redhat.com \
--cc=sforshee@kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=xuyang2018.jy@fujitsu.com \
/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).