From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751861AbdEHEoD (ORCPT ); Mon, 8 May 2017 00:44:03 -0400 Received: from h2.hallyn.com ([78.46.35.8]:39232 "EHLO h2.hallyn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750862AbdEHEoC (ORCPT ); Mon, 8 May 2017 00:44:02 -0400 Date: Sun, 7 May 2017 23:44:08 -0500 From: "Serge E. Hallyn" To: "Eric W. Biederman" Cc: kernel test robot , LKML , containers@lists.linux-foundation.org, lkp@01.org Subject: Re: 64fa03de33: BUG:Dentry_still_in_use Message-ID: <20170508044408.GA11400@mail.hallyn.com> References: <20170507092105.GA67584@inn.lkp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170507092105.GA67584@inn.lkp.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From 6a3fb632f67f8425c6e76c65dad8115f1550d2a0 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Sun, 7 May 2017 23:40:42 -0500 Subject: [PATCH 1/1] cap_inode_getsecurity: don't pin dentry (fold up) This should fix the "Dentry_still_in_use" reported by the kernel test robot. Signed-off-by: Serge Hallyn --- security/commoncap.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/security/commoncap.c b/security/commoncap.c index a1a2935..c970b71 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -406,21 +406,21 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, &tmpbuf, size, GFP_NOFS); if (ret < 0) - return ret; + goto out; fs_ns = inode->i_sb->s_user_ns; cap = (struct vfs_cap_data *) tmpbuf; if (is_v2header(ret, cap->magic_etc)) { /* If this is sizeof(vfs_cap_data) then we're ok with the * on-disk value, so return that. */ - if (alloc) + if (alloc) { *buffer = tmpbuf; - else - kfree(tmpbuf); - return ret; + tmpbuf = NULL; + } + goto out; } else if (!is_v3header(ret, cap->magic_etc)) { - kfree(tmpbuf); - return -EINVAL; + ret = -EINVAL; + goto out; } nscap = (struct vfs_ns_cap_data *) tmpbuf; @@ -434,14 +434,14 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, if (alloc) { *buffer = tmpbuf; nscap->rootid = cpu_to_le32(mappedroot); - } else - kfree(tmpbuf); - return size; + tmpbuf = NULL; + } + goto out; } if (!rootid_owns_currentns(kroot)) { - kfree(tmpbuf); - return -EOPNOTSUPP; + ret = -EOPNOTSUPP; + goto out; } /* This comes from a parent namespace. Return as a v2 capability */ @@ -459,6 +459,9 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, cap->magic_etc = cpu_to_le32(magic); } } + +out: + dput(dentry); kfree(tmpbuf); return size; } -- 2.7.4