浏览代码

ovl: fix return value of ovl_fill_super

If kcalloc() failed, the return value of ovl_fill_super() is -EINVAL,
not -ENOMEM. So this patch sets this value to -ENOMEM before calling
kcalloc(), and sets it back to -EINVAL after calling kcalloc().

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Geliang Tang 8 年之前
父节点
当前提交
313684c48c
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      fs/overlayfs/super.c

+ 2 - 0
fs/overlayfs/super.c

@@ -774,10 +774,12 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
 		goto out_free_lowertmp;
 		goto out_free_lowertmp;
 	}
 	}
 
 
+	err = -ENOMEM;
 	stack = kcalloc(stacklen, sizeof(struct path), GFP_KERNEL);
 	stack = kcalloc(stacklen, sizeof(struct path), GFP_KERNEL);
 	if (!stack)
 	if (!stack)
 		goto out_free_lowertmp;
 		goto out_free_lowertmp;
 
 
+	err = -EINVAL;
 	lower = lowertmp;
 	lower = lowertmp;
 	for (numlower = 0; numlower < stacklen; numlower++) {
 	for (numlower = 0; numlower < stacklen; numlower++) {
 		err = ovl_lower_dir(lower, &stack[numlower], ufs,
 		err = ovl_lower_dir(lower, &stack[numlower], ufs,