Skip to content

Commit

Permalink
ovl: remove privs in ovl_fallocate()
Browse files Browse the repository at this point in the history
[ Upstream commit 23a8ce1 ]

Underlying fs doesn't remove privs because fallocate is called with
privileged mounter credentials.

This fixes some failure in fstests generic/683..687.

Fixes: aab8848 ("ovl: add ovl_fallocate()")
Acked-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
amir73il authored and gregkh committed Dec 31, 2022
1 parent 5dc34f9 commit 26bffaf
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion fs/overlayfs/file.c
Expand Up @@ -516,9 +516,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);
Expand All @@ -529,6 +536,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;
}

Expand Down

0 comments on commit 26bffaf

Please sign in to comment.