From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45218 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932107AbdJJPNm (ORCPT ); Tue, 10 Oct 2017 11:13:42 -0400 Subject: Patch "ovl: fix dentry leak in ovl_indexdir_cleanup()" has been added to the 4.13-stable tree To: amir73il@gmail.com, gregkh@linuxfoundation.org, mszeredi@redhat.com Cc: , From: Date: Tue, 10 Oct 2017 17:12:58 +0200 Message-ID: <1507648378112244@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ovl: fix dentry leak in ovl_indexdir_cleanup() to the 4.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ovl-fix-dentry-leak-in-ovl_indexdir_cleanup.patch and it can be found in the queue-4.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From dc7ab6773e8171e07f16fd0df0c5eea28c899503 Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Sun, 24 Sep 2017 22:19:10 +0300 Subject: ovl: fix dentry leak in ovl_indexdir_cleanup() From: Amir Goldstein commit dc7ab6773e8171e07f16fd0df0c5eea28c899503 upstream. index dentry was not released when breaking out of the loop due to index verification error. Fixes: 415543d5c64f ("ovl: cleanup bad and stale index entries on mount") Signed-off-by: Amir Goldstein Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman --- fs/overlayfs/readdir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c @@ -672,6 +672,7 @@ int ovl_indexdir_cleanup(struct dentry * struct path *lowerstack, unsigned int numlower) { int err; + struct dentry *index = NULL; struct inode *dir = dentry->d_inode; struct path path = { .mnt = mnt, .dentry = dentry }; LIST_HEAD(list); @@ -690,8 +691,6 @@ int ovl_indexdir_cleanup(struct dentry * inode_lock_nested(dir, I_MUTEX_PARENT); list_for_each_entry(p, &list, l_node) { - struct dentry *index; - if (p->name[0] == '.') { if (p->len == 1) continue; @@ -701,6 +700,7 @@ int ovl_indexdir_cleanup(struct dentry * index = lookup_one_len(p->name, dentry, p->len); if (IS_ERR(index)) { err = PTR_ERR(index); + index = NULL; break; } err = ovl_verify_index(index, lowerstack, numlower); @@ -712,7 +712,9 @@ int ovl_indexdir_cleanup(struct dentry * break; } dput(index); + index = NULL; } + dput(index); inode_unlock(dir); out: ovl_cache_free(&list); Patches currently in stable-queue which might be from amir73il@gmail.com are queue-4.13/ovl-fix-missing-unlock_rename-in-ovl_do_copy_up.patch queue-4.13/ovl-fix-error-value-printed-in-ovl_lookup_index.patch queue-4.13/ovl-fix-dput-of-err_ptr-in-ovl_cleanup_index.patch queue-4.13/ovl-fix-regression-caused-by-exclusive-upper-work-dir-protection.patch queue-4.13/ovl-fix-dentry-leak-in-ovl_indexdir_cleanup.patch