From e4bad5f0ac9b8e6602181a51b1f97e39bef0595b Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 15 Aug 2018 19:47:56 +0200
Subject: 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>
---
 ...-qcom-Add-a-NULL-check-for-devm_kasprintf.patch | 26 ----------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 target/linux/ipq40xx/patches-4.14/050-0006-mtd-nand-qcom-Add-a-NULL-check-for-devm_kasprintf.patch

(limited to 'target/linux/ipq40xx/patches-4.14/050-0006-mtd-nand-qcom-Add-a-NULL-check-for-devm_kasprintf.patch')

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 4ddc014..0000000
--- 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;
- 
-- 
cgit v1.1