Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

Pull overlayfs bug fixes from Miklos Szeredi:
 "This contains fixes for bugs that appeared in earlier kernels (all are
  marked for -stable)"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: free lower_mnt array in ovl_put_super
  ovl: free stack of paths in ovl_fill_super
  ovl: fix open in stacked overlay
  ovl: fix dentry reference leak
  ovl: use O_LARGEFILE in ovl_copy_up()

3 files changed, 8 insertions, 3 deletions

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 84d693d37428..871fcb67be97 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -81,11 +81,11 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
         if (len == 0)
                 return 0;
 
-        old_file = ovl_path_open(old, O_RDONLY);
+        old_file = ovl_path_open(old, O_LARGEFILE | O_RDONLY);
         if (IS_ERR(old_file))
                 return PTR_ERR(old_file);
 
-        new_file = ovl_path_open(new, O_WRONLY);
+        new_file = ovl_path_open(new, O_LARGEFILE | O_WRONLY);
         if (IS_ERR(new_file)) {
                 error = PTR_ERR(new_file);
                 goto out_fput;
@@ -267,7 +267,7 @@ out:
 
 out_cleanup:
         ovl_cleanup(wdir, newdentry);
-        goto out;
+        goto out2;
 }
 
 /*
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index d9da5a4e9382..ec0c2a050043 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -363,6 +363,9 @@ struct inode *ovl_d_select_inode(struct dentry *dentry, unsigned file_flags)
                 ovl_path_upper(dentry, &realpath);
         }
 
+        if (realpath.dentry->d_flags & DCACHE_OP_SELECT_INODE)
+                return realpath.dentry->d_op->d_select_inode(realpath.dentry, file_flags);
+
         return d_backing_inode(realpath.dentry);
 }
 
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 79073d68b475..e38ee0fed24a 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -544,6 +544,7 @@ static void ovl_put_super(struct super_block *sb)
         mntput(ufs->upper_mnt);
         for (i = 0; i < ufs->numlower; i++)
                 mntput(ufs->lower_mnt[i]);
+        kfree(ufs->lower_mnt);
 
         kfree(ufs->config.lowerdir);
         kfree(ufs->config.upperdir);
@@ -1048,6 +1049,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
                 oe->lowerstack[i].dentry = stack[i].dentry;
                 oe->lowerstack[i].mnt = ufs->lower_mnt[i];
         }
+        kfree(stack);
 
         root_dentry->d_fsdata = oe;