xattr: Constify ->name member of "struct xattr".

Since everybody sets kstrdup()ed constant string to "struct xattr"->name but nobody modifies "struct xattr"->name , we can omit kstrdup() and its failure checking by constifying ->name member of "struct xattr".

Tetsuo Handa committed 13 years ago

Commit 95489061 parent be0306b9 files · +21 −31Browse files

Unified · Split

9 files

fs/ocfs2/xattr.h +1 −1
include/linux/security.h +4 −4
include/linux/xattr.h +1 −1
include/uapi/linux/reiserfs_xattr.h +1 −1
security/capability.c +1 −1
security/integrity/evm/evm_main.c +1 −1
security/security.c +3 −5
security/selinux/hooks.c +6 −11
security/smack/smack_lsm.c +3 −6

fs/ocfs2/xattr.h+1−1

@@ -32,7 +32,7 @@ enum ocfs2_xattr_type { · 31 unmodified lines
32		32
33	struct ocfs2_security_xattr_info {	33	struct ocfs2_security_xattr_info {
34	int enable;	34	int enable;
35	char *name;	35	const char *name;
36	void *value;	36	void *value;
37	size_t value_len;	37	size_t value_len;
38	};	38	};

include/linux/security.h+4−4

@@ -1492,7 +1492,7 @@ struct security_operations { · 1491 unmodified lines
1492	int (inode_alloc_security) (struct inode inode);	1492	int (inode_alloc_security) (struct inode inode);
1493	void (inode_free_security) (struct inode inode);	1493	void (inode_free_security) (struct inode inode);
1494	int (inode_init_security) (struct inode inode, struct inode *dir,	1494	int (inode_init_security) (struct inode inode, struct inode *dir,
1495	const struct qstr qstr, char *name,	1495	const struct qstr qstr, const char *name,
1496	void *value, size_t len);	1496	void *value, size_t len);
1497	int (inode_create) (struct inode dir,	1497	int (inode_create) (struct inode dir,
1498	struct dentry *dentry, umode_t mode);	1498	struct dentry *dentry, umode_t mode);
@@ -1770,7 +1770,7 @@ int security_inode_init_security(struct inode inode, struct inode dir, · 271 unmodified lines
1770	const struct qstr *qstr,	1770	const struct qstr *qstr,
1771	initxattrs initxattrs, void *fs_data);	1771	initxattrs initxattrs, void *fs_data);
1772	int security_old_inode_init_security(struct inode inode, struct inode dir,	1772	int security_old_inode_init_security(struct inode inode, struct inode dir,
1773	const struct qstr qstr, char *name,	1773	const struct qstr qstr, const char *name,
1774	void *value, size_t len);	1774	void *value, size_t len);
1775	int security_inode_create(struct inode dir, struct dentry dentry, umode_t mode);	1775	int security_inode_create(struct inode dir, struct dentry dentry, umode_t mode);
1776	int security_inode_link(struct dentry old_dentry, struct inode dir,	1776	int security_inode_link(struct dentry old_dentry, struct inode dir,
@@ -2094,8 +2094,8 @@ static inline int security_inode_init_security(struct inode *inode, · 317 unmodified lines
2094	static inline int security_old_inode_init_security(struct inode *inode,	2094	static inline int security_old_inode_init_security(struct inode *inode,
2095	struct inode *dir,	2095	struct inode *dir,
2096	const struct qstr *qstr,	2096	const struct qstr *qstr,
2097	char name, void value,	2097	const char **name,
2098	size_t *len)	2098	void *value, size_t len)
2099	{	2099	{
2100	return -EOPNOTSUPP;	2100	return -EOPNOTSUPP;
2101	}	2101	}

include/linux/xattr.h+1−1

@@ -31,7 +31,7 @@ struct xattr_handler { · 30 unmodified lines
31	};	31	};
32		32
33	struct xattr {	33	struct xattr {
34	char *name;	34	const char *name;
35	void *value;	35	void *value;
36	size_t value_len;	36	size_t value_len;
37	};	37	};

include/uapi/linux/reiserfs_xattr.h+1−1

@@ -16,7 +16,7 @@ struct reiserfs_xattr_header { · 15 unmodified lines
16	};	16	};
17		17
18	struct reiserfs_security_handle {	18	struct reiserfs_security_handle {
19	char *name;	19	const char *name;
20	void *value;	20	void *value;
21	size_t length;	21	size_t length;
22	};	22	};

security/capability.c+1−1

@@ -129,7 +129,7 @@ static void cap_inode_free_security(struct inode *inode) · 128 unmodified lines
129	}	129	}
130		130
131	static int cap_inode_init_security(struct inode inode, struct inode dir,	131	static int cap_inode_init_security(struct inode inode, struct inode dir,
132	const struct qstr qstr, char *name,	132	const struct qstr qstr, const char *name,
133	void *value, size_t len)	133	void *value, size_t len)
134	{	134	{
135	return -EOPNOTSUPP;	135	return -EOPNOTSUPP;

security/integrity/evm/evm_main.c+1−1

@@ -418,7 +418,7 @@ int evm_inode_init_security(struct inode *inode, · 417 unmodified lines
418		418
419	evm_xattr->value = xattr_data;	419	evm_xattr->value = xattr_data;
420	evm_xattr->value_len = sizeof(*xattr_data);	420	evm_xattr->value_len = sizeof(*xattr_data);
421	evm_xattr->name = kstrdup(XATTR_EVM_SUFFIX, GFP_NOFS);	421	evm_xattr->name = XATTR_EVM_SUFFIX;
422	return 0;	422	return 0;
423	out:	423	out:
424	kfree(xattr_data);	424	kfree(xattr_data);

security/security.c+3−5

 	if (unlikely(IS_PRIVATE(inode)))
 		return 0;
-	memset(new_xattrs, 0, sizeof new_xattrs);
 	if (!initxattrs)
 		return security_ops->inode_init_security(inode, dir, qstr,
 							 NULL, NULL, NULL);
+	memset(new_xattrs, 0, sizeof(new_xattrs));
 	lsm_xattr = new_xattrs;
 	ret = security_ops->inode_init_security(inode, dir, qstr,
 						&lsm_xattr->name,
 		goto out;
 	ret = initxattrs(inode, new_xattrs, fs_data);
 out:
-	for (xattr = new_xattrs; xattr->name != NULL; xattr++) {
+	for (xattr = new_xattrs; xattr->value != NULL; xattr++)
-		kfree(xattr->name);
 		kfree(xattr->value);
-	}
 	return (ret == -EOPNOTSUPP) ? 0 : ret;
 }
 EXPORT_SYMBOL(security_inode_init_security);
 int security_old_inode_init_security(struct inode *inode, struct inode *dir,
-				     const struct qstr *qstr, char **name,
+				     const struct qstr *qstr, const char **name,
 				     void **value, size_t *len)
 {
 	if (unlikely(IS_PRIVATE(inode)))

security/selinux/hooks.c+6−11

 }
 static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
-				       const struct qstr *qstr, char **name,
+				       const struct qstr *qstr,
+				       const char **name,
 				       void **value, size_t *len)
 {
 	const struct task_security_struct *tsec = current_security();
 	struct superblock_security_struct *sbsec;
 	u32 sid, newsid, clen;
 	int rc;
-	char *namep = NULL, *context;
+	char *context;
 	dsec = dir->i_security;
 	sbsec = dir->i_sb->s_security;
 	if (!ss_initialized || !(sbsec->flags & SE_SBLABELSUPP))
 		return -EOPNOTSUPP;
-	if (name) {
+	if (name)
-		namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_NOFS);
+		*name = XATTR_SELINUX_SUFFIX;
-		if (!namep)
-			return -ENOMEM;
-		*name = namep;
-	}
 	if (value && len) {
 		rc = security_sid_to_context_force(newsid, &context, &clen);
-		if (rc) {
+		if (rc)
-			kfree(namep);
 			return rc;
-		}
 		*value = context;
 		*len = clen;
 	}

security/smack/smack_lsm.c+3−6

  * Returns 0 if it all works out, -ENOMEM if there's no memory
  */
 static int smack_inode_init_security(struct inode *inode, struct inode *dir,
-				     const struct qstr *qstr, char **name,
+				     const struct qstr *qstr, const char **name,
 				     void **value, size_t *len)
 {
 	struct inode_smack *issp = inode->i_security;
 	char *dsp = smk_of_inode(dir);
 	int may;
-	if (name) {
+	if (name)
-		*name = kstrdup(XATTR_SMACK_SUFFIX, GFP_NOFS);
+		*name = XATTR_SMACK_SUFFIX;
-		if (*name == NULL)
-			return -ENOMEM;
-	}
 	if (value) {
 		rcu_read_lock();

xattr: Constify ->name member of "struct xattr".

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code