Commit 8250865c authored by Xiu Jianfeng's avatar Xiu Jianfeng Committed by Mimi Zohar
Browse files

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



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: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent b8dc5794

security/integrity/evm/evm_crypto.c

+16 −17
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void hmac_add_misc(struct shash_desc *desc, struct inode *inode, 
 * Dump large security xattr values as a continuous ascii hexademical string.

 * (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)

{

#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
@@ -200,6 +200,16 @@ static void dump_security_xattr(const char *prefix, const void *src, 
#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.

 *
@@ -254,12 +264,6 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry, 
			if (is_ima)

				ima_present = true;



			if (req_xattr_value_len < 64)

				pr_debug("%s: (%zu) [%*phN]\n", req_xattr_name,

					 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);
@@ -286,12 +290,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry, 
		if (is_ima)

			ima_present = true;



		if (xattr_size < 64)

			pr_debug("%s: (%zu) [%*phN]", xattr->name, xattr_size,

				 (int)xattr_size, xattr_value);

		else

			dump_security_xattr(xattr->name, xattr_value,

					    xattr_size);

		dump_security_xattr(xattr->name, xattr_value, xattr_size);

	}

	hmac_add_misc(desc, inode, type, data->digest);