Commit 2f8d62da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.6-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "This fixes a regression in sm2"

* tag 'v6.6-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sm2 - Fix crash caused by uninitialized context
parents 3a457d28 21155620

crypto/sm2.c

+5 −1
Original line number Diff line number Diff line
@@ -278,10 +278,14 @@ int sm2_compute_z_digest(struct shash_desc *desc, 
	if (!ec)

		return -ENOMEM;



	err = __sm2_set_pub_key(ec, key, keylen);

	err = sm2_ec_ctx_init(ec);

	if (err)

		goto out_free_ec;



	err = __sm2_set_pub_key(ec, key, keylen);

	if (err)

		goto out_deinit_ec;



	bits_len = SM2_DEFAULT_USERID_LEN * 8;

	entl[0] = bits_len >> 8;

	entl[1] = bits_len & 0xff;