aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-12-18 16:40:13 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-12-25 15:55:41 +0100
commit27dddb67c0cfedc86c4ccfea6c50ed5f1cf3894d (patch)
tree023cbaf378fad1c5aa5128e821d6f6ba0d573522 /target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch
parent8623b58c1d1cccc5986f1c306b0959d3514987b4 (diff)
downloadupstream-27dddb67c0cfedc86c4ccfea6c50ed5f1cf3894d.tar.gz
upstream-27dddb67c0cfedc86c4ccfea6c50ed5f1cf3894d.tar.bz2
upstream-27dddb67c0cfedc86c4ccfea6c50ed5f1cf3894d.zip
kernel: bump 4.14 to 4.14.159
Refreshed all patches. 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/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch')
-rw-r--r--target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch b/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch
index 55c85005af..2ac1e5a1d6 100644
--- a/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch
+++ b/target/linux/apm821xx/patches-4.14/020-0022-crypto-crypto4xx-simplify-sa-and-state-context-acqui.patch
@@ -167,7 +167,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
/**
* alloc memory for the gather ring
* no need to alloc buf for the ring
-@@ -892,8 +861,6 @@ static int crypto4xx_alg_init(struct cry
+@@ -888,8 +857,6 @@ static int crypto4xx_alg_init(struct cry
ctx->dev = amcc_alg->dev;
ctx->sa_in = NULL;
ctx->sa_out = NULL;
@@ -176,7 +176,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
ctx->sa_len = 0;
switch (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) {
-@@ -914,7 +881,6 @@ static void crypto4xx_alg_exit(struct cr
+@@ -910,7 +877,6 @@ static void crypto4xx_alg_exit(struct cr
struct crypto4xx_ctx *ctx = crypto_tfm_ctx(tfm);
crypto4xx_free_sa(ctx);