linux-kernel - [PATCH] configfs: initialize inode with owner

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180307033600.102115-1-gwendal@chromium.org>
Date:   Tue,  6 Mar 2018 19:36:00 -0800
From:   Gwendal Grignou <gwendal@...omium.org>
To:     jlbec@...lplan.org
Cc:     linux-kernel@...r.kernel.org, jorgelo@...omium.org
Subject: [PATCH] configfs: initialize inode with owner

From: Sarthak Kukreti <sarthakkukreti@...omium.org>

Use standard helper to set inode owner when created from user space.
This is a noop when the owner is root.

Signed-off-by: Sarthak Kukreti <sarthakkukreti@...omium.org>
Signed-off-by: Gwendal Grignou <gwendal@...omium.org>
---
 fs/configfs/configfs_internal.h |  5 ++++-
 fs/configfs/inode.c             | 14 ++++++++------
 fs/configfs/mount.c             |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h
index b65d1ef532d5..772fce1fd222 100644
--- a/fs/configfs/configfs_internal.h
+++ b/fs/configfs/configfs_internal.h
@@ -68,7 +68,10 @@ extern struct kmem_cache *configfs_dir_cachep;
 
 extern int configfs_is_root(struct config_item *item);
 
-extern struct inode * configfs_new_inode(umode_t mode, struct configfs_dirent *, struct super_block *);
+extern struct inode *configfs_new_inode(umode_t mode,
+					struct configfs_dirent *sd,
+					struct inode *p_inode,
+					struct super_block *s);
 extern int configfs_create(struct dentry *, umode_t mode, void (*init)(struct inode *));
 
 extern int configfs_create_file(struct config_item *, const struct configfs_attribute *);
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index eae87575e681..93db05a2db1f 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -108,9 +108,11 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
 	return error;
 }
 
-static inline void set_default_inode_attr(struct inode * inode, umode_t mode)
+static inline void set_default_inode_attr(struct inode *inode,
+					  struct inode *p_inode,
+					  umode_t mode)
 {
-	inode->i_mode = mode;
+	inode_init_owner(inode, p_inode, mode);
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 }
 
@@ -125,7 +127,7 @@ static inline void set_inode_attr(struct inode * inode, struct iattr * iattr)
 }
 
 struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent *sd,
-				 struct super_block *s)
+				 struct inode *p_inode, struct super_block *s)
 {
 	struct inode * inode = new_inode(s);
 	if (inode) {
@@ -140,7 +142,7 @@ struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent *sd,
 			 */
 			set_inode_attr(inode, sd->s_iattr);
 		} else
-			set_default_inode_attr(inode, mode);
+			set_default_inode_attr(inode, p_inode, mode);
 	}
 	return inode;
 }
@@ -190,11 +192,11 @@ int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct in
 		return -EEXIST;
 
 	sd = dentry->d_fsdata;
-	inode = configfs_new_inode(mode, sd, dentry->d_sb);
+	p_inode = d_inode(dentry->d_parent);
+	inode = configfs_new_inode(mode, sd, p_inode, dentry->d_sb);
 	if (!inode)
 		return -ENOMEM;
 
-	p_inode = d_inode(dentry->d_parent);
 	p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME;
 	configfs_set_inode_lock_class(sd, inode);
 
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index a8f3b589a2df..23aede27c502 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -78,7 +78,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
 	sb->s_time_gran = 1;
 
 	inode = configfs_new_inode(S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
-				   &configfs_root, sb);
+				   &configfs_root, NULL, sb);
 	if (inode) {
 		inode->i_op = &configfs_root_inode_operations;
 		inode->i_fop = &configfs_dir_operations;
-- 
2.16.2.660.g709887971b-goog