aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-05-11 12:10:28 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-05-12 12:45:57 +0200
commit7b49c0b48a80d422ad37a4c6bcddcd341fca747b (patch)
tree110ea65a1554d75ff5435d78cedf23dfd531ef58 /target/linux/mxs/patches-4.14
parent5faccaf0252b4130ecb50d369c4ed2ead907aa10 (diff)
downloadupstream-7b49c0b48a80d422ad37a4c6bcddcd341fca747b.tar.gz
upstream-7b49c0b48a80d422ad37a4c6bcddcd341fca747b.tar.bz2
upstream-7b49c0b48a80d422ad37a4c6bcddcd341fca747b.zip
kernel: bump 4.14 to 4.14.180
Refreshed all patches. Fixed: - CVE-2020-12114 - CVE-2020-11669 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mxs/patches-4.14')
-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,