Skip to contentSkip to conversation

Patch "NFSv4: Fix a dentry leak on alias use" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 1, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

NFSv4: Fix a dentry leak on alias use

to the 4.4-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:
nfsv4-fix-a-dentry-leak-on-alias-use.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From d9dfd8d741683347ee159d25f5b50c346a0df557 Mon Sep 17 00:00:00 2001

From: Benjamin Coddington <[email protected]>
Date: Wed, 17 Feb 2016 10:41:41 -0500
Subject: NFSv4: Fix a dentry leak on alias use

From: Benjamin Coddington <[email protected]>

commit d9dfd8d741683347ee159d25f5b50c346a0df557 upstream.

In the case where d_add_unique() finds an appropriate alias to use it will have already incremented the reference count. An additional dget() to swap the open context's dentry is unnecessary and will leak a reference.

Fixes 275bb307865a3 ("NFSv4: Move dentry instantiation into the NFSv4-...")
---
 fs/nfs/nfs4proc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/nfs4proc.c +2 -2
@@ -2461,9 +2461,9 @@ static int _nfs4_open_and_get_state(stru
 		dentry = d_add_unique(dentry, igrab(state->inode));
 		if (dentry == NULL) {
 			dentry = opendata->dentry;
-		} else if (dentry != ctx->dentry) {
+		} else {
 			dput(ctx->dentry);
-			ctx->dentry = dget(dentry);
+			ctx->dentry = dentry;
 		}
 		nfs_set_verifier(dentry,
 				nfs_save_change_attribute(d_inode(opendata->dir)));

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/nfsv4-fix-a-dentry-leak-on-alias-use.patch