]> git.baikalelectronics.ru Git - kernel.git/commit
KEYS: asymmetric: enforce SM2 signature use pkey algo
authorTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Tue, 28 Jun 2022 03:37:20 +0000 (11:37 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:24:28 +0000 (14:24 +0200)
commitaae30dcff4162a84f890a8b150338c5ee04d20c1
tree463311575d0a271055b26f3248bb20276319c250
parent9c412a8e3debe22955876b119ec107b00be19b72
KEYS: asymmetric: enforce SM2 signature use pkey algo

[ Upstream commit dee32321c5f862a4a063109d0bd69fd4dd9ccbb3 ]

The signature verification of SM2 needs to add the Za value and
recalculate sig->digest, which requires the detection of the pkey_algo
in public_key_verify_signature(). As Eric Biggers said, the pkey_algo
field in sig is attacker-controlled and should be use pkey->pkey_algo
instead of sig->pkey_algo, and secondly, if sig->pkey_algo is NULL, it
will also cause signature verification failure.

The software_key_determine_akcipher() already forces the algorithms
are matched, so the SM3 algorithm is enforced in the SM2 signature,
although this has been checked, we still avoid using any algorithm
information in the signature as input.

Fixes: d4bf49dcd6a1 ("X.509: support OSCCA SM2-with-SM3 certificate verification")
Reported-by: Eric Biggers <ebiggers@google.com>
Cc: stable@vger.kernel.org # v5.10+
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
crypto/asymmetric_keys/public_key.c