Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1637208

Re: 64fa03de33: BUG:Dentry_still_in_use

Show all headers | View raw

From 6a3fb632f67f8425c6e76c65dad8115f1550d2a0 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge@hallyn.com>
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 <serge@hallyn.com>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Re: 64fa03de33: BUG:Dentry_still_in_use "Serge E. Hallyn" <serge@hallyn.com> - 2017-05-08 06:50 +0200
  Re: 64fa03de33: BUG:Dentry_still_in_use Masami Ichikawa <masami256@gmail.com> - 2017-05-08 13:50 +0200
    Re: 64fa03de33: BUG:Dentry_still_in_use "Serge E. Hallyn" <serge@hallyn.com> - 2017-05-08 17:50 +0200
    [PATCH v4] Introduce v3 namespaced file capabilities "Serge E. Hallyn" <serge@hallyn.com> - 2017-05-08 20:20 +0200
      Re: [PATCH v4] Introduce v3 namespaced file capabilities ebiederm@xmission.com (Eric W. Biederman) - 2017-05-09 19:10 +0200
        Re: [PATCH v4] Introduce v3 namespaced file capabilities "Serge E. Hallyn" <serge@hallyn.com> - 2017-05-09 22:40 +0200
          Re: [PATCH v4] Introduce v3 namespaced file capabilities ebiederm@xmission.com (Eric W. Biederman) - 2017-05-10 00:40 +0200

csiph-web