diff options
| author | James Morris <jmorris@namei.org> | 2011-08-09 10:31:03 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-08-09 10:31:03 +1000 |
| commit | 5a2f3a02aea164f4f59c0c3497772090a411b462 (patch) | |
| tree | d3ebe03d4f97575290087843960baa01de3acd0a /fs/ext2 | |
| parent | 1d568ab068c021672d6cd7f50f92a3695a921ffb (diff) | |
| parent | 817b54aa45db03437c6d09a7693fc6926eb8e822 (diff) | |
| download | linux-3.10-5a2f3a02aea164f4f59c0c3497772090a411b462.tar.gz linux-3.10-5a2f3a02aea164f4f59c0c3497772090a411b462.tar.bz2 linux-3.10-5a2f3a02aea164f4f59c0c3497772090a411b462.zip | |
Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next
Conflicts:
fs/attr.c
Resolve conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/xattr_security.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c index 5d979b4347b..c922adc8ef4 100644 --- a/fs/ext2/xattr_security.c +++ b/fs/ext2/xattr_security.c @@ -46,28 +46,30 @@ ext2_xattr_security_set(struct dentry *dentry, const char *name, value, size, flags); } -int -ext2_init_security(struct inode *inode, struct inode *dir, - const struct qstr *qstr) +int ext2_initxattrs(struct inode *inode, const struct xattr *xattr_array, + void *fs_info) { - int err; - size_t len; - void *value; - char *name; + const struct xattr *xattr; + int err = 0; - err = security_inode_init_security(inode, dir, qstr, &name, &value, &len); - if (err) { - if (err == -EOPNOTSUPP) - return 0; - return err; + for (xattr = xattr_array; xattr->name != NULL; xattr++) { + err = ext2_xattr_set(inode, EXT2_XATTR_INDEX_SECURITY, + xattr->name, xattr->value, + xattr->value_len, 0); + if (err < 0) + break; } - err = ext2_xattr_set(inode, EXT2_XATTR_INDEX_SECURITY, - name, value, len, 0); - kfree(name); - kfree(value); return err; } +int +ext2_init_security(struct inode *inode, struct inode *dir, + const struct qstr *qstr) +{ + return security_inode_init_security(inode, dir, qstr, + &ext2_initxattrs, NULL); +} + const struct xattr_handler ext2_xattr_security_handler = { .prefix = XATTR_SECURITY_PREFIX, .list = ext2_xattr_security_list, |