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-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.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-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch b/target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch index 2bb4741efd..324a7406b0 100644 --- a/target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch +++ b/target/linux/apm821xx/patches-4.14/023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch @@ -107,7 +107,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> static int crypto4xx_sk_setup_fallback(struct crypto4xx_ctx *ctx, --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1215,8 +1215,8 @@ static struct crypto4xx_alg_common crypt +@@ -1211,8 +1211,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_cbc, @@ -118,7 +118,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } }, -@@ -1235,8 +1235,8 @@ static struct crypto4xx_alg_common crypt +@@ -1231,8 +1231,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_cfb, @@ -129,7 +129,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } }, -@@ -1295,8 +1295,8 @@ static struct crypto4xx_alg_common crypt +@@ -1291,8 +1291,8 @@ static struct crypto4xx_alg_common crypt .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE, .setkey = crypto4xx_setkey_aes_ecb, @@ -140,7 +140,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } }, -@@ -1315,8 +1315,8 @@ static struct crypto4xx_alg_common crypt +@@ -1311,8 +1311,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_ofb, |