evm: add support for different security.evm data types
EVM protects a file's security extended attributes(xattrs) against integrity attacks. The current patchset maintains an HMAC-sha1 value across the security xattrs, storing the value as the extended attribute 'security.evm'. We anticipate other methods for protecting the security extended attributes. This patch reserves the first byte of 'security.evm' as a place holder for the type of method. Changelog v6: - move evm_ima_xattr_type definition to security/integrity/integrity.h - defined a structure for the EVM xattr called evm_ima_xattr_data (based on Serge Hallyn's suggestion) - removed unnecessary memset Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com> Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
This commit is contained in:

committed by
Mimi Zohar

parent
66dbc325af
commit
6be5cc5246
@@ -141,14 +141,17 @@ int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name,
|
||||
const char *xattr_value, size_t xattr_value_len)
|
||||
{
|
||||
struct inode *inode = dentry->d_inode;
|
||||
u8 hmac[SHA1_DIGEST_SIZE];
|
||||
struct evm_ima_xattr_data xattr_data;
|
||||
int rc = 0;
|
||||
|
||||
rc = evm_calc_hmac(dentry, xattr_name, xattr_value,
|
||||
xattr_value_len, hmac);
|
||||
if (rc == 0)
|
||||
xattr_value_len, xattr_data.digest);
|
||||
if (rc == 0) {
|
||||
xattr_data.type = EVM_XATTR_HMAC;
|
||||
rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM,
|
||||
hmac, SHA1_DIGEST_SIZE, 0);
|
||||
&xattr_data,
|
||||
sizeof(xattr_data), 0);
|
||||
}
|
||||
else if (rc == -ENODATA)
|
||||
rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM);
|
||||
return rc;
|
||||
|
Reference in New Issue
Block a user