aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-05-04 14:53:34 +0200
committerPetr Štetiar <ynezz@true.cz>2020-05-04 21:05:21 +0200
commitf9ef0c570550c9cbda3f28522753472d0d048378 (patch)
treef5ddd3755b9e36df6cd32e6858f0cf9eb9f549ff /target/linux/mxs
parent2df0ea042d14dbfc2735b843eb82a0ae0d8bec19 (diff)
downloadupstream-f9ef0c570550c9cbda3f28522753472d0d048378.tar.gz
upstream-f9ef0c570550c9cbda3f28522753472d0d048378.tar.bz2
upstream-f9ef0c570550c9cbda3f28522753472d0d048378.zip
kernel: bump 4.14 to 4.14.178
Refreshed all patches and removed upstreamed: oxnas/001-irqchip-versatile-fpga-Handle-chained-IRQs-properly.patch oxnas/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch Fixes: CVE-2020-12114 and CVE-2020-11669 Runtime-tested on: qemu-x86-64 Compile-tested on: ath79/generic, x86/64, imx6 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/mxs')
-rw-r--r--target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch b/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch
index 4a1722a663..49e96d1e95 100644
--- a/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch
+++ b/target/linux/mxs/patches-4.14/110-crypto-mxsdcp-provide-importexport.patch
@@ -1,6 +1,6 @@
--- a/drivers/crypto/mxs-dcp.c
+++ b/drivers/crypto/mxs-dcp.c
-@@ -833,6 +833,24 @@ static void dcp_sha_cra_exit(struct cryp
+@@ -831,6 +831,24 @@ static void dcp_sha_cra_exit(struct cryp
{
}
@@ -25,7 +25,7 @@
/* AES 128 ECB and AES 128 CBC */
static struct crypto_alg dcp_aes_algs[] = {
{
-@@ -892,8 +910,11 @@ static struct ahash_alg dcp_sha1_alg = {
+@@ -890,8 +908,11 @@ static struct ahash_alg dcp_sha1_alg = {
.final = dcp_sha_final,
.finup = dcp_sha_finup,
.digest = dcp_sha_digest,
@@ -37,7 +37,7 @@
.base = {
.cra_name = "sha1",
.cra_driver_name = "sha1-dcp",
-@@ -916,8 +937,11 @@ static struct ahash_alg dcp_sha256_alg =
+@@ -914,8 +935,11 @@ static struct ahash_alg dcp_sha256_alg =
.final = dcp_sha_final,
.finup = dcp_sha_finup,
.digest = dcp_sha_digest,