1 files changed, 8 insertions, 1 deletions

diff --git a/fs/open.c b/fs/open.c
index 8d06ec911fd9..2835f096c683 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -887,6 +887,10 @@ struct file *nameidata_to_filp(struct nameidata *nd, int flags)
         return filp;
 }
 
+/*
+ * dentry_open() will have done dput(dentry) and mntput(mnt) if it returns an
+ * error.
+ */
 struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
 {
         int error;
@@ -894,8 +898,11 @@ struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
 
         error = -ENFILE;
         f = get_empty_filp();
-        if (f == NULL)
+        if (f == NULL) {
+                dput(dentry);
+                mntput(mnt);
                 return ERR_PTR(error);
+        }
 
         return __dentry_open(dentry, mnt, flags, f, NULL);
 }