diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-18 16:39:42 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 15:29:32 +0100 |
| commit | f80272dd9c40dae4aeff38fa5c7132a0f5fc198c (patch) | |
| tree | f67e8c7c33caf3eb39fceaa545472e4cc204388e /target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch | |
| parent | 3030abfa7e9ac73ee54b4ac9e9a784775001d750 (diff) | |
| download | upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.tar.gz upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.tar.bz2 upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.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/022-0003-crypto-crypto4xx-convert-to-skcipher.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch b/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch index 64c07d7127..439f78ae5c 100644 --- a/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch +++ b/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch @@ -196,7 +196,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> #include <crypto/internal/aead.h> #include <crypto/internal/skcipher.h> #include "crypto4xx_reg_def.h" -@@ -526,21 +527,19 @@ static void crypto4xx_ret_sg_desc(struct +@@ -522,21 +523,19 @@ static void crypto4xx_ret_sg_desc(struct } } @@ -223,7 +223,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> } else { dst = pd_uinfo->dest_va; addr = dma_map_page(dev->core_dev->device, sg_page(dst), -@@ -558,8 +557,8 @@ static void crypto4xx_ablkcipher_done(st +@@ -554,8 +553,8 @@ static void crypto4xx_ablkcipher_done(st crypto4xx_ret_sg_desc(dev, pd_uinfo); if (pd_uinfo->state & PD_ENTRY_BUSY) @@ -234,7 +234,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> } static void crypto4xx_ahash_done(struct crypto4xx_device *dev, -@@ -650,8 +649,8 @@ static void crypto4xx_pd_done(struct cry +@@ -646,8 +645,8 @@ static void crypto4xx_pd_done(struct cry struct pd_uinfo *pd_uinfo = &dev->pdr_uinfo[idx]; switch (crypto_tfm_alg_type(pd_uinfo->async_req->tfm)) { @@ -245,7 +245,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> break; case CRYPTO_ALG_TYPE_AEAD: crypto4xx_aead_done(dev, pd_uinfo, pd); -@@ -945,15 +944,14 @@ static void crypto4xx_ctx_init(struct cr +@@ -941,15 +940,14 @@ static void crypto4xx_ctx_init(struct cr ctx->sa_len = 0; } @@ -264,7 +264,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> return 0; } -@@ -962,9 +960,11 @@ static void crypto4xx_common_exit(struct +@@ -958,9 +956,11 @@ static void crypto4xx_common_exit(struct crypto4xx_free_sa(ctx); } @@ -278,7 +278,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> } static int crypto4xx_aead_init(struct crypto_aead *tfm) -@@ -1021,7 +1021,7 @@ static int crypto4xx_register_alg(struct +@@ -1017,7 +1017,7 @@ static int crypto4xx_register_alg(struct break; default: @@ -287,7 +287,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> break; } -@@ -1050,7 +1050,7 @@ static void crypto4xx_unregister_alg(str +@@ -1046,7 +1046,7 @@ static void crypto4xx_unregister_alg(str break; default: @@ -296,7 +296,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> } kfree(alg); } -@@ -1112,126 +1112,109 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1108,126 +1108,109 @@ static irqreturn_t crypto4xx_ce_interrup */ static struct crypto4xx_alg_common crypto4xx_alg[] = { /* Crypto AES modes */ |