Skip to content

Commit 996e0a9

Browse files
robertosassumimizohar
authored andcommitted
evm: Fix build warnings
Fix build warnings (function parameters description) for evm_read_protected_xattrs(), evm_set_key() and evm_verifyxattr(). Fixes: 7626676 ("evm: provide a function to set the EVM key from the kernel") # v4.5+ Fixes: 8314b67 ("ima: Define new template fields xattrnames, xattrlengths and xattrvalues") # v5.14+ Fixes: 2960e6c ("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>
1 parent b1de86d commit 996e0a9

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

security/integrity/evm/evm_crypto.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static const char evm_hmac[] = "hmac(sha1)";
4040
/**
4141
* evm_set_key() - set EVM HMAC key from the kernel
4242
* @key: pointer to a buffer with the key data
43-
* @size: length of the key data
43+
* @keylen: length of the key data
4444
*
4545
* This function allows setting the EVM HMAC key from the kernel
4646
* without using the "encrypted" key subsystem keys. It can be used

security/integrity/evm/evm_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ int evm_protected_xattr_if_enabled(const char *req_xattr_name)
318318
/**
319319
* evm_read_protected_xattrs - read EVM protected xattr names, lengths, values
320320
* @dentry: dentry of the read xattrs
321-
* @inode: inode of the read xattrs
322321
* @buffer: buffer xattr names, lengths or values are copied to
323322
* @buffer_size: size of buffer
324323
* @type: n: names, l: lengths, v: values
@@ -390,6 +389,7 @@ int evm_read_protected_xattrs(struct dentry *dentry, u8 *buffer,
390389
* @xattr_name: requested xattr
391390
* @xattr_value: requested xattr value
392391
* @xattr_value_len: requested xattr value length
392+
* @iint: inode integrity metadata
393393
*
394394
* Calculate the HMAC for the given dentry and verify it against the stored
395395
* security.evm xattr. For performance, use the xattr value and length

0 commit comments

Comments
 (0)