This is a note to let you know that I've just added the patch titled
ovl: fix dput() of ERR_PTR in ovl_cleanup_index()
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-dput-of-err_ptr-in-ovl_cleanup_index.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 <stable@xxxxxxxxxxxxxxx> know about it.
>From 9f4ec904dbd4eb1a2db10d5e7dc16eae386fe64d Mon Sep 17 00:00:00 2001
From: Amir Goldstein <amir73il@xxxxxxxxx>
Date: Sun, 24 Sep 2017 17:36:26 +0300
Subject: ovl: fix dput() of ERR_PTR in ovl_cleanup_index()
From: Amir Goldstein <amir73il@xxxxxxxxx>
commit 9f4ec904dbd4eb1a2db10d5e7dc16eae386fe64d upstream.
Fixes: caf70cb2ba5d ("ovl: cleanup orphan index entries")
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/overlayfs/util.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -418,7 +418,7 @@ void ovl_inuse_unlock(struct dentry *den
}
}
-/* Called must hold OVL_I(inode)->oi_lock */
+/* Caller must hold OVL_I(inode)->lock */
static void ovl_cleanup_index(struct dentry *dentry)
{
struct inode *dir = ovl_indexdir(dentry->d_sb)->d_inode;
@@ -457,6 +457,9 @@ static void ovl_cleanup_index(struct den
err = PTR_ERR(index);
if (!IS_ERR(index))
err = ovl_cleanup(dir, index);
+ else
+ index = NULL;
+
inode_unlock(dir);
if (err)
goto fail;
Patches currently in stable-queue which might be from amir73il@xxxxxxxxx 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