aboutsummaryrefslogtreecommitdiffstats
path: root/fs/overlayfs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2014-10-23 18:14:39 -0400
committerMiklos Szeredi <mszeredi@suse.cz>2014-10-23 18:14:39 -0400
commit69c433ed2ecd2d3264efd7afec4439524b319121 (patch)
tree49fcf55fbd3913881ccb47a6e700f668a4307daf /fs/overlayfs
parent7c37fbda85ceb9be7bdb9d5f53e702efc40cf783 (diff)
fs: limit filesystem stacking depth
Add a simple read-only counter to super_block that indicates how deep this is in the stack of filesystems. Previously ecryptfs was the only stackable filesystem and it explicitly disallowed multiple layers of itself. Overlayfs, however, can be stacked recursively and also may be stacked on top of ecryptfs or vice versa. To limit the kernel stack usage we must limit the depth of the filesystem stack. Initially the limit is set to 2. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/overlayfs')
-rw-r--r--fs/overlayfs/super.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 7dcc24e84417..08b704cebfc4 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -677,6 +677,15 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
677 } 677 }
678 ufs->lower_namelen = statfs.f_namelen; 678 ufs->lower_namelen = statfs.f_namelen;
679 679
680 sb->s_stack_depth = max(upperpath.mnt->mnt_sb->s_stack_depth,
681 lowerpath.mnt->mnt_sb->s_stack_depth) + 1;
682
683 err = -EINVAL;
684 if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
685 pr_err("overlayfs: maximum fs stacking depth exceeded\n");
686 goto out_put_workpath;
687 }
688
680 ufs->upper_mnt = clone_private_mount(&upperpath); 689 ufs->upper_mnt = clone_private_mount(&upperpath);
681 err = PTR_ERR(ufs->upper_mnt); 690 err = PTR_ERR(ufs->upper_mnt);
682 if (IS_ERR(ufs->upper_mnt)) { 691 if (IS_ERR(ufs->upper_mnt)) {