diff options
| author | Amir Goldstein | 2017-06-25 15:37:17 +0200 |
|---|---|---|
| committer | Miklos Szeredi | 2017-11-09 10:23:26 +0100 |
| commit | b79e05aaa166755fafbf02db275175edb5175df8 (patch) | |
| tree | aaa5fcc30c2ffe7c22df0074900846917332c08b /fs/overlayfs/util.c | |
| parent | ovl: lockdep annotate of nested OVL_I(inode)->lock (diff) | |
| download | kernel-qcow2-linux-b79e05aaa166755fafbf02db275175edb5175df8.tar.gz kernel-qcow2-linux-b79e05aaa166755fafbf02db275175edb5175df8.tar.xz kernel-qcow2-linux-b79e05aaa166755fafbf02db275175edb5175df8.zip | |
ovl: no direct iteration for dir with origin xattr
If a non-merge dir in an overlay mount has an overlay.origin xattr, it
means it was once an upper merge dir, which may contain whiteouts and
then the lower dir was removed under it.
Do not iterate real dir directly in this case to avoid exposing whiteouts.
[SzM] Set OVL_WHITEOUT for all merge directories as well.
[amir] A directory that was just copied up does not have the OVL_WHITEOUTS
flag. We need to set it to fix merge dir iteration.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/util.c')
| -rw-r--r-- | fs/overlayfs/util.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index b9b239fa5cfd..51ca8bd16009 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -329,6 +329,19 @@ void ovl_copy_up_end(struct dentry *dentry) mutex_unlock(&OVL_I(d_inode(dentry))->lock); } +bool ovl_check_origin_xattr(struct dentry *dentry) +{ + int res; + + res = vfs_getxattr(dentry, OVL_XATTR_ORIGIN, NULL, 0); + + /* Zero size value means "copied up but origin unknown" */ + if (res >= 0) + return true; + + return false; +} + bool ovl_check_dir_xattr(struct dentry *dentry, const char *name) { int res; |