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-0005-crypto-crypto4xx-add-aes-ctr-support.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-0005-crypto-crypto4xx-add-aes-ctr-support.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch b/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch index c916d5a212..7f4220feb3 100644 --- a/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch +++ b/target/linux/apm821xx/patches-4.14/022-0005-crypto-crypto4xx-add-aes-ctr-support.patch @@ -160,7 +160,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -950,6 +950,19 @@ static int crypto4xx_sk_init(struct cryp +@@ -946,6 +946,19 @@ static int crypto4xx_sk_init(struct cryp struct crypto4xx_alg *amcc_alg; struct crypto4xx_ctx *ctx = crypto_skcipher_ctx(sk); @@ -180,7 +180,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> amcc_alg = container_of(alg, struct crypto4xx_alg, alg.u.cipher); crypto4xx_ctx_init(amcc_alg, ctx); return 0; -@@ -965,6 +978,8 @@ static void crypto4xx_sk_exit(struct cry +@@ -961,6 +974,8 @@ static void crypto4xx_sk_exit(struct cry struct crypto4xx_ctx *ctx = crypto_skcipher_ctx(sk); crypto4xx_common_exit(ctx); @@ -189,7 +189,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> } static int crypto4xx_aead_init(struct crypto_aead *tfm) -@@ -1154,6 +1169,28 @@ static struct crypto4xx_alg_common crypt +@@ -1150,6 +1165,28 @@ static struct crypto4xx_alg_common crypt .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } }, |