Commit 24ed5e1b authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by ZhangPeng
Browse files

KEYS: trusted: Do not use WARN when encode fails 

stable inclusion
from stable-v6.6.32
commit 1c652e1e10676f942149052d9329b8bf2703529a
bugzilla: https://gitee.com/openeuler/kernel/issues/IA4MGD

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1c652e1e10676f942149052d9329b8bf2703529a



--------------------------------

commit 050bf3c793a07f96bd1e2fd62e1447f731ed733b upstream.

When asn1_encode_sequence() fails, WARN is not the correct solution.

1. asn1_encode_sequence() is not an internal function (located
   in lib/asn1_encode.c).
2. Location is known, which makes the stack trace useless.
3. Results a crash if panic_on_warn is set.

It is also noteworthy that the use of WARN is undocumented, and it
should be avoided unless there is a carefully considered rationale to
use it.

Replace WARN with pr_err, and print the return value instead, which is
only useful piece of information.

Cc: stable@vger.kernel.org # v5.13+
Fixes: f2219745 ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs")
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 24898f5e

security/keys/trusted-keys/trusted_tpm2.c

+2 −1
Original line number Diff line number Diff line
@@ -84,8 +84,9 @@ static int tpm2_key_encode(struct trusted_key_payload *payload, 
	work1 = payload->blob;

	work1 = asn1_encode_sequence(work1, work1 + sizeof(payload->blob),

				     scratch, work - scratch);

	if (WARN(IS_ERR(work1), "BUG: ASN.1 encoder failed")) {

	if (IS_ERR(work1)) {

		ret = PTR_ERR(work1);

		pr_err("BUG: ASN.1 encoder failed with %d\n", ret);

		goto err;

	}