Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

reiserfs: Switch to security_inode_init_security()

In preparation for removing security_old_inode_init_security(), switch to
security_inode_init_security(). Commit 572302af1258 ("reiserfs: Add missing
calls to reiserfs_security_free()") fixed possible memory leaks and another
issue related to adding an xattr at inode creation time.

Define the initxattrs callback reiserfs_initxattrs(), to populate the
name/value/len triple in the reiserfs_security_handle() with the first
xattr provided by LSMs. Make a copy of the xattr value, as
security_inode_init_security() frees it.

After the call to security_inode_init_security(), remove the check for
returning -EOPNOTSUPP, as security_inode_init_security() changes it to
zero.

Multiple xattrs are currently not supported, as the
reiserfs_security_handle structure is exported to user space. As a
consequence, even if EVM is invoked, it will not provide an xattr (if it
is not the first to set it, its xattr will be discarded; if it is the
first, it does not have xattrs to calculate the HMAC on).

Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

authored by

Roberto Sassu and committed by
Paul Moore
52ca4b64 b9b8701b

+18 -5
+18 -5
fs/reiserfs/xattr_security.c
··· 39 39 return !IS_PRIVATE(d_inode(dentry)); 40 40 } 41 41 42 + static int 43 + reiserfs_initxattrs(struct inode *inode, const struct xattr *xattr_array, 44 + void *fs_info) 45 + { 46 + struct reiserfs_security_handle *sec = fs_info; 47 + 48 + sec->value = kmemdup(xattr_array->value, xattr_array->value_len, 49 + GFP_KERNEL); 50 + if (!sec->value) 51 + return -ENOMEM; 52 + 53 + sec->name = xattr_array->name; 54 + sec->length = xattr_array->value_len; 55 + return 0; 56 + } 57 + 42 58 /* Initializes the security context for a new inode and returns the number 43 59 * of blocks needed for the transaction. If successful, reiserfs_security 44 60 * must be released using reiserfs_security_free when the caller is done. */ ··· 72 56 if (IS_PRIVATE(dir)) 73 57 return 0; 74 58 75 - error = security_old_inode_init_security(inode, dir, qstr, &sec->name, 76 - &sec->value, &sec->length); 59 + error = security_inode_init_security(inode, dir, qstr, 60 + &reiserfs_initxattrs, sec); 77 61 if (error) { 78 - if (error == -EOPNOTSUPP) 79 - error = 0; 80 - 81 62 sec->name = NULL; 82 63 sec->value = NULL; 83 64 sec->length = 0;