From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Christian Brauner <brauner@kernel.org>,
Yang Xu <xuyang2018.jy@fujitsu.com>,
"Darrick J . Wong" <djwong@kernel.org>,
Filipe Manana <fdmanana@kernel.org>,
linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 2/2] ovl: remove privs in ovl_fallocate()
Date: Mon, 3 Oct 2022 15:30:40 +0300 [thread overview]
Message-ID: <20221003123040.900827-3-amir73il@gmail.com> (raw)
In-Reply-To: <20221003123040.900827-1-amir73il@gmail.com>
Underlying fs doesn't remove privs because fallocate is called with
privileged mounter credentials.
This fixes some failure in fstests generic/683..687.
Fixes: aab8848cee5e ("ovl: add ovl_fallocate()")
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/overlayfs/file.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index c8308da8909a..e90ac5376456 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -517,9 +517,16 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len
const struct cred *old_cred;
int ret;
+ inode_lock(inode);
+ /* Update mode */
+ ovl_copyattr(inode);
+ ret = file_remove_privs(file);
+ if (ret)
+ goto out_unlock;
+
ret = ovl_real_fdget(file, &real);
if (ret)
- return ret;
+ goto out_unlock;
old_cred = ovl_override_creds(file_inode(file)->i_sb);
ret = vfs_fallocate(real.file, mode, offset, len);
@@ -530,6 +537,9 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len
fdput(real);
+out_unlock:
+ inode_unlock(inode);
+
return ret;
}
--
2.25.1
next prev parent reply other threads:[~2022-10-03 12:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 12:30 [PATCH 0/2] Some fixes for overlayfs remove privs Amir Goldstein
2022-10-03 12:30 ` [PATCH 1/2] ovl: remove privs in ovl_copyfile() Amir Goldstein
2022-10-05 14:37 ` Miklos Szeredi
2022-10-03 12:30 ` Amir Goldstein [this message]
2022-10-04 10:59 ` [PATCH 2/2] ovl: remove privs in ovl_fallocate() Christian Brauner
2022-10-04 13:20 ` Christian Brauner
2022-10-04 14:01 ` Amir Goldstein
2022-10-04 14:12 ` Christian Brauner
2022-10-04 15:52 ` Christian Brauner
2022-10-05 13:56 ` Amir Goldstein
2022-10-05 14:40 ` Miklos Szeredi
2022-10-05 15:16 ` Christian Brauner
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 12:21 [PATCH 0/2] Some fixes for overlayfs remove privs Amir Goldstein
2022-10-03 12:21 ` [PATCH 2/2] ovl: remove privs in ovl_fallocate() Amir Goldstein
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=20221003123040.900827-3-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=brauner@kernel.org \
--cc=djwong@kernel.org \
--cc=fdmanana@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--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).