Commit 6be4506e authored Jan 15, 2015 by hujianyang Committed by Miklos Szeredi Mar 18, 2015

ovl: check lowerdir amount for non-upper mount



Recently multi-lower layer mount support allow upperdir and workdir
to be omitted, then cause overlayfs can be mount with only one
lowerdir directory. This action make no sense and have potential risk.

This patch check the total number of lower directories to prevent
mounting overlayfs with only one directory.

Also, an error message is added to indicate lower directories exceed
OVL_MAX_STACK limit.

Signed-off-by: hujianyang <hujianyang@huawei.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>

parent bead55ef

fs/overlayfs/super.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -870,8 +870,14 @@ static int ovl_fill_super(struct super_block sb, void data, int silent)

		err = -EINVAL;
		stacklen = ovl_split_lowerdirs(lowertmp);
		if (stacklen > OVL_MAX_STACK)
		if (stacklen > OVL_MAX_STACK) {
		pr_err("overlayfs: too many lower directries, limit is %d\n",
		OVL_MAX_STACK);
		goto out_free_lowertmp;
		} else if (!ufs->config.upperdir && stacklen == 1) {
		pr_err("overlayfs: at least 2 lowerdir are needed while upperdir nonexistent\n");
		goto out_free_lowertmp;
		}

		stack = kcalloc(stacklen, sizeof(struct path), GFP_KERNEL);
		if (!stack)

Admin message