提交 d677f38a 编写于 作者: T Tianjia Zhang 提交者: Zheng Zengkai

X.509: Fix crash caused by NULL pointer

stable inclusion
from stable-5.10.10
commit 90bd4a0cf5ddabf9249c6f92731fcba8c462a6ca
bugzilla: 47610

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

commit 7178a107 upstream.

On the following call path, `sig->pkey_algo` is not assigned
in asymmetric_key_verify_signature(), which causes runtime
crash in public_key_verify_signature().

  keyctl_pkey_verify
    asymmetric_key_verify_signature
      verify_signature
        public_key_verify_signature

This patch simply check this situation and fixes the crash
caused by NULL pointer.

Fixes: 21552563 ("X.509: support OSCCA SM2-with-SM3 certificate verification")
Reported-by: NTobias Markus <tobias@markus-regensburg.de>
Signed-off-by: NTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: NDavid Howells <dhowells@redhat.com>
Reviewed-and-tested-by: NToke Høiland-Jørgensen <toke@redhat.com>
Tested-by: NJoão Fonseca <jpedrofonseca@ua.pt>
Acked-by: NJarkko Sakkinen <jarkko@kernel.org>
Cc: stable@vger.kernel.org # v5.10+
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 2e32965a
...@@ -356,7 +356,8 @@ int public_key_verify_signature(const struct public_key *pkey, ...@@ -356,7 +356,8 @@ int public_key_verify_signature(const struct public_key *pkey,
if (ret) if (ret)
goto error_free_key; goto error_free_key;
if (strcmp(sig->pkey_algo, "sm2") == 0 && sig->data_size) { if (sig->pkey_algo && strcmp(sig->pkey_algo, "sm2") == 0 &&
sig->data_size) {
ret = cert_sig_digest_update(sig, tfm); ret = cert_sig_digest_update(sig, tfm);
if (ret) if (ret)
goto error_free_key; goto error_free_key;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
新手
引导
客服 返回
顶部