From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 May 2024 21:32:22 +0000 (-0700)
Subject: Merge tag 'v6.10-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v6.10-rc5-pxa1908~397
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=84c7d76b5ab6a52e1b3d8101b9f910c128dca396;p=linux.git

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

Pull crypto updates from Herbert Xu:
 "API:
   - Remove crypto stats interface

  Algorithms:
   - Add faster AES-XTS on modern x86_64 CPUs
   - Forbid curves with order less than 224 bits in ecc (FIPS 186-5)
   - Add ECDSA NIST P521

  Drivers:
   - Expose otp zone in atmel
   - Add dh fallback for primes > 4K in qat
   - Add interface for live migration in qat
   - Use dma for aes requests in starfive
   - Add full DMA support for stm32mpx in stm32
   - Add Tegra Security Engine driver

  Others:
   - Introduce scope-based x509_certificate allocation"

* tag 'v6.10-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (123 commits)
  crypto: atmel-sha204a - provide the otp content
  crypto: atmel-sha204a - add reading from otp zone
  crypto: atmel-i2c - rename read function
  crypto: atmel-i2c - add missing arg description
  crypto: iaa - Use kmemdup() instead of kzalloc() and memcpy()
  crypto: sahara - use 'time_left' variable with wait_for_completion_timeout()
  crypto: api - use 'time_left' variable with wait_for_completion_killable_timeout()
  crypto: caam - i.MX8ULP donot have CAAM page0 access
  crypto: caam - init-clk based on caam-page0-access
  crypto: starfive - Use fallback for unaligned dma access
  crypto: starfive - Do not free stack buffer
  crypto: starfive - Skip unneeded fallback allocation
  crypto: starfive - Skip dma setup for zeroed message
  crypto: hisilicon/sec2 - fix for register offset
  crypto: hisilicon/debugfs - mask the unnecessary info from the dump
  crypto: qat - specify firmware files for 402xx
  crypto: x86/aes-gcm - simplify GCM hash subkey derivation
  crypto: x86/aes-gcm - delete unused GCM assembly code
  crypto: x86/aes-xts - simplify loop in xts_crypt_slowpath()
  hwrng: stm32 - repair clock handling
  ...
---

84c7d76b5ab6a52e1b3d8101b9f910c128dca396
diff --cc crypto/asymmetric_keys/x509_cert_parser.c
index bb0bffa271b5,a814e5f136e2..25cc4273472f
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@@ -65,19 -65,19 +65,18 @@@ struct x509_certificate *x509_cert_pars
  	struct asymmetric_key_id *kid;
  	long ret;
  
- 	ret = -ENOMEM;
  	cert = kzalloc(sizeof(struct x509_certificate), GFP_KERNEL);
 -	assume(!IS_ERR(cert)); /* Avoid gratuitous IS_ERR() check on return */
  	if (!cert)
- 		goto error_no_cert;
+ 		return ERR_PTR(-ENOMEM);
  	cert->pub = kzalloc(sizeof(struct public_key), GFP_KERNEL);
  	if (!cert->pub)
- 		goto error_no_ctx;
+ 		return ERR_PTR(-ENOMEM);
  	cert->sig = kzalloc(sizeof(struct public_key_signature), GFP_KERNEL);
  	if (!cert->sig)
- 		goto error_no_ctx;
+ 		return ERR_PTR(-ENOMEM);
  	ctx = kzalloc(sizeof(struct x509_parse_context), GFP_KERNEL);
  	if (!ctx)
- 		goto error_no_ctx;
+ 		return ERR_PTR(-ENOMEM);
  
  	ctx->cert = cert;
  	ctx->data = (unsigned long)data;