[1/2] evm: Fix build warnings

Commit Message

Roberto Sassu June 6, 2023, 7:41 a.m. UTC

From: Roberto Sassu <[e-mail]>

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

Fixes: 7626676320f3 ("evm: provide a function to set the EVM key from the kernel")
Fixes: 8314b6732ae4 ("ima: Define new template fields xattrnames, xattrlengths and xattrvalues")
Fixes: 2960e6cb5f7c ("evm: additional parameter to pass integrity cache entry 'iint'")
Signed-off-by: Roberto Sassu <[e-mail]>
---
 security/integrity/evm/evm_crypto.c | 2 +-
 security/integrity/evm/evm_main.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Mimi Zohar June 6, 2023, 1:47 p.m. UTC | #1

On Tue, 2023-06-06 at 09:41 +0200, Roberto Sassu wrote:
> From: Roberto Sassu <[e-mail]>
> 
> Fix build warnings (function parameters description) for
> evm_read_protected_xattrs(), evm_set_key() and evm_verifyxattr().
> 
> Fixes: 7626676320f3 ("evm: provide a function to set the EVM key from the kernel")
> Fixes: 8314b6732ae4 ("ima: Define new template fields xattrnames, xattrlengths and xattrvalues")
> Fixes: 2960e6cb5f7c ("evm: additional parameter to pass integrity cache entry 'iint'")
> Signed-off-by: Roberto Sassu <[e-mail]>

Thanks, Roberto.  This patch and 2/2 are now queued in next-integrity.

Patch

diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index 033804f5a5f..0dae649f374 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -40,7 +40,7 @@  static const char evm_hmac[] = "hmac(sha1)";
 /**
  * evm_set_key() - set EVM HMAC key from the kernel
  * @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
  * without using the "encrypted" key subsystem keys. It can be used
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index b1c2197473a..c9b6e2a4347 100644
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -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
  * @dentry: dentry of the read xattrs
- * @inode: inode of the read xattrs
  * @buffer: buffer xattr names, lengths or values are copied to
  * @buffer_size: size of buffer
  * @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_value: requested xattr value
  * @xattr_value_len: requested xattr value length
+ * @iint: inode integrity metadata
  *
  * Calculate the HMAC for the given dentry and verify it against the stored
  * security.evm xattr. For performance, use the xattr value and length