aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-29 12:13:16 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-02 13:00:26 +0200
commit4685bf1d2f509f0bf1384b4a39768bbde7e3d0f8 (patch)
treee435fcb09a88b8e22ffccf0f66c9288e0675cf89 /target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch
parent2faceb1a395fcd61107b2154638b35d15172ef06 (diff)
downloadupstream-4685bf1d2f509f0bf1384b4a39768bbde7e3d0f8.tar.gz
upstream-4685bf1d2f509f0bf1384b4a39768bbde7e3d0f8.tar.bz2
upstream-4685bf1d2f509f0bf1384b4a39768bbde7e3d0f8.zip
kernel: bump 4.14 to 4.14.114
Refreshed all patches. Altered patches: - 150-bridge_allow_receiption_on_disabled_port.patch - 201-extra_optimization.patch Remove upstreamed: - 022-0006-crypto-crypto4xx-properly-set-IV-after-de-and-encryp.patch Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch')
-rw-r--r--target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch b/target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch
index a3e1b8c7df..a1e9b4b41a 100644
--- a/target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch
+++ b/target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch
@@ -26,7 +26,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
if (ivlen)
crypto4xx_memcpy_to_le32(iv, req->iv, ivlen);
-@@ -270,13 +270,7 @@ static inline bool crypto4xx_aead_need_f
+@@ -271,13 +271,7 @@ static inline bool crypto4xx_aead_need_f
static int crypto4xx_aead_fallback(struct aead_request *req,
struct crypto4xx_ctx *ctx, bool do_decrypt)
{
@@ -41,7 +41,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
aead_request_set_tfm(subreq, ctx->sw_cipher.aead);
aead_request_set_callback(subreq, req->base.flags,
-@@ -377,7 +371,7 @@ static int crypto4xx_crypt_aes_ccm(struc
+@@ -378,7 +372,7 @@ static int crypto4xx_crypt_aes_ccm(struc
struct crypto_aead *aead = crypto_aead_reqtfm(req);
unsigned int len = req->cryptlen;
__le32 iv[16];
@@ -50,7 +50,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
struct dynamic_sa_ctl *sa = (struct dynamic_sa_ctl *)tmp_sa;
if (crypto4xx_aead_need_fallback(req, true, decrypt))
-@@ -386,7 +380,7 @@ static int crypto4xx_crypt_aes_ccm(struc
+@@ -387,7 +381,7 @@ static int crypto4xx_crypt_aes_ccm(struc
if (decrypt)
len -= crypto_aead_authsize(aead);