Skip to content

Commit 924577e

Browse files
andrealmeidMiklos Szeredi
authored andcommitted
ovl: Fix nested backing file paths
When the lowerdir of an overlayfs is a merged directory of another overlayfs, ovl_open_realfile() will fail to open the real file and point to a lower dentry copy, without the proper parent path. After this, d_path() will then display the path incorrectly as if the file is placed in the root directory. This bug can be triggered with the following setup: mkdir -p ovl-A/lower ovl-A/upper ovl-A/merge ovl-A/work mkdir -p ovl-B/upper ovl-B/merge ovl-B/work cp /bin/cat ovl-A/lower/ mount -t overlay overlay -o \ lowerdir=ovl-A/lower,upperdir=ovl-A/upper,workdir=ovl-A/work \ ovl-A/merge mount -t overlay overlay -o \ lowerdir=ovl-A/merge,upperdir=ovl-B/upper,workdir=ovl-B/work \ ovl-B/merge ovl-A/merge/cat /proc/self/maps | grep --color cat ovl-B/merge/cat /proc/self/maps | grep --color cat The first cat will correctly show `/ovl-A/merge/cat`, while the second one shows just `/cat`. To fix that, uses file_user_path() inside of backing_file_open() to get the correct file path for the dentry. Co-developed-by: John Schoenick <[email protected]> Signed-off-by: John Schoenick <[email protected]> Signed-off-by: André Almeida <[email protected]> Fixes: def3ae8 ("fs: store real path instead of fake path in backing file f_path") Cc: <[email protected]> # v6.7 Signed-off-by: Miklos Szeredi <[email protected]>
1 parent a6eb9a4 commit 924577e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/overlayfs/file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ static struct file *ovl_open_realfile(const struct file *file,
4848
if (!inode_owner_or_capable(real_idmap, realinode))
4949
flags &= ~O_NOATIME;
5050

51-
realfile = backing_file_open(&file->f_path, flags, realpath,
52-
current_cred());
51+
realfile = backing_file_open(file_user_path((struct file *) file),
52+
flags, realpath, current_cred());
5353
}
5454
ovl_revert_creds(old_cred);
5555

0 commit comments

Comments
 (0)