diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-18 16:34:37 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 01:22:45 +0100 |
| commit | 7604e53d5f593120449cdaf059bfaf66ec07607e (patch) | |
| tree | 264a5d24c34f29c1d0b34e2c8c8ac554d5e0a912 /target/linux/apm821xx/patches-4.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch | |
| parent | db992e7b53f5a3b614c27f9f2d589128c570a821 (diff) | |
| download | upstream-7604e53d5f593120449cdaf059bfaf66ec07607e.tar.gz upstream-7604e53d5f593120449cdaf059bfaf66ec07607e.tar.bz2 upstream-7604e53d5f593120449cdaf059bfaf66ec07607e.zip | |
kernel: bump 4.14 to 4.14.159
Refreshed all patches.
Remove upstreamed:
- 302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch
Fixes:
- CVE-2019-19332
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/apm821xx/patches-4.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.14/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.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch b/target/linux/apm821xx/patches-4.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch index b20049c83e..b06a8f9893 100644 --- a/target/linux/apm821xx/patches-4.14/023-0006-crypto-crypto4xx-add-prng-crypto-support.patch +++ b/target/linux/apm821xx/patches-4.14/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" -@@ -1035,6 +1037,10 @@ static int crypto4xx_register_alg(struct +@@ -1031,6 +1033,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; -@@ -1064,6 +1070,10 @@ static void crypto4xx_unregister_alg(str +@@ -1060,6 +1066,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); } -@@ -1122,6 +1132,69 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1118,6 +1128,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 */ -@@ -1291,6 +1364,18 @@ static struct crypto4xx_alg_common crypt +@@ -1287,6 +1360,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> }; /** -@@ -1360,6 +1445,7 @@ static int crypto4xx_probe(struct platfo +@@ -1356,6 +1441,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); -@@ -1439,6 +1525,7 @@ static int crypto4xx_remove(struct platf +@@ -1435,6 +1521,7 @@ static int crypto4xx_remove(struct platf tasklet_kill(&core_dev->tasklet); /* Un-register with Linux CryptoAPI */ crypto4xx_unregister_alg(core_dev->dev); |