From: Amir Goldstein <amir73il@gmail.com>
Date: Mon, 5 Jun 2017 19:44:49 +0000 (+0300)
Subject: ovl: fix nlink leak in ovl_rename()
X-Git-Tag: v4.13-rc1~53^2~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f681eb1d5c02c9e79775e10363057d034c720efc;p=karo-tx-linux.git

ovl: fix nlink leak in ovl_rename()

This patch fixes an overlay inode nlink leak in the case where
ovl_rename() renames over a non-dir.

This is not so critical, because overlay inode doesn't rely on
nlink dropping to zero for inode deletion.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index a63a71656e9b..fcfa7de12ad5 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -1046,6 +1046,13 @@ static int ovl_rename(struct inode *olddir, struct dentry *old,
 	if (cleanup_whiteout)
 		ovl_cleanup(old_upperdir->d_inode, newdentry);
 
+	if (overwrite && d_inode(new)) {
+		if (new_is_dir)
+			clear_nlink(d_inode(new));
+		else
+			drop_nlink(d_inode(new));
+	}
+
 	ovl_dentry_version_inc(old->d_parent);
 	ovl_dentry_version_inc(new->d_parent);