diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-08-15 19:47:56 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-08-15 22:31:56 +0200 |
| commit | e4bad5f0ac9b8e6602181a51b1f97e39bef0595b (patch) | |
| tree | ecab994bc521d2ac0f3ed1d31cb1e529de2c3891 /target/linux/ipq40xx/patches-4.14 | |
| parent | ae9c3105a3d8db9cd76a05a8e78724e4e1a58853 (diff) | |
| download | upstream-e4bad5f0ac9b8e6602181a51b1f97e39bef0595b.tar.gz upstream-e4bad5f0ac9b8e6602181a51b1f97e39bef0595b.tar.bz2 upstream-e4bad5f0ac9b8e6602181a51b1f97e39bef0595b.zip | |
kernel: bump kernel 4.14 to version 4.14.63
The following patches were integrated upstream:
* target/linux/ipq40xx/patches-4.14/050-0006-mtd-nand-qcom-Add-a-NULL-check-for-devm_kasprintf.patch
* target/linux/mediatek/patches-4.14/0177-phy-phy-mtk-tphy-use-auto-instead-of-force-to-bypass.patch
This fixes tries to work around the following security problems:
* CVE-2018-3620 L1 Terminal Fault OS, SMM related aspects
* CVE-2018-3646 L1 Terminal Fault Virtualization related aspects
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ipq40xx/patches-4.14')
2 files changed, 1 insertions, 27 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/050-0003-mtd-nand-qcom-support-for-command-descriptor-formati.patch b/target/linux/ipq40xx/patches-4.14/050-0003-mtd-nand-qcom-support-for-command-descriptor-formati.patch index 8dd209b919..62bac3762a 100644 --- a/target/linux/ipq40xx/patches-4.14/050-0003-mtd-nand-qcom-support-for-command-descriptor-formati.patch +++ b/target/linux/ipq40xx/patches-4.14/050-0003-mtd-nand-qcom-support-for-command-descriptor-formati.patch @@ -191,7 +191,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> if (r) return r; } -@@ -2722,6 +2797,7 @@ static int qcom_nandc_probe(struct platf +@@ -2725,6 +2800,7 @@ static int qcom_nandc_probe(struct platf if (IS_ERR(nandc->base)) return PTR_ERR(nandc->base); diff --git a/target/linux/ipq40xx/patches-4.14/050-0006-mtd-nand-qcom-Add-a-NULL-check-for-devm_kasprintf.patch b/target/linux/ipq40xx/patches-4.14/050-0006-mtd-nand-qcom-Add-a-NULL-check-for-devm_kasprintf.patch deleted file mode 100644 index 4ddc0148ad..0000000000 --- a/target/linux/ipq40xx/patches-4.14/050-0006-mtd-nand-qcom-Add-a-NULL-check-for-devm_kasprintf.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 069f05346d01e7298939f16533953cdf52370be3 Mon Sep 17 00:00:00 2001 -From: Fabio Estevam <fabio.estevam@nxp.com> -Date: Fri, 5 Jan 2018 18:02:55 -0200 -Subject: [PATCH 6/7] mtd: nand: qcom: Add a NULL check for devm_kasprintf() - -devm_kasprintf() may fail, so we should better add a NULL check -and propagate an error on failure. - -Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> -Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> ---- - drivers/mtd/nand/qcom_nandc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/mtd/nand/qcom_nandc.c -+++ b/drivers/mtd/nand/qcom_nandc.c -@@ -2639,6 +2639,9 @@ static int qcom_nand_host_init(struct qc - - nand_set_flash_node(chip, dn); - mtd->name = devm_kasprintf(dev, GFP_KERNEL, "qcom_nand.%d", host->cs); -+ if (!mtd->name) -+ return -ENOMEM; -+ - mtd->owner = THIS_MODULE; - mtd->dev.parent = dev; - |