OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

evm: Fix build warnings 

[ Upstream commit 996e0a97eb ]

Fix build warnings (function parameters description) for
evm_read_protected_xattrs(), evm_set_key() and evm_verifyxattr().

Fixes: 7626676320 ("evm: provide a function to set the EVM key from the kernel") # v4.5+
Fixes: 8314b6732a ("ima: Define new template fields xattrnames, xattrlengths and xattrvalues") # v5.14+
Fixes: 2960e6cb5f ("evm: additional parameter to pass integrity cache entry 'iint'") # v3.2+
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Roberto Sassu 2023-06-06 09:41:12 +02:00 committed by Greg Kroah-Hartman
parent b050ade6e0
commit 9085f2ca94
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/integrity/evm/evm_crypto.c
View File

@ -40,7 +40,7 @@ static const char evm_hmac[] = "hmac(sha1)";
/** /**
* evm_set_key() - set EVM HMAC key from the kernel * evm_set_key() - set EVM HMAC key from the kernel
* @key: pointer to a buffer with the key data * @key: pointer to a buffer with the key data
* @size: length of the key data * @keylen: length of the key data
* *
* This function allows setting the EVM HMAC key from the kernel * This function allows setting the EVM HMAC key from the kernel
* without using the "encrypted" key subsystem keys. It can be used * without using the "encrypted" key subsystem keys. It can be used

2
security/integrity/evm/evm_main.c
View File

@ -318,7 +318,6 @@ int evm_protected_xattr_if_enabled(const char *req_xattr_name)
/** /**
* evm_read_protected_xattrs - read EVM protected xattr names, lengths, values * evm_read_protected_xattrs - read EVM protected xattr names, lengths, values
* @dentry: dentry of the read xattrs * @dentry: dentry of the read xattrs
* @inode: inode of the read xattrs
* @buffer: buffer xattr names, lengths or values are copied to * @buffer: buffer xattr names, lengths or values are copied to
* @buffer_size: size of buffer * @buffer_size: size of buffer
* @type: n: names, l: lengths, v: values * @type: n: names, l: lengths, v: values
@ -390,6 +389,7 @@ int evm_read_protected_xattrs(struct dentry *dentry, u8 *buffer,
* @xattr_name: requested xattr * @xattr_name: requested xattr
* @xattr_value: requested xattr value * @xattr_value: requested xattr value
* @xattr_value_len: requested xattr value length * @xattr_value_len: requested xattr value length
* @iint: inode integrity metadata
* *
* Calculate the HMAC for the given dentry and verify it against the stored * Calculate the HMAC for the given dentry and verify it against the stored
* security.evm xattr. For performance, use the xattr value and length * security.evm xattr. For performance, use the xattr value and length