diff options
author | Christian Lamparter <chunkeey@gmail.com> | 2020-03-07 16:58:32 +0100 |
---|---|---|
committer | Christian Lamparter <chunkeey@gmail.com> | 2020-03-14 15:17:32 +0100 |
commit | b052b62efc3d49f61eb12d48b16851a48cfb928c (patch) | |
tree | 1a23d3e3707c5e52f42471cbe0bc173eed02ec2f /target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch | |
parent | 0a06fcf608ddf1f5db389decf266283392344784 (diff) | |
download | upstream-b052b62efc3d49f61eb12d48b16851a48cfb928c.tar.gz upstream-b052b62efc3d49f61eb12d48b16851a48cfb928c.tar.bz2 upstream-b052b62efc3d49f61eb12d48b16851a48cfb928c.zip |
apm821xx: 4.14: remove kernel config and patches
This patch removes the 4.14 kernel support from the apm821xx target.
The 4.19 kernel has been available and stable for a while and the 5.4
kernel support has been tested successfully on real hardware as well.
Signed-off-by: Christian Lamparter <chunkeey@gmail.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.patch | 61 |
1 files changed, 0 insertions, 61 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 deleted file mode 100644 index a1e9b4b41a..0000000000 --- a/target/linux/apm821xx/patches-4.14/022-0004-crypto-crypto4xx-avoid-VLA-use.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c4e90650ff0cbf123ec9cfc32026fa0fb2931658 Mon Sep 17 00:00:00 2001 -From: Christian Lamparter <chunkeey@gmail.com> -Date: Thu, 19 Apr 2018 18:41:53 +0200 -Subject: [PATCH 4/8] crypto: crypto4xx - avoid VLA use - -This patch fixes some of the -Wvla warnings. - -crypto4xx_alg.c:83:19: warning: Variable length array is used. -crypto4xx_alg.c:273:56: warning: Variable length array is used. -crypto4xx_alg.c:380:32: warning: Variable length array is used. - -Signed-off-by: Christian Lamparter <chunkeey@gmail.com> -Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> ---- - drivers/crypto/amcc/crypto4xx_alg.c | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - ---- a/drivers/crypto/amcc/crypto4xx_alg.c -+++ b/drivers/crypto/amcc/crypto4xx_alg.c -@@ -80,7 +80,7 @@ static inline int crypto4xx_crypt(struct - { - struct crypto_skcipher *cipher = crypto_skcipher_reqtfm(req); - struct crypto4xx_ctx *ctx = crypto_skcipher_ctx(cipher); -- __le32 iv[ivlen]; -+ __le32 iv[AES_IV_SIZE]; - - if (ivlen) - crypto4xx_memcpy_to_le32(iv, req->iv, ivlen); -@@ -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) - { -- char aead_req_data[sizeof(struct aead_request) + -- crypto_aead_reqsize(ctx->sw_cipher.aead)] -- __aligned(__alignof__(struct aead_request)); -- -- struct aead_request *subreq = (void *) aead_req_data; -- -- memset(subreq, 0, sizeof(aead_req_data)); -+ struct aead_request *subreq = aead_request_ctx(req); - - aead_request_set_tfm(subreq, ctx->sw_cipher.aead); - aead_request_set_callback(subreq, req->base.flags, -@@ -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]; -- u32 tmp_sa[ctx->sa_len * 4]; -+ u32 tmp_sa[SA_AES128_CCM_LEN + 4]; - struct dynamic_sa_ctl *sa = (struct dynamic_sa_ctl *)tmp_sa; - - if (crypto4xx_aead_need_fallback(req, true, decrypt)) -@@ -387,7 +381,7 @@ static int crypto4xx_crypt_aes_ccm(struc - if (decrypt) - len -= crypto_aead_authsize(aead); - -- memcpy(tmp_sa, decrypt ? ctx->sa_in : ctx->sa_out, sizeof(tmp_sa)); -+ memcpy(tmp_sa, decrypt ? ctx->sa_in : ctx->sa_out, ctx->sa_len * 4); - sa->sa_command_0.bf.digest_len = crypto_aead_authsize(aead) >> 2; - - if (req->iv[0] == 1) { |