aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/overlayfs/super.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 84f3144e1b33..6ca8ea8cb9b2 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -836,6 +836,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
836 if (err) 836 if (err)
837 goto out_put_upperpath; 837 goto out_put_upperpath;
838 838
839 err = -EINVAL;
839 if (upperpath.mnt != workpath.mnt) { 840 if (upperpath.mnt != workpath.mnt) {
840 pr_err("overlayfs: workdir and upperdir must reside under the same mount\n"); 841 pr_err("overlayfs: workdir and upperdir must reside under the same mount\n");
841 goto out_put_workpath; 842 goto out_put_workpath;
@@ -894,12 +895,14 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
894 } 895 }
895 } 896 }
896 897
898 err = -ENOMEM;
897 ufs->lower_mnt = kcalloc(numlower, sizeof(struct vfsmount *), GFP_KERNEL); 899 ufs->lower_mnt = kcalloc(numlower, sizeof(struct vfsmount *), GFP_KERNEL);
898 if (ufs->lower_mnt == NULL) 900 if (ufs->lower_mnt == NULL)
899 goto out_put_workdir; 901 goto out_put_workdir;
900 for (i = 0; i < numlower; i++) { 902 for (i = 0; i < numlower; i++) {
901 struct vfsmount *mnt = clone_private_mount(&stack[i]); 903 struct vfsmount *mnt = clone_private_mount(&stack[i]);
902 904
905 err = PTR_ERR(mnt);
903 if (IS_ERR(mnt)) { 906 if (IS_ERR(mnt)) {
904 pr_err("overlayfs: failed to clone lowerpath\n"); 907 pr_err("overlayfs: failed to clone lowerpath\n");
905 goto out_put_lower_mnt; 908 goto out_put_lower_mnt;