diff options
| author | Vignesh Raghavendra <vigneshr@ti.com> | 2021-12-17 15:01:55 +0530 |
|---|---|---|
| committer | Vignesh Raghavendra <vigneshr@ti.com> | 2021-12-17 15:01:55 +0530 |
| commit | 4575f9eb57c262823be0258cc9b08ea8b8d9b839 (patch) | |
| tree | 6a4e2c4c6b92d3075da7691e88e43ccc451604ca /crypto | |
| parent | dcc6bedb2c2bdb509709e4ae08303206e95ce6c2 (diff) | |
| parent | f884bb85b8d877d4e0c670403754813a7901705b (diff) | |
Merge tag 'v5.10.80' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux into ti-linux-5.10.y
This is the 5.10.80 stable release
* tag 'v5.10.80' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: (1714 commits)
Linux 5.10.80
soc/tegra: pmc: Fix imbalanced clock disabling in error code path
x86/sev: Make the #VC exception stacks part of the default stacks storage
x86/sev: Add an x86 version of cc_platform_has()
arch/cc: Introduce a function to check for confidential computing features
selftests/bpf: Fix also no-alu32 strobemeta selftest
mmc: moxart: Fix null pointer dereference on pointer host
ath10k: fix invalid dma_addr_t token assignment
SUNRPC: Partial revert of commit 6f9f17287e78
PCI: aardvark: Fix PCIe Max Payload Size setting
PCI: Add PCI_EXP_DEVCTL_PAYLOAD_* macros
drm/sun4i: Fix macros in sun8i_csc.h
powerpc/85xx: fix timebase sync issue when CONFIG_HOTPLUG_CPU=n
powerpc/powernv/prd: Unregister OPAL_MSG_PRD2 notifier during module unload
mtd: rawnand: au1550nd: Keep the driver compatible with on-die ECC engines
mtd: rawnand: plat_nand: Keep the driver compatible with on-die ECC engines
mtd: rawnand: orion: Keep the driver compatible with on-die ECC engines
mtd: rawnand: pasemi: Keep the driver compatible with on-die ECC engines
mtd: rawnand: gpio: Keep the driver compatible with on-die ECC engines
mtd: rawnand: mpc5121: Keep the driver compatible with on-die ECC engines
...
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
# Conflicts:
# Documentation/devicetree/bindings/mtd/gpmc-nand.txt
# drivers/pci/controller/cadence/pci-j721e.c
# drivers/pci/controller/cadence/pcie-cadence.c
# drivers/pci/controller/cadence/pcie-cadence.h
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 2 | ||||
| -rw-r--r-- | crypto/pcrypt.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 774adc9846fa..1157f82dc9cf 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -238,12 +238,12 @@ config CRYPTO_DH config CRYPTO_ECC tristate + select CRYPTO_RNG_DEFAULT config CRYPTO_ECDH tristate "ECDH algorithm" select CRYPTO_ECC select CRYPTO_KPP - select CRYPTO_RNG_DEFAULT help Generic implementation of the ECDH algorithm diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c index d569c7ed6c80..9d10b846ccf7 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -78,12 +78,14 @@ static void pcrypt_aead_enc(struct padata_priv *padata) { struct pcrypt_request *preq = pcrypt_padata_request(padata); struct aead_request *req = pcrypt_request_ctx(preq); + int ret; - padata->info = crypto_aead_encrypt(req); + ret = crypto_aead_encrypt(req); - if (padata->info == -EINPROGRESS) + if (ret == -EINPROGRESS) return; + padata->info = ret; padata_do_serial(padata); } @@ -123,12 +125,14 @@ static void pcrypt_aead_dec(struct padata_priv *padata) { struct pcrypt_request *preq = pcrypt_padata_request(padata); struct aead_request *req = pcrypt_request_ctx(preq); + int ret; - padata->info = crypto_aead_decrypt(req); + ret = crypto_aead_decrypt(req); - if (padata->info == -EINPROGRESS) + if (ret == -EINPROGRESS) return; + padata->info = ret; padata_do_serial(padata); } |