diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-18 16:38:57 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 15:34:43 +0100 |
| commit | e115fa478fb3914db2f414d642254ff09f04bc09 (patch) | |
| tree | 43278ae296fd8b569b2c9bc93fb3a09a45193f14 /target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch | |
| parent | 7604e53d5f593120449cdaf059bfaf66ec07607e (diff) | |
| download | upstream-e115fa478fb3914db2f414d642254ff09f04bc09.tar.gz upstream-e115fa478fb3914db2f414d642254ff09f04bc09.tar.bz2 upstream-e115fa478fb3914db2f414d642254ff09f04bc09.zip | |
kernel: bump 4.19 to 4.19.90
Refreshed all patches.
Remove upstreamed:
- 010-dmaengine-dw-dmac-implement-dma-prot.patch
- 950-0148-Increase-firmware-call-buffer-size-to-48-bytes.patch
- 950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch
- 402-leds-trigger-netdev-fix-handling-on-interface-rename.patch
Fixes:
- CVE-2019-19332
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
[Add 010-dt-bindings-dmaengine-dw-dmac-add-protection-control.patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch b/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch index ba4419787c..cf7f92c2d0 100644 --- a/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch +++ b/target/linux/apm821xx/patches-4.19/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch @@ -31,7 +31,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> #include <crypto/internal/skcipher.h> #include "crypto4xx_reg_def.h" #include "crypto4xx_core.h" -@@ -1046,6 +1048,10 @@ static int crypto4xx_register_alg(struct +@@ -1042,6 +1044,10 @@ static int crypto4xx_register_alg(struct rc = crypto_register_ahash(&alg->alg.u.hash); break; @@ -42,7 +42,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> default: rc = crypto_register_skcipher(&alg->alg.u.cipher); break; -@@ -1075,6 +1081,10 @@ static void crypto4xx_unregister_alg(str +@@ -1071,6 +1077,10 @@ static void crypto4xx_unregister_alg(str crypto_unregister_aead(&alg->alg.u.aead); break; @@ -53,7 +53,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> default: crypto_unregister_skcipher(&alg->alg.u.cipher); } -@@ -1133,6 +1143,69 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1129,6 +1139,69 @@ static irqreturn_t crypto4xx_ce_interrup PPC4XX_TMO_ERR_INT); } @@ -123,7 +123,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> /** * Supported Crypto Algorithms */ -@@ -1302,6 +1375,18 @@ static struct crypto4xx_alg_common crypt +@@ -1298,6 +1371,18 @@ static struct crypto4xx_alg_common crypt .cra_module = THIS_MODULE, }, } }, @@ -142,7 +142,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> }; /** -@@ -1371,6 +1456,7 @@ static int crypto4xx_probe(struct platfo +@@ -1367,6 +1452,7 @@ static int crypto4xx_probe(struct platfo core_dev->dev->core_dev = core_dev; core_dev->dev->is_revb = is_revb; core_dev->device = dev; @@ -150,7 +150,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> spin_lock_init(&core_dev->lock); INIT_LIST_HEAD(&core_dev->dev->alg_list); ratelimit_default_init(&core_dev->dev->aead_ratelimit); -@@ -1450,6 +1536,7 @@ static int crypto4xx_remove(struct platf +@@ -1446,6 +1532,7 @@ static int crypto4xx_remove(struct platf tasklet_kill(&core_dev->tasklet); /* Un-register with Linux CryptoAPI */ crypto4xx_unregister_alg(core_dev->dev); |