iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

evm: call dump_security_xattr() in all cases to remove code duplication

Browse Source 
Currently dump_security_xattr() is used to dump security xattr value
which is larger than 64 bytes, otherwise, pr_debug() is used. In order
to remove code duplication, refactor dump_security_xattr() and call it
in all cases.

Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Xiu Jianfeng 2023-01-31 10:00:31 +08:00 committed by Mimi Zohar
parent b8dc579473
commit 8250865c16
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,8 +183,8 @@ static void hmac_add_misc(struct shash_desc *desc, struct inode *inode,
* Dump large security xattr values as a continuous ascii hexademical string. * Dump large security xattr values as a continuous ascii hexademical string.
* (pr_debug is limited to 64 bytes.) * (pr_debug is limited to 64 bytes.)
*/ */
static void dump_security_xattr(const char *prefix, const void *src, static void dump_security_xattr_l(const char *prefix, const void *src,
size_t count) size_t count)
{ {
#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) #if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
char *asciihex, *p; char *asciihex, *p;
@ -200,6 +200,16 @@ static void dump_security_xattr(const char *prefix, const void *src,
#endif #endif
} }
static void dump_security_xattr(const char *name, const char *value,
size_t value_len)
{
if (value_len < 64)
pr_debug("%s: (%zu) [%*phN]\n", name, value_len,
(int)value_len, value);
else
dump_security_xattr_l(name, value, value_len);
}
/* /*
* Calculate the HMAC value across the set of protected security xattrs. * Calculate the HMAC value across the set of protected security xattrs.
* *
@ -254,15 +264,9 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
if (is_ima) if (is_ima)
ima_present = true; ima_present = true;
if (req_xattr_value_len < 64) dump_security_xattr(req_xattr_name,
pr_debug("%s: (%zu) [%*phN]\n", req_xattr_name, req_xattr_value,
req_xattr_value_len, req_xattr_value_len);
(int)req_xattr_value_len,
req_xattr_value);
else
dump_security_xattr(req_xattr_name,
req_xattr_value,
req_xattr_value_len);
continue; continue;
} }
size = vfs_getxattr_alloc(&init_user_ns, dentry, xattr->name, size = vfs_getxattr_alloc(&init_user_ns, dentry, xattr->name,
@ -286,12 +290,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
if (is_ima) if (is_ima)
ima_present = true; ima_present = true;
if (xattr_size < 64) dump_security_xattr(xattr->name, xattr_value, xattr_size);
pr_debug("%s: (%zu) [%*phN]", xattr->name, xattr_size,
(int)xattr_size, xattr_value);
else
dump_security_xattr(xattr->name, xattr_value,
xattr_size);
} }
hmac_add_misc(desc, inode, type, data->digest); hmac_add_misc(desc, inode, type, data->digest);