Commit 996e0a97 authored Jun 06, 2023 by Roberto Sassu Committed by Mimi Zohar Jun 06, 2023

evm: Fix build warnings

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

Fixes: 76266763 ("evm: provide a function to set the EVM key from the kernel") # v4.5+
Fixes: 8314b673 ("ima: Define new template fields xattrnames, xattrlengths and xattrvalues") # v5.14+
Fixes: 2960e6cb ("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>

parent b1de86d4

security/integrity/evm/evm_crypto.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

security/integrity/evm/evm_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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