2016-11-18 15:02:59

by Geliang Tang

Subject: [PATCH] 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 <[email protected]>
---
fs/overlayfs/super.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 19d31ce..1afdf77 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -754,10 +754,12 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
goto out_free_lowertmp;
}

+ err = -ENOMEM;
stack = kcalloc(stacklen, sizeof(struct path), GFP_KERNEL);
if (!stack)
goto out_free_lowertmp;

+ err = -EINVAL;
lower = lowertmp;
for (numlower = 0; numlower < stacklen; numlower++) {
err = ovl_lower_dir(lower, &stack[numlower], ufs,
--
2.9.3

2016-12-06 10:27:23

by Miklos Szeredi

Subject: Re: [PATCH] ovl: fix return value of ovl_fill_super

On Fri, Nov 18, 2016 at 4:02 PM, Geliang Tang <[email protected]> wrote:
> 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().

Thanks, applied.

Miklos