diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-18 16:38:57 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 15:34:43 +0100 |
| commit | e115fa478fb3914db2f414d642254ff09f04bc09 (patch) | |
| tree | 43278ae296fd8b569b2c9bc93fb3a09a45193f14 /target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch | |
| parent | 7604e53d5f593120449cdaf059bfaf66ec07607e (diff) | |
| download | upstream-e115fa478fb3914db2f414d642254ff09f04bc09.tar.gz upstream-e115fa478fb3914db2f414d642254ff09f04bc09.tar.bz2 upstream-e115fa478fb3914db2f414d642254ff09f04bc09.zip | |
kernel: bump 4.19 to 4.19.90
Refreshed all patches.
Remove upstreamed:
- 010-dmaengine-dw-dmac-implement-dma-prot.patch
- 950-0148-Increase-firmware-call-buffer-size-to-48-bytes.patch
- 950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch
- 402-leds-trigger-netdev-fix-handling-on-interface-rename.patch
Fixes:
- CVE-2019-19332
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
[Add 010-dt-bindings-dmaengine-dw-dmac-add-protection-control.patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch b/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch index 4b246a793d..24e34edd58 100644 --- a/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch +++ b/target/linux/apm821xx/patches-4.19/023-0012-crypto-crypto4xx-get-rid-of-redundant-using_sd-varia.patch @@ -17,7 +17,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 -@@ -539,7 +539,7 @@ static void crypto4xx_cipher_done(struct +@@ -535,7 +535,7 @@ static void crypto4xx_cipher_done(struct req = skcipher_request_cast(pd_uinfo->async_req); @@ -26,7 +26,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo, req->cryptlen, req->dst); } else { -@@ -593,7 +593,7 @@ static void crypto4xx_aead_done(struct c +@@ -589,7 +589,7 @@ static void crypto4xx_aead_done(struct c u32 icv[AES_BLOCK_SIZE]; int err = 0; @@ -35,7 +35,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> crypto4xx_copy_pkt_to_dst(dev, pd, pd_uinfo, pd->pd_ctl_len.bf.pkt_len, dst); -@@ -887,7 +887,6 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -883,7 +883,6 @@ int crypto4xx_build_pd(struct crypto_asy * we know application give us dst a whole piece of memory * no need to use scatter ring. */ @@ -43,7 +43,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> pd_uinfo->first_sd = 0xffffffff; sa->sa_command_0.bf.scatter = 0; pd->dest = (u32)dma_map_page(dev->core_dev->device, -@@ -901,7 +900,6 @@ int crypto4xx_build_pd(struct crypto_asy +@@ -897,7 +896,6 @@ int crypto4xx_build_pd(struct crypto_asy u32 sd_idx = fst_sd; nbytes = datalen; sa->sa_command_0.bf.scatter = 1; |