From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756372AbcCBAOx (ORCPT ); Tue, 1 Mar 2016 19:14:53 -0500 Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:57058 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932364AbcCAX6L (ORCPT ); Tue, 1 Mar 2016 18:58:11 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=mandrill; d=linuxfoundation.org; b=TaIOZIytHSqatbRtjTfkOdTilJV8CuqKAcXmrjtjp3NC5B8/eBSrAy9MzxPOyK1Lq4kI5ubq/ul7 6kBm0WZrQXMdSLLG6dMDZyRqdESJbhLpCnocPsSjiS6I4q39Mwei/ayb74AI8aQOtF+EEHKqX9Ph bMU5uXSsiMuxWRyilX0=; From: Greg Kroah-Hartman Subject: [PATCH 4.4 298/342] NFSv4: Fix a dentry leak on alias use X-Mailer: git-send-email 2.7.2 To: Cc: Greg Kroah-Hartman , , Benjamin Coddington , Trond Myklebust Message-Id: <20160301234537.528370073@linuxfoundation.org> In-Reply-To: <20160301234527.990448862@linuxfoundation.org> References: <20160301234527.990448862@linuxfoundation.org> X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.66414d2f711a454da3dc8a21a7856061 X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 23:55:23 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Benjamin Coddington 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. Signed-off-by: Benjamin Coddington Fixes: 275bb307865a3 ("NFSv4: Move dentry instantiation into the NFSv4-...") Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/nfs4proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -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)));