diff options
| author |  Amir Goldstein <amir73il@gmail.com>
| 2017-06-21 15:28:38 +0300 |
|---|---|---|
| committer |  Miklos Szeredi <mszeredi@redhat.com>
| 2017-07-04 22:03:17 +0200 |
| commit | 54fb347e836faadaed2a5617fb4dd4a4597d0490 (patch) | |
| tree | 776d77e3848edf181ebeeda5bea8169c8937c6bc /fs/overlayfs/namei.c | |
| parent | ovl: verify upper root dir matches lower root dir (diff) | |
| download | linux-54fb347e836faadaed2a5617fb4dd4a4597d0490.tar.gz linux-54fb347e836faadaed2a5617fb4dd4a4597d0490.tar.bz2 linux-54fb347e836faadaed2a5617fb4dd4a4597d0490.zip | |
ovl: verify index dir matches upper dir
An index dir contains persistent hardlinks to files in upper dir.
Therefore, we must never mount an existing index dir with a differnt
upper dir.
Store the upper root dir file handle in index dir inode when index
dir is created and verify the file handle before using an existing
index dir on mount.
Add an 'is_upper' flag to the overlay file handle encoding and set it
when encoding the upper root file handle. This is not critical for index
dir verification, but it is good practice towards a standard overlayfs
file handle format for NFS export.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/namei.c')
| -rw-r--r-- | fs/overlayfs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c index 197b53d34861..0c816e9aa50c 100644 --- a/fs/overlayfs/namei.c +++ b/fs/overlayfs/namei.c @@ -350,13 +350,13 @@ static int ovl_verify_origin_fh(struct dentry *dentry, const struct ovl_fh *fh) * Return 0 on match, -ESTALE on mismatch, < 0 on error. */ int ovl_verify_origin(struct dentry *dentry, struct vfsmount *mnt, - struct dentry *origin, bool set) + struct dentry *origin, bool is_upper, bool set) { struct inode *inode; struct ovl_fh *fh; int err; - fh = ovl_encode_fh(origin); + fh = ovl_encode_fh(origin, is_upper); err = PTR_ERR(fh); if (IS_ERR(fh)) goto fail; |